From ef76a1c97d8712529c70b8c063324dfc59b0d9be Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 4 Apr 2000 18:53:37 +0000 Subject: [PATCH] Michael Abd-El-Malek (Corel) Changed irl.nls to eni.nls. Reviewed and fixed a lot of the NLS files to be more compatible to Windows. Added en_GB (used by Corel Linux 1.0,1.1) as alias for en_UK. Jeff Tranter The measurement unit for Canadian English should be metric. LANG_SUB_ENTRY did always return the first language due to missing {}. --- misc/main.c | 6 ++-- ole/nls/ena.nls | 23 +++++++-------- ole/nls/enb.nls | 27 +++++++++--------- ole/nls/enc.nls | 27 +++++++++--------- ole/nls/eng.nls | 7 +++-- ole/nls/{irl.nls => eni.nls} | 55 ++++++++++++++++++------------------ ole/nls/enj.nls | 29 ++++++++++--------- ole/nls/enl.nls | 42 +++++++++++++-------------- ole/nls/ens.nls | 33 +++++++++++----------- ole/nls/ent.nls | 38 ++++++++++++------------- ole/nls/enu.nls | 5 ++-- ole/nls/enz.nls | 17 +++++------ ole/ole2nls.c | 8 +++--- 13 files changed, 163 insertions(+), 154 deletions(-) rename ole/nls/{irl.nls => eni.nls} (77%) diff --git a/misc/main.c b/misc/main.c index 6e87b259309..69152a2885b 100644 --- a/misc/main.c +++ b/misc/main.c @@ -301,9 +301,10 @@ int MAIN_GetLanguageID(LPCSTR Lang,LPCSTR Country,LPCSTR Charset,LPCSTR Dialect) ret=LANG_##y ; \ goto end_MAIN_GetLanguageID; \ } -#define LANG_SUB_ENTRY(x,y,z) if (!strcmp(country, x )) \ +#define LANG_SUB_ENTRY(x,y,z) if (!strcmp(country, x )) { \ ret = MAKELANGID( LANG_##y , SUBLANG_##z ); \ - goto end_MAIN_GetLanguageID; + goto end_MAIN_GetLanguageID; \ + } #define LANG_DIALECT_ENTRY(x,y) { ret = MAKELANGID(LANG_##x , SUBLANG_##y ); \ goto end_MAIN_GetLanguageID; } #define LANG_ENTRY_END(x) ret = MAKELANGID(LANG_##x , SUBLANG_DEFAULT); \ @@ -355,6 +356,7 @@ int MAIN_GetLanguageID(LPCSTR Lang,LPCSTR Country,LPCSTR Charset,LPCSTR Dialect) /*x09*/ LANG_ENTRY_BEGIN( "en", ENGLISH ) LANG_SUB_ENTRY( "US", ENGLISH, ENGLISH_US ) LANG_SUB_ENTRY( "UK", ENGLISH, ENGLISH_UK ) + LANG_SUB_ENTRY( "GB", ENGLISH, ENGLISH_UK ) LANG_SUB_ENTRY( "AU", ENGLISH, ENGLISH_AUS ) LANG_SUB_ENTRY( "CA", ENGLISH, ENGLISH_CAN ) LANG_SUB_ENTRY( "NZ", ENGLISH, ENGLISH_NZ ) diff --git a/ole/nls/ena.nls b/ole/nls/ena.nls index 017e40273ab..10f357c7a98 100644 --- a/ole/nls/ena.nls +++ b/ole/nls/ena.nls @@ -1,22 +1,23 @@ /* * OLE2NLS library - * Australia + * English (Australian) */ LOCVAL(LOCALE_ILANGUAGE, "0c09") -LOCVAL(LOCALE_SLANGUAGE, "English (Australia)") +LOCVAL(LOCALE_SLANGUAGE, "English (Australian)") LOCVAL(LOCALE_SENGLANGUAGE, "English") -LOCVAL(LOCALE_SABBREVLANGNAME, "ena") +LOCVAL(LOCALE_SABBREVLANGNAME, "ENA") LOCVAL(LOCALE_SNATIVELANGNAME, "English") -LOCVAL(LOCALE_ICOUNTRY, "44") +LOCVAL(LOCALE_ICOUNTRY, "61") LOCVAL(LOCALE_SCOUNTRY, "Australia") LOCVAL(LOCALE_SENGCOUNTRY, "Australia") LOCVAL(LOCALE_SABBREVCTRYNAME, "AUS") LOCVAL(LOCALE_SNATIVECTRYNAME, "Australia") -LOCVAL(LOCALE_IDEFAULTLANGUAGE, "0409") -LOCVAL(LOCALE_IDEFAULTCOUNTRY, "44") +LOCVAL(LOCALE_IDEFAULTLANGUAGE, "0c09") +LOCVAL(LOCALE_IDEFAULTCOUNTRY, "61") LOCVAL(LOCALE_IDEFAULTCODEPAGE, "850") LOCVAL(LOCALE_IDEFAULTANSICODEPAGE, "1252") +LOCVAL(LOCALE_IDEFAULTMACCODEPAGE, "10000") LOCVAL(LOCALE_SLIST, ",") LOCVAL(LOCALE_IMEASURE, "0") LOCVAL(LOCALE_SDECIMAL, ".") @@ -37,16 +38,16 @@ LOCVAL(LOCALE_ICURRENCY, "0") LOCVAL(LOCALE_INEGCURR, "1") LOCVAL(LOCALE_SDATE, "/") LOCVAL(LOCALE_STIME, ":") -LOCVAL(LOCALE_SSHORTDATE, "dd/MM/yy") -LOCVAL(LOCALE_SLONGDATE, "dd MMMM yyyy") -LOCVAL(LOCALE_STIMEFORMAT, "HH:mm:ss") +LOCVAL(LOCALE_SSHORTDATE, "d/MM/yy") +LOCVAL(LOCALE_SLONGDATE, "dddd, d MMMM yyyy") +LOCVAL(LOCALE_STIMEFORMAT, "H:mm:ss") LOCVAL(LOCALE_IDATE, "1") LOCVAL(LOCALE_ILDATE, "1") LOCVAL(LOCALE_ITIME, "1") LOCVAL(LOCALE_ITIMEMARKPOSN, "0") LOCVAL(LOCALE_ICENTURY, "0") -LOCVAL(LOCALE_ITLZERO, "1") -LOCVAL(LOCALE_IDAYLZERO, "1") +LOCVAL(LOCALE_ITLZERO, "0") +LOCVAL(LOCALE_IDAYLZERO, "0") LOCVAL(LOCALE_IMONLZERO, "1") LOCVAL(LOCALE_S1159, "AM") LOCVAL(LOCALE_S2359, "PM") diff --git a/ole/nls/enb.nls b/ole/nls/enb.nls index 04c6e8f43fe..25a95b26e43 100644 --- a/ole/nls/enb.nls +++ b/ole/nls/enb.nls @@ -1,24 +1,25 @@ /* * OLE2NLS library - * Caribbean + * Enlgish (Caribbean) */ LOCVAL(LOCALE_ILANGUAGE, "2409") LOCVAL(LOCALE_SLANGUAGE, "English (Caribbean)") LOCVAL(LOCALE_SENGLANGUAGE, "English") -LOCVAL(LOCALE_SABBREVLANGNAME, "enb") +LOCVAL(LOCALE_SABBREVLANGNAME, "ENB") LOCVAL(LOCALE_SNATIVELANGNAME, "English") -LOCVAL(LOCALE_ICOUNTRY, "44") +LOCVAL(LOCALE_ICOUNTRY, "1") LOCVAL(LOCALE_SCOUNTRY, "Caribbean") LOCVAL(LOCALE_SENGCOUNTRY, "Caribbean") LOCVAL(LOCALE_SABBREVCTRYNAME, "CAR") -LOCVAL(LOCALE_SNATIVECTRYNAME, "Carribean") +LOCVAL(LOCALE_SNATIVECTRYNAME, "Caribbean") LOCVAL(LOCALE_IDEFAULTLANGUAGE, "2409") -LOCVAL(LOCALE_IDEFAULTCOUNTRY, "44") +LOCVAL(LOCALE_IDEFAULTCOUNTRY, "1") LOCVAL(LOCALE_IDEFAULTCODEPAGE, "850") LOCVAL(LOCALE_IDEFAULTANSICODEPAGE, "1252") +LOCVAL(LOCALE_IDEFAULTMACCODEPAGE, "10000") LOCVAL(LOCALE_SLIST, ",") -LOCVAL(LOCALE_IMEASURE, "0") +LOCVAL(LOCALE_IMEASURE, "1") LOCVAL(LOCALE_SDECIMAL, ".") LOCVAL(LOCALE_STHOUSAND, ",") LOCVAL(LOCALE_SGROUPING, "3;0") @@ -37,15 +38,15 @@ LOCVAL(LOCALE_ICURRENCY, "0") LOCVAL(LOCALE_INEGCURR, "1") LOCVAL(LOCALE_SDATE, "/") LOCVAL(LOCALE_STIME, ":") -LOCVAL(LOCALE_SSHORTDATE, "dd/MM/yy") -LOCVAL(LOCALE_SLONGDATE, "dd MMMM yyyy") -LOCVAL(LOCALE_STIMEFORMAT, "HH:mm:ss") -LOCVAL(LOCALE_IDATE, "1") -LOCVAL(LOCALE_ILDATE, "1") -LOCVAL(LOCALE_ITIME, "1") +LOCVAL(LOCALE_SSHORTDATE, "MM/dd/yy") +LOCVAL(LOCALE_SLONGDATE, "dddd, MMMM dd, yyyy") +LOCVAL(LOCALE_STIMEFORMAT, "h:mm:ss tt") +LOCVAL(LOCALE_IDATE, "0") +LOCVAL(LOCALE_ILDATE, "0") +LOCVAL(LOCALE_ITIME, "0") LOCVAL(LOCALE_ITIMEMARKPOSN, "0") LOCVAL(LOCALE_ICENTURY, "0") -LOCVAL(LOCALE_ITLZERO, "1") +LOCVAL(LOCALE_ITLZERO, "0") LOCVAL(LOCALE_IDAYLZERO, "1") LOCVAL(LOCALE_IMONLZERO, "1") LOCVAL(LOCALE_S1159, "AM") diff --git a/ole/nls/enc.nls b/ole/nls/enc.nls index 5285d6d5d3f..40bfaf952e5 100644 --- a/ole/nls/enc.nls +++ b/ole/nls/enc.nls @@ -1,24 +1,25 @@ /* * OLE2NLS library - * Canada (English) + * English (Canadian) */ LOCVAL(LOCALE_ILANGUAGE, "1009") -LOCVAL(LOCALE_SLANGUAGE, "English (Canada)") +LOCVAL(LOCALE_SLANGUAGE, "English (Canadian)") LOCVAL(LOCALE_SENGLANGUAGE, "English") -LOCVAL(LOCALE_SABBREVLANGNAME, "enc") +LOCVAL(LOCALE_SABBREVLANGNAME, "ENC") LOCVAL(LOCALE_SNATIVELANGNAME, "English") LOCVAL(LOCALE_ICOUNTRY, "2") LOCVAL(LOCALE_SCOUNTRY, "Canada") LOCVAL(LOCALE_SENGCOUNTRY, "Canada") LOCVAL(LOCALE_SABBREVCTRYNAME, "CAN") LOCVAL(LOCALE_SNATIVECTRYNAME, "Canada") -LOCVAL(LOCALE_IDEFAULTLANGUAGE, "0409") -LOCVAL(LOCALE_IDEFAULTCOUNTRY, "1") +LOCVAL(LOCALE_IDEFAULTLANGUAGE, "1009") +LOCVAL(LOCALE_IDEFAULTCOUNTRY, "2") LOCVAL(LOCALE_IDEFAULTCODEPAGE, "850") LOCVAL(LOCALE_IDEFAULTANSICODEPAGE, "1252") +LOCVAL(LOCALE_IDEFAULTMACCODEPAGE, "10000") LOCVAL(LOCALE_SLIST, ",") -LOCVAL(LOCALE_IMEASURE, "1") +LOCVAL(LOCALE_IMEASURE, "0") LOCVAL(LOCALE_SDECIMAL, ".") LOCVAL(LOCALE_STHOUSAND, ",") LOCVAL(LOCALE_SGROUPING, "3;0") @@ -34,20 +35,20 @@ LOCVAL(LOCALE_SMONGROUPING, "3;0") LOCVAL(LOCALE_ICURRDIGITS, "2") LOCVAL(LOCALE_IINTLCURRDIGITS, "2") LOCVAL(LOCALE_ICURRENCY, "0") -LOCVAL(LOCALE_INEGCURR, "0") +LOCVAL(LOCALE_INEGCURR, "1") LOCVAL(LOCALE_SDATE, "/") LOCVAL(LOCALE_STIME, ":") -LOCVAL(LOCALE_SSHORTDATE, "M/d/yy") -LOCVAL(LOCALE_SLONGDATE, "dddd, MMMM dd, yyyy") +LOCVAL(LOCALE_SSHORTDATE, "dd/MM/yy") +LOCVAL(LOCALE_SLONGDATE, "MMMM d, yyyy") LOCVAL(LOCALE_STIMEFORMAT, "h:mm:ss tt") -LOCVAL(LOCALE_IDATE, "0") +LOCVAL(LOCALE_IDATE, "1") LOCVAL(LOCALE_ILDATE, "0") LOCVAL(LOCALE_ITIME, "0") LOCVAL(LOCALE_ITIMEMARKPOSN, "0") LOCVAL(LOCALE_ICENTURY, "0") LOCVAL(LOCALE_ITLZERO, "0") -LOCVAL(LOCALE_IDAYLZERO, "0") -LOCVAL(LOCALE_IMONLZERO, "0") +LOCVAL(LOCALE_IDAYLZERO, "1") +LOCVAL(LOCALE_IMONLZERO, "1") LOCVAL(LOCALE_S1159, "AM") LOCVAL(LOCALE_S2359, "PM") LOCVAL(LOCALE_ICALENDARTYPE, "1") @@ -102,7 +103,7 @@ LOCVAL(LOCALE_SABBREVMONTHNAME13, "") LOCVAL(LOCALE_SPOSITIVESIGN, "") LOCVAL(LOCALE_SNEGATIVESIGN, "-") LOCVAL(LOCALE_IPOSSIGNPOSN, "3") -LOCVAL(LOCALE_INEGSIGNPOSN, "0") +LOCVAL(LOCALE_INEGSIGNPOSN, "3") LOCVAL(LOCALE_IPOSSYMPRECEDES, "1") LOCVAL(LOCALE_IPOSSEPBYSPACE, "0") LOCVAL(LOCALE_INEGSYMPRECEDES, "1") diff --git a/ole/nls/eng.nls b/ole/nls/eng.nls index 0d7702044dc..a9793b33c61 100644 --- a/ole/nls/eng.nls +++ b/ole/nls/eng.nls @@ -1,22 +1,23 @@ /* * OLE2NLS library - * United Kingdom + * English (United Kingdom) */ LOCVAL(LOCALE_ILANGUAGE, "0809") LOCVAL(LOCALE_SLANGUAGE, "English (United Kingdom)") LOCVAL(LOCALE_SENGLANGUAGE, "English") -LOCVAL(LOCALE_SABBREVLANGNAME, "eng") +LOCVAL(LOCALE_SABBREVLANGNAME, "ENG") LOCVAL(LOCALE_SNATIVELANGNAME, "English") LOCVAL(LOCALE_ICOUNTRY, "44") LOCVAL(LOCALE_SCOUNTRY, "United Kingdom") LOCVAL(LOCALE_SENGCOUNTRY, "United Kingdom") LOCVAL(LOCALE_SABBREVCTRYNAME, "GBR") LOCVAL(LOCALE_SNATIVECTRYNAME, "United Kingdom") -LOCVAL(LOCALE_IDEFAULTLANGUAGE, "0409") +LOCVAL(LOCALE_IDEFAULTLANGUAGE, "0809") LOCVAL(LOCALE_IDEFAULTCOUNTRY, "44") LOCVAL(LOCALE_IDEFAULTCODEPAGE, "850") LOCVAL(LOCALE_IDEFAULTANSICODEPAGE, "1252") +LOCVAL(LOCALE_IDEFAULTMACCODEPAGE, "10000") LOCVAL(LOCALE_SLIST, ",") LOCVAL(LOCALE_IMEASURE, "0") LOCVAL(LOCALE_SDECIMAL, ".") diff --git a/ole/nls/irl.nls b/ole/nls/eni.nls similarity index 77% rename from ole/nls/irl.nls rename to ole/nls/eni.nls index 08f46adaa9b..4510f2d3eb8 100644 --- a/ole/nls/irl.nls +++ b/ole/nls/eni.nls @@ -1,24 +1,25 @@ -/* - * OLE2NLS library - * Ireland - */ +/* + * OLE2NLS library + * English (Ireland) + */ LOCVAL(LOCALE_ILANGUAGE, "1809") LOCVAL(LOCALE_SLANGUAGE, "English (Ireland)") LOCVAL(LOCALE_SENGLANGUAGE, "English") -LOCVAL(LOCALE_SABBREVLANGNAME, "irl") +LOCVAL(LOCALE_SABBREVLANGNAME, "ENI") LOCVAL(LOCALE_SNATIVELANGNAME, "English") LOCVAL(LOCALE_ICOUNTRY, "353") LOCVAL(LOCALE_SCOUNTRY, "Ireland") LOCVAL(LOCALE_SENGCOUNTRY, "Ireland") LOCVAL(LOCALE_SABBREVCTRYNAME, "IRL") LOCVAL(LOCALE_SNATIVECTRYNAME, "Eire") -LOCVAL(LOCALE_IDEFAULTLANGUAGE, "0409") +LOCVAL(LOCALE_IDEFAULTLANGUAGE, "1809") LOCVAL(LOCALE_IDEFAULTCOUNTRY, "353") -LOCVAL(LOCALE_IDEFAULTCODEPAGE, "437") +LOCVAL(LOCALE_IDEFAULTCODEPAGE, "850") LOCVAL(LOCALE_IDEFAULTANSICODEPAGE, "1252") +LOCVAL(LOCALE_IDEFAULTMACCODEPAGE, "10000") LOCVAL(LOCALE_SLIST, ",") -LOCVAL(LOCALE_IMEASURE, "1") +LOCVAL(LOCALE_IMEASURE, "0") LOCVAL(LOCALE_SDECIMAL, ".") LOCVAL(LOCALE_STHOUSAND, ",") LOCVAL(LOCALE_SGROUPING, "3;0") @@ -26,7 +27,7 @@ LOCVAL(LOCALE_IDIGITS, "2") LOCVAL(LOCALE_ILZERO, "1") LOCVAL(LOCALE_INEGNUMBER, "1") LOCVAL(LOCALE_SNATIVEDIGITS, "0123456789") -LOCVAL(LOCALE_SCURRENCY, "IR") +LOCVAL(LOCALE_SCURRENCY, "IR£") LOCVAL(LOCALE_SINTLSYMBOL, "IEP") LOCVAL(LOCALE_SMONDECIMALSEP, ".") LOCVAL(LOCALE_SMONTHOUSANDSEP, ",") @@ -34,25 +35,25 @@ LOCVAL(LOCALE_SMONGROUPING, "3;0") LOCVAL(LOCALE_ICURRDIGITS, "2") LOCVAL(LOCALE_IINTLCURRDIGITS, "2") LOCVAL(LOCALE_ICURRENCY, "0") -LOCVAL(LOCALE_INEGCURR, "0") +LOCVAL(LOCALE_INEGCURR, "1") LOCVAL(LOCALE_SDATE, "/") LOCVAL(LOCALE_STIME, ":") -LOCVAL(LOCALE_SSHORTDATE, "M/d/yy") -LOCVAL(LOCALE_SLONGDATE, "dddd, MMMM dd, yyyy") -LOCVAL(LOCALE_STIMEFORMAT, "h:mm:ss tt") -LOCVAL(LOCALE_IDATE, "0") -LOCVAL(LOCALE_ILDATE, "0") -LOCVAL(LOCALE_ITIME, "0") +LOCVAL(LOCALE_SSHORTDATE, "dd/MM/yy") +LOCVAL(LOCALE_SLONGDATE, "dd MMMM yyyy") +LOCVAL(LOCALE_STIMEFORMAT, "HH:mm:ss") +LOCVAL(LOCALE_IDATE, "1") +LOCVAL(LOCALE_ILDATE, "1") +LOCVAL(LOCALE_ITIME, "1") LOCVAL(LOCALE_ITIMEMARKPOSN, "0") LOCVAL(LOCALE_ICENTURY, "0") -LOCVAL(LOCALE_ITLZERO, "0") -LOCVAL(LOCALE_IDAYLZERO, "0") -LOCVAL(LOCALE_IMONLZERO, "0") -LOCVAL(LOCALE_S1159, "AM") -LOCVAL(LOCALE_S2359, "PM") +LOCVAL(LOCALE_ITLZERO, "1") +LOCVAL(LOCALE_IDAYLZERO, "1") +LOCVAL(LOCALE_IMONLZERO, "1") +LOCVAL(LOCALE_S1159, "") +LOCVAL(LOCALE_S2359, "") LOCVAL(LOCALE_ICALENDARTYPE, "1") LOCVAL(LOCALE_IOPTIONALCALENDAR, "0") -LOCVAL(LOCALE_IFIRSTDAYOFWEEK, "6") +LOCVAL(LOCALE_IFIRSTDAYOFWEEK, "0") LOCVAL(LOCALE_IFIRSTWEEKOFYEAR, "0") LOCVAL(LOCALE_SDAYNAME1, "Monday") @@ -102,13 +103,11 @@ LOCVAL(LOCALE_SABBREVMONTHNAME13, "") LOCVAL(LOCALE_SPOSITIVESIGN, "") LOCVAL(LOCALE_SNEGATIVESIGN, "-") LOCVAL(LOCALE_IPOSSIGNPOSN, "3") -LOCVAL(LOCALE_INEGSIGNPOSN, "0") +LOCVAL(LOCALE_INEGSIGNPOSN, "3") LOCVAL(LOCALE_IPOSSYMPRECEDES, "1") LOCVAL(LOCALE_IPOSSEPBYSPACE, "0") LOCVAL(LOCALE_INEGSYMPRECEDES, "1") LOCVAL(LOCALE_INEGSEPBYSPACE, "0") -/* LOCVAL(LOCALE_FONTSIGNATURE, "") */ -LOCVAL(LOCALE_SISO639LANGNAME,"en") -LOCVAL(LOCALE_SISO3166CTRYNAME,"IE") - -/* Gregorian Calendar */ +/* LOCVAL(LOCALE_FONTSIGNATURE, "/") */ +LOCVAL(LOCALE_SISO639LANGNAME, "en") +LOCVAL(LOCALE_SISO3166CTRYNAME, "IE") diff --git a/ole/nls/enj.nls b/ole/nls/enj.nls index 7ce059c44a5..0724d00997d 100644 --- a/ole/nls/enj.nls +++ b/ole/nls/enj.nls @@ -1,24 +1,25 @@ /* * OLE2NLS library - * Jamaica + * English (Jamaica) */ LOCVAL(LOCALE_ILANGUAGE, "2009") LOCVAL(LOCALE_SLANGUAGE, "English (Jamaica)") LOCVAL(LOCALE_SENGLANGUAGE, "English") -LOCVAL(LOCALE_SABBREVLANGNAME, "enj") +LOCVAL(LOCALE_SABBREVLANGNAME, "ENJ") LOCVAL(LOCALE_SNATIVELANGNAME, "English") -LOCVAL(LOCALE_ICOUNTRY, "44") +LOCVAL(LOCALE_ICOUNTRY, "1") LOCVAL(LOCALE_SCOUNTRY, "Jamaica") LOCVAL(LOCALE_SENGCOUNTRY, "Jamaica") LOCVAL(LOCALE_SABBREVCTRYNAME, "JAM") LOCVAL(LOCALE_SNATIVECTRYNAME, "Jamaica") -LOCVAL(LOCALE_IDEFAULTLANGUAGE, "0409") -LOCVAL(LOCALE_IDEFAULTCOUNTRY, "44") +LOCVAL(LOCALE_IDEFAULTLANGUAGE, "2009") +LOCVAL(LOCALE_IDEFAULTCOUNTRY, "1") LOCVAL(LOCALE_IDEFAULTCODEPAGE, "850") LOCVAL(LOCALE_IDEFAULTANSICODEPAGE, "1252") +LOCVAL(LOCALE_IDEFAULTMACCODEPAGE, "10000") LOCVAL(LOCALE_SLIST, ",") -LOCVAL(LOCALE_IMEASURE, "0") +LOCVAL(LOCALE_IMEASURE, "1") LOCVAL(LOCALE_SDECIMAL, ".") LOCVAL(LOCALE_STHOUSAND, ",") LOCVAL(LOCALE_SGROUPING, "3;0") @@ -26,7 +27,7 @@ LOCVAL(LOCALE_IDIGITS, "2") LOCVAL(LOCALE_ILZERO, "1") LOCVAL(LOCALE_INEGNUMBER, "1") LOCVAL(LOCALE_SNATIVEDIGITS, "0123456789") -LOCVAL(LOCALE_SCURRENCY, "$") +LOCVAL(LOCALE_SCURRENCY, "J$") LOCVAL(LOCALE_SINTLSYMBOL, "USD") LOCVAL(LOCALE_SMONDECIMALSEP, ".") LOCVAL(LOCALE_SMONTHOUSANDSEP, ",") @@ -37,14 +38,14 @@ LOCVAL(LOCALE_ICURRENCY, "0") LOCVAL(LOCALE_INEGCURR, "1") LOCVAL(LOCALE_SDATE, "/") LOCVAL(LOCALE_STIME, ":") -LOCVAL(LOCALE_SSHORTDATE, "dd/MM/yy") -LOCVAL(LOCALE_SLONGDATE, "dd MMMM yyyy") -LOCVAL(LOCALE_STIMEFORMAT, "HH:mm:ss") +LOCVAL(LOCALE_SSHORTDATE, "dd/MM/yyyy") +LOCVAL(LOCALE_SLONGDATE, "dddd, MMMM dd, yyyy") +LOCVAL(LOCALE_STIMEFORMAT, "hh:mm:ss tt") LOCVAL(LOCALE_IDATE, "1") -LOCVAL(LOCALE_ILDATE, "1") -LOCVAL(LOCALE_ITIME, "1") +LOCVAL(LOCALE_ILDATE, "0") +LOCVAL(LOCALE_ITIME, "0") LOCVAL(LOCALE_ITIMEMARKPOSN, "0") -LOCVAL(LOCALE_ICENTURY, "0") +LOCVAL(LOCALE_ICENTURY, "1") LOCVAL(LOCALE_ITLZERO, "1") LOCVAL(LOCALE_IDAYLZERO, "1") LOCVAL(LOCALE_IMONLZERO, "1") @@ -52,7 +53,7 @@ LOCVAL(LOCALE_S1159, "AM") LOCVAL(LOCALE_S2359, "PM") LOCVAL(LOCALE_ICALENDARTYPE, "1") LOCVAL(LOCALE_IOPTIONALCALENDAR, "0") -LOCVAL(LOCALE_IFIRSTDAYOFWEEK, "0") +LOCVAL(LOCALE_IFIRSTDAYOFWEEK, "6") LOCVAL(LOCALE_IFIRSTWEEKOFYEAR, "0") LOCVAL(LOCALE_SDAYNAME1, "Monday") diff --git a/ole/nls/enl.nls b/ole/nls/enl.nls index 89d6c831358..c045362a5ed 100644 --- a/ole/nls/enl.nls +++ b/ole/nls/enl.nls @@ -1,24 +1,25 @@ /* * OLE2NLS library - * English Belize + * English (Belize) */ LOCVAL(LOCALE_ILANGUAGE, "2809") LOCVAL(LOCALE_SLANGUAGE, "English (Belize)") LOCVAL(LOCALE_SENGLANGUAGE, "English") -LOCVAL(LOCALE_SABBREVLANGNAME, "enl") +LOCVAL(LOCALE_SABBREVLANGNAME, "ENL") LOCVAL(LOCALE_SNATIVELANGNAME, "English") -LOCVAL(LOCALE_ICOUNTRY, "1") +LOCVAL(LOCALE_ICOUNTRY, "501") LOCVAL(LOCALE_SCOUNTRY, "Belize") LOCVAL(LOCALE_SENGCOUNTRY, "Belize") LOCVAL(LOCALE_SABBREVCTRYNAME, "BLZ") LOCVAL(LOCALE_SNATIVECTRYNAME, "Belize") -LOCVAL(LOCALE_IDEFAULTLANGUAGE, "0409") -LOCVAL(LOCALE_IDEFAULTCOUNTRY, "1") -LOCVAL(LOCALE_IDEFAULTCODEPAGE, "437") +LOCVAL(LOCALE_IDEFAULTLANGUAGE, "2809") +LOCVAL(LOCALE_IDEFAULTCOUNTRY, "501") +LOCVAL(LOCALE_IDEFAULTCODEPAGE, "850") LOCVAL(LOCALE_IDEFAULTANSICODEPAGE, "1252") -LOCVAL(LOCALE_SLIST, ",") -LOCVAL(LOCALE_IMEASURE, "1") +LOCVAL(LOCALE_IDEFAULTMACCODEPAGE, "10000") +LOCVAL(LOCALE_SLIST, ";") +LOCVAL(LOCALE_IMEASURE, "0") LOCVAL(LOCALE_SDECIMAL, ".") LOCVAL(LOCALE_STHOUSAND, ",") LOCVAL(LOCALE_SGROUPING, "3;0") @@ -26,28 +27,28 @@ LOCVAL(LOCALE_IDIGITS, "2") LOCVAL(LOCALE_ILZERO, "1") LOCVAL(LOCALE_INEGNUMBER, "1") LOCVAL(LOCALE_SNATIVEDIGITS, "0123456789") -LOCVAL(LOCALE_SCURRENCY, "$") -LOCVAL(LOCALE_SINTLSYMBOL, "USD") +LOCVAL(LOCALE_SCURRENCY, "BZ$") +LOCVAL(LOCALE_SINTLSYMBOL, "BZE") LOCVAL(LOCALE_SMONDECIMALSEP, ".") LOCVAL(LOCALE_SMONTHOUSANDSEP, ",") -LOCVAL(LOCALE_SMONGROUPING, "3;0") +LOCVAL(LOCALE_SMONGROUPING, "3") LOCVAL(LOCALE_ICURRDIGITS, "2") LOCVAL(LOCALE_IINTLCURRDIGITS, "2") LOCVAL(LOCALE_ICURRENCY, "0") LOCVAL(LOCALE_INEGCURR, "0") LOCVAL(LOCALE_SDATE, "/") LOCVAL(LOCALE_STIME, ":") -LOCVAL(LOCALE_SSHORTDATE, "M/d/yy") -LOCVAL(LOCALE_SLONGDATE, "dddd, MMMM dd, yyyy") -LOCVAL(LOCALE_STIMEFORMAT, "h:mm:ss tt") -LOCVAL(LOCALE_IDATE, "0") -LOCVAL(LOCALE_ILDATE, "0") +LOCVAL(LOCALE_SSHORTDATE, "dd/MM/yyyy") +LOCVAL(LOCALE_SLONGDATE, "dddd, dd MMMM yyyy") +LOCVAL(LOCALE_STIMEFORMAT, "hh:mm:ss") +LOCVAL(LOCALE_IDATE, "1") +LOCVAL(LOCALE_ILDATE, "1") LOCVAL(LOCALE_ITIME, "0") LOCVAL(LOCALE_ITIMEMARKPOSN, "0") -LOCVAL(LOCALE_ICENTURY, "0") -LOCVAL(LOCALE_ITLZERO, "0") -LOCVAL(LOCALE_IDAYLZERO, "0") -LOCVAL(LOCALE_IMONLZERO, "0") +LOCVAL(LOCALE_ICENTURY, "1") +LOCVAL(LOCALE_ITLZERO, "1") +LOCVAL(LOCALE_IDAYLZERO, "1") +LOCVAL(LOCALE_IMONLZERO, "1") LOCVAL(LOCALE_S1159, "AM") LOCVAL(LOCALE_S2359, "PM") LOCVAL(LOCALE_ICALENDARTYPE, "1") @@ -110,4 +111,3 @@ LOCVAL(LOCALE_INEGSEPBYSPACE, "0") /* LOCVAL(LOCALE_FONTSIGNATURE, "") */ LOCVAL(LOCALE_SISO639LANGNAME,"en") LOCVAL(LOCALE_SISO3166CTRYNAME,"BZ") - diff --git a/ole/nls/ens.nls b/ole/nls/ens.nls index 4b5953d9019..d4cb7db3af6 100644 --- a/ole/nls/ens.nls +++ b/ole/nls/ens.nls @@ -1,22 +1,23 @@ /* * OLE2NLS library - * South Africa (English) + * English (South Africa) */ LOCVAL(LOCALE_ILANGUAGE, "1c09") LOCVAL(LOCALE_SLANGUAGE, "English (South Africa)") LOCVAL(LOCALE_SENGLANGUAGE, "English") -LOCVAL(LOCALE_SABBREVLANGNAME, "ens") +LOCVAL(LOCALE_SABBREVLANGNAME, "ENS") LOCVAL(LOCALE_SNATIVELANGNAME, "English") -/* LOCVAL(LOCALE_ICOUNTRY, "") */ +LOCVAL(LOCALE_ICOUNTRY, "27") LOCVAL(LOCALE_SCOUNTRY, "South Africa") LOCVAL(LOCALE_SENGCOUNTRY, "South Africa") LOCVAL(LOCALE_SABBREVCTRYNAME, "ZAF") LOCVAL(LOCALE_SNATIVECTRYNAME, "South Africa") -LOCVAL(LOCALE_IDEFAULTLANGUAGE, "0409") -LOCVAL(LOCALE_IDEFAULTCOUNTRY, "44") -LOCVAL(LOCALE_IDEFAULTCODEPAGE, "850") +LOCVAL(LOCALE_IDEFAULTLANGUAGE, "1c09") +LOCVAL(LOCALE_IDEFAULTCOUNTRY, "27") +LOCVAL(LOCALE_IDEFAULTCODEPAGE, "437") LOCVAL(LOCALE_IDEFAULTANSICODEPAGE, "1252") +LOCVAL(LOCALE_IDEFAULTMACCODEPAGE, "10000") LOCVAL(LOCALE_SLIST, ",") LOCVAL(LOCALE_IMEASURE, "0") LOCVAL(LOCALE_SDECIMAL, ".") @@ -33,16 +34,16 @@ LOCVAL(LOCALE_SMONTHOUSANDSEP, ",") LOCVAL(LOCALE_SMONGROUPING, "3;0") LOCVAL(LOCALE_ICURRDIGITS, "2") LOCVAL(LOCALE_IINTLCURRDIGITS, "2") -LOCVAL(LOCALE_ICURRENCY, "0") -LOCVAL(LOCALE_INEGCURR, "1") +LOCVAL(LOCALE_ICURRENCY, "2") +LOCVAL(LOCALE_INEGCURR, "2") LOCVAL(LOCALE_SDATE, "/") LOCVAL(LOCALE_STIME, ":") -LOCVAL(LOCALE_SSHORTDATE, "dd/MM/yy") +LOCVAL(LOCALE_SSHORTDATE, "yy/MM/dd") LOCVAL(LOCALE_SLONGDATE, "dd MMMM yyyy") -LOCVAL(LOCALE_STIMEFORMAT, "HH:mm:ss") -LOCVAL(LOCALE_IDATE, "1") +LOCVAL(LOCALE_STIMEFORMAT, "hh:mm:ss") +LOCVAL(LOCALE_IDATE, "2") LOCVAL(LOCALE_ILDATE, "1") -LOCVAL(LOCALE_ITIME, "1") +LOCVAL(LOCALE_ITIME, "0") LOCVAL(LOCALE_ITIMEMARKPOSN, "0") LOCVAL(LOCALE_ICENTURY, "0") LOCVAL(LOCALE_ITLZERO, "1") @@ -52,7 +53,7 @@ LOCVAL(LOCALE_S1159, "AM") LOCVAL(LOCALE_S2359, "PM") LOCVAL(LOCALE_ICALENDARTYPE, "1") LOCVAL(LOCALE_IOPTIONALCALENDAR, "0") -LOCVAL(LOCALE_IFIRSTDAYOFWEEK, "0") +LOCVAL(LOCALE_IFIRSTDAYOFWEEK, "6") LOCVAL(LOCALE_IFIRSTWEEKOFYEAR, "0") LOCVAL(LOCALE_SDAYNAME1, "Monday") @@ -101,10 +102,10 @@ LOCVAL(LOCALE_SABBREVMONTHNAME13, "") LOCVAL(LOCALE_SPOSITIVESIGN, "") LOCVAL(LOCALE_SNEGATIVESIGN, "-") -LOCVAL(LOCALE_IPOSSIGNPOSN, "3") -LOCVAL(LOCALE_INEGSIGNPOSN, "3") +LOCVAL(LOCALE_IPOSSIGNPOSN, "4") +LOCVAL(LOCALE_INEGSIGNPOSN, "4") LOCVAL(LOCALE_IPOSSYMPRECEDES, "1") -LOCVAL(LOCALE_IPOSSEPBYSPACE, "0") +LOCVAL(LOCALE_IPOSSEPBYSPACE, "1") LOCVAL(LOCALE_INEGSYMPRECEDES, "1") LOCVAL(LOCALE_INEGSEPBYSPACE, "0") /* LOCVAL(LOCALE_FONTSIGNATURE, "") */ diff --git a/ole/nls/ent.nls b/ole/nls/ent.nls index 16eea3fb52c..6115dabde32 100644 --- a/ole/nls/ent.nls +++ b/ole/nls/ent.nls @@ -1,24 +1,25 @@ /* * OLE2NLS library - * Trinidad & Tobago + * English (Trinidad & Tobago) */ LOCVAL(LOCALE_ILANGUAGE, "2c09") LOCVAL(LOCALE_SLANGUAGE, "English (Trinidad & Tobago)") LOCVAL(LOCALE_SENGLANGUAGE, "English") -LOCVAL(LOCALE_SABBREVLANGNAME, "ent") +LOCVAL(LOCALE_SABBREVLANGNAME, "ENT") LOCVAL(LOCALE_SNATIVELANGNAME, "English") -/* LOCVAL(LOCALE_ICOUNTRY, "") */ +LOCVAL(LOCALE_ICOUNTRY, "296") LOCVAL(LOCALE_SCOUNTRY, "Trinidad & Tobago") LOCVAL(LOCALE_SENGCOUNTRY, "Trinidad & Tobago") LOCVAL(LOCALE_SABBREVCTRYNAME, "TTO") LOCVAL(LOCALE_SNATIVECTRYNAME, "Trinidad & Tobago") LOCVAL(LOCALE_IDEFAULTLANGUAGE, "2c09") -LOCVAL(LOCALE_IDEFAULTCOUNTRY, "1") +LOCVAL(LOCALE_IDEFAULTCOUNTRY, "296") LOCVAL(LOCALE_IDEFAULTCODEPAGE, "437") LOCVAL(LOCALE_IDEFAULTANSICODEPAGE, "1252") -LOCVAL(LOCALE_SLIST, ",") -LOCVAL(LOCALE_IMEASURE, "1") +LOCVAL(LOCALE_IDEFAULTMACCODEPAGE, "10000") +LOCVAL(LOCALE_SLIST, ";") +LOCVAL(LOCALE_IMEASURE, "0") LOCVAL(LOCALE_SDECIMAL, ".") LOCVAL(LOCALE_STHOUSAND, ",") LOCVAL(LOCALE_SGROUPING, "3;0") @@ -26,28 +27,28 @@ LOCVAL(LOCALE_IDIGITS, "2") LOCVAL(LOCALE_ILZERO, "1") LOCVAL(LOCALE_INEGNUMBER, "1") LOCVAL(LOCALE_SNATIVEDIGITS, "0123456789") -LOCVAL(LOCALE_SCURRENCY, "$") -LOCVAL(LOCALE_SINTLSYMBOL, "USD") +LOCVAL(LOCALE_SCURRENCY, "TT$") +LOCVAL(LOCALE_SINTLSYMBOL, "TTO") LOCVAL(LOCALE_SMONDECIMALSEP, ".") LOCVAL(LOCALE_SMONTHOUSANDSEP, ",") -LOCVAL(LOCALE_SMONGROUPING, "3;0") +LOCVAL(LOCALE_SMONGROUPING, "3") LOCVAL(LOCALE_ICURRDIGITS, "2") LOCVAL(LOCALE_IINTLCURRDIGITS, "2") LOCVAL(LOCALE_ICURRENCY, "0") LOCVAL(LOCALE_INEGCURR, "0") LOCVAL(LOCALE_SDATE, "/") LOCVAL(LOCALE_STIME, ":") -LOCVAL(LOCALE_SSHORTDATE, "M/d/yy") -LOCVAL(LOCALE_SLONGDATE, "dddd, MMMM dd, yyyy") -LOCVAL(LOCALE_STIMEFORMAT, "h:mm:ss tt") -LOCVAL(LOCALE_IDATE, "0") -LOCVAL(LOCALE_ILDATE, "0") +LOCVAL(LOCALE_SSHORTDATE, "dd/MM/yyyy") +LOCVAL(LOCALE_SLONGDATE, "dddd, dd MMMM yyyy") +LOCVAL(LOCALE_STIMEFORMAT, "hh:mm:ss") +LOCVAL(LOCALE_IDATE, "1") +LOCVAL(LOCALE_ILDATE, "1") LOCVAL(LOCALE_ITIME, "0") LOCVAL(LOCALE_ITIMEMARKPOSN, "0") -LOCVAL(LOCALE_ICENTURY, "0") -LOCVAL(LOCALE_ITLZERO, "0") -LOCVAL(LOCALE_IDAYLZERO, "0") -LOCVAL(LOCALE_IMONLZERO, "0") +LOCVAL(LOCALE_ICENTURY, "1") +LOCVAL(LOCALE_ITLZERO, "1") +LOCVAL(LOCALE_IDAYLZERO, "1") +LOCVAL(LOCALE_IMONLZERO, "1") LOCVAL(LOCALE_S1159, "AM") LOCVAL(LOCALE_S2359, "PM") LOCVAL(LOCALE_ICALENDARTYPE, "1") @@ -110,4 +111,3 @@ LOCVAL(LOCALE_INEGSEPBYSPACE, "0") /* LOCVAL(LOCALE_FONTSIGNATURE, "") */ LOCVAL(LOCALE_SISO639LANGNAME,"en") LOCVAL(LOCALE_SISO3166CTRYNAME,"TT") - diff --git a/ole/nls/enu.nls b/ole/nls/enu.nls index 8bd3a913129..aac5ffb4ef4 100644 --- a/ole/nls/enu.nls +++ b/ole/nls/enu.nls @@ -1,12 +1,12 @@ /* * OLE2NLS library - * United States + * English (United States) */ LOCVAL(LOCALE_ILANGUAGE, "0409") LOCVAL(LOCALE_SLANGUAGE, "English (United States)") LOCVAL(LOCALE_SENGLANGUAGE, "English") -LOCVAL(LOCALE_SABBREVLANGNAME, "enu") +LOCVAL(LOCALE_SABBREVLANGNAME, "ENU") LOCVAL(LOCALE_SNATIVELANGNAME, "English") LOCVAL(LOCALE_ICOUNTRY, "1") LOCVAL(LOCALE_SCOUNTRY, "United States") @@ -17,6 +17,7 @@ LOCVAL(LOCALE_IDEFAULTLANGUAGE, "0409") LOCVAL(LOCALE_IDEFAULTCOUNTRY, "1") LOCVAL(LOCALE_IDEFAULTCODEPAGE, "437") LOCVAL(LOCALE_IDEFAULTANSICODEPAGE, "1252") +LOCVAL(LOCALE_IDEFAULTMACCODEPAGE, "10000") LOCVAL(LOCALE_SLIST, ",") LOCVAL(LOCALE_IMEASURE, "1") LOCVAL(LOCALE_SDECIMAL, ".") diff --git a/ole/nls/enz.nls b/ole/nls/enz.nls index 7b75df9a047..41a9bcdb31f 100644 --- a/ole/nls/enz.nls +++ b/ole/nls/enz.nls @@ -1,22 +1,23 @@ /* * OLE2NLS library - * New Zealand + * English (New Zealand) */ LOCVAL(LOCALE_ILANGUAGE, "1409") LOCVAL(LOCALE_SLANGUAGE, "English (New Zealand)") LOCVAL(LOCALE_SENGLANGUAGE, "English") -LOCVAL(LOCALE_SABBREVLANGNAME, "enz") +LOCVAL(LOCALE_SABBREVLANGNAME, "ENZ") LOCVAL(LOCALE_SNATIVELANGNAME, "English") -/* LOCVAL(LOCALE_ICOUNTRY, "") */ +LOCVAL(LOCALE_ICOUNTRY, "64") LOCVAL(LOCALE_SCOUNTRY, "New Zealand") LOCVAL(LOCALE_SENGCOUNTRY, "New Zealand") LOCVAL(LOCALE_SABBREVCTRYNAME, "NZL") LOCVAL(LOCALE_SNATIVECTRYNAME, "New Zealand") -LOCVAL(LOCALE_IDEFAULTLANGUAGE, "0409") -LOCVAL(LOCALE_IDEFAULTCOUNTRY, "44") +LOCVAL(LOCALE_IDEFAULTLANGUAGE, "1409") +LOCVAL(LOCALE_IDEFAULTCOUNTRY, "64") LOCVAL(LOCALE_IDEFAULTCODEPAGE, "850") LOCVAL(LOCALE_IDEFAULTANSICODEPAGE, "1252") +LOCVAL(LOCALE_IDEFAULTMACCODEPAGE, "10000") LOCVAL(LOCALE_SLIST, ",") LOCVAL(LOCALE_IMEASURE, "0") LOCVAL(LOCALE_SDECIMAL, ".") @@ -37,8 +38,8 @@ LOCVAL(LOCALE_ICURRENCY, "0") LOCVAL(LOCALE_INEGCURR, "1") LOCVAL(LOCALE_SDATE, "/") LOCVAL(LOCALE_STIME, ":") -LOCVAL(LOCALE_SSHORTDATE, "dd/MM/yy") -LOCVAL(LOCALE_SLONGDATE, "dd MMMM yyyy") +LOCVAL(LOCALE_SSHORTDATE, "d/MM/yy") +LOCVAL(LOCALE_SLONGDATE, "dddd, d MMMM yyyy") LOCVAL(LOCALE_STIMEFORMAT, "HH:mm:ss") LOCVAL(LOCALE_IDATE, "1") LOCVAL(LOCALE_ILDATE, "1") @@ -46,7 +47,7 @@ LOCVAL(LOCALE_ITIME, "1") LOCVAL(LOCALE_ITIMEMARKPOSN, "0") LOCVAL(LOCALE_ICENTURY, "0") LOCVAL(LOCALE_ITLZERO, "1") -LOCVAL(LOCALE_IDAYLZERO, "1") +LOCVAL(LOCALE_IDAYLZERO, "0") LOCVAL(LOCALE_IMONLZERO, "1") LOCVAL(LOCALE_S1159, "AM") LOCVAL(LOCALE_S2359, "PM") diff --git a/ole/ole2nls.c b/ole/ole2nls.c index c8729207a71..bd8ad99f020 100644 --- a/ole/ole2nls.c +++ b/ole/ole2nls.c @@ -92,7 +92,7 @@ LANG_BEGIN (LANG_ENGLISH, SUBLANG_ENGLISH_NZ) /*0x1409*/ #include "nls/enz.nls" LANG_END LANG_BEGIN (LANG_ENGLISH, SUBLANG_ENGLISH_EIRE) /*0x1809*/ -#include "nls/irl.nls" +#include "nls/eni.nls" LANG_END LANG_BEGIN (LANG_ENGLISH, SUBLANG_ENGLISH_SAFRICA) /*0x1C09*/ #include "nls/ens.nls" @@ -443,15 +443,15 @@ const struct map_lcid2str { {0x0408,"Greek"}, {0x0409,"English (United States)"}, {0x0809,"English (United Kingdom)"}, - {0x0c09,"English (Australia)"}, - {0x1009,"English (Canada)"}, + {0x0c09,"English (Australian)"}, + {0x1009,"English (Canadian)"}, {0x1409,"English (New Zealand)"}, {0x1809,"English (Ireland)"}, {0x1c09,"English (South Africa)"}, {0x2009,"English (Jamaica)"}, {0x2409,"English (Caribbean)"}, {0x2809,"English (Belize)"}, - {0x2c09,"English (Trinidad)"}, + {0x2c09,"English (Trinidad & Tobago)"}, {0x3009,"English (Zimbabwe)"}, {0x3409,"English (Philippines)"}, {0x040a,"Spanish (Spain, traditional sorting)"},