[Libreoffice-commits] core.git: i18npool/Library_localedata_en.mk i18npool/Library_localedata_others.mk i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/Library_localedata_en.mk         |    1 +
 i18npool/Library_localedata_others.mk     |    1 -
 i18npool/source/localedata/localedata.cxx |    8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 75aa541d6a7c15f6e79b29c0a1b6e813cebc1ac3
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Wed May 5 18:56:15 2021 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Wed May 5 23:10:42 2021 +0200

    Move en_KE to lcl_DATA_EN where it belongs
    
    Comment en_IN and en_MY why they should / have to stay.
    
    Change-Id: I816741324bfc328ec4e0bf269ec27f65fe79f3f6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115154
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins

diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk
index 86a9178bf4ed..94f65b6805c3 100644
--- a/i18npool/Library_localedata_en.mk
+++ b/i18npool/Library_localedata_en.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_en,\
 	CustomTarget/i18npool/localedata/localedata_en_GM \
 	CustomTarget/i18npool/localedata/localedata_en_IE \
 	CustomTarget/i18npool/localedata/localedata_en_JM \
+	CustomTarget/i18npool/localedata/localedata_en_KE \
 	CustomTarget/i18npool/localedata/localedata_en_LK \
 	CustomTarget/i18npool/localedata/localedata_en_MW \
 	CustomTarget/i18npool/localedata/localedata_en_NA \
diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk
index cece0e15fc30..a6246b8b24c2 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -52,7 +52,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\
 	CustomTarget/i18npool/localedata/localedata_ee_GH \
 	CustomTarget/i18npool/localedata/localedata_en_HK \
 	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/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 8bc822936b7b..8f159a40d53b 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -80,6 +80,7 @@ const struct {
     { "en_ZM",  lcl_DATA_EN },
     { "en_LK",  lcl_DATA_EN },
     { "en_NG",  lcl_DATA_EN },
+    { "en_KE",  lcl_DATA_EN },
 
     { "es_ES",  lcl_DATA_ES },
     { "es_AR",  lcl_DATA_ES },
@@ -217,7 +218,7 @@ const struct {
     { "pa_IN",  lcl_DATA_OTHERS },
     { "bn_IN",  lcl_DATA_OTHERS },
     { "or_IN",  lcl_DATA_OTHERS },
-    { "en_IN",  lcl_DATA_OTHERS },
+    { "en_IN",  lcl_DATA_OTHERS },  // keep in OTHERS for IN
     { "ml_IN",  lcl_DATA_OTHERS },
     { "bn_BD",  lcl_DATA_OTHERS },
     { "th_TH",  lcl_DATA_OTHERS },
@@ -226,7 +227,7 @@ const struct {
     { "hu_HU",  lcl_DATA_OTHERS },
     { "id_ID",  lcl_DATA_OTHERS },
     { "ms_MY",  lcl_DATA_OTHERS },
-    { "en_MY",  lcl_DATA_OTHERS },
+    { "en_MY",  lcl_DATA_OTHERS },  // needs to be in OTHERS instead of EN because currency inherited from ms_MY
     { "ia",     lcl_DATA_OTHERS },
     { "mn_Cyrl_MN",  lcl_DATA_OTHERS },
     { "az_AZ",  lcl_DATA_OTHERS },
@@ -330,8 +331,7 @@ const struct {
     { "ilo_PH", lcl_DATA_OTHERS },
     { "ha_Latn_NG",  lcl_DATA_OTHERS },
     { "min_ID", lcl_DATA_OTHERS },
-    { "sun_ID", lcl_DATA_OTHERS },
-    { "en_KE",  lcl_DATA_OTHERS }
+    { "sun_ID", lcl_DATA_OTHERS }
 };
 
 #else