i18nlangtag/source/isolang/isolang.cxx | 1
i18npool/Library_localedata_en.mk | 1
i18npool/source/localedata/data/en_LK.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 fe511a5068b12904b2242d38b3c56ea3a365da23
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Thu Aug 1 16:27:13 2019 +0200
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Thu Aug 1 21:46:51 2019 +0200
Resolves: tdf#126282 add English (Sri Lanka) [en-LK] locale data
Change-Id: I0a678a3599c43e5158c843d7781a0f55a3b03261
Reviewed-on: https://gerrit.libreoffice.org/76808
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
diff --git a/i18npool/Library_localedata_en.mk
b/i18npool/Library_localedata_en.mk
index c38c3523af92..2b0a77a42f0e 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_LK \
CustomTarget/i18npool/localedata/localedata_en_MW \
CustomTarget/i18npool/localedata/localedata_en_NA \
CustomTarget/i18npool/localedata/localedata_en_NZ \
diff --git a/i18npool/source/localedata/data/en_LK.xml
b/i18npool/source/localedata/data/en_LK.xml
new file mode 100644
index 000000000000..5d3e741499ad
--- /dev/null
+++ b/i18npool/source/localedata/data/en_LK.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>LK</CountryID>
+ <DefaultName>Sri Lanka</DefaultName>
+ </Country>
+ </LC_INFO>
+ <LC_CTYPE ref="en_GB" />
+ <LC_FORMAT ref="en_GB" replaceFrom="[CURRENCY]" replaceTo="[$Rs-A409]" />
+ <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>LKR</CurrencyID>
+ <CurrencySymbol>Rs</CurrencySymbol>
+ <BankSymbol>LKR</BankSymbol>
+ <CurrencyName>Sri Lankan rupee</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 3d244fcfbab1..06ec029eac51 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -79,6 +79,7 @@ static const struct {
{ "en_GM", lcl_DATA_EN },
{ "en_BW", lcl_DATA_EN },
{ "en_ZM", lcl_DATA_EN },
+ { "en_LK", lcl_DATA_EN },
{ "es_ES", lcl_DATA_ES },
{ "es_AR", lcl_DATA_ES },
commit bfa0a2ee278fbe23f2b2c7122a1ca63639b2da41
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Thu Aug 1 16:25:43 2019 +0200
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Thu Aug 1 21:46:40 2019 +0200
tdf#126282 add English (Sri Lanka) [en-LK] 0xA409 to language list
Change-Id: I2b02498684c952f9a6bf8f6bc17a3355c3607aac
Reviewed-on: https://gerrit.libreoffice.org/76807
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index ca511f9989df..612efc294db5 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -678,6 +678,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_NARO, "nhr", "BW", k0 },
{ LANGUAGE_USER_ILOKO, "ilo", "PH", k0 },
{ LANGUAGE_USER_ENGLISH_ZAMBIA, "en", "ZM", k0 },
+ { LANGUAGE_USER_ENGLISH_SRI_LANKA, "en", "LK", 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 37dba1cc5123..fb7ee80118bf 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -750,6 +750,7 @@ namespace o3tl
#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)) */
+#define LANGUAGE_USER_ENGLISH_SRI_LANKA LanguageType(0xA409) /*
makeLangID( 0x29, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
/* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 13fb8a89070a..48a6126edc39 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -417,7 +417,8 @@ const std::pair<const char*, LanguageType>
STR_ARR_SVT_LANGUAGE_TABLE[] =
{ 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", "English (Zambia)") ,
LANGUAGE_USER_ENGLISH_ZAMBIA }
+ { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Zambia)") ,
LANGUAGE_USER_ENGLISH_ZAMBIA },
+ { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Sri Lanka)") ,
LANGUAGE_USER_ENGLISH_SRI_LANKA }
};
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
