i18npool/source/localedata/data/da_DK.xml | 2 +-
i18npool/source/localedata/data/en_CA.xml | 2 +-
i18npool/source/localedata/data/en_DK.xml | 2 +-
i18npool/source/localedata/data/en_GB.xml | 2 +-
i18npool/source/localedata/data/en_GH.xml | 2 +-
i18npool/source/localedata/data/en_NA.xml | 2 +-
i18npool/source/localedata/data/en_ZA.xml | 2 +-
i18npool/source/localedata/data/eo.xml | 2 +-
i18npool/source/localedata/data/fi_FI.xml | 2 +-
i18npool/source/localedata/data/fo_FO.xml | 2 +-
i18npool/source/localedata/data/fr_CA.xml | 2 +-
i18npool/source/localedata/data/gd_GB.xml | 2 +-
i18npool/source/localedata/data/hu_HU.xml | 2 +-
i18npool/source/localedata/data/id_ID.xml | 2 +-
i18npool/source/localedata/data/is_IS.xml | 2 +-
i18npool/source/localedata/data/kl_GL.xml | 2 +-
i18npool/source/localedata/data/lg_UG.xml | 2 +-
i18npool/source/localedata/data/sv_FI.xml | 2 +-
i18npool/source/localedata/data/sv_SE.xml | 2 +-
i18npool/source/localedata/data/zh_HK.xml | 2 +-
sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py | 11 +++++++++--
21 files changed, 29 insertions(+), 22 deletions(-)
New commits:
commit 56ae948b08010ed1b61be9857c8c6ae4e97e86b2
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Fri Jul 2 23:29:28 2021 +0200
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Sat Jul 3 11:47:28 2021 +0200
Related: tdf#125035 Include day of week in formatindex="19" DATE_SYSTEM_LONG
Used programmatically with number formatter's NF_DATE_SYSTEM_LONG
but quite some locales were lacking the day of week; maybe legacy
because duplicated formats sometimes were avoided, which nowadays
are suppressed in the number format dialog. Made the format code a
copy of formatindex="30" explicit DATE_SYS_NNNNDMMMMYYYY.
Didn't know what to do about lt_LT so kept that as is.
This made it necessary to adapt a dreaded UITest_writer_tests5
test that checks for listbox content,
test_date_field_with_custom_format, which depends on actual locale
data. See comment there.
Change-Id: Ifc26a4a5be6bed3fb8d9cedc1afcba1225751635
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118335
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
diff --git a/i18npool/source/localedata/data/da_DK.xml
b/i18npool/source/localedata/data/da_DK.xml
index 540e2ca7365d..6b659a0381e9 100644
--- a/i18npool/source/localedata/data/da_DK.xml
+++ b/i18npool/source/localedata/data/da_DK.xml
@@ -108,7 +108,7 @@
<FormatCode>DD-MM-YY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>D. MMMM YYYY</FormatCode>
+ <FormatCode>NNNND. MMMM YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="true" type="medium"
usage="DATE" formatindex="20">
<FormatCode>DD-MM-YY</FormatCode>
diff --git a/i18npool/source/localedata/data/en_CA.xml
b/i18npool/source/localedata/data/en_CA.xml
index 9e637a7530d0..d3eb8804bd02 100644
--- a/i18npool/source/localedata/data/en_CA.xml
+++ b/i18npool/source/localedata/data/en_CA.xml
@@ -116,7 +116,7 @@
<FormatCode>YY-M-D</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>MMMM D, YYYY</FormatCode>
+ <FormatCode>NNNNMMMM D, YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="false" type="medium"
usage="DATE" formatindex="20">
<FormatCode>YY-MM-DD</FormatCode>
diff --git a/i18npool/source/localedata/data/en_DK.xml
b/i18npool/source/localedata/data/en_DK.xml
index f8ac52e25f06..041ce09a73ae 100644
--- a/i18npool/source/localedata/data/en_DK.xml
+++ b/i18npool/source/localedata/data/en_DK.xml
@@ -120,7 +120,7 @@
<FormatCode>YY-MM-DD</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>DD MMMM YYYY</FormatCode>
+ <FormatCode>NNNND. MMMM YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="false" type="medium"
usage="DATE" formatindex="20">
<FormatCode>YY-MM-DD</FormatCode>
diff --git a/i18npool/source/localedata/data/en_GB.xml
b/i18npool/source/localedata/data/en_GB.xml
index 2928b62529da..ac82153508fa 100644
--- a/i18npool/source/localedata/data/en_GB.xml
+++ b/i18npool/source/localedata/data/en_GB.xml
@@ -79,7 +79,7 @@
<FormatCode>DD/MM/YY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>DD MMMM YYYY</FormatCode>
+ <FormatCode>NNNND MMMM YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey10" default="false" type="long"
usage="DATE" formatindex="22">
<FormatCode>D MMM YY</FormatCode>
diff --git a/i18npool/source/localedata/data/en_GH.xml
b/i18npool/source/localedata/data/en_GH.xml
index ccda3d203d24..0a6ea83eec08 100644
--- a/i18npool/source/localedata/data/en_GH.xml
+++ b/i18npool/source/localedata/data/en_GH.xml
@@ -114,7 +114,7 @@
<FormatCode>YY/MM/DD</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>DD MMMM YYYY</FormatCode>
+ <FormatCode>NNNND MMMM YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="true" type="medium"
usage="DATE" formatindex="20">
<FormatCode>YY/MM/DD</FormatCode>
diff --git a/i18npool/source/localedata/data/en_NA.xml
b/i18npool/source/localedata/data/en_NA.xml
index 4322f2bb5afa..09d481e413d7 100644
--- a/i18npool/source/localedata/data/en_NA.xml
+++ b/i18npool/source/localedata/data/en_NA.xml
@@ -114,7 +114,7 @@
<FormatCode>YY/MM/DD</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>DD MMMM YYYY</FormatCode>
+ <FormatCode>NNNND MMMM YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="true" type="medium"
usage="DATE" formatindex="20">
<FormatCode>YY/MM/DD</FormatCode>
diff --git a/i18npool/source/localedata/data/en_ZA.xml
b/i18npool/source/localedata/data/en_ZA.xml
index ec3990a72135..574f1da3407b 100644
--- a/i18npool/source/localedata/data/en_ZA.xml
+++ b/i18npool/source/localedata/data/en_ZA.xml
@@ -116,7 +116,7 @@
<FormatCode>YY-MM-DD</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>DD MMMM YYYY</FormatCode>
+ <FormatCode>NNNND MMMM YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="false" type="medium"
usage="DATE" formatindex="20">
<FormatCode>YY-MM-DD</FormatCode>
diff --git a/i18npool/source/localedata/data/eo.xml
b/i18npool/source/localedata/data/eo.xml
index 4fb04f908328..4d012531505a 100644
--- a/i18npool/source/localedata/data/eo.xml
+++ b/i18npool/source/localedata/data/eo.xml
@@ -78,7 +78,7 @@
<FormatCode>YY-MM-DD</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>D MMMM YYYY</FormatCode>
+ <FormatCode>NNNND MMMM YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey10" default="false" type="long"
usage="DATE" formatindex="22">
<FormatCode>D MMM YY</FormatCode>
diff --git a/i18npool/source/localedata/data/fi_FI.xml
b/i18npool/source/localedata/data/fi_FI.xml
index cace5bcba575..c800db1aea2f 100644
--- a/i18npool/source/localedata/data/fi_FI.xml
+++ b/i18npool/source/localedata/data/fi_FI.xml
@@ -108,7 +108,7 @@
<FormatCode>P.K.VVVV</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>P. KKKK VVVV</FormatCode>
+ <FormatCode>NNNNP. KKKK VVVV</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="true" type="medium"
usage="DATE" formatindex="20">
<FormatCode>PP.KK.VV</FormatCode>
diff --git a/i18npool/source/localedata/data/fo_FO.xml
b/i18npool/source/localedata/data/fo_FO.xml
index 3b43a6a93099..053283204ab1 100644
--- a/i18npool/source/localedata/data/fo_FO.xml
+++ b/i18npool/source/localedata/data/fo_FO.xml
@@ -78,7 +78,7 @@
<FormatCode>DD-MM-YY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>D. MMMM YYYY</FormatCode>
+ <FormatCode>NNNND. MMMM YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey10" default="false" type="long"
usage="DATE" formatindex="22">
<FormatCode>D. MMM YY</FormatCode>
diff --git a/i18npool/source/localedata/data/fr_CA.xml
b/i18npool/source/localedata/data/fr_CA.xml
index 25e81ab7462b..fd8bd9c7fcb9 100644
--- a/i18npool/source/localedata/data/fr_CA.xml
+++ b/i18npool/source/localedata/data/fr_CA.xml
@@ -110,7 +110,7 @@
<FormatCode>AA-M-J</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>J MMMM AAAA</FormatCode>
+ <FormatCode>NNNNJ MMMM AAAA</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="false" type="medium"
usage="DATE" formatindex="20">
<FormatCode>AA-MM-JJ</FormatCode>
diff --git a/i18npool/source/localedata/data/gd_GB.xml
b/i18npool/source/localedata/data/gd_GB.xml
index 13c07a017ca3..476b7dc10a26 100644
--- a/i18npool/source/localedata/data/gd_GB.xml
+++ b/i18npool/source/localedata/data/gd_GB.xml
@@ -137,7 +137,7 @@
<FormatCode>DD/MM/YY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>DD MMMM YYYY</FormatCode>
+ <FormatCode>NNNND MMMM YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey10" default="false" type="long"
usage="DATE" formatindex="22">
<FormatCode>D MMM YY</FormatCode>
diff --git a/i18npool/source/localedata/data/hu_HU.xml
b/i18npool/source/localedata/data/hu_HU.xml
index 35b2a9cfdda3..4c9445afa469 100644
--- a/i18npool/source/localedata/data/hu_HU.xml
+++ b/i18npool/source/localedata/data/hu_HU.xml
@@ -114,7 +114,7 @@
<FormatCode>YYYY". "MM". "DD.</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>YYYY". "MMMM D.</FormatCode>
+ <FormatCode>YYYY". "MMMM D., NNN</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="false" type="medium"
usage="DATE" formatindex="20">
<FormatCode>YY.MM.DD.</FormatCode>
diff --git a/i18npool/source/localedata/data/id_ID.xml
b/i18npool/source/localedata/data/id_ID.xml
index e4024cbf4c13..45cc97e59417 100644
--- a/i18npool/source/localedata/data/id_ID.xml
+++ b/i18npool/source/localedata/data/id_ID.xml
@@ -108,7 +108,7 @@
<FormatCode>DD/MM/YY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>DD MMMM YYYY</FormatCode>
+ <FormatCode>NNNND MMMM YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="true" type="medium"
usage="DATE" formatindex="20">
<FormatCode>DD/MM/YY</FormatCode>
diff --git a/i18npool/source/localedata/data/is_IS.xml
b/i18npool/source/localedata/data/is_IS.xml
index 301799d4a5e9..c294114cb0c9 100644
--- a/i18npool/source/localedata/data/is_IS.xml
+++ b/i18npool/source/localedata/data/is_IS.xml
@@ -94,7 +94,7 @@
<FormatCode>D.MM.YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>D. MMMM, YYYY</FormatCode>
+ <FormatCode>NNNND. MMMM, YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="true" type="medium"
usage="DATE" formatindex="20">
<FormatCode>DD.MM.YY</FormatCode>
diff --git a/i18npool/source/localedata/data/kl_GL.xml
b/i18npool/source/localedata/data/kl_GL.xml
index 4789e090356f..f5af7ceb2f4a 100644
--- a/i18npool/source/localedata/data/kl_GL.xml
+++ b/i18npool/source/localedata/data/kl_GL.xml
@@ -108,7 +108,7 @@
<FormatCode>DD-MM-YY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>D. MMMM YYYY</FormatCode>
+ <FormatCode>NNNND. MMMM YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="true" type="medium"
usage="DATE" formatindex="20">
<FormatCode>DD-MM-YY</FormatCode>
diff --git a/i18npool/source/localedata/data/lg_UG.xml
b/i18npool/source/localedata/data/lg_UG.xml
index 9108f9230468..5c12eb85c8ee 100644
--- a/i18npool/source/localedata/data/lg_UG.xml
+++ b/i18npool/source/localedata/data/lg_UG.xml
@@ -108,7 +108,7 @@
<FormatCode>YY/MM/DD</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>DD MMMM YYYY</FormatCode>
+ <FormatCode>NNNND MMMM YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="true" type="medium"
usage="DATE" formatindex="20">
<FormatCode>YY/MM/DD</FormatCode>
diff --git a/i18npool/source/localedata/data/sv_FI.xml
b/i18npool/source/localedata/data/sv_FI.xml
index 953bdedf0cdd..894df6a28b1a 100644
--- a/i18npool/source/localedata/data/sv_FI.xml
+++ b/i18npool/source/localedata/data/sv_FI.xml
@@ -108,7 +108,7 @@
<FormatCode>D.M.YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>D. MMMM YYYY</FormatCode>
+ <FormatCode>NNNND. MMMM YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="true" type="medium"
usage="DATE" formatindex="20">
<FormatCode>DD.MM.YY</FormatCode>
diff --git a/i18npool/source/localedata/data/sv_SE.xml
b/i18npool/source/localedata/data/sv_SE.xml
index 51cea4568d4b..4a85f9d13f04 100644
--- a/i18npool/source/localedata/data/sv_SE.xml
+++ b/i18npool/source/localedata/data/sv_SE.xml
@@ -109,7 +109,7 @@
<FormatCode>YYYY-MM-DD</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>D MMMM YYYY</FormatCode>
+ <FormatCode>NNNND MMMM YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="true" type="short"
usage="DATE" formatindex="20">
<FormatCode>YY-MM-DD</FormatCode>
diff --git a/i18npool/source/localedata/data/zh_HK.xml
b/i18npool/source/localedata/data/zh_HK.xml
index 9b183028d00c..df1c52c02469 100644
--- a/i18npool/source/localedata/data/zh_HK.xml
+++ b/i18npool/source/localedata/data/zh_HK.xml
@@ -91,7 +91,7 @@
<FormatCode>DD/MM/YY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey2" default="true" type="long"
usage="DATE" formatindex="19">
- <FormatCode>YYYY"年"M"月"D"日"</FormatCode>
+ <FormatCode>YYYY"年"M"月"D"日" NNNN</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey4" default="false" type="medium"
usage="DATE" formatindex="20">
<FormatCode>YY"年"M"月"D"日"</FormatCode>
diff --git a/sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py
b/sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py
index fb4a3098d19f..b5c3c4d863ae 100644
--- a/sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py
+++ b/sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py
@@ -45,8 +45,15 @@ class dateFormFieldDialog(UITestCase):
itemsList = xDialog.getChild("date_formats_treeview")
# check whether we have the right format selected
- self.assertEqual(get_state_as_dict(itemsList)["Children"],
"20")
-
self.assertEqual(get_state_as_dict(itemsList)["SelectEntryText"], "1999.
december 31., péntek")
+ # This is awkward though because checking for a fixed number of
+ # entries if the selected default format happens to equal a
+ # standard system format the entry gets duplicated with
+ # "[System]" appended. So this may be either 20 or 21 ... and
+ # in that case it is the selected format and the
+ # SelectEntryText doesn't match the sample string, so all this
+ # is rather fragile depending on actual locale data.
+ self.assertEqual(get_state_as_dict(itemsList)["Children"],
"21")
+
self.assertEqual(get_state_as_dict(itemsList)["SelectEntryText"], "1999.
december 31., péntek[System]")
def test_date_reformat(self):
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
