i18npool/Library_localedata_others.mk     |    1 
 i18npool/source/localedata/data/en_HK.xml |   34 ++++++++++++++++++++++++++++++
 i18npool/source/localedata/localedata.cxx |    1 
 3 files changed, 36 insertions(+)

New commits:
commit 37352332a3b6e6d068ce77b46f616e0b752e3ba8
Author:     Eike Rathke <er...@redhat.com>
AuthorDate: Fri Aug 21 11:51:44 2020 +0200
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Mon Sep 28 02:09:43 2020 +0200

    Resolves: tdf#135518 Add English (Hong Kong) [en-HK] locale data
    
    Inherited from en-GB, zh-HK
    
    Change-Id: I966d19cfa2da26d3d882af35afe79a2f77eaffa8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101139
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 5dffb7ba361ad76aa249d6c93fd87fff67362726)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103328
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/i18npool/Library_localedata_others.mk 
b/i18npool/Library_localedata_others.mk
index f1cb28820c6d..cece0e15fc30 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -50,6 +50,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,localedata_others,\
        CustomTarget/i18npool/localedata/localedata_dz_BT \
        CustomTarget/i18npool/localedata/localedata_ebo_CG \
        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 \
diff --git a/i18npool/source/localedata/data/en_HK.xml 
b/i18npool/source/localedata/data/en_HK.xml
new file mode 100644
index 000000000000..e0d913b912ac
--- /dev/null
+++ b/i18npool/source/localedata/data/en_HK.xml
@@ -0,0 +1,34 @@
+<?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>HK</CountryID>
+      <DefaultName>Hong Kong</DefaultName>
+    </Country>
+  </LC_INFO>
+  <LC_CTYPE ref="en_GB" />
+  <LC_FORMAT ref="en_GB" replaceFrom="[CURRENCY]" replaceTo="[$HK$-3C09]"/>
+  <LC_COLLATION ref="en_GB" />
+  <LC_SEARCH ref="en_GB" />
+  <LC_INDEX ref="en_GB" />
+  <LC_CALENDAR ref="en_GB" />
+  <LC_CURRENCY ref="zh_HK" />
+  <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 a0fbd8361068..a25c391ac927 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -201,6 +201,7 @@ static const struct {
     { "zh_SG",  lcl_DATA_OTHERS },
     { "zh_TW",  lcl_DATA_OTHERS },
     { "zh_MO",  lcl_DATA_OTHERS },
+    { "en_HK",  lcl_DATA_OTHERS },  // needs to be in OTHERS instead of EN 
because currency inherited from zh_HK
 
     { "ar_EG",  lcl_DATA_OTHERS },
     { "ar_DZ",  lcl_DATA_OTHERS },
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to