[Libreoffice-commits] core.git: i18npool/source

[Julien Nabet]

 i18npool/source/localedata/data/zh_CN.xml |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 71969c8b6a62253353acba548fc6f62ccf75fd23
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Oct 13 19:18:02 2014 +0200

    Resolves fdo#84961: zh_CN date separator should be "/" rather than "／"
    
    Thanks to the patch from Kevin Suo, see https://bugs.freedesktop.org/attachment.cgi?id=107768
    
    Signed-off-by: Eike Rathke <erack at redhat.com>
    With additional change to the DateAcceptancePattern.
    
    Change-Id: I80695028d51c6b91e9e9418e2d1ce33d76d23893
    Reviewed-on: https://gerrit.libreoffice.org/11958
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/i18npool/source/localedata/data/zh_CN.xml b/i18npool/source/localedata/data/zh_CN.xml
index e58c59a..d6e839e 100644
--- a/i18npool/source/localedata/data/zh_CN.xml
+++ b/i18npool/source/localedata/data/zh_CN.xml
@@ -30,7 +30,7 @@
   </LC_INFO>
   <LC_CTYPE unoid="generic">
     <Separators>
-      <DateSeparator>／</DateSeparator>
+      <DateSeparator>/</DateSeparator>
       <ThousandSeparator>,</ThousandSeparator>
       <DecimalSeparator>.</DecimalSeparator>
       <TimeSeparator>:</TimeSeparator>
@@ -56,7 +56,7 @@
     <DateAcceptancePattern>M/D</DateAcceptancePattern>
     <DateAcceptancePattern>M／D</DateAcceptancePattern>
     <DateAcceptancePattern>Y.M.D</DateAcceptancePattern>
-    <DateAcceptancePattern>Y/M/D</DateAcceptancePattern>
+    <DateAcceptancePattern>Y／M／D</DateAcceptancePattern>
     <DateAcceptancePattern>Y年M月D日</DateAcceptancePattern>
     <DateAcceptancePattern>M月D日</DateAcceptancePattern>
     <!-- Fix number formats. Index range is from 0 to 5. -->
@@ -119,10 +119,10 @@
       <FormatCode>YYYY"年"M"月"D"日"　NNNN</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="20">
-      <FormatCode>YY／M／D</FormatCode>
+      <FormatCode>YY/M/D</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="21">
-      <FormatCode>YYYY／M／D</FormatCode>
+      <FormatCode>YYYY/M/D</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey22" default="false" type="short" usage="DATE" formatindex="22">
       <FormatCode>YYYY"年"M"月"</FormatCode>
@@ -143,10 +143,10 @@
       <FormatCode>YY"年"M"月"D"日" NNNN</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey11" default="false" type="medium" usage="DATE" formatindex="28">
-      <FormatCode>YY／M／D NNNN</FormatCode>
+      <FormatCode>YY/M/D NNNN</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="29">
-      <FormatCode>YYYY／M／D NNNN</FormatCode>
+      <FormatCode>YYYY/M/D NNNN</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="30">
       <FormatCode>YYYY"年"M"月"D"日" NNNN</FormatCode>
@@ -228,10 +228,10 @@
       <FormatCode>YY"年"M"月"D"日"HH"时"MM"分"</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateTimeFormatskey1" default="false" type="long" usage="DATE_TIME"  formatindex="58">
-      <FormatCode>M／D／YY HH:MM</FormatCode>
+      <FormatCode>M/D/YY HH:MM</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateTimeFormatskey2" default="false" type="long" usage="DATE_TIME"  formatindex="59">
-      <FormatCode>MM／DD／YYYY HH:MM:SS</FormatCode>
+      <FormatCode>MM/DD/YYYY HH:MM:SS</FormatCode>
     </FormatElement>
   </LC_FORMAT>
   <LC_COLLATION>