[Libreoffice-commits] core.git: 2 commits - i18nlangtag/source i18npool/Library_localedata_en.mk i18npool/source include/i18nlangtag svtools/inc
Eike Rathke (via logerrit)
logerrit at kemper.freedesktop.org
Sat May 4 08:30:59 UTC 2019
i18nlangtag/source/isolang/isolang.cxx | 1
i18npool/Library_localedata_en.mk | 1
i18npool/source/localedata/data/en_ZM.xml | 50 ++++++++++++++++++++++++++++++
i18npool/source/localedata/localedata.cxx | 1
include/i18nlangtag/lang.h | 1
svtools/inc/langtab.hrc | 3 +
6 files changed, 56 insertions(+), 1 deletion(-)
New commits:
commit 99f71a3f4a0207db0c18df1737cdb7b00e456b7e
Author: Eike Rathke <erack at redhat.com>
AuthorDate: Fri May 3 22:11:52 2019 +0200
Commit: Eike Rathke <erack at redhat.com>
CommitDate: Sat May 4 10:30:33 2019 +0200
Related: tdf#123948 add English (Zambia) [en-ZM] locale data
Inherits en-GB
Change-Id: I11febf18959380f9dcc73cb94aa9532ccb1200e7
Reviewed-on: https://gerrit.libreoffice.org/71769
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 40d3ff25001f..c38c3523af92 100644
--- a/i18npool/Library_localedata_en.mk
+++ b/i18npool/Library_localedata_en.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_en,\
CustomTarget/i18npool/localedata/localedata_en_TT \
CustomTarget/i18npool/localedata/localedata_en_US \
CustomTarget/i18npool/localedata/localedata_en_ZA \
+ CustomTarget/i18npool/localedata/localedata_en_ZM \
CustomTarget/i18npool/localedata/localedata_en_ZW \
))
diff --git a/i18npool/source/localedata/data/en_ZM.xml b/i18npool/source/localedata/data/en_ZM.xml
new file mode 100644
index 000000000000..96866eb2b4ca
--- /dev/null
+++ b/i18npool/source/localedata/data/en_ZM.xml
@@ -0,0 +1,50 @@
+<?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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.0">
+ <LC_INFO>
+ <Language>
+ <LangID>en</LangID>
+ <DefaultName>English</DefaultName>
+ </Language>
+ <Country>
+ <CountryID>ZM</CountryID>
+ <DefaultName>Zambia</DefaultName>
+ </Country>
+ </LC_INFO>
+ <LC_CTYPE ref="en_GB" />
+ <LC_FORMAT ref="en_GB" replaceFrom="[CURRENCY]" replaceTo="[$K-A009]" />
+ <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>ZMW</CurrencyID>
+ <CurrencySymbol>K</CurrencySymbol>
+ <BankSymbol>ZMW</BankSymbol>
+ <CurrencyName>Kwacha</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>
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index c4f68f0a319a..74dbde3fdb53 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -75,6 +75,7 @@ static const struct {
{ "en_MW", lcl_DATA_EN },
{ "en_GM", lcl_DATA_EN },
{ "en_BW", lcl_DATA_EN },
+ { "en_ZM", lcl_DATA_EN },
{ "es_ES", lcl_DATA_ES },
{ "es_AR", lcl_DATA_ES },
commit 90b17ec7ab218f1ba9ec789bad0c2a40644ad937
Author: Eike Rathke <erack at redhat.com>
AuthorDate: Fri May 3 18:43:27 2019 +0200
Commit: Eike Rathke <erack at redhat.com>
CommitDate: Sat May 4 10:30:22 2019 +0200
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 at redhat.com>
Tested-by: Jenkins
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 4ed15d5a3efb..d095542c8229 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
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index f9a84d660fee..0863e5a1a9ae 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.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 9de0eb1dfb66..43394d03e2a1 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
More information about the Libreoffice-commits
mailing list