Signed-off-by: André Hentschel nerv@dawncrow.de --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/nls/csy.nls | 4 ++-- dlls/msvcrt/tests/locale.c | 6 ++++-- loader/wine.inf.in | 2 +- tools/wmc/lang.c | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index c5eeabf..73f7a6f 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4927,7 +4927,7 @@ static const struct geoinfo_t geoinfodata[] = { { 71, {'E','R',0}, {'E','R','I',0}, 47603, 232 }, /* Eritrea */ { 72, {'S','V',0}, {'S','L','V',0}, 27082, 222 }, /* El Salvador */ { 73, {'E','T',0}, {'E','T','H',0}, 47603, 231 }, /* Ethiopia */ - { 75, {'C','Z',0}, {'C','Z','E',0}, 47609, 203 }, /* Czech Republic */ + { 75, {'C','Z',0}, {'C','Z','E',0}, 47609, 203 }, /* Czechia */ { 77, {'F','I',0}, {'F','I','N',0}, 10039882, 246 }, /* Finland */ { 78, {'F','J',0}, {'F','J','I',0}, 20900, 242 }, /* Fiji Islands */ { 80, {'F','M',0}, {'F','S','M',0}, 21206, 583 }, /* Micronesia */ diff --git a/dlls/kernel32/nls/csy.nls b/dlls/kernel32/nls/csy.nls index 7d7aa0e..8d9178d 100644 --- a/dlls/kernel32/nls/csy.nls +++ b/dlls/kernel32/nls/csy.nls @@ -86,7 +86,7 @@ STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME11 "XI" LOCALE_SABBREVMONTHNAME12 "XII" LOCALE_SABBREVMONTHNAME13 "" - LOCALE_SCOUNTRY "Czech Republic" + LOCALE_SCOUNTRY "Czechia" LOCALE_SCURRENCY "Kč" LOCALE_SDATE "." LOCALE_SDAYNAME1 "pondělí" @@ -97,7 +97,7 @@ STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT LOCALE_SDAYNAME6 "sobota" LOCALE_SDAYNAME7 "neděle" LOCALE_SDECIMAL "," - LOCALE_SENGCOUNTRY "Czech Republic" + LOCALE_SENGCOUNTRY "Czechia" LOCALE_SENGCURRNAME "Czech Koruna" LOCALE_SENGLANGUAGE "Czech" LOCALE_SGROUPING "3;0" diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index f87a791..949068a 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -158,12 +158,14 @@ todo_wine ret = setlocale(LC_ALL, "csy"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Czech_Czech Republic.1250"), "ret = %s\n", ret); + ok(!strcmp(ret, "Czech_Czechia.1250") + || broken(!strcmp(ret, "Czech_Czech Republic.1250")), "ret = %s\n", ret);
ret = setlocale(LC_ALL, "czech"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Czech_Czech Republic.1250"), "ret = %s\n", ret); + ok(!strcmp(ret, "Czech_Czechia.1250") + || broken(!strcmp(ret, "Czech_Czech Republic.1250")), "ret = %s\n", ret);
ret = setlocale(LC_ALL, "dan"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3c55125..1249bb2 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -1774,7 +1774,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\41,"SameAreaRule",,"G" HKLM,%CurrentVersion%\Telephony\Country List\420,"CountryCode",0x10001,0x000001a4 HKLM,%CurrentVersion%\Telephony\Country List\420,"InternationalRule",,"00EFG" HKLM,%CurrentVersion%\Telephony\Country List\420,"LongDistanceRule",,"0FG" -HKLM,%CurrentVersion%\Telephony\Country List\420,"Name",,"Czech Republic" +HKLM,%CurrentVersion%\Telephony\Country List\420,"Name",,"Czechia" HKLM,%CurrentVersion%\Telephony\Country List\420,"SameAreaRule",,"G"
HKLM,%CurrentVersion%\Telephony\Country List\421,"CountryCode",0x10001,0x000001a5 diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c index b045612..76ddfdd 100644 --- a/tools/wmc/lang.c +++ b/tools/wmc/lang.c @@ -76,7 +76,7 @@ static const language_t languages[] = { {0x003E, 850, 1252, "Malay", NULL}, {0x0402, 866, 1251, "Bulgarian", "Bulgaria"}, {0x0403, 850, 1252, "Catalan", "Spain"}, - {0x0405, 852, 1250, "Czech", "Czech Republic"}, + {0x0405, 852, 1250, "Czech", "Czechia"}, {0x0406, 850, 1252, "Danish", "Denmark"}, {0x0407, 850, 1252, "German", "Germany"}, {0x0408, 737, 1253, "Greek", "Greece"},
This looks like something to avoid until it becomes necessary.
-
André Hentschel -
Nikolay Sivov