commit 90b17ec7ab218f1ba9ec789bad0c2a40644ad937
author Eike Rathke <erack@redhat.com> Fri May 03 18:43:27 2019 +0200
committer Eike Rathke <erack@redhat.com> Sat May 04 10:30:22 2019 +0200
tree 22ae73e28f1bdc028f5ceb53d5101e367030870e
parent ca40d4ce9b8134fd8bfc90e9e8289b620163475b

Resolves: tdf#123948 add English (Zambia) [en-ZM] to language list

Change-Id: I6632cacb7e713d4c7aaaedd50267b9e6029b0389
Reviewed-on: https://gerrit.libreoffice.org/71768
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins

i18nlangtag/source/isolang/isolang.cxx

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 4ed15d5..d095542 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -677,6 +677,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
    { LANGUAGE_USER_JUHOAN,                "ktz", "NA", k0    },
    { LANGUAGE_USER_NARO,                  "nhr", "BW", k0    },
    { LANGUAGE_USER_ILOKO,                 "ilo", "PH", k0    },
    { LANGUAGE_USER_ENGLISH_ZAMBIA,         "en", "ZM", 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

include/i18nlangtag/lang.h

diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index f9a84d6..0863e5a 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -749,6 +749,7 @@ namespace o3tl
#define LANGUAGE_USER_JUHOAN                LanguageType(0x06A1)
#define LANGUAGE_USER_NARO                  LanguageType(0x06A2)
#define LANGUAGE_USER_ILOKO                 LanguageType(0x06A3)
#define LANGUAGE_USER_ENGLISH_ZAMBIA        LanguageType(0xA009)  /* makeLangID( 0x28, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */


/* XXX Add new user defined LCIDs ^^^ there.

svtools/inc/langtab.hrc

diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 9de0eb1..43394d0 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -416,7 +416,8 @@ const std::pair<const char*, LanguageType> STR_ARR_SVT_LANGUAGE_TABLE[] =
    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Malay Arabic (Brunei Darussalam)") , LANGUAGE_USER_MALAY_ARABIC_BRUNEI },
    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Juǀ’hoan") , LANGUAGE_USER_JUHOAN },
    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Naro") , LANGUAGE_USER_NARO },
    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Iloko") , LANGUAGE_USER_ILOKO }
    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Iloko") , LANGUAGE_USER_ILOKO },
    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Zambia)") , LANGUAGE_USER_ENGLISH_ZAMBIA }
};

#endif