Resolves: tdf#147390 tag oc-FR to oc-FR-lengadoc, oc-ES to oc-ES-aranes
Change-Id: I849e8e2c6cf2a61b81b25c96b79478bc04907b5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135458
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 16a2ee2..5b73b3c 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -751,6 +751,8 @@ bool checkMapping( std::u16string_view rStr1, std::u16string_view rStr2 )
if (rStr1 == u"cmn-CN" ) return rStr2 == u"zh-CN";
if (rStr1 == u"cmn-TW" ) return rStr2 == u"zh-TW";
if (rStr1 == u"kw-UK" ) return rStr2 == u"kw-GB";
if (rStr1 == u"oc-FR" ) return rStr2 == u"oc-FR-lengadoc";
if (rStr1 == u"oc-ES" ) return rStr2 == u"oc-ES-aranes";
return rStr1 == rStr2;
}
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 1e96701..d20014e 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -489,8 +489,8 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_LOWER_SORBIAN_GERMANY, "dsb", "DE", k0 }, // MS maps this to 'wee-DE', which is nonsense. 'WEE' is a SIL code, see http://www.ethnologue.com/14/show_language.asp?code=WEE
{ LANGUAGE_LOWER_SORBIAN_LSO, "dsb", "" , k0 },
{ LANGUAGE_OBSOLETE_USER_LOWER_SORBIAN,"dsb", "DE", k0 },
{ LANGUAGE_OCCITAN_FRANCE, "oc", "FR", k0 },
{ LANGUAGE_OBSOLETE_USER_OCCITAN, "oc", "FR", k0 },
{ LANGUAGE_OCCITAN_FRANCE, "oc", "FR", kSAME },
{ LANGUAGE_OBSOLETE_USER_OCCITAN, "oc", "FR", LANGUAGE_OCCITAN_FRANCE },
{ LANGUAGE_USER_KURDISH_TURKEY, "kmr", "TR", kSAME },
{ LANGUAGE_USER_KURDISH_TURKEY, "ku", "TR", kSAME },
{ LANGUAGE_USER_KURDISH_SYRIA, "kmr", "SY", kSAME },
@@ -639,7 +639,7 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_CHURCH_SLAVIC, "cu", "RU", k0 },
{ LANGUAGE_USER_VENETIAN, "vec", "IT", k0 },
{ LANGUAGE_USER_ENGLISH_GAMBIA, "en", "GM", k0 },
{ LANGUAGE_USER_OCCITAN_ARANESE, "oc", "ES", k0 },
{ LANGUAGE_USER_OCCITAN_ARANESE, "oc", "ES", kSAME },
{ LANGUAGE_USER_ARPITAN_FRANCE, "frp", "FR", k0 },
{ LANGUAGE_USER_ARPITAN_ITALY, "frp", "IT", k0 },
{ LANGUAGE_USER_ARPITAN_SWITZERLAND, "frp", "CH", k0 },
@@ -779,6 +779,8 @@ Bcp47CountryEntry const aImplBcp47CountryEntries[] =
{ LANGUAGE_USER_ENGLISH_UK_OED, "en-GB-oed", "GB", "", LANGUAGE_USER_ENGLISH_UK_OXENDICT }, // grandfathered, deprecated, prefer en-GB-oxendict
{ LANGUAGE_SPANISH_DATED, "es-ES-u-co-trad", "ES", "es-u-co-trad", k0 }, // RFC6067/CLDR
{ LANGUAGE_SPANISH_DATED, "es-ES_tradnl", "ES", "", kSAME }, // MS malformed
{ LANGUAGE_OCCITAN_FRANCE, "oc-FR-lengadoc", "FR", "oc-lengadoc", k0 },
{ LANGUAGE_USER_OCCITAN_ARANESE, "oc-ES-aranes", "ES", "oc-aranes", k0 },
// { LANGUAGE_YUE_CHINESE_HONGKONG, "zh-yue-HK", "HK", "", 0 }, // MS reserved, prefer yue-HK; do not add unless LanguageTag::simpleExtract() can handle it to not call liblangtag for rsc!
{ LANGUAGE_YIDDISH, "yi-001", "", "", k0 }, // MS since rev.15, was "yi-Hebr" reserved, "001"="World"
{ LANGUAGE_FRENCH_WEST_INDIES, "fr-029", "", "", k0 }, // MS since rev.15, was "Neither defined nor reserved", "029"="Caribbean"
diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk
index 5b6cdd3..46f8c38 100644
--- a/i18npool/Library_localedata_es.mk
+++ b/i18npool/Library_localedata_es.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_es,\
CustomTarget/i18npool/localedata/localedata_es_UY \
CustomTarget/i18npool/localedata/localedata_es_VE \
CustomTarget/i18npool/localedata/localedata_gl_ES \
CustomTarget/i18npool/localedata/localedata_oc_ES \
CustomTarget/i18npool/localedata/localedata_oc_ES_aranes \
))
# vim: set noet sw=4 ts=4:
diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk
index afe813b..069809b 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -83,7 +83,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\
CustomTarget/i18npool/localedata/localedata_nl_NL \
CustomTarget/i18npool/localedata/localedata_nn_NO \
CustomTarget/i18npool/localedata/localedata_no_NO \
CustomTarget/i18npool/localedata/localedata_oc_FR \
CustomTarget/i18npool/localedata/localedata_oc_FR_lengadoc \
CustomTarget/i18npool/localedata/localedata_pl_PL \
CustomTarget/i18npool/localedata/localedata_pt_BR \
CustomTarget/i18npool/localedata/localedata_pt_PT \
diff --git a/i18npool/source/localedata/data/oc_ES.xml b/i18npool/source/localedata/data/oc_ES_aranes.xml
similarity index 98%
rename from i18npool/source/localedata/data/oc_ES.xml
rename to i18npool/source/localedata/data/oc_ES_aranes.xml
index 2032a4a..72f2914 100644
--- a/i18npool/source/localedata/data/oc_ES.xml
+++ b/i18npool/source/localedata/data/oc_ES_aranes.xml
@@ -20,13 +20,14 @@
<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
<LC_INFO>
<Language>
<LangID>oc</LangID>
<DefaultName>Aranese</DefaultName>
<LangID>qlt</LangID>
<DefaultName>Occitan (Aranese)</DefaultName>
</Language>
<Country>
<CountryID>ES</CountryID>
<DefaultName>Spain</DefaultName>
</Country>
<Variant>oc-ES-aranes</Variant>
</LC_INFO>
<LC_CTYPE>
<Separators>
diff --git a/i18npool/source/localedata/data/oc_FR.xml b/i18npool/source/localedata/data/oc_FR_lengadoc.xml
similarity index 98%
rename from i18npool/source/localedata/data/oc_FR.xml
rename to i18npool/source/localedata/data/oc_FR_lengadoc.xml
index c90d6b8..bec03a7 100644
--- a/i18npool/source/localedata/data/oc_FR.xml
+++ b/i18npool/source/localedata/data/oc_FR_lengadoc.xml
@@ -20,13 +20,14 @@
<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.9">
<LC_INFO>
<Language>
<LangID>oc</LangID>
<DefaultName>Languedocien</DefaultName>
<LangID>qlt</LangID>
<DefaultName>Occitan (Languedocien)</DefaultName>
</Language>
<Country>
<CountryID>FR</CountryID>
<DefaultName>France</DefaultName>
</Country>
<Variant>oc-FR-lengadoc</Variant>
</LC_INFO>
<LC_CTYPE unoid="generic">
<Separators>
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index aaf85c4..19e10b7 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -101,7 +101,7 @@ const struct {
{ "es_UY", lcl_DATA_ES },
{ "es_VE", lcl_DATA_ES },
{ "gl_ES", lcl_DATA_ES },
{ "oc_ES", lcl_DATA_ES },
{ "oc_ES_aranes", lcl_DATA_ES },
{ "de_DE", lcl_DATA_EURO },
{ "de_AT", lcl_DATA_EURO },
@@ -178,7 +178,7 @@ const struct {
{ "fur_IT", lcl_DATA_EURO },
{ "gsc_FR", lcl_DATA_EURO },
{ "fy_NL", lcl_DATA_EURO },
{ "oc_FR", lcl_DATA_EURO },
{ "oc_FR_lengadoc", lcl_DATA_EURO },
{ "mt_MT", lcl_DATA_EURO },
{ "sc_IT", lcl_DATA_EURO },
{ "ast_ES", lcl_DATA_EURO },
