[Libreoffice-commits] core.git: 2 commits - i18npool/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Sep 3 11:38:34 UTC 2018
i18npool/source/localedata/data/af_ZA.xml | 24 -----------------
i18npool/source/localedata/data/en_ZA.xml | 42 +++++++++++++++---------------
2 files changed, 22 insertions(+), 44 deletions(-)
New commits:
commit 464154aa26ae77883dd59fcbaab9e084aa035c9d
Author: Eike Rathke <erack at redhat.com>
AuthorDate: Mon Sep 3 09:41:03 2018 +0200
Commit: Eike Rathke <erack at redhat.com>
CommitDate: Mon Sep 3 13:38:23 2018 +0200
Related: tdf#119613 inherit af_ZA separators from identical en_ZA
Also LC_FORMAT is already inherited.
Change-Id: I166ac1b50329430139d3f243454d7fdd2069e4ad
Reviewed-on: https://gerrit.libreoffice.org/59920
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Jenkins
diff --git a/i18npool/source/localedata/data/af_ZA.xml b/i18npool/source/localedata/data/af_ZA.xml
index e3fcf6f23015..dfaae6f3769c 100644
--- a/i18npool/source/localedata/data/af_ZA.xml
+++ b/i18npool/source/localedata/data/af_ZA.xml
@@ -28,29 +28,7 @@
<DefaultName>South Africa</DefaultName>
</Country>
</LC_INFO>
- <LC_CTYPE unoid="generic">
- <Separators>
- <DateSeparator>/</DateSeparator>
- <ThousandSeparator> </ThousandSeparator>
- <DecimalSeparator>,</DecimalSeparator>
- <TimeSeparator>:</TimeSeparator>
- <Time100SecSeparator>,</Time100SecSeparator>
- <ListSeparator>;</ListSeparator>
- <LongDateDayOfWeekSeparator> </LongDateDayOfWeekSeparator>
- <LongDateDaySeparator> </LongDateDaySeparator>
- <LongDateMonthSeparator> </LongDateMonthSeparator>
- <LongDateYearSeparator> </LongDateYearSeparator>
- </Separators>
- <Markers>
- <QuotationStart>‘</QuotationStart>
- <QuotationEnd>’</QuotationEnd>
- <DoubleQuotationStart>“</DoubleQuotationStart>
- <DoubleQuotationEnd>”</DoubleQuotationEnd>
- </Markers>
- <TimeAM>vm.</TimeAM>
- <TimePM>nm.</TimePM>
- <MeasurementSystem>metric</MeasurementSystem>
- </LC_CTYPE>
+ <LC_CTYPE ref="en_ZA"/>
<LC_FORMAT ref="en_ZA" replaceTo="[$R-436]"/>
<LC_COLLATION ref="en_US"/>
<LC_SEARCH ref="en_US"/>
commit 5c10c448b299faf43d9df28bdb9dc4fbb00540aa
Author: Eike Rathke <erack at redhat.com>
AuthorDate: Mon Sep 3 09:20:53 2018 +0200
Commit: Eike Rathke <erack at redhat.com>
CommitDate: Mon Sep 3 13:38:13 2018 +0200
tdf#119613 [*-ZA] decimal separator is comma, group separator is space
Change-Id: I9152a419385cc894f973a7333ae03b75b7f79008
Reviewed-on: https://gerrit.libreoffice.org/59919
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/i18npool/source/localedata/data/af_ZA.xml b/i18npool/source/localedata/data/af_ZA.xml
index a8eaaa1ff491..e3fcf6f23015 100644
--- a/i18npool/source/localedata/data/af_ZA.xml
+++ b/i18npool/source/localedata/data/af_ZA.xml
@@ -31,10 +31,10 @@
<LC_CTYPE unoid="generic">
<Separators>
<DateSeparator>/</DateSeparator>
- <ThousandSeparator>,</ThousandSeparator>
- <DecimalSeparator>.</DecimalSeparator>
+ <ThousandSeparator> </ThousandSeparator>
+ <DecimalSeparator>,</DecimalSeparator>
<TimeSeparator>:</TimeSeparator>
- <Time100SecSeparator>.</Time100SecSeparator>
+ <Time100SecSeparator>,</Time100SecSeparator>
<ListSeparator>;</ListSeparator>
<LongDateDayOfWeekSeparator> </LongDateDayOfWeekSeparator>
<LongDateDaySeparator> </LongDateDaySeparator>
diff --git a/i18npool/source/localedata/data/en_ZA.xml b/i18npool/source/localedata/data/en_ZA.xml
index 5b65d64a9a1b..b0584d8e1966 100644
--- a/i18npool/source/localedata/data/en_ZA.xml
+++ b/i18npool/source/localedata/data/en_ZA.xml
@@ -31,10 +31,10 @@
<LC_CTYPE>
<Separators>
<DateSeparator>/</DateSeparator>
- <ThousandSeparator>,</ThousandSeparator>
- <DecimalSeparator>.</DecimalSeparator>
+ <ThousandSeparator> </ThousandSeparator>
+ <DecimalSeparator>,</DecimalSeparator>
<TimeSeparator>:</TimeSeparator>
- <Time100SecSeparator>.</Time100SecSeparator>
+ <Time100SecSeparator>,</Time100SecSeparator>
<ListSeparator>;</ListSeparator>
<LongDateDayOfWeekSeparator> </LongDateDayOfWeekSeparator>
<LongDateDaySeparator> </LongDateDaySeparator>
@@ -60,55 +60,55 @@
<FormatCode>0</FormatCode>
</FormatElement>
<FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2">
- <FormatCode>0.00</FormatCode>
+ <FormatCode>0,00</FormatCode>
</FormatElement>
<FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3">
- <FormatCode>#,##0</FormatCode>
+ <FormatCode># ##0</FormatCode>
</FormatElement>
<FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4">
- <FormatCode>#,##0.00</FormatCode>
+ <FormatCode># ##0,00</FormatCode>
</FormatElement>
<FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5">
- <FormatCode>#,###.00</FormatCode>
+ <FormatCode># ###,00</FormatCode>
</FormatElement>
<FormatElement msgid="FixedFormatskey7" default="false" type="short" usage="FIXED_NUMBER" formatindex="70">
- <FormatCode>#,##0_);(#,##0)</FormatCode>
+ <FormatCode># ##0_);(# ##0)</FormatCode>
</FormatElement>
<FormatElement msgid="FixedFormatskey8" default="false" type="medium" usage="FIXED_NUMBER" formatindex="71">
- <FormatCode>#,##0.00_);(#,##0.00)</FormatCode>
+ <FormatCode># ##0,00_);(# ##0,00)</FormatCode>
</FormatElement>
<FormatElement msgid="ScientificFormatskey1" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6">
- <FormatCode>0.00E+000</FormatCode>
+ <FormatCode>0,00E+000</FormatCode>
</FormatElement>
<FormatElement msgid="ScientificFormatskey2" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7">
- <FormatCode>0.00E+00</FormatCode>
+ <FormatCode>0,00E+00</FormatCode>
</FormatElement>
<FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="78">
- <FormatCode>##0.00E+00</FormatCode>
+ <FormatCode>##0,00E+00</FormatCode>
</FormatElement>
<FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
<FormatCode>0%</FormatCode>
</FormatElement>
<FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER" formatindex="9">
- <FormatCode>0.00%</FormatCode>
+ <FormatCode>0,00%</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
- <FormatCode>[CURRENCY] #,##0;[CURRENCY]-#,##0</FormatCode>
+ <FormatCode>[CURRENCY] # ##0;[CURRENCY]-# ##0</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
- <FormatCode>[CURRENCY] #,##0.00;[CURRENCY]-#,##0.00</FormatCode>
+ <FormatCode>[CURRENCY] # ##0,00;[CURRENCY]-# ##0,00</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
- <FormatCode>[CURRENCY] #,##0;[RED][CURRENCY]-#,##0</FormatCode>
+ <FormatCode>[CURRENCY] # ##0;[RED][CURRENCY]-# ##0</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
- <FormatCode>[CURRENCY] #,##0.00;[RED][CURRENCY]-#,##0.00</FormatCode>
+ <FormatCode>[CURRENCY] # ##0,00;[RED][CURRENCY]-# ##0,00</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
- <FormatCode>#,##0.00 CCC</FormatCode>
+ <FormatCode># ##0,00 CCC</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
- <FormatCode>[CURRENCY] #,##0.--;[RED][CURRENCY]-#,##0.--</FormatCode>
+ <FormatCode>[CURRENCY] # ##0,--;[RED][CURRENCY]-# ##0,--</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>YY/MM/DD</FormatCode>
@@ -190,10 +190,10 @@
<FormatCode>[HH]:MM:SS</FormatCode>
</FormatElement>
<FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44">
- <FormatCode>MM:SS.00</FormatCode>
+ <FormatCode>MM:SS,00</FormatCode>
</FormatElement>
<FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45">
- <FormatCode>[HH]:MM:SS.00</FormatCode>
+ <FormatCode>[HH]:MM:SS,00</FormatCode>
</FormatElement>
<FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46">
<FormatCode>YY/MM/DD HH:MM</FormatCode>
More information about the Libreoffice-commits
mailing list