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

5 files changed, 10 insertions, 8 deletions

diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk
index 5b6cdd3bcc29..46f8c387848b 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 afe813ba747f..069809bcf0af 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
index 2032a4a7adc0..72f2914ece2e 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
index c90d6b8f7753..bec03a7128a6 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 aaf85c48fd8e..19e10b758886 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 },