From 9ed79b47510097dcc4de4290e753035e1e74f04d Mon Sep 17 00:00:00 2001 From: delphij Date: Thu, 29 Oct 2015 17:04:43 +0000 Subject: [PATCH] MFC r289038,r289041: MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Add encoding for mime-types. Fix short month names and replace %b with %_m in date_fmt for Chinese locales. When using a Chinese locale, such as zh_TW.UTF-8 or zh_CN.UTF-8, nl_langinfo(ABMON_*) only returned numbers. For instance, nl_langinfo(ABMON_1) returns 1, nl_langinfo(ABMON_2) returns 2, and so on. This causes problems in applications that put the short month name and the day of the month together. For example, 'Apr 14' in English becomes '414日' in Chinese on the top bar of GNOME Shell. This problem may be resolved by appending '月' to all short month names and replacing %b with %_m in date_fmt. ja_JP.UTF-8 already does this, and this matches the en_US.ISO8859-1 behavior, which returns 'Oct'. The GNU C Library also returns values with '月' appended. PR: 199441 Submitted by: Ting-Wei Lan git-svn-id: svn://svn.freebsd.org/base/stable/9@290151 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- share/timedef/zh_CN.GB18030.src | 26 +++++++++++++------------- share/timedef/zh_CN.GB2312.src | 26 +++++++++++++------------- share/timedef/zh_CN.UTF-8.src | 26 +++++++++++++------------- share/timedef/zh_CN.eucCN.src | 26 +++++++++++++------------- share/timedef/zh_TW.Big5.src | 26 +++++++++++++------------- share/timedef/zh_TW.UTF-8.src | 26 +++++++++++++------------- 6 files changed, 78 insertions(+), 78 deletions(-) diff --git a/share/timedef/zh_CN.GB18030.src b/share/timedef/zh_CN.GB18030.src index 300002231..4290be778 100644 --- a/share/timedef/zh_CN.GB18030.src +++ b/share/timedef/zh_CN.GB18030.src @@ -5,18 +5,18 @@ # # Short month names # - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1Ô + 2Ô + 3Ô + 4Ô + 5Ô + 6Ô + 7Ô + 8Ô + 9Ô +10Ô +11Ô +12Ô # # Long month names (as in a date) # @@ -75,7 +75,7 @@ # # date_fmt # -%YÄê%bÔÂ%eÈÕ %A %X %Z +%YÄê%_mÔÂ%eÈÕ %A %X %Z # # Long month names (without case ending) # diff --git a/share/timedef/zh_CN.GB2312.src b/share/timedef/zh_CN.GB2312.src index 300002231..4290be778 100644 --- a/share/timedef/zh_CN.GB2312.src +++ b/share/timedef/zh_CN.GB2312.src @@ -5,18 +5,18 @@ # # Short month names # - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1Ô + 2Ô + 3Ô + 4Ô + 5Ô + 6Ô + 7Ô + 8Ô + 9Ô +10Ô +11Ô +12Ô # # Long month names (as in a date) # @@ -75,7 +75,7 @@ # # date_fmt # -%YÄê%bÔÂ%eÈÕ %A %X %Z +%YÄê%_mÔÂ%eÈÕ %A %X %Z # # Long month names (without case ending) # diff --git a/share/timedef/zh_CN.UTF-8.src b/share/timedef/zh_CN.UTF-8.src index 6b1d02358..9f742dd48 100644 --- a/share/timedef/zh_CN.UTF-8.src +++ b/share/timedef/zh_CN.UTF-8.src @@ -5,18 +5,18 @@ # # Short month names # - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1月 + 2月 + 3月 + 4月 + 5月 + 6月 + 7月 + 8月 + 9月 +10月 +11月 +12月 # # Long month names (as in a date) # @@ -75,7 +75,7 @@ # # date_fmt # -%Yå¹´%b月%e日 %A %X %Z +%Yå¹´%_m月%e日 %A %X %Z # # Long month names (without case ending) # diff --git a/share/timedef/zh_CN.eucCN.src b/share/timedef/zh_CN.eucCN.src index 300002231..4290be778 100644 --- a/share/timedef/zh_CN.eucCN.src +++ b/share/timedef/zh_CN.eucCN.src @@ -5,18 +5,18 @@ # # Short month names # - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1Ô + 2Ô + 3Ô + 4Ô + 5Ô + 6Ô + 7Ô + 8Ô + 9Ô +10Ô +11Ô +12Ô # # Long month names (as in a date) # @@ -75,7 +75,7 @@ # # date_fmt # -%YÄê%bÔÂ%eÈÕ %A %X %Z +%YÄê%_mÔÂ%eÈÕ %A %X %Z # # Long month names (without case ending) # diff --git a/share/timedef/zh_TW.Big5.src b/share/timedef/zh_TW.Big5.src index dee99ae16..b3aa1425b 100644 --- a/share/timedef/zh_TW.Big5.src +++ b/share/timedef/zh_TW.Big5.src @@ -4,18 +4,18 @@ # WARNING: empty lines are essential too # # Short month names - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1¤ë + 2¤ë + 3¤ë + 4¤ë + 5¤ë + 6¤ë + 7¤ë + 8¤ë + 9¤ë +10¤ë +11¤ë +12¤ë # # Long month names (as in a date) # @@ -74,7 +74,7 @@ # # date_fmt # -%Y¦~%b¤ë%e¤é %A %X %Z +%Y¦~%_m¤ë%e¤é %A %X %Z # # Long month names (without case ending) # diff --git a/share/timedef/zh_TW.UTF-8.src b/share/timedef/zh_TW.UTF-8.src index 22b68920c..85cc20f15 100644 --- a/share/timedef/zh_TW.UTF-8.src +++ b/share/timedef/zh_TW.UTF-8.src @@ -4,18 +4,18 @@ # WARNING: empty lines are essential too # # Short month names - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1月 + 2月 + 3月 + 4月 + 5月 + 6月 + 7月 + 8月 + 9月 +10月 +11月 +12月 # # Long month names (as in a date) # @@ -74,7 +74,7 @@ # # date_fmt # -%Yå¹´%b月%e日 %A %X %Z +%Yå¹´%_m月%e日 %A %X %Z # # Long month names (without case ending) # -- 2.45.0