[PATCH 4/4] kernel32: Update sr-Latn locale definition.
Zebediah Figura
z.figura12 at gmail.com
Wed Feb 3 17:48:36 CST 2021
From: Michael Müller <michael at fds-team.de>
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/kernel32/nls/srl.nls | 14 +++++++-------
dlls/kernel32/tests/locale.c | 4 +---
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls
index 948b5e11a2b..516bb512aae 100644
--- a/dlls/kernel32/nls/srl.nls
+++ b/dlls/kernel32/nls/srl.nls
@@ -66,7 +66,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
LOCALE_ITLZERO "0"
LOCALE_S1159 ""
LOCALE_S2359 ""
- LOCALE_SABBREVCTRYNAME "SRB"
+ LOCALE_SABBREVCTRYNAME "SCG"
LOCALE_SABBREVDAYNAME1 "pon"
LOCALE_SABBREVDAYNAME2 "uto"
LOCALE_SABBREVDAYNAME3 "sre"
@@ -88,7 +88,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
LOCALE_SABBREVMONTHNAME11 "nov"
LOCALE_SABBREVMONTHNAME12 "dec"
LOCALE_SABBREVMONTHNAME13 ""
- LOCALE_SCOUNTRY "Serbia"
+ LOCALE_SCOUNTRY "Serbia and Montenegro (Former)"
LOCALE_SCURRENCY "Din."
LOCALE_SDATE "."
LOCALE_SDAYNAME1 "ponedeljak"
@@ -99,12 +99,12 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
LOCALE_SDAYNAME6 "subota"
LOCALE_SDAYNAME7 "nedelja"
LOCALE_SDECIMAL ","
- LOCALE_SENGCOUNTRY "Serbia"
+ LOCALE_SENGCOUNTRY "Serbia and Montenegro (Former)"
LOCALE_SENGCURRNAME "Serbian Dinar"
LOCALE_SENGLANGUAGE "Serbian (Latin)"
LOCALE_SGROUPING "3;0"
- LOCALE_SINTLSYMBOL "RSD"
- LOCALE_SISO3166CTRYNAME "RS"
+ LOCALE_SINTLSYMBOL "CSD"
+ LOCALE_SISO3166CTRYNAME "CS"
LOCALE_SISO639LANGNAME "sr"
LOCALE_SLANGUAGE "Serbian (Latin)"
LOCALE_SLIST ";"
@@ -126,9 +126,9 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
LOCALE_SMONTHNAME12 "decembar"
LOCALE_SMONTHNAME13 ""
LOCALE_SMONTHOUSANDSEP "."
- LOCALE_SNAME "sr-Latn-RS"
+ LOCALE_SNAME "sr-Latn-CS"
LOCALE_SNAN "NaN"
- LOCALE_SNATIVECTRYNAME "Srbija"
+ LOCALE_SNATIVECTRYNAME "Srbija i Crna Gora (Bivši)"
LOCALE_SNATIVECURRNAME "dinar"
LOCALE_SNATIVEDIGITS "0123456789"
LOCALE_SNATIVEDISPLAYNAME "srpski (Srbija)"
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index b354f759335..55566d3e703 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -2768,7 +2768,6 @@ struct neutralsublang_name_t {
WCHAR name[3];
WCHAR sname[16];
LCID lcid;
- int todo;
};
static const struct neutralsublang_name_t neutralsublang_names[] = {
@@ -2782,7 +2781,7 @@ static const struct neutralsublang_name_t neutralsublang_names[] = {
{ {'m','s',0}, {'m','s','-','M','Y',0}, MAKELCID(MAKELANGID(LANG_MALAY, SUBLANG_MALAY_MALAYSIA), SORT_DEFAULT) },
{ {'n','l',0}, {'n','l','-','N','L',0}, MAKELCID(MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH), SORT_DEFAULT) },
{ {'p','t',0}, {'p','t','-','B','R',0}, MAKELCID(MAKELANGID(LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN), SORT_DEFAULT) },
- { {'s','r',0}, {'s','r','-','L','a','t','n','-','R','S',0}, MAKELCID(MAKELANGID(LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN), SORT_DEFAULT), 1 },
+ { {'s','r',0}, {'s','r','-','L','a','t','n','-','R','S',0}, MAKELCID(MAKELANGID(LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN), SORT_DEFAULT) },
{ {'s','v',0}, {'s','v','-','S','E',0}, MAKELCID(MAKELANGID(LANG_SWEDISH, SUBLANG_SWEDISH), SORT_DEFAULT) },
{ {'u','z',0}, {'u','z','-','L','a','t','n','-','U','Z',0}, MAKELCID(MAKELANGID(LANG_UZBEK, SUBLANG_UZBEK_LATIN), SORT_DEFAULT) },
{ {'z','h',0}, {'z','h','-','C','N',0}, MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT) },
@@ -2977,7 +2976,6 @@ static void test_LocaleNameToLCID(void)
status = pRtlLocaleNameToLcid( ptr->sname, &lcid, 0 );
ok( !status || broken(ptr->lcid == MAKELANGID(LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN)), /* vista */
"%s failed error %x\n", wine_dbgstr_w(ptr->name), status );
- todo_wine_if(ptr->todo)
if (!status) ok( lcid == ptr->lcid, "%s: got wrong lcid 0x%04x, expected 0x%04x\n",
wine_dbgstr_w(ptr->name), lcid, ptr->lcid );
}
--
2.20.1
More information about the wine-devel
mailing list