summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2015-10-29 17:00:51 +0000
committerdelphij <delphij@FreeBSD.org>2015-10-29 17:00:51 +0000
commit0528cc36312cf19f8a6e72069d7287150a69b514 (patch)
tree85e9fd3313f122c46525b93b16de276959370bb8
parent73d04e0e3d8a68ad719134d40eb89a14bff4694e (diff)
downloadFreeBSD-src-0528cc36312cf19f8a6e72069d7287150a69b514.zip
FreeBSD-src-0528cc36312cf19f8a6e72069d7287150a69b514.tar.gz
MFC r289038,r289041:
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 <lantw44 gmail com>
-rw-r--r--share/timedef/zh_CN.GB18030.src26
-rw-r--r--share/timedef/zh_CN.GB2312.src26
-rw-r--r--share/timedef/zh_CN.UTF-8.src26
-rw-r--r--share/timedef/zh_CN.eucCN.src26
-rw-r--r--share/timedef/zh_TW.Big5.src26
-rw-r--r--share/timedef/zh_TW.UTF-8.src26
6 files changed, 78 insertions, 78 deletions
diff --git a/share/timedef/zh_CN.GB18030.src b/share/timedef/zh_CN.GB18030.src
index 3000022..4290be7 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 3000022..4290be7 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 6b1d023..9f742dd 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 3000022..4290be7 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 dee99ae..b3aa142 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 22b6892..85cc20f 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)
#
OpenPOWER on IntegriCloud