diff options
| author | Eike Rathke <erack@redhat.com> | 2018-10-01 15:57:12 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-10-01 21:35:39 +0200 |
| commit | fbc6415b85a855d3658be758efe4684cfd49faa3 (patch) | |
| tree | 9300595c24925400a1291b90dcf07de2ef293d33 /i18npool | |
| parent | 5c64c0e5f264818a648fbe8b49ed784f14cd8e6a (diff) | |
Resolves: tdf#119613 [*-ZA] default to ISO 8601 date format
This also made it necessary to adapt the unit tests that checked
for the old default format in output.
Change-Id: Ie7bc78d1e5a17e5cb6f52d5ed1ab42db80f07d2e
Reviewed-on: https://gerrit.libreoffice.org/61200
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/localedata/data/en_ZA.xml | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/i18npool/source/localedata/data/en_ZA.xml b/i18npool/source/localedata/data/en_ZA.xml index b0584d8e1966..3807110cda43 100644 --- a/i18npool/source/localedata/data/en_ZA.xml +++ b/i18npool/source/localedata/data/en_ZA.xml @@ -52,6 +52,8 @@ <MeasurementSystem>metric</MeasurementSystem> </LC_CTYPE> <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$R-1C09]"> + <!-- Y-M-D implicit from formatindex="21", Y/M/D implicit from formatindex="21" and DateSeparator --> + <DateAcceptancePattern>M-D</DateAcceptancePattern> <DateAcceptancePattern>M/D</DateAcceptancePattern> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> <FormatCode>Standard</FormatCode> @@ -111,16 +113,16 @@ <FormatCode>[CURRENCY] # ##0,--;[RED][CURRENCY]-# ##0,--</FormatCode> </FormatElement> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> - <FormatCode>YY/MM/DD</FormatCode> + <FormatCode>YY-MM-DD</FormatCode> </FormatElement> <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> <FormatCode>DD MMMM YYYY</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> - <FormatCode>YY/MM/DD</FormatCode> + <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="20"> + <FormatCode>YY-MM-DD</FormatCode> </FormatElement> - <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> - <FormatCode>YYYY/MM/DD</FormatCode> + <FormatElement msgid="DateFormatskey7" default="true" type="medium" usage="DATE" formatindex="21"> + <FormatCode>YYYY-MM-DD</FormatCode> </FormatElement> <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> <FormatCode>D MMM YY</FormatCode> @@ -174,6 +176,12 @@ <FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38"> <FormatCode>WW</FormatCode> </FormatElement> + <FormatElement msgid="DateFormatskey22" default="false" type="medium" usage="DATE" formatindex="60"> + <FormatCode>YY/MM/DD</FormatCode> + </FormatElement> + <FormatElement msgid="DateFormatskey23" default="false" type="medium" usage="DATE" formatindex="61"> + <FormatCode>YYYY/MM/DD</FormatCode> + </FormatElement> <FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME" formatindex="39"> <FormatCode>HH:MM</FormatCode> </FormatElement> @@ -195,10 +203,16 @@ <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45"> <FormatCode>[HH]:MM:SS,00</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46"> + <FormatElement msgid="DateTimeFormatskey1" default="false" type="medium" usage="DATE_TIME" formatindex="46"> + <FormatCode>YY-MM-DD HH:MM</FormatCode> + </FormatElement> + <FormatElement msgid="DateTimeFormatskey2" default="true" type="medium" usage="DATE_TIME" formatindex="47"> + <FormatCode>YYYY-MM-DD HH:MM:SS</FormatCode> + </FormatElement> + <FormatElement msgid="DateTimeFormatskey3" default="false" type="medium" usage="DATE_TIME" formatindex="62"> <FormatCode>YY/MM/DD HH:MM</FormatCode> </FormatElement> - <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> + <FormatElement msgid="DateTimeFormatskey4" default="false" type="medium" usage="DATE_TIME" formatindex="63"> <FormatCode>YYYY/MM/DD HH:MM:SS</FormatCode> </FormatElement> </LC_FORMAT> |