[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag svtools/source

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx |    2 ++
 include/i18nlangtag/lang.h             |    2 ++
 svtools/source/misc/langtab.src        |    2 ++
 3 files changed, 6 insertions(+)

New commits:
commit b1aba5781af8a5e5a1ba88d525b2463063878ec0
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Aug 21 15:25:09 2015 +0200

    Resolves: tdf#93468 add Arpitan (France,Italy) [frp-FR] [frp-IT]
    
    Change-Id: I3a50722f07f4dbaf89b4e8829dea7b41b829c038

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index e1c331b..b43424a 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -652,6 +652,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
     { LANGUAGE_USER_VENETIAN,              "vec", "IT", 0     },
     { LANGUAGE_USER_ENGLISH_GAMBIA,         "en", "GM", 0     },
     { LANGUAGE_USER_OCCITAN_ARANESE,        "oc", "ES", 0     },
+    { LANGUAGE_USER_ARPITAN_FRANCE,        "frp", "FR", 0     },
+    { LANGUAGE_USER_ARPITAN_ITALY,         "frp", "IT", 0     },
     { LANGUAGE_MULTIPLE,                   "mul", ""  , 0     },    // multiple languages, many languages are used
     { LANGUAGE_UNDETERMINED,               "und", ""  , 0     },    // undetermined language, language cannot be identified
     { LANGUAGE_NONE,                       "zxx", ""  , 0     },    // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 22b0ed1..0592072 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -696,6 +696,8 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_ENGLISH_GAMBIA        0x9009  /* makeLangID( 0x24, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_OCCITAN_ARANESE       0x8082  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_OCCITAN_FRANCE)) */
 #define LANGUAGE_USER_ENGLISH_UK_OXENDICT   0x9409  /* makeLangID( 0x25, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
+#define LANGUAGE_USER_ARPITAN_FRANCE        0x0696
+#define LANGUAGE_USER_ARPITAN_ITALY         0x0A96  /* makeLangID( 0x02, getPrimaryLanguage( LANGUAGE_USER_ARPITAN_FRANCE)) */
 
 
 /* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 19c1d6c..dfe85df 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -393,6 +393,8 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Venetian" ; LANGUAGE_USER_VENETIAN ; > ;
         < "English (Gambia)" ; LANGUAGE_USER_ENGLISH_GAMBIA ; > ;
         < "Aranese" ; LANGUAGE_USER_OCCITAN_ARANESE ; > ;
+        < "Arpitan (France)" ; LANGUAGE_USER_ARPITAN_FRANCE ; > ;
+        < "Arpitan (Italy)" ; LANGUAGE_USER_ARPITAN_ITALY ; > ;
     };
 };