summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkevlo <kevlo@FreeBSD.org>2016-09-06 01:10:51 +0000
committerkevlo <kevlo@FreeBSD.org>2016-09-06 01:10:51 +0000
commit0772c1030c08964ecd6cbd4f0535597bee41c666 (patch)
tree6283cee52403c96587fcb3b7f371daf8f93ddbc1
parent604d056da8a45b89edd33e364751e5ad2e2e26cd (diff)
downloadFreeBSD-src-0772c1030c08964ecd6cbd4f0535597bee41c666.zip
FreeBSD-src-0772c1030c08964ecd6cbd4f0535597bee41c666.tar.gz
MFC r305265:
Revert r304192 to fix short month names and replace %b with %_m in date_fmt for Chinese locales. As mentioned in the commit message of r289041, nl_langinfo(ABMON_*) only returned numbers when using a Chinese locale, this causes problems in applications that put the short month name and the day of the month together. Spotted by: Ting-Wei Lan <lantw44 gmail com>
-rw-r--r--share/timedef/zh_CN.GB2312.src26
-rw-r--r--share/timedef/zh_CN.GBK.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.GB2312.src b/share/timedef/zh_CN.GB2312.src
index e98dc5f..ab55041 100644
--- a/share/timedef/zh_CN.GB2312.src
+++ b/share/timedef/zh_CN.GB2312.src
@@ -4,18 +4,18 @@
# -----------------------------------------------------------------------------
#
# Short month names
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
-10
-11
-12
+!!#1TB
+!!#2TB
+!!#3TB
+!!#4TB
+!!#5TB
+!!#6TB
+!!#7TB
+!!#8TB
+!!#9TB
+#1#0TB
+#1#1TB
+#1#2TB
#
# Long month names (as in a date)
一月
@@ -63,7 +63,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.GBK.src b/share/timedef/zh_CN.GBK.src
index e98dc5f..7079ac0 100644
--- a/share/timedef/zh_CN.GBK.src
+++ b/share/timedef/zh_CN.GBK.src
@@ -4,18 +4,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)
一月
@@ -63,7 +63,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 2460706..a99e12b 100644
--- a/share/timedef/zh_CN.UTF-8.src
+++ b/share/timedef/zh_CN.UTF-8.src
@@ -4,18 +4,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)
涓鏈
@@ -63,7 +63,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 e98dc5f..34803e4 100644
--- a/share/timedef/zh_CN.eucCN.src
+++ b/share/timedef/zh_CN.eucCN.src
@@ -4,18 +4,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)
一月
@@ -63,7 +63,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 4ed7cde..2930f5f 100644
--- a/share/timedef/zh_TW.Big5.src
+++ b/share/timedef/zh_TW.Big5.src
@@ -4,18 +4,18 @@
# -----------------------------------------------------------------------------
#
# Short month names
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
-10
-11
-12
+る
+⒈る
+⒉る
+⒊る
+⒋る
+⒌る
+⒍る
+⒎る
+⒏る
+る
+る
+⒈る
#
# Long month names (as in a date)
1る
@@ -63,7 +63,7 @@
と
#
# date_fmt
-%Y%bる%eら %A %X %Z
+%Y%_mる%eら %A %X %Z
#
# Long month names (without case ending)
1る
diff --git a/share/timedef/zh_TW.UTF-8.src b/share/timedef/zh_TW.UTF-8.src
index 3121d4a..3affab6 100644
--- a/share/timedef/zh_TW.UTF-8.src
+++ b/share/timedef/zh_TW.UTF-8.src
@@ -4,18 +4,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)
1鏈
@@ -63,7 +63,7 @@
涓嬪崍
#
# date_fmt
-%Y骞%b鏈%e鏃 %A %X %Z
+%Y骞%_m鏈%e鏃 %A %X %Z
#
# Long month names (without case ending)
1鏈
OpenPOWER on IntegriCloud