Vijay Kiran Kamuju : kernel/nls: Fix LOCALE_SLONGDATE and LOCALE_SYEARMONTH for some chinese locales.

Alexandre Julliard julliard at winehq.org
Mon Nov 25 09:12:28 CST 2019


Module: wine
Branch: stable
Commit: 3acd748808ba66ab43d7538f3a27f25374774133
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3acd748808ba66ab43d7538f3a27f25374774133

Author: Vijay Kiran Kamuju <infyquest at gmail.com>
Date:   Tue Apr 23 11:17:23 2019 +0200

kernel/nls: Fix LOCALE_SLONGDATE and LOCALE_SYEARMONTH for some chinese locales.

Signed-off-by: Vijay Kiran Kamuju <infyquest at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 568609f051acbd147529dfe74854757831058267)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/kernel32/nls/zhh.nls | 4 ++--
 dlls/kernel32/nls/zhi.nls | 4 ++--
 dlls/kernel32/nls/zhm.nls | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/kernel32/nls/zhh.nls b/dlls/kernel32/nls/zhh.nls
index 720261cd32..9da553c2c3 100644
--- a/dlls/kernel32/nls/zhh.nls
+++ b/dlls/kernel32/nls/zhh.nls
@@ -106,7 +106,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
   LOCALE_SISO639LANGNAME "zh"
   LOCALE_SLANGUAGE "Chinese (Hong Kong S.A.R.)"
   LOCALE_SLIST ","
-  LOCALE_SLONGDATE "dddd, d MMMM, yyyy"
+  LOCALE_SLONGDATE "yyyy'年'M'月'd'日'"
   LOCALE_SMONDECIMALSEP "."
   LOCALE_SMONGROUPING "3;0"
   LOCALE_SMONTHDAY "M'月'd'日'"
@@ -149,7 +149,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
   LOCALE_STHOUSAND ","
   LOCALE_STIME ":"
   LOCALE_STIMEFORMAT "H:mm:ss"
-  LOCALE_SYEARMONTH "MMMM, yyyy"
+  LOCALE_SYEARMONTH "yyyy'年'M'月'"
 
   LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States"
   LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe"
diff --git a/dlls/kernel32/nls/zhi.nls b/dlls/kernel32/nls/zhi.nls
index 2017b87f0c..389b8ebaa1 100644
--- a/dlls/kernel32/nls/zhi.nls
+++ b/dlls/kernel32/nls/zhi.nls
@@ -106,7 +106,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE
   LOCALE_SISO639LANGNAME "zh"
   LOCALE_SLANGUAGE "Chinese (Singapore)"
   LOCALE_SLIST ","
-  LOCALE_SLONGDATE "dddd, d MMMM, yyyy"
+  LOCALE_SLONGDATE "yyyy'年'M'月'd'日'"
   LOCALE_SMONDECIMALSEP "."
   LOCALE_SMONGROUPING "3;0"
   LOCALE_SMONTHDAY "M'月'd'日'"
@@ -149,7 +149,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE
   LOCALE_STHOUSAND ","
   LOCALE_STIME ":"
   LOCALE_STIMEFORMAT "tt h:mm:ss"
-  LOCALE_SYEARMONTH "MMMM, yyyy"
+  LOCALE_SYEARMONTH "yyyy'年'M'月'"
 
   LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States"
   LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe"
diff --git a/dlls/kernel32/nls/zhm.nls b/dlls/kernel32/nls/zhm.nls
index c9a6f14355..009fb93f5a 100644
--- a/dlls/kernel32/nls/zhm.nls
+++ b/dlls/kernel32/nls/zhm.nls
@@ -106,7 +106,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_MACAU
   LOCALE_SISO639LANGNAME "zh"
   LOCALE_SLANGUAGE "Chinese (Macau S.A.R.)"
   LOCALE_SLIST ","
-  LOCALE_SLONGDATE "dddd, d MMMM, yyyy"
+  LOCALE_SLONGDATE "yyyy'年'M'月'd'日'"
   LOCALE_SMONDECIMALSEP "."
   LOCALE_SMONGROUPING "3;0"
   LOCALE_SMONTHDAY "M'月'd'日'"
@@ -149,7 +149,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_MACAU
   LOCALE_STHOUSAND ","
   LOCALE_STIME ":"
   LOCALE_STIMEFORMAT "H:mm:ss"
-  LOCALE_SYEARMONTH "MMMM, yyyy"
+  LOCALE_SYEARMONTH "yyyy'年'M'月'"
 
   LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States"
   LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe"




More information about the wine-cvs mailing list