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

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx  |    2 ++
 i18nlangtag/source/isolang/mslangid.cxx |    1 +
 include/i18nlangtag/lang.h              |    2 ++
 svtools/source/misc/langtab.src         |    2 ++
 4 files changed, 7 insertions(+)

New commits:
commit f67061be4f4dde9d5050b48a19ea71a1fc263a7f
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Jan 30 17:33:18 2017 +0100

    tdf#105448 add Sibe [nco-PG] to language list
    
    Change-Id: If7dfeaa0dd4cf4d164147b8b866f7c493a5af669

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 70cf7d6..bbe0c47 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -665,6 +665,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
     { LANGUAGE_USER_FRENCH_MAURITIUS,       "fr", "MU", 0     },
     { LANGUAGE_USER_SILESIAN,              "szl", "PL", 0     },
     { LANGUAGE_USER_MANCHU,                "mnc", "CN", 0     },
+    { LANGUAGE_USER_SIBE,                  "nco", "PG", 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 fe4eacf..3b39dee 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -719,6 +719,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_SILESIAN              0x0699
 #define LANGUAGE_USER_HUNGARIAN_ROVAS       0x800E  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_HUNGARIAN)) */
 #define LANGUAGE_USER_MANCHU                0x069A
+#define LANGUAGE_USER_SIBE                  0x069B
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 6ff69e7..cce48f4 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -405,6 +405,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Hungarian (Szekely-Hungarian Rovas)" ; LANGUAGE_USER_HUNGARIAN_ROVAS ; > ;
         < "English (Malaysia)" ; LANGUAGE_ENGLISH_MALAYSIA ; > ;
         < "Manchu" ; LANGUAGE_USER_MANCHU ; > ;
+        < "Sibe" ; LANGUAGE_USER_SIBE ; > ;
     };
 };
 
commit 608b749f27a38c267b599968e60dd87bbd9abde6
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Jan 30 17:26:21 2017 +0100

    tdf#105448 add Manchu [mnc-CN] to language list (CTL)
    
    Change-Id: Ia19da31a3df0a7d196997eedef07d8a28aa2e72c

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 435a220..70cf7d6 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -664,6 +664,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
     { LANGUAGE_USER_ENGLISH_MAURITIUS,      "en", "MU", 0     },
     { LANGUAGE_USER_FRENCH_MAURITIUS,       "fr", "MU", 0     },
     { LANGUAGE_USER_SILESIAN,              "szl", "PL", 0     },
+    { LANGUAGE_USER_MANCHU,                "mnc", "CN", 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/i18nlangtag/source/isolang/mslangid.cxx b/i18nlangtag/source/isolang/mslangid.cxx
index 280d21f..7d53cd0 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -359,6 +359,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
         case LANGUAGE_USER_KURDISH_SOUTHERN_IRAQ:
         case LANGUAGE_USER_KYRGYZ_CHINA:
         case LANGUAGE_USER_HUNGARIAN_ROVAS:
+        case LANGUAGE_USER_MANCHU:
             nScript = css::i18n::ScriptType::COMPLEX;
             break;
 
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index eeca00c..fe4eacf 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -718,6 +718,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_FRENCH_MAURITIUS      0x900C  /* makeLangID( 0x24, getPrimaryLanguage( LANGUAGE_FRENCH)) */
 #define LANGUAGE_USER_SILESIAN              0x0699
 #define LANGUAGE_USER_HUNGARIAN_ROVAS       0x800E  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_HUNGARIAN)) */
+#define LANGUAGE_USER_MANCHU                0x069A
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 67e5f0a..6ff69e7 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -404,6 +404,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Silesian" ; LANGUAGE_USER_SILESIAN ; > ;
         < "Hungarian (Szekely-Hungarian Rovas)" ; LANGUAGE_USER_HUNGARIAN_ROVAS ; > ;
         < "English (Malaysia)" ; LANGUAGE_ENGLISH_MALAYSIA ; > ;
+        < "Manchu" ; LANGUAGE_USER_MANCHU ; > ;
     };
 };