[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - i18nlangtag/source i18npool/Library_localedata_others.mk i18npool/source include/i18nlangtag

[Eike Rathke (via logerrit)]

 i18nlangtag/source/isolang/isolang.cxx    |    1 
 i18npool/Library_localedata_others.mk     |    1 
 i18npool/source/localedata/data/en_KE.xml |   42 ++++++++++++++++++++++++++++++
 i18npool/source/localedata/localedata.cxx |    3 +-
 include/i18nlangtag/lang.h                |    1 
 5 files changed, 47 insertions(+), 1 deletion(-)

New commits:
commit 34b2f0d5c6634942486ed62527732b2184eb758c
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Thu Sep 24 11:42:15 2020 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Sep 24 21:40:39 2020 +0200

    Resolves: tdf#115436 Add English Kenya {en-KE} locale data
    
     This is a combination of 2 commits.
    
    Add English Kenya LCID 0xAC09 {en-KE} langtag mapping, tdf#115436
    
    I0c32ffa2d7f316b3e97dc597da8539842ad51367
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103300
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 23ff2c96709e48e06aa0a9dee237b73935cd60e5)
    
    Resolves: tdf#115436 Add English Kenya {en-KE} locale data
    
    I06b9479e48bfcc3421ae1ec634064f9f3209cffd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103301
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit ae8995694da9ca29a62d13e6a320e5d39f4727e8)
    
    Change-Id: I06b9479e48bfcc3421ae1ec634064f9f3209cffd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103323
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 8151d5e29640..730890a2428c 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -689,6 +689,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
     { LANGUAGE_USER_MINANGKABAU,           "min", "ID", k0    },
     { LANGUAGE_USER_SUNDANESE,             "sun", "ID", k0    },
     { LANGUAGE_USER_YAKA_DRCONGO,          "yaf", "CD", k0    },
+    { LANGUAGE_USER_ENGLISH_KENYA,          "en", "KE", 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/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk
index 62436f1a817d..f1cb28820c6d 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\
 	CustomTarget/i18npool/localedata/localedata_ebo_CG \
 	CustomTarget/i18npool/localedata/localedata_ee_GH \
 	CustomTarget/i18npool/localedata/localedata_en_IN \
+	CustomTarget/i18npool/localedata/localedata_en_KE \
 	CustomTarget/i18npool/localedata/localedata_en_MY \
 	CustomTarget/i18npool/localedata/localedata_eo \
 	CustomTarget/i18npool/localedata/localedata_fa_IR \
diff --git a/i18npool/source/localedata/data/en_KE.xml b/i18npool/source/localedata/data/en_KE.xml
new file mode 100644
index 000000000000..cb4811d73229
--- /dev/null
+++ b/i18npool/source/localedata/data/en_KE.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
+  <LC_INFO>
+    <Language>
+      <LangID>en</LangID>
+      <DefaultName>English</DefaultName>
+    </Language>
+    <Country>
+      <CountryID>KE</CountryID>
+      <DefaultName>Kenya</DefaultName>
+    </Country>
+  </LC_INFO>
+  <LC_CTYPE ref="en_GB" />
+  <LC_FORMAT ref="en_GB" replaceFrom="[CURRENCY]" replaceTo="[$KSh-AC09]"/>
+  <LC_COLLATION ref="en_GB" />
+  <LC_SEARCH ref="en_GB" />
+  <LC_INDEX ref="en_GB" />
+  <LC_CALENDAR ref="en_GB" />
+  <LC_CURRENCY>
+    <Currency default="true" usedInCompatibleFormatCodes="true">
+      <CurrencyID>KES</CurrencyID>
+      <CurrencySymbol>KSh</CurrencySymbol>
+      <BankSymbol>KES</BankSymbol>
+      <CurrencyName>Kenyan shilling</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+  </LC_CURRENCY>
+  <LC_TRANSLITERATION ref="en_GB" />
+  <LC_MISC ref="en_GB" />
+  <LC_NumberingLevel ref="en_GB" />
+  <LC_OutLineNumberingLevel ref="en_GB"/>
+</Locale>
+<!--Version 1.0  -->
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 4a8e565dc8e1..a0fbd8361068 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -330,7 +330,8 @@ static const struct {
     { "ilo_PH", lcl_DATA_OTHERS },
     { "ha_Latn_NG",  lcl_DATA_OTHERS },
     { "min_ID", lcl_DATA_OTHERS },
-    { "sun_ID", lcl_DATA_OTHERS }
+    { "sun_ID", lcl_DATA_OTHERS },
+    { "en_KE",  lcl_DATA_OTHERS }
 };
 
 #else
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 96df56181159..d3b0ece0bce6 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -761,6 +761,7 @@ namespace o3tl
 #define LANGUAGE_USER_MINANGKABAU           LanguageType(0x06A7)
 #define LANGUAGE_USER_SUNDANESE             LanguageType(0x06A8)
 #define LANGUAGE_USER_YAKA_DRCONGO          LanguageType(0x06A9)
+#define LANGUAGE_USER_ENGLISH_KENYA         LanguageType(0xAC09)  /* makeLangID( 0x2B, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 
 
 /* XXX Add new user defined LCIDs ^^^ there.