[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - i18npool/source

[Kevin Suo]

 i18npool/source/localedata/data/zh_CN.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fabdb9356fe2b4d04b7e3ae4f2bfbd92fc306d76
Author: Kevin Suo <suokunlong at gmail.com>
Date:   Fri Dec 5 12:48:48 2014 +0800

    fdo#83752: date-time cell becomes text string when editing, zh_CN locale
    
    In the locale data xml file, formatindex 47 is used for date-and-time
    editing. If the format code does not match the defined date/time
    separators, it will cause the cell value to be treated as string text
    (rather than a date time value).
    
    Change-Id: I75a59d943d832f28a0a6153a17e6f671e5328abd
    Reviewed-on: https://gerrit.libreoffice.org/13306
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit d00a3722b46314c927ba392a31fe4ff5ebc5c0b5)
    Reviewed-on: https://gerrit.libreoffice.org/13309

diff --git a/i18npool/source/localedata/data/zh_CN.xml b/i18npool/source/localedata/data/zh_CN.xml
index 8fc15de..6cd5879 100644
--- a/i18npool/source/localedata/data/zh_CN.xml
+++ b/i18npool/source/localedata/data/zh_CN.xml
@@ -225,7 +225,7 @@
       <FormatCode>YYYY"年"MM"月"D"日"HH"时"MM"分"SS"秒"</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateTimeFormatskey3" default="false" type="long" usage="DATE_TIME"  formatindex="47">
-      <FormatCode>YY"年"M"月"D"日"HH"时"MM"分"</FormatCode>
+      <FormatCode>YYYY/MM/DD HH:MM:SS</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateTimeFormatskey1" default="false" type="long" usage="DATE_TIME"  formatindex="58">
       <FormatCode>M/D/YY HH:MM</FormatCode>