[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - i18nlangtag/source include/i18nlangtag svtools/inc

[Eike Rathke (via logerrit)]

 i18nlangtag/source/isolang/isolang.cxx |    1 +
 include/i18nlangtag/lang.h             |    1 +
 svtools/inc/langtab.hrc                |    3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 76b85527d8d303be38f5374713c840ad4afd37f1
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Mon Nov 18 15:57:47 2019 +0100
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Tue Nov 19 18:25:59 2019 +0100

    Resolves: tdf#128855 Add Kabardian [kbd-RU] to language list
    
    Change-Id: I84cfc3aa3f018de1d6950617fe2a06402ce2ac2b
    Reviewed-on: https://gerrit.libreoffice.org/83103
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit b4008306febc147e9f8a3c91102304ec40671a07)
    Reviewed-on: https://gerrit.libreoffice.org/83174

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 9e6d87fdd927..3d8da21708b1 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -680,6 +680,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
     { LANGUAGE_USER_ENGLISH_ZAMBIA,         "en", "ZM", k0    },
     { LANGUAGE_USER_ENGLISH_SRI_LANKA,      "en", "LK", k0    },
     { LANGUAGE_USER_ENGLISH_NIGERIA,        "en", "NG", k0    },
+    { LANGUAGE_USER_KABARDIAN,             "kbd", "RU", k0    },    // Cyrillic script
     { LANGUAGE_MULTIPLE,                   "mul", ""  , k0    },    // multiple languages, many languages are used
     { LANGUAGE_UNDETERMINED,               "und", ""  , k0    },    // undetermined language, language cannot be identified
     { LANGUAGE_NONE,                       "zxx", ""  , k0    },    // 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 d149016d2ae4..a9ee385f1cee 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -752,6 +752,7 @@ namespace o3tl
 #define LANGUAGE_USER_ENGLISH_ZAMBIA        LanguageType(0xA009)  /* makeLangID( 0x28, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_ENGLISH_SRI_LANKA     LanguageType(0xA409)  /* makeLangID( 0x29, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_ENGLISH_NIGERIA       LanguageType(0xA809)  /* makeLangID( 0x2A, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
+#define LANGUAGE_USER_KABARDIAN             LanguageType(0x06A4)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 7ca5feb8156b..6f8c4a21a833 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -419,7 +419,8 @@ const std::pair<const char*, LanguageType> STR_ARR_SVT_LANGUAGE_TABLE[] =
     { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Iloko") , LANGUAGE_USER_ILOKO },
     { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Zambia)") , LANGUAGE_USER_ENGLISH_ZAMBIA },
     { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Sri Lanka)") , LANGUAGE_USER_ENGLISH_SRI_LANKA },
-    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Nigeria)") , LANGUAGE_USER_ENGLISH_NIGERIA }
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Nigeria)") , LANGUAGE_USER_ENGLISH_NIGERIA },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kabardian") , LANGUAGE_USER_KABARDIAN }
 };
 
 #endif