i18nlangtag/source/isolang/isolang.cxx | 7 +++++--
include/i18nlangtag/lang.h | 3 +++
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit dcd2ccfcde370d76da8265d0ea47e6fd4f7ed5d7
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Wed May 27 19:58:05 2020 +0200
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Thu May 28 12:39:13 2020 +0200
Add LCIDs of [MS-LCID] from 3/4/2020 14.0 revision
See also
commit 574c57090642347980d2395e1e183cc7b5c171ad
CommitDate: Wed May 27 13:56:28 2020 +0200
update list of [MS-LCID] from 3/4/2020 14.0 rev.
Change-Id: Ia0d068081a309dbefadceac986be83bac2d900d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94998
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 4e91c3cff4efb5c4973e79caed5172ce4037d081)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94959
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 5abdc085fb11..c9e623b390de 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -378,7 +378,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_FRENCH_MOROCCO, "fr", "MA", k0 },
{ LANGUAGE_FRENCH_REUNION, "fr", "RE", k0 },
{ LANGUAGE_FRENCH, "fr", "" , k0 }, // needed
as a catcher before other "fr" entries!
- { LANGUAGE_FRENCH_NORTH_AFRICA, "fr", "" , k0 },
+ { LANGUAGE_FRENCH_NORTH_AFRICA, "fr", "" , k0 }, // MS
reserved, "fr-015"
{ LANGUAGE_FRENCH_WEST_INDIES, "fr", "" , k0 }, // no ISO
country code; MS "Neither defined nor reserved"
{ LANGUAGE_FRISIAN_NETHERLANDS, "fy", "NL", k0 },
{ LANGUAGE_GAELIC_IRELAND, "ga", "IE", k0 },
@@ -485,7 +485,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_ENGLISH_PHILIPPINES, "en", "PH", k0 },
{ LANGUAGE_IBIBIO_NIGERIA, "ibb", "NG", k0 },
{ LANGUAGE_YI, "ii", "CN", k0 },
- { LANGUAGE_ENGLISH_ARAB_EMIRATES, "en", "AE", k0 }, // MS
reserved
+ { LANGUAGE_ENGLISH_ARAB_EMIRATES, "en", "AE", k0 },
{ LANGUAGE_ENGLISH_BAHRAIN, "en", "BH", k0 }, // MS
reserved
{ LANGUAGE_ENGLISH_EGYPT, "en", "EG", k0 }, // MS
reserved
{ LANGUAGE_ENGLISH_JORDAN, "en", "JO", k0 }, // MS
reserved
@@ -774,6 +774,9 @@ static IsoLanguageScriptCountryEntry const
aImplIsoLangScriptEntries[] =
{ LANGUAGE_USER_HUNGARIAN_ROVAS, "hu-Hung", "HU", k0 },
{ LANGUAGE_USER_MALAY_ARABIC_MALAYSIA, "ms-Arab", "MY", k0 },
{ LANGUAGE_USER_MALAY_ARABIC_BRUNEI, "ms-Arab", "BN", k0 },
+ { LANGUAGE_KAZAKH_LATIN, "kk-Latn", "KZ", k0 },
// MS reserved
+ { LANGUAGE_KAZAKH_LATIN_LSO, "kk-Latn", "" , k0 },
// MS reserved
+ { LANGUAGE_KAZAKH_CYRILLIC_LSO, "kk-Cyrl", "" , k0 },
// MS reserved
{ LANGUAGE_DONTKNOW, "", "" , k0 }
// marks end of table
};
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 1cae83ef8356..f4d1266a3e0d 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -275,6 +275,9 @@ namespace o3tl
#define LANGUAGE_KASHMIRI LanguageType(0x0460)
#define LANGUAGE_KASHMIRI_INDIA LanguageType(0x0860)
#define LANGUAGE_KAZAKH LanguageType(0x043F)
+#define LANGUAGE_KAZAKH_LATIN LanguageType(0x083F)
+#define LANGUAGE_KAZAKH_CYRILLIC_LSO LanguageType(0x783F)
+#define LANGUAGE_KAZAKH_LATIN_LSO LanguageType(0x7C3F)
#define LANGUAGE_KHMER LanguageType(0x0453)
#define LANGUAGE_KICHE_GUATEMALA LanguageType(0x0486) /* AKA
K'iche', West Central Quiche, */
#define LANGUAGE_KINYARWANDA_RWANDA LanguageType(0x0487) /* obsoletes
LANGUAGE_USER_KINYARWANDA 0x0621 */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
