made formatindex="33" the ISO 8601 YYYY-MM-DD that it needs to be

9 files changed, 28 insertions, 14 deletions

diff --git a/i18npool/source/localedata/data/ar_DZ.xml b/i18npool/source/localedata/data/ar_DZ.xml
index 68cf3ed441e8..a9feabee095a 100644
--- a/i18npool/source/localedata/data/ar_DZ.xml
+++ b/i18npool/source/localedata/data/ar_DZ.xml
@@ -130,7 +130,7 @@
       <DefaultName>ISO 8601</DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="33">
-      <FormatCode>[NatNum1]YYYY/MM/DD</FormatCode>
+      <FormatCode>YYYY-MM-DD</FormatCode>
       <DefaultName>ISO 8601</DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34">
@@ -181,6 +181,9 @@
     <FormatElement msgid="DateTimeFormatskey4" default="false" type="medium" usage="DATE_TIME" formatindex="51">
       <FormatCode>[NatNum1]AM/PMHH:MM YYYY/MM/D</FormatCode>
     </FormatElement>
+    <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="52">
+      <FormatCode>[NatNum1]YYYY/MM/DD</FormatCode>
+    </FormatElement>
   </LC_FORMAT>
   <LC_COLLATION ref="en_US" />
   <LC_SEARCH ref="en_US"/>
diff --git a/i18npool/source/localedata/data/ar_EG.xml b/i18npool/source/localedata/data/ar_EG.xml
index bc3341d12969..b99a02db526b 100644
--- a/i18npool/source/localedata/data/ar_EG.xml
+++ b/i18npool/source/localedata/data/ar_EG.xml
@@ -130,7 +130,7 @@
       <DefaultName>ISO 8601</DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="33">
-      <FormatCode>[NatNum1]YYYY/MM/DD</FormatCode>
+      <FormatCode>YYYY-MM-DD</FormatCode>
       <DefaultName>ISO 8601</DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34">
@@ -181,6 +181,9 @@
     <FormatElement msgid="DateTimeFormatskey4" default="false" type="medium" usage="DATE_TIME" formatindex="51">
       <FormatCode>[NatNum1]AM/PMHH:MM YYYY/MM/D</FormatCode>
     </FormatElement>
+    <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="52">
+      <FormatCode>[NatNum1]YYYY/MM/DD</FormatCode>
+    </FormatElement>
   </LC_FORMAT>
   <LC_COLLATION ref="en_US" />
   <LC_SEARCH ref="en_US"/>
diff --git a/i18npool/source/localedata/data/ja_JP.xml b/i18npool/source/localedata/data/ja_JP.xml
index d09dd5302749..54c42a2bcbc1 100644
--- a/i18npool/source/localedata/data/ja_JP.xml
+++ b/i18npool/source/localedata/data/ja_JP.xml
@@ -129,7 +129,8 @@
       <FormatCode>GE.M.D</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey16" default="false" type="medium" usage="DATE" formatindex="33">
-      <FormatCode>GE.MM.DD</FormatCode>
+      <FormatCode>YYYY-MM-DD</FormatCode>
+      <DefaultName>ISO 8601</DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey17" default="false" type="medium" usage="DATE" formatindex="34">
       <FormatCode>YY/MM</FormatCode>
@@ -170,7 +171,7 @@
     <FormatElement msgid="TimeFormatskey8" default="false" type="medium" usage="TIME" formatindex="52">
       <FormatCode>H時MM分</FormatCode>
     </FormatElement>
-    <FormatElement msgid="TimeFormatskey9" default="false" type="long" usage="TIME" formatindex="54">
+    <FormatElement msgid="TimeFormatskey9" default="false" type="long" usage="TIME" formatindex="53">
       <FormatCode>H時MM分SS秒</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateTimeFormatskey1" default="false" type="long" usage="DATE_TIME" formatindex="46">
@@ -179,6 +180,9 @@
     <FormatElement msgid="DateTimeFormatskey2" default="true" type="long" usage="DATE_TIME" formatindex="47">
       <FormatCode>YYYY/M/D H:MM</FormatCode>
     </FormatElement>
+    <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="54">
+      <FormatCode>GE.MM.DD</FormatCode>
+    </FormatElement>
   </LC_FORMAT>
   <LC_COLLATION>
     <Collator default="true" unoid="phonetic (alphanumeric first)" />
diff --git a/i18npool/source/localedata/data/ko_KR.xml b/i18npool/source/localedata/data/ko_KR.xml
index 7762c6dea4dc..932bd915d657 100644
--- a/i18npool/source/localedata/data/ko_KR.xml
+++ b/i18npool/source/localedata/data/ko_KR.xml
@@ -129,7 +129,8 @@
       <FormatCode>YY-M-D</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey16" default="false" type="medium" usage="DATE" formatindex="33">
-      <FormatCode>YY"년" M"월"</FormatCode>
+      <FormatCode>YYYY-MM-DD</FormatCode>
+      <DefaultName>ISO 8601</DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey17" default="false" type="medium" usage="DATE" formatindex="34">
       <FormatCode>M"月" D"日"</FormatCode>
diff --git a/i18npool/source/localedata/data/locale.dtd b/i18npool/source/localedata/data/locale.dtd
index ae4cec5121d5..1d790390ffe3 100644
--- a/i18npool/source/localedata/data/locale.dtd
+++ b/i18npool/source/localedata/data/locale.dtd
@@ -236,8 +236,7 @@
         TODO: Future versions should make use of an edit="true" attribute
         instead of relying on this special requirement.
 
-        Formatindices 32 and 33 are always used for ISO 8601 YY-MM-DD
-        respectively YYYY-MM-DD format codes.
+        formatindex="33" must be ISO 8601 YYYY-MM-DD format code.
 
     Of usage="DATE_TIME":
         formatindex="47" is used to edit already existing combined date/time
diff --git a/i18npool/source/localedata/data/mk_MK.xml b/i18npool/source/localedata/data/mk_MK.xml
index 10e488e3cac1..10d6b6ed331c 100644
--- a/i18npool/source/localedata/data/mk_MK.xml
+++ b/i18npool/source/localedata/data/mk_MK.xml
@@ -130,7 +130,7 @@
       <DefaultName>ISO 8601</DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="33">
-      <FormatCode>DD.MM.YYYY</FormatCode>
+      <FormatCode>YYYY-MM-DD</FormatCode>
       <DefaultName>ISO 8601</DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34">
diff --git a/i18npool/source/localedata/data/zh_HK.xml b/i18npool/source/localedata/data/zh_HK.xml
index da509424340c..aa6d7638bb59 100644
--- a/i18npool/source/localedata/data/zh_HK.xml
+++ b/i18npool/source/localedata/data/zh_HK.xml
@@ -144,8 +144,8 @@
 <DefaultName/>
 </FormatElement>
 <FormatElement msgid="DateFormatskey16" default="false" type="medium" usage="DATE" formatindex="33">
-<FormatCode>YYYY"年"M"月"D"日"</FormatCode>
-<DefaultName/>
+<FormatCode>YYYY-MM-DD</FormatCode>
+<DefaultName>ISO 8601</DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey17" default="false" type="short" usage="DATE" formatindex="34">
 <FormatCode>MMMM/YY</FormatCode>
diff --git a/i18npool/source/localedata/data/zh_MO.xml b/i18npool/source/localedata/data/zh_MO.xml
index ae768a1e41ff..bc90760af813 100644
--- a/i18npool/source/localedata/data/zh_MO.xml
+++ b/i18npool/source/localedata/data/zh_MO.xml
@@ -143,8 +143,8 @@
 <DefaultName/>
 </FormatElement>
 <FormatElement msgid="DateFormatskey16" default="false" type="medium" usage="DATE" formatindex="33">
-<FormatCode>D-M-YYYY</FormatCode>
-<DefaultName/>
+<FormatCode>YYYY-MM-DD</FormatCode>
+<DefaultName>ISO 8601</DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey17" default="false" type="short" usage="DATE" formatindex="34">
 <FormatCode>MM/YY</FormatCode>
@@ -236,6 +236,10 @@
 <FormatCode>YY"年"M"月"D"日" HH"時"MM"分"SS"秒"</FormatCode>
 <DefaultName/>
 </FormatElement>
+<FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="58">
+<FormatCode>D-M-YYYY</FormatCode>
+<DefaultName/>
+</FormatElement>
 </LC_FORMAT>
 <LC_COLLATION ref="zh_HK"/>
 <LC_SEARCH ref="zh_CN"/>
diff --git a/i18npool/source/localedata/data/zh_TW.xml b/i18npool/source/localedata/data/zh_TW.xml
index 3d997136b73c..94eeb8fad143 100644
--- a/i18npool/source/localedata/data/zh_TW.xml
+++ b/i18npool/source/localedata/data/zh_TW.xml
@@ -165,8 +165,8 @@
 <DefaultName/>
 </FormatElement>
 <FormatElement msgid="DateFormatskey16" default="false" type="medium" usage="DATE" formatindex="33">
-<FormatCode>GGGEE"年"M"月"D"日"</FormatCode>
-<DefaultName/>
+<FormatCode>YYYY-MM-DD</FormatCode>
+<DefaultName>ISO 8601</DefaultName>
 </FormatElement>
 <FormatElement msgid="DateFormatskey17" default="false" type="short" usage="DATE" formatindex="34">
 <FormatCode>YY/M</FormatCode>