i18npool/source/localedata/data/en_US.xml | 2 +-
svl/qa/unit/svl.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit af6f3aaddaa0b83a73dca073008e360ece998110
Author: Eike Rathke <erack at redhat.com>
AuthorDate: Sat Jul 3 21:50:29 2021 +0200
Commit: Eike Rathke <erack at redhat.com>
CommitDate: Mon Jul 5 01:08:09 2021 +0200
Related: tdf#125035 en_US formatindex="19" DATE_SYSTEM_LONG with D not DD
Otherwise CppunitTest_sw_odfimport testDateFormFormats fails with
- Expected: Wednesday, March 4, 2020
- Actual : Wednesday, March 04, 2020
if DateFormatter uses number formatter.
This is also what
https://www.localeplanet.com/icu/en-US/index.html
lists for Date.0 and formatindex="30" has as well.
This makes adapting CppunitTest_svl_qa_cppunit testNumberFormat
necessary.
Change-Id: I1c8cfd954f34f742b0397b8f922d22eb11ae19f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118361
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Jenkins
(cherry picked from commit 57bd9a60757a5a5d222d6e992e7f38cb3cea4bf6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118308
diff --git a/i18npool/source/localedata/data/en_US.xml b/i18npool/source/localedata/data/en_US.xml
index bed196f3cee7..a96750aab17d 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -120,7 +120,7 @@
<FormatCode>M/D/YY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
- <FormatCode>NNNNMMMM DD, YYYY</FormatCode>
+ <FormatCode>NNNNMMMM D, YYYY</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20">
<FormatCode>MM/DD/YY</FormatCode>
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 553ae8b7e8c1..ba3b6a34a805 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -182,7 +182,7 @@ void Test::testNumberFormat()
const char* pDate[] = {
"M/D/YY",
- "NNNNMMMM DD, YYYY",
+ "NNNNMMMM D, YYYY",
"MM/DD/YY",
"MM/DD/YYYY",
"MMM D, YY",