i18npool/source/localedata/data/ja_JP.xml | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
New commits:
commit cdab3bec73a0a5137b8d102f5781f88231721db3
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Sat Apr 10 18:10:30 2021 +0200
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Sat Apr 10 23:00:04 2021 +0200
Quote literals in {ja-JP} date and time format codes
Because when loading number formats from ODF literal text is
enquoted that resulted in duplicated formats that differed only in
quoted literals vs unquoted literals with identical functionality,
but unnecessarily polluting the number formats list.
Since
commit 5d1042cbd25b22babaf8b30bc4edff6f70750b5e
CommitDate: Sat Apr 10 03:49:37 2021 +0200
ODF load: use AAA/AAAA instead of NN/NNN(N) for implicit
secondary calendar
these predefined format codes now load actually identical.
Change-Id: I02b5367ecd8ddab4419a56ba4d1c3ac4233142b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113925
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
diff --git a/i18npool/source/localedata/data/ja_JP.xml
b/i18npool/source/localedata/data/ja_JP.xml
index d75f9712cf72..9319d07f9036 100644
--- a/i18npool/source/localedata/data/ja_JP.xml
+++ b/i18npool/source/localedata/data/ja_JP.xml
@@ -114,7 +114,7 @@
<FormatCode>YY/M/D</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey2" default="false" type="long"
usage="DATE" formatindex="19">
- <FormatCode>YYYY年MM月DD日（AAAA）</FormatCode>
+ <FormatCode>YYYY"年"MM"月"DD"日（"AAAA"）"</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey3" default="false" type="medium"
usage="DATE" formatindex="20">
<FormatCode>YY/MM/DD</FormatCode>
@@ -123,31 +123,31 @@
<FormatCode>YYYY/MM/DD</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey5" default="false" type="long"
usage="DATE" formatindex="22">
- <FormatCode>YY年M月D日</FormatCode>
+ <FormatCode>YY"年"M"月"D"日"</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey6" default="true" type="long"
usage="DATE" formatindex="23">
- <FormatCode>YYYY年M月D日</FormatCode>
+ <FormatCode>YYYY"年"M"月"D"日"</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey7" default="false" type="long"
usage="DATE" formatindex="24">
- <FormatCode>GGGE年M月D日</FormatCode>
+ <FormatCode>GGGE"年"M"月"D"日"</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="false" type="long"
usage="DATE" formatindex="25">
- <FormatCode>YYYY年M月D日</FormatCode>
+ <FormatCode>YYYY"年"M"月"D"日"</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="false" type="long"
usage="DATE" formatindex="26">
- <FormatCode>GGGE年M月D日（AAAA）</FormatCode>
+ <FormatCode>GGGE"年"M"月"D"日（"AAAA"）"</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey10" default="false" type="long"
usage="DATE" formatindex="27">
- <FormatCode>YY年M月D日（AAA）</FormatCode>
+ <FormatCode>YY"年"M"月"D"日（"AAA"）"</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey11" default="false" type="long"
usage="DATE" formatindex="28">
- <FormatCode>GGGE年M月D日（AAA）</FormatCode>
+ <FormatCode>GGGE"年"M"月"D"日（"AAA"）"</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey12" default="false" type="long"
usage="DATE" formatindex="29">
- <FormatCode>YYYY年M月D日（AAA）</FormatCode>
+ <FormatCode>YYYY"年"M"月"D"日（"AAA"）"</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey13" default="false" type="long"
usage="DATE" formatindex="30">
- <FormatCode>YYYY年M月D日（AAAA）</FormatCode>
+ <FormatCode>YYYY"年"M"月"D"日（"AAAA"）"</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey23" default="false" type="long"
usage="DATE" formatindex="69">
<FormatCode>YYYY"年（"GGGE"年）"MM"月"DD"日"</FormatCode>
@@ -169,13 +169,13 @@
<FormatCode>YY/MM</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey18" default="true" type="medium"
usage="DATE" formatindex="35">
- <FormatCode>M月D日</FormatCode>
+ <FormatCode>M"月"D"日"</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey19" default="false" type="medium"
usage="DATE" formatindex="36">
- <FormatCode>M月</FormatCode>
+ <FormatCode>M"月"</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey20" default="false" type="medium"
usage="DATE" formatindex="37">
- <FormatCode>YY年 QQ</FormatCode>
+ <FormatCode>YY"年 "QQ</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey21" default="false" type="medium"
usage="DATE" formatindex="38">
<FormatCode>WW 1</FormatCode>
@@ -202,10 +202,10 @@
<FormatCode>[HH]:MM:SS.00</FormatCode>
</FormatElement>
<FormatElement msgid="TimeFormatskey8" default="false" type="short"
usage="TIME" formatindex="66">
- <FormatCode>H時MM分</FormatCode>
+ <FormatCode>H"時"MM"分"</FormatCode>
</FormatElement>
<FormatElement msgid="TimeFormatskey9" default="false" type="medium"
usage="TIME" formatindex="67">
- <FormatCode>H時MM分SS秒</FormatCode>
+ <FormatCode>H"時"MM"分"SS"秒"</FormatCode>
</FormatElement>
<FormatElement msgid="DateTimeFormatskey1" default="false" type="medium"
usage="DATE_TIME" formatindex="46">
<FormatCode>YY/MM/DD HH:MM</FormatCode>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
