ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Update sr-Latn locale definition. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Müller 2021-02-03 17:48:36 -06:00 committed by Alexandre Julliard
parent db3e08770f
commit 3b3dfda599
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/kernel32/nls/srl.nls
View File

@ -66,7 +66,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
LOCALE_ITLZERO "0" LOCALE_ITLZERO "0"
LOCALE_S1159 "" LOCALE_S1159 ""
LOCALE_S2359 "" LOCALE_S2359 ""
LOCALE_SABBREVCTRYNAME "SRB" LOCALE_SABBREVCTRYNAME "SCG"
LOCALE_SABBREVDAYNAME1 "pon" LOCALE_SABBREVDAYNAME1 "pon"
LOCALE_SABBREVDAYNAME2 "uto" LOCALE_SABBREVDAYNAME2 "uto"
LOCALE_SABBREVDAYNAME3 "sre" LOCALE_SABBREVDAYNAME3 "sre"
@ -88,7 +88,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
LOCALE_SABBREVMONTHNAME11 "nov" LOCALE_SABBREVMONTHNAME11 "nov"
LOCALE_SABBREVMONTHNAME12 "dec" LOCALE_SABBREVMONTHNAME12 "dec"
LOCALE_SABBREVMONTHNAME13 "" LOCALE_SABBREVMONTHNAME13 ""
LOCALE_SCOUNTRY "Serbia" LOCALE_SCOUNTRY "Serbia and Montenegro (Former)"
LOCALE_SCURRENCY "Din." LOCALE_SCURRENCY "Din."
LOCALE_SDATE "." LOCALE_SDATE "."
LOCALE_SDAYNAME1 "ponedeljak" LOCALE_SDAYNAME1 "ponedeljak"
@ -99,12 +99,12 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
LOCALE_SDAYNAME6 "subota" LOCALE_SDAYNAME6 "subota"
LOCALE_SDAYNAME7 "nedelja" LOCALE_SDAYNAME7 "nedelja"
LOCALE_SDECIMAL "," LOCALE_SDECIMAL ","
LOCALE_SENGCOUNTRY "Serbia" LOCALE_SENGCOUNTRY "Serbia and Montenegro (Former)"
LOCALE_SENGCURRNAME "Serbian Dinar" LOCALE_SENGCURRNAME "Serbian Dinar"
LOCALE_SENGLANGUAGE "Serbian (Latin)" LOCALE_SENGLANGUAGE "Serbian (Latin)"
LOCALE_SGROUPING "3;0" LOCALE_SGROUPING "3;0"
LOCALE_SINTLSYMBOL "RSD" LOCALE_SINTLSYMBOL "CSD"
LOCALE_SISO3166CTRYNAME "RS" LOCALE_SISO3166CTRYNAME "CS"
LOCALE_SISO639LANGNAME "sr" LOCALE_SISO639LANGNAME "sr"
LOCALE_SLANGUAGE "Serbian (Latin)" LOCALE_SLANGUAGE "Serbian (Latin)"
LOCALE_SLIST ";" LOCALE_SLIST ";"
@ -126,9 +126,9 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
LOCALE_SMONTHNAME12 "decembar" LOCALE_SMONTHNAME12 "decembar"
LOCALE_SMONTHNAME13 "" LOCALE_SMONTHNAME13 ""
LOCALE_SMONTHOUSANDSEP "." LOCALE_SMONTHOUSANDSEP "."
LOCALE_SNAME "sr-Latn-RS" LOCALE_SNAME "sr-Latn-CS"
LOCALE_SNAN "NaN" LOCALE_SNAN "NaN"
LOCALE_SNATIVECTRYNAME "Srbija" LOCALE_SNATIVECTRYNAME "Srbija i Crna Gora (Bivši)"
LOCALE_SNATIVECURRNAME "dinar" LOCALE_SNATIVECURRNAME "dinar"
LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVEDIGITS "0123456789"
LOCALE_SNATIVEDISPLAYNAME "srpski (Srbija)" LOCALE_SNATIVEDISPLAYNAME "srpski (Srbija)"

4
dlls/kernel32/tests/locale.c
View File

@ -2768,7 +2768,6 @@ struct neutralsublang_name_t {
WCHAR name[3]; WCHAR name[3];
WCHAR sname[16]; WCHAR sname[16];
LCID lcid; LCID lcid;
int todo;
}; };
static const struct neutralsublang_name_t neutralsublang_names[] = { 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) }, { {'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) }, { {'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) }, { {'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) }, { {'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) }, { {'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) }, { {'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 ); status = pRtlLocaleNameToLcid( ptr->sname, &lcid, 0 );
ok( !status || broken(ptr->lcid == MAKELANGID(LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN)), /* vista */ ok( !status || broken(ptr->lcid == MAKELANGID(LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN)), /* vista */
"%s failed error %x\n", wine_dbgstr_w(ptr->name), status ); "%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", if (!status) ok( lcid == ptr->lcid, "%s: got wrong lcid 0x%04x, expected 0x%04x\n",
wine_dbgstr_w(ptr->name), lcid, ptr->lcid ); wine_dbgstr_w(ptr->name), lcid, ptr->lcid );
} }