From 9fb7ecb077ed8ee770eed5327062311841995f5d Mon Sep 17 00:00:00 2001 From: delphij Date: Sun, 30 Dec 2018 23:04:02 +0000 Subject: [PATCH] Fix various issues with Chinese locales: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Change short weekday names to use only one Chinese character. (note: this is a somewhat misunfortunate compromise due to the fact that some applications are using short buffer for weekday names, and in ~1905 when 星期 system was created to replace the traditional 七曜 system, which can use 日月火水木金土 to represent Sunday through Saturday with just one character without any confusion). - for zh_CN locales: use Arabic numerals for month names, matching the practice of all other CJK locales - Regenerate zh_CN.{GB2312,GBK} locales from zh_CN.UTF-8. Reported by: ygy Reviewed by: kevlo MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D18689 --- share/timedef/zh_CN.GB2312.src | 86 +++++++++++++++++----------------- share/timedef/zh_CN.GBK.src | 62 ++++++++++++------------ share/timedef/zh_CN.UTF-8.src | 62 ++++++++++++------------ share/timedef/zh_HK.UTF-8.src | 14 +++--- share/timedef/zh_TW.UTF-8.src | 14 +++--- 5 files changed, 119 insertions(+), 119 deletions(-) diff --git a/share/timedef/zh_CN.GB2312.src b/share/timedef/zh_CN.GB2312.src index ab5504114e8c..65a0c4ac8df5 100644 --- a/share/timedef/zh_CN.GB2312.src +++ b/share/timedef/zh_CN.GB2312.src @@ -4,41 +4,41 @@ # ----------------------------------------------------------------------------- # # Short month names -!!#1TB -!!#2TB -!!#3TB -!!#4TB -!!#5TB -!!#6TB -!!#7TB -!!#8TB -!!#9TB -#1#0TB -#1#1TB -#1#2TB + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 +10 +11 +12 # # Long month names (as in a date) -һ - - - - - - - - -ʮ -ʮһ -ʮ +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 # # Short weekday names - -һ -ܶ - - - - + +һ + + + + + # # Long weekday names @@ -66,18 +66,18 @@ %Y%_m%e %A %X %Z # # Long month names (without case ending) -һ - - - - - - - - -ʮ -ʮһ -ʮ +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 # # md_order md diff --git a/share/timedef/zh_CN.GBK.src b/share/timedef/zh_CN.GBK.src index 7079ac09d15c..65a0c4ac8df5 100644 --- a/share/timedef/zh_CN.GBK.src +++ b/share/timedef/zh_CN.GBK.src @@ -18,27 +18,27 @@ 12 # # Long month names (as in a date) -һ - - - - - - - - -ʮ -ʮһ -ʮ +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 # # Short weekday names - -һ -ܶ - - - - + +һ + + + + + # # Long weekday names @@ -66,18 +66,18 @@ %Y%_m%e %A %X %Z # # Long month names (without case ending) -һ - - - - - - - - -ʮ -ʮһ -ʮ +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 # # md_order md diff --git a/share/timedef/zh_CN.UTF-8.src b/share/timedef/zh_CN.UTF-8.src index a99e12b185d3..76db00a96899 100644 --- a/share/timedef/zh_CN.UTF-8.src +++ b/share/timedef/zh_CN.UTF-8.src @@ -18,27 +18,27 @@ 12月 # # Long month names (as in a date) -一月 -二月 -三月 -四月 -五月 -六月 -七月 -八月 -九月 -十月 -十一月 -十二月 +1月 +2月 +3月 +4月 +5月 +6月 +7月 +8月 +9月 +10月 +11月 +12月 # # Short weekday names -周日 -周一 -周二 -周三 -周四 -周五 -周六 +日 +一 +二 +三 +四 +五 +六 # # Long weekday names 星期日 @@ -66,18 +66,18 @@ %Y年%_m月%e日 %A %X %Z # # Long month names (without case ending) -一月 -二月 -三月 -四月 -五月 -六月 -七月 -八月 -九月 -十月 -十一月 -十二月 +1月 +2月 +3月 +4月 +5月 +6月 +7月 +8月 +9月 +10月 +11月 +12月 # # md_order md diff --git a/share/timedef/zh_HK.UTF-8.src b/share/timedef/zh_HK.UTF-8.src index 9800bcf231eb..6cda30e19d9e 100644 --- a/share/timedef/zh_HK.UTF-8.src +++ b/share/timedef/zh_HK.UTF-8.src @@ -32,13 +32,13 @@ 12月 # # Short weekday names -週日 -週一 -週二 -週三 -週四 -週五 -週六 +日 +一 +二 +三 +四 +五 +六 # # Long weekday names 星期日 diff --git a/share/timedef/zh_TW.UTF-8.src b/share/timedef/zh_TW.UTF-8.src index 3affab634a21..602840256bc1 100644 --- a/share/timedef/zh_TW.UTF-8.src +++ b/share/timedef/zh_TW.UTF-8.src @@ -32,13 +32,13 @@ 12月 # # Short weekday names -週日 -週一 -週二 -週三 -週四 -週五 -週六 +日 +一 +二 +三 +四 +五 +六 # # Long weekday names 星期日