summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJill Zheng <yijiu.zheng@gmail.com>2021-12-08 23:33:18 -0800
committerGitHub <noreply@github.com>2021-12-09 08:33:18 +0100
commit9f31b3f1eb66c7c42912fa13c04f871778d207d4 (patch)
tree9b0a3215032024ac330c92c690806e08602b082b
parent73d9d8779797f4ec88468246f45853ae8227f453 (diff)
downloadzope-i18n-9f31b3f1eb66c7c42912fa13c04f871778d207d4.tar.gz
Merge pull request #17 from yijiuzheng/locale_data_fix
Fixed date/time format in zh.xml, sv.xml and es_US.xml
-rw-r--r--src/zope/i18n/locales/data/es_US.xml12
-rw-r--r--src/zope/i18n/locales/data/sv.xml4
-rw-r--r--src/zope/i18n/locales/data/zh.xml48
3 files changed, 56 insertions, 8 deletions
diff --git a/src/zope/i18n/locales/data/es_US.xml b/src/zope/i18n/locales/data/es_US.xml
index a8ba7fc..4bb7544 100644
--- a/src/zope/i18n/locales/data/es_US.xml
+++ b/src/zope/i18n/locales/data/es_US.xml
@@ -35,12 +35,12 @@
</dateFormatLength >
<dateFormatLength type="medium">
<dateFormat >
- <pattern>MMM d, yyyy</pattern>
+ <pattern>dd-MMM-yy</pattern>
</dateFormat>
</dateFormatLength >
<dateFormatLength type="short">
<dateFormat >
- <pattern>M/d/yy</pattern>
+ <pattern>d/MM/yy</pattern>
</dateFormat>
</dateFormatLength >
</dateFormats>
@@ -48,22 +48,22 @@
<default type="medium"/>
<timeFormatLength type="full">
<timeFormat >
- <pattern>h:mm:ss a z</pattern>
+ <pattern>HH'H'mm''ss" z</pattern>
</timeFormat>
</timeFormatLength >
<timeFormatLength type="long">
<timeFormat >
- <pattern>h:mm:ss a z</pattern>
+ <pattern>HH:mm:ss z</pattern>
</timeFormat>
</timeFormatLength >
<timeFormatLength type="medium">
<timeFormat >
- <pattern>h:mm:ss a</pattern>
+ <pattern>HH:mm:ss</pattern>
</timeFormat>
</timeFormatLength >
<timeFormatLength type="short">
<timeFormat >
- <pattern>h:mm a</pattern>
+ <pattern>HH:mm</pattern>
</timeFormat>
</timeFormatLength >
</timeFormats>
diff --git a/src/zope/i18n/locales/data/sv.xml b/src/zope/i18n/locales/data/sv.xml
index aa9caea..6f7b5c0 100644
--- a/src/zope/i18n/locales/data/sv.xml
+++ b/src/zope/i18n/locales/data/sv.xml
@@ -902,12 +902,12 @@
</dateFormatLength >
<dateFormatLength type="medium">
<dateFormat >
- <pattern>yyyy-MM-dd</pattern>
+ <pattern>dd-MMM-yy</pattern>
</dateFormat>
</dateFormatLength >
<dateFormatLength type="short">
<dateFormat >
- <pattern>yyyy-MM-dd</pattern>
+ <pattern>d/MM/yy</pattern>
</dateFormat>
</dateFormatLength >
</dateFormats>
diff --git a/src/zope/i18n/locales/data/zh.xml b/src/zope/i18n/locales/data/zh.xml
index df95d72..5f070f4 100644
--- a/src/zope/i18n/locales/data/zh.xml
+++ b/src/zope/i18n/locales/data/zh.xml
@@ -883,6 +883,54 @@
<era type="2">公元</era>
</eraAbbr>
</eras>
+ <dateFormats>
+ <default type="medium"/>
+ <dateFormatLength type="full">
+ <dateFormat >
+ <pattern>yyyy'年'M'月'd'日'EEEE</pattern>
+ </dateFormat>
+ </dateFormatLength >
+ <dateFormatLength type="long">
+ <dateFormat >
+ <pattern>yyyy'年'M'月'd'日'</pattern>
+ </dateFormat>
+ </dateFormatLength >
+ <dateFormatLength type="medium">
+ <dateFormat >
+ <pattern>yyyy/MM/dd</pattern>
+ </dateFormat>
+ </dateFormatLength >
+ <dateFormatLength type="short">
+ <dateFormat >
+ <pattern>yy/MM/dd</pattern>
+ </dateFormat>
+ </dateFormatLength >
+ </dateFormats>
+ <timeFormats>
+ <default type="medium"/>
+ <timeFormatLength type="long">
+ <timeFormat >
+ <pattern>H:mm:ss:z</pattern>
+ </timeFormat>
+ </timeFormatLength >
+ <timeFormatLength type="medium">
+ <timeFormat >
+ <pattern>H:mm:ss</pattern>
+ </timeFormat>
+ </timeFormatLength >
+ <timeFormatLength type="short">
+ <timeFormat >
+ <pattern>H:mm</pattern>
+ </timeFormat>
+ </timeFormatLength >
+ </timeFormats>
+ <dateTimeFormats>
+ <dateTimeFormatLength >
+ <dateTimeFormat>
+ <pattern>{1} {0}</pattern>
+ </dateTimeFormat>
+ </dateTimeFormatLength >
+ </dateTimeFormats>
</calendar>
</calendars>
<timeZoneNames>