i18npool/Library_localedata_euro.mk | 1 i18npool/Library_localedata_others.mk | 1 i18npool/source/localedata/data/cu_RU.xml | 148 ------------------------------ i18npool/source/localedata/data/ru_RU.xml | 16 +-- i18npool/source/localedata/localedata.cxx | 4 5 files changed, 13 insertions(+), 157 deletions(-)
New commits: commit 4d045be758885a09daa4fe3324984174d6f7c4f2 Author: Eike Rathke <er...@redhat.com> Date: Wed Apr 29 15:47:16 2015 +0200 inherit cu-RU format codes from ru-RU, tdf#90802 follow-up Change-Id: Id37aa3a416ab826d5363dca4e91f83346460e78d diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk index 7150ba1..96059fa 100644 --- a/i18npool/Library_localedata_euro.mk +++ b/i18npool/Library_localedata_euro.mk @@ -24,6 +24,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\ CustomTarget/i18npool/localedata/localedata_ca_ES \ CustomTarget/i18npool/localedata/localedata_ca_ES_valencia \ CustomTarget/i18npool/localedata/localedata_cs_CZ \ + CustomTarget/i18npool/localedata/localedata_cu_RU \ CustomTarget/i18npool/localedata/localedata_cv_RU \ CustomTarget/i18npool/localedata/localedata_cy_GB \ CustomTarget/i18npool/localedata/localedata_da_DK \ diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index fe4f152..ea706b8 100644 --- a/i18npool/Library_localedata_others.mk +++ b/i18npool/Library_localedata_others.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\ CustomTarget/i18npool/localedata/localedata_bo_CN \ CustomTarget/i18npool/localedata/localedata_bo_IN \ CustomTarget/i18npool/localedata/localedata_bvx_CG \ - CustomTarget/i18npool/localedata/localedata_cu_RU \ CustomTarget/i18npool/localedata/localedata_dde_CG \ CustomTarget/i18npool/localedata/localedata_dz_BT \ CustomTarget/i18npool/localedata/localedata_ebo_CG \ diff --git a/i18npool/source/localedata/data/cu_RU.xml b/i18npool/source/localedata/data/cu_RU.xml index 5d4f1d6..d4dde46 100644 --- a/i18npool/source/localedata/data/cu_RU.xml +++ b/i18npool/source/localedata/data/cu_RU.xml @@ -29,6 +29,7 @@ </Country> </LC_INFO> <LC_CTYPE> + <!-- only LongDateYearSeparator and Quotation markers and TimeAM/PM differ from ru_RU, so it's ok. --> <Separators> <DateSeparator>.</DateSeparator> <ThousandSeparator> </ThousandSeparator> @@ -51,152 +52,7 @@ <TimePM>по поÌлêд.</TimePM> <MeasurementSystem>metric</MeasurementSystem> </LC_CTYPE> - <LC_FORMAT> - <DateAcceptancePattern>D.M.</DateAcceptancePattern> - <DateAcceptancePattern>D/M/</DateAcceptancePattern> - <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> - <FormatCode>Standard</FormatCode> - </FormatElement> - <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER" formatindex="1"> - <FormatCode>0</FormatCode> - </FormatElement> - <FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER" formatindex="2"> - <FormatCode>0,00</FormatCode> - </FormatElement> - <FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER" formatindex="3"> - <FormatCode># ##0</FormatCode> - </FormatElement> - <FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER" formatindex="4"> - <FormatCode># ##0,00</FormatCode> - </FormatElement> - <FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER" formatindex="5"> - <FormatCode># ###,00</FormatCode> - </FormatElement> - <FormatElement msgid="ScientificFormatskey1" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="6"> - <FormatCode>0,00E+000</FormatCode> - </FormatElement> - <FormatElement msgid="ScientificFormatskey2" default="true" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="7"> - <FormatCode>0,00E+00</FormatCode> - </FormatElement> - <FormatElement msgid="ScientificFormatskey3" default="false" type="medium" usage="SCIENTIFIC_NUMBER" formatindex="78"> - <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> - </FormatElement> - <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12"> - <FormatCode># ##0 [$Ñ.-694];-# ##0 [$Ñ.-694]</FormatCode> - </FormatElement> - <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> - <FormatCode># ##0,00 [$Ñ.-694];-# ##0,00 [$Ñ.-694]</FormatCode> - </FormatElement> - <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> - <FormatCode># ##0 [$Ñ.-694];[RED]-# ##0 [$Ñ.-694]</FormatCode> - </FormatElement> - <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> - <FormatCode># ##0,00 [$Ñ.-694];[RED]-# ##0,00 [$Ñ.-694]</FormatCode> - </FormatElement> - <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16"> - <FormatCode># ##0,00 CCC</FormatCode> - </FormatElement> - <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17"> - <FormatCode># ##0,-- [$Ñ.-694];[RED]-# ##0,-- [$Ñ.-694]</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> - <FormatCode>D.M.YY</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19"> - <FormatCode>NNNNDD MMMM, YYYY</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20"> - <FormatCode>DD.MM.YY</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21"> - <FormatCode>DD.MM.YYYY</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22"> - <FormatCode>D MMM, YY</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23"> - <FormatCode>D MMM, YYYY</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24"> - <FormatCode>D. MMM. YYYY</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25"> - <FormatCode>D MMMM, YYYY</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26"> - <FormatCode>D. MMMM YYYY</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27"> - <FormatCode>NN, D MMM, YY</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28"> - <FormatCode>NN DD.MMM YY</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29"> - <FormatCode>NN, D MMMM, YYYY</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30"> - <FormatCode>NNNND MMMM, YYYY</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31"> - <FormatCode>MM-DD</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32"> - <FormatCode>YY-MM-DD</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="33"> - <FormatCode>YYYY-MM-DD</FormatCode> - <DefaultName>ISO 8601</DefaultName> - </FormatElement> - <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34"> - <FormatCode>MM.YY</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35"> - <FormatCode>DD.MMM</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36"> - <FormatCode>MMMM</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37"> - <FormatCode>QQ YY</FormatCode> - </FormatElement> - <FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38"> - <FormatCode>WW</FormatCode> - </FormatElement> - <FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME" formatindex="39"> - <FormatCode>HH:MM</FormatCode> - </FormatElement> - <FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME" formatindex="40"> - <FormatCode>HH:MM:SS</FormatCode> - </FormatElement> - <FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME" formatindex="41"> - <FormatCode>HH:MM AM/PM</FormatCode> - </FormatElement> - <FormatElement msgid="TimeFormatskey4" default="false" type="medium" usage="TIME" formatindex="42"> - <FormatCode>HH:MM:SS AM/PM</FormatCode> - </FormatElement> - <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43"> - <FormatCode>[HH]:MM:SS</FormatCode> - </FormatElement> - <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44"> - <FormatCode>MM:SS,00</FormatCode> - </FormatElement> - <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"> - <FormatCode>DD.MM.YY HH:MM</FormatCode> - </FormatElement> - <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47"> - <FormatCode>DD.MM.YYYY HH:MM:SS</FormatCode> - </FormatElement> - </LC_FORMAT> + <LC_FORMAT ref="ru_RU" replaceFrom="[CURRENCY]" replaceTo="[$Ñ.-694]" /> <LC_COLLATION> <Collator unoid="charset" default="true"/> <CollationOptions> diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 7fe719c..91745e8 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -176,6 +176,7 @@ static const struct { { "an_ES", lcl_DATA_EURO }, { "myv_RU", lcl_DATA_EURO }, { "lld_IT", lcl_DATA_EURO }, + { "cu_RU", lcl_DATA_EURO }, { "ja_JP", lcl_DATA_OTHERS }, { "ko_KR", lcl_DATA_OTHERS }, @@ -299,8 +300,7 @@ static const struct { { "bm_ML", lcl_DATA_OTHERS }, { "pui_CO", lcl_DATA_OTHERS }, { "lgr_SB", lcl_DATA_OTHERS }, - { "mos_BF", lcl_DATA_OTHERS }, - { "cu_RU", lcl_DATA_OTHERS } + { "mos_BF", lcl_DATA_OTHERS } }; #else commit 1ebffd4011b7e6ccf9f3eafdc7a88aa4bc77fd4f Author: Eike Rathke <er...@redhat.com> Date: Wed Apr 29 15:32:33 2015 +0200 define what is actually used ... Change-Id: I68365a85c9025c0637bc99607e65cbd21f87e1b7 diff --git a/i18npool/source/localedata/data/ru_RU.xml b/i18npool/source/localedata/data/ru_RU.xml index 69877c4..1ebf8cd 100644 --- a/i18npool/source/localedata/data/ru_RU.xml +++ b/i18npool/source/localedata/data/ru_RU.xml @@ -36,8 +36,8 @@ <TimeSeparator>:</TimeSeparator> <Time100SecSeparator>,</Time100SecSeparator> <ListSeparator>;</ListSeparator> - <LongDateDayOfWeekSeparator> </LongDateDayOfWeekSeparator> - <LongDateDaySeparator> </LongDateDaySeparator> + <LongDateDayOfWeekSeparator>, </LongDateDayOfWeekSeparator> + <LongDateDaySeparator>, </LongDateDaySeparator> <LongDateMonthSeparator> </LongDateMonthSeparator> <LongDateYearSeparator> г.</LongDateYearSeparator> </Separators> commit e41a948c5e065ec45d451c4da5db2893db854b8f Author: Eike Rathke <er...@redhat.com> Date: Wed Apr 29 15:20:50 2015 +0200 prepare to inherit from, adding replacement, tdf#90802 related Change-Id: I172c103fb5033e8346d78479bb1c1ce71fe11e4a diff --git a/i18npool/source/localedata/data/ru_RU.xml b/i18npool/source/localedata/data/ru_RU.xml index 4cab36a..69877c4 100644 --- a/i18npool/source/localedata/data/ru_RU.xml +++ b/i18npool/source/localedata/data/ru_RU.xml @@ -51,7 +51,7 @@ <TimePM>PM</TimePM> <MeasurementSystem>metric</MeasurementSystem> </LC_CTYPE> - <LC_FORMAT> + <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$Ñ.-419]"> <DateAcceptancePattern>D.M.</DateAcceptancePattern> <DateAcceptancePattern>D/M/</DateAcceptancePattern> <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0"> @@ -88,22 +88,22 @@ <FormatCode>0,00%</FormatCode> </FormatElement> <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12"> - <FormatCode># ##0 [$Ñ.-419];-# ##0 [$Ñ.-419]</FormatCode> + <FormatCode># ##0 [CURRENCY];-# ##0 [CURRENCY]</FormatCode> </FormatElement> <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> - <FormatCode># ##0,00 [$Ñ.-419];-# ##0,00 [$Ñ.-419]</FormatCode> + <FormatCode># ##0,00 [CURRENCY];-# ##0,00 [CURRENCY]</FormatCode> </FormatElement> <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> - <FormatCode># ##0 [$Ñ.-419];[RED]-# ##0 [$Ñ.-419]</FormatCode> + <FormatCode># ##0 [CURRENCY];[RED]-# ##0 [CURRENCY]</FormatCode> </FormatElement> <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> - <FormatCode># ##0,00 [$Ñ.-419];[RED]-# ##0,00 [$Ñ.-419]</FormatCode> + <FormatCode># ##0,00 [CURRENCY];[RED]-# ##0,00 [CURRENCY]</FormatCode> </FormatElement> <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16"> <FormatCode># ##0,00 CCC</FormatCode> </FormatElement> <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17"> - <FormatCode># ##0,-- [$Ñ.-419];[RED]-# ##0,-- [$Ñ.-419]</FormatCode> + <FormatCode># ##0,-- [CURRENCY];[RED]-# ##0,-- [CURRENCY]</FormatCode> </FormatElement> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>D.M.YY</FormatCode>
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits