From 16c0a819a974d7d0c2ae4be7b800ea0ffd2a39af Mon Sep 17 00:00:00 2001 From: Dianne Skoll Date: Tue, 25 Jan 2022 22:03:34 -0500 Subject: [PATCH] Fix to language code. --- src/globals.h | 11 ++++++++++- src/langs/romanian.h | 1 - src/langs/spanish.h | 2 +- src/test-all-languages.sh | 3 ++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/globals.h b/src/globals.h index 453016f3..7cd09ab3 100644 --- a/src/globals.h +++ b/src/globals.h @@ -170,11 +170,15 @@ EXTERN char *MonthName[] EXTERN char *DynamicMonthName[] #ifdef MK_GLOBALS +#if LANG == ENGLISH = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"} +#else += {L_JAN, L_FEB, L_MAR, L_APR, L_MAY, L_JUN, + L_JUL, L_AUG, L_SEP, L_OCT, L_NOV, L_DEC} +#endif #endif ; - EXTERN char *EnglishDayName[] #ifdef MK_GLOBALS = {"Monday", "Tuesday", "Wednesday", "Thursday", "Friday", @@ -195,8 +199,13 @@ EXTERN char *DayName[] EXTERN char *DynamicDayName [] #ifdef MK_GLOBALS +#if LANG == ENGLISH = {"Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"} +#else += {L_MONDAY, L_TUESDAY, L_WEDNESDAY, L_THURSDAY, L_FRIDAY, + L_SATURDAY, L_SUNDAY} +#endif #endif ; diff --git a/src/langs/romanian.h b/src/langs/romanian.h index 0a004083..8e76dcf5 100644 --- a/src/langs/romanian.h +++ b/src/langs/romanian.h @@ -24,7 +24,6 @@ # define L_THURSDAY "Joi" # define L_FRIDAY "Vineri" # define L_SATURDAY "Sâmbătă" -#endif /* Month names */ #define L_JAN "Ianuarie" diff --git a/src/langs/spanish.h b/src/langs/spanish.h index 1e49108d..b323909a 100644 --- a/src/langs/spanish.h +++ b/src/langs/spanish.h @@ -17,7 +17,7 @@ #define L_SUNDAY "Domingo" #define L_MONDAY "Lunes" #define L_TUESDAY "Martes" -#define L_WEDNESDAY "miércoles" +#define L_WEDNESDAY "Miércoles" #define L_THURSDAY "Jueves" #define L_FRIDAY "Viernes" #define L_SATURDAY "Sábado" diff --git a/src/test-all-languages.sh b/src/test-all-languages.sh index 510d768e..8ea24067 100755 --- a/src/test-all-languages.sh +++ b/src/test-all-languages.sh @@ -5,7 +5,8 @@ ALL=`grep ^#define lang.h | grep -v '#define LANG' | awk '{print $2}'` for i in $ALL ; do - make clean all LANGDEF=-DLANG=$i || exit 1 + make clean + make -j`nproc` all LANGDEF=-DLANG=$i || exit 1 ./remind -q -r ../tests/tstlang.rem done exit 0