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

[Eike Rathke]

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

New commits:
commit 6b2fa7792a8e4feafb6920f0b289bf2c525d14e5
Author: Eike Rathke <erack at redhat.com>
Date:   Tue May 8 19:42:19 2018 +0200

    Add Ju|’hoansi [ktz-NA] and Naro [nhr-BW] to language list
    
    Change-Id: I65c048a7d52432a7d268b9a0f58aba7efc12a16e

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index f2af1092ed42..38e8f6d89476 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -674,6 +674,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
     { LANGUAGE_USER_PLAUTDIETSCH,          "pdt", "CA", k0    },
     { LANGUAGE_USER_ARMENIAN_WESTERN,      "hyw", "AM", k0    },
     { LANGUAGE_USER_ARMENIAN_CLASSIC,      "xcl", "AM", k0    },
+    { LANGUAGE_USER_JUHOAN,                "ktz", "NA", k0    },
+    { LANGUAGE_USER_NARO,                  "nhr", "BW", k0    },
     { 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 4030651e9123..ae7235288cfb 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -742,6 +742,8 @@ namespace o3tl
 #define LANGUAGE_USER_ARMENIAN_CLASSIC      LanguageType(0x06A0)
 #define LANGUAGE_USER_MALAY_ARABIC_MALAYSIA LanguageType(0x803E)  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_MALAY_MALAYSIA)) */
 #define LANGUAGE_USER_MALAY_ARABIC_BRUNEI   LanguageType(0x843E)  /* makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_MALAY_BRUNEI_DARUSSALAM)) */
+#define LANGUAGE_USER_JUHOAN                LanguageType(0x06A1)
+#define LANGUAGE_USER_NARO                  LanguageType(0x06A2)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 69f397cfab29..ab173f8ec7a0 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -412,7 +412,9 @@ const std::pair<const char*, LanguageType> STR_ARR_SVT_LANGUAGE_TABLE[] =
     { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Western (Armenia)") , LANGUAGE_USER_ARMENIAN_WESTERN },
     { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Classic (Armenia)") , LANGUAGE_USER_ARMENIAN_CLASSIC },
     { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Malay Arabic (Malaysia)") , LANGUAGE_USER_MALAY_ARABIC_MALAYSIA },
-    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Malay Arabic (Brunei Darussalam)") , LANGUAGE_USER_MALAY_ARABIC_BRUNEI }
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Malay Arabic (Brunei Darussalam)") , LANGUAGE_USER_MALAY_ARABIC_BRUNEI },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Ju|’hoansi") , LANGUAGE_USER_JUHOAN },
+    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Naro") , LANGUAGE_USER_NARO }
 };
 
 #endif