[Libreoffice-commits] core.git: i18npool/source
Eike Rathke (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jun 3 17:54:37 UTC 2019
i18npool/source/localedata/data/cu_RU.xml | 13 ++++++++++---
i18npool/source/localedata/data/cv_RU.xml | 19 +++++++++++++------
i18npool/source/localedata/data/myv_RU.xml | 9 ++++++++-
i18npool/source/localedata/data/ru_RU.xml | 13 ++++++++++---
i18npool/source/localedata/data/tt_RU.xml | 23 +++++++++++++++--------
5 files changed, 56 insertions(+), 21 deletions(-)
New commits:
commit d83e831747c1e7a57296c7f1d64a5d51a97cef91
Author: Eike Rathke <erack at redhat.com>
AuthorDate: Mon Jun 3 16:15:18 2019 +0200
Commit: Eike Rathke <erack at redhat.com>
CommitDate: Mon Jun 3 19:53:33 2019 +0200
Resolves: tdf#96711 RUB currency symbol is ₽ U+20BD RUBLE SIGN
Change-Id: Ie9781713f04076174cdbbc34bf802df45c169727
Reviewed-on: https://gerrit.libreoffice.org/73389
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Jenkins
diff --git a/i18npool/source/localedata/data/cu_RU.xml b/i18npool/source/localedata/data/cu_RU.xml
index 95d82c4451ff..5dcfe38feecf 100644
--- a/i18npool/source/localedata/data/cu_RU.xml
+++ b/i18npool/source/localedata/data/cu_RU.xml
@@ -52,7 +52,7 @@
<TimePM>по по́лꙋд.</TimePM>
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
- <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$р.-694]">
+ <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₽-694]">
<DateAcceptancePattern>D.M.</DateAcceptancePattern>
<DateAcceptancePattern>D/M/</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
@@ -396,14 +396,21 @@
</Calendar>
</LC_CALENDAR>
<LC_CURRENCY>
- <Currency default="true" usedInCompatibleFormatCodes="false">
+ <Currency default="true" usedInCompatibleFormatCodes="true">
+ <CurrencyID>RUB</CurrencyID>
+ <CurrencySymbol>₽</CurrencySymbol>
+ <BankSymbol>RUB</BankSymbol>
+ <CurrencyName>рꙋ́бль рѡссі́йскїй</CurrencyName>
+ <DecimalPlaces>2</DecimalPlaces>
+ </Currency>
+ <Currency default="false" usedInCompatibleFormatCodes="false" legacyOnly="true">
<CurrencyID>RUB</CurrencyID>
<CurrencySymbol>рꙋб.</CurrencySymbol>
<BankSymbol>RUB</BankSymbol>
<CurrencyName>рꙋ́бль рѡссі́йскїй</CurrencyName>
<DecimalPlaces>2</DecimalPlaces>
</Currency>
- <Currency default="false" usedInCompatibleFormatCodes="true">
+ <Currency default="false" usedInCompatibleFormatCodes="false">
<CurrencyID>RUR</CurrencyID>
<CurrencySymbol>р.</CurrencySymbol>
<BankSymbol>RUR</BankSymbol>
diff --git a/i18npool/source/localedata/data/cv_RU.xml b/i18npool/source/localedata/data/cv_RU.xml
index 2e7eb69d0e7f..7b09492fd816 100644
--- a/i18npool/source/localedata/data/cv_RU.xml
+++ b/i18npool/source/localedata/data/cv_RU.xml
@@ -51,7 +51,7 @@
<TimePM>PM</TimePM>
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
- <LC_FORMAT>
+ <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₽-635]">
<DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
@@ -87,22 +87,22 @@
<FormatCode>0,00%</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
- <FormatCode># ##0[$тен.-635];-# ##0[$тен.-635]</FormatCode>
+ <FormatCode># ##0[CURRENCY];-# ##0[CURRENCY]</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
- <FormatCode># ##0,00[$тен.-635];-# ##0,00[$тен.-635]</FormatCode>
+ <FormatCode># ##0,00[CURRENCY];-# ##0,00[CURRENCY]</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
- <FormatCode># ##0[$тен.-635];[RED]-# ##0[$тен.-635]</FormatCode>
+ <FormatCode># ##0[CURRENCY];[RED]-# ##0[CURRENCY]</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
- <FormatCode># ##0,00[$тен.-635];[RED]-# ##0,00[$тен.-635]</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,--[$тен.-635];[RED]-# ##0,--[$тен.-635]</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>
@@ -326,6 +326,13 @@
<LC_CURRENCY>
<Currency default="true" usedInCompatibleFormatCodes="true">
<CurrencyID>RUB</CurrencyID>
+ <CurrencySymbol>₽</CurrencySymbol>
+ <BankSymbol>RUB</BankSymbol>
+ <CurrencyName>Раççей тенки</CurrencyName>
+ <DecimalPlaces>2</DecimalPlaces>
+ </Currency>
+ <Currency default="false" usedInCompatibleFormatCodes="false" legacyOnly="true">
+ <CurrencyID>RUB</CurrencyID>
<CurrencySymbol>тен.</CurrencySymbol>
<BankSymbol>RUB</BankSymbol>
<CurrencyName>Раççей тенки</CurrencyName>
diff --git a/i18npool/source/localedata/data/myv_RU.xml b/i18npool/source/localedata/data/myv_RU.xml
index c356e2acfdc5..3cb6899e6b0d 100644
--- a/i18npool/source/localedata/data/myv_RU.xml
+++ b/i18npool/source/localedata/data/myv_RU.xml
@@ -51,7 +51,7 @@
<TimePM>ч.л.</TimePM>
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
- <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$цел-66C]">
+ <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₽-66C]">
<DateAcceptancePattern>M/D</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>General</FormatCode>
@@ -336,6 +336,13 @@
<LC_CURRENCY>
<Currency default="true" usedInCompatibleFormatCodes="true">
<CurrencyID>RUB</CurrencyID>
+ <CurrencySymbol>₽</CurrencySymbol>
+ <BankSymbol>RUB</BankSymbol>
+ <CurrencyName>Цельковой</CurrencyName>
+ <DecimalPlaces>2</DecimalPlaces>
+ </Currency>
+ <Currency default="false" usedInCompatibleFormatCodes="false" legacyOnly="true">
+ <CurrencyID>RUB</CurrencyID>
<CurrencySymbol>цел</CurrencySymbol>
<BankSymbol>RUB</BankSymbol>
<CurrencyName>Цельковой</CurrencyName>
diff --git a/i18npool/source/localedata/data/ru_RU.xml b/i18npool/source/localedata/data/ru_RU.xml
index 1ebf8cd3360c..b0ddb3352689 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 replaceFrom="[CURRENCY]" replaceTo="[$р.-419]">
+ <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">
@@ -387,14 +387,21 @@
</Calendar>
</LC_CALENDAR>
<LC_CURRENCY>
- <Currency default="true" usedInCompatibleFormatCodes="false">
+ <Currency default="true" usedInCompatibleFormatCodes="true">
+ <CurrencyID>RUB</CurrencyID>
+ <CurrencySymbol>₽</CurrencySymbol>
+ <BankSymbol>RUB</BankSymbol>
+ <CurrencyName>Российский рубль</CurrencyName>
+ <DecimalPlaces>2</DecimalPlaces>
+ </Currency>
+ <Currency default="false" usedInCompatibleFormatCodes="false" legacyOnly="true">
<CurrencyID>RUB</CurrencyID>
<CurrencySymbol>руб.</CurrencySymbol>
<BankSymbol>RUB</BankSymbol>
<CurrencyName>Российский рубль</CurrencyName>
<DecimalPlaces>2</DecimalPlaces>
</Currency>
- <Currency default="false" usedInCompatibleFormatCodes="true">
+ <Currency default="false" usedInCompatibleFormatCodes="false">
<CurrencyID>RUR</CurrencyID>
<CurrencySymbol>р.</CurrencySymbol>
<BankSymbol>RUR</BankSymbol>
diff --git a/i18npool/source/localedata/data/tt_RU.xml b/i18npool/source/localedata/data/tt_RU.xml
index 488e11c6ad30..e3118f8f1a53 100644
--- a/i18npool/source/localedata/data/tt_RU.xml
+++ b/i18npool/source/localedata/data/tt_RU.xml
@@ -51,7 +51,7 @@
<TimePM>кич</TimePM>
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
- <LC_FORMAT>
+ <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$₽-444]">
<DateAcceptancePattern>D.M.</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
@@ -87,22 +87,22 @@
<FormatCode>0,00%</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
- <FormatCode># ##0 [$р.-444];-# ##0 [$р.-444]</FormatCode>
+ <FormatCode># ##0 [CURRENCY];-# ##0 [CURRENCY]</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
- <FormatCode># ##0,00 [$р.-444];-# ##0,00 [$р.-444]</FormatCode>
+ <FormatCode># ##0,00 [CURRENCY];-# ##0,00 [CURRENCY]</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
- <FormatCode># ##0 [$р.-444];[RED]-# ##0 [$р.-444]</FormatCode>
+ <FormatCode># ##0 [CURRENCY];[RED]-# ##0 [CURRENCY]</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
- <FormatCode># ##0,00 [$р.-444];[RED]-# ##0,00 [$р.-444]</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,-- [$р.-444];[RED]-# ##0,-- [$р.-444]</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>
@@ -325,14 +325,21 @@
</Calendar>
</LC_CALENDAR>
<LC_CURRENCY>
- <Currency default="true" usedInCompatibleFormatCodes="false">
+ <Currency default="true" usedInCompatibleFormatCodes="true">
+ <CurrencyID>RUB</CurrencyID>
+ <CurrencySymbol>₽</CurrencySymbol>
+ <BankSymbol>RUB</BankSymbol>
+ <CurrencyName>Рәсәй сумы</CurrencyName>
+ <DecimalPlaces>2</DecimalPlaces>
+ </Currency>
+ <Currency default="false" usedInCompatibleFormatCodes="false" legacyOnly="true">
<CurrencyID>RUB</CurrencyID>
<CurrencySymbol>руб.</CurrencySymbol>
<BankSymbol>RUB</BankSymbol>
<CurrencyName>Рәсәй сумы</CurrencyName>
<DecimalPlaces>2</DecimalPlaces>
</Currency>
- <Currency default="false" usedInCompatibleFormatCodes="true">
+ <Currency default="false" usedInCompatibleFormatCodes="false">
<CurrencyID>RUR</CurrencyID>
<CurrencySymbol>р.</CurrencySymbol>
<BankSymbol>RUR</BankSymbol>
More information about the Libreoffice-commits
mailing list