i18npool/Library_localedata_others.mk | 1 i18npool/source/localedata/data/en_MY.xml | 34 ++++++++++++++++++++++++++++++ i18npool/source/localedata/localedata.cxx | 1 svtools/source/misc/langtab.src | 1 4 files changed, 37 insertions(+)
New commits: commit 35ed50dcd1c38bb0ec304dfc50758b96db65a8a5 Author: Eike Rathke <[email protected]> Date: Mon Jan 16 21:17:46 2017 +0100 Resolves: tdf#104950 add English (Malaysia) [en-MY] to language listbox Change-Id: I3a6865fa61e4bd0089214f110087ce0fff194e64 diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index 114b781..67e5f0a 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -403,6 +403,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE < "French (Mauritius)" ; LANGUAGE_USER_FRENCH_MAURITIUS ; > ; < "Silesian" ; LANGUAGE_USER_SILESIAN ; > ; < "Hungarian (Szekely-Hungarian Rovas)" ; LANGUAGE_USER_HUNGARIAN_ROVAS ; > ; + < "English (Malaysia)" ; LANGUAGE_ENGLISH_MALAYSIA ; > ; }; }; commit 4cc33214a5acf278b9549e21627ff44a01ce5f5f Author: Eike Rathke <[email protected]> Date: Mon Jan 16 21:16:11 2017 +0100 tdf#104950 add English (Malaysia) [en-MY] locale data en-MY is a known locale with already assigned LangID and mapping, adding just its locale data will have it appear as 'en-MY' in the number formatter's Language listbox instead of "English (Malaysia)", but solves the users' problem. Change-Id: I32a7e9985d37c962d077531bc8d15162f8e2b48c diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index b485379..b447d06 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_ebo_CG \ CustomTarget/i18npool/localedata/localedata_ee_GH \ CustomTarget/i18npool/localedata/localedata_en_IN \ + CustomTarget/i18npool/localedata/localedata_en_MY \ CustomTarget/i18npool/localedata/localedata_eo \ CustomTarget/i18npool/localedata/localedata_fa_IR \ CustomTarget/i18npool/localedata/localedata_gu_IN \ diff --git a/i18npool/source/localedata/data/en_MY.xml b/i18npool/source/localedata/data/en_MY.xml new file mode 100644 index 0000000..09a9369 --- /dev/null +++ b/i18npool/source/localedata/data/en_MY.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>MY</CountryID> + <DefaultName>Malaysia</DefaultName> + </Country> + </LC_INFO> + <LC_CTYPE ref="en_GB" /> + <LC_FORMAT ref="en_GB" replaceFrom="[CURRENCY]" replaceTo="[$RM-4409]"/> + <LC_COLLATION ref="en_GB" /> + <LC_SEARCH ref="en_GB" /> + <LC_INDEX ref="en_GB" /> + <LC_CALENDAR ref="en_GB" /> + <LC_CURRENCY ref="ms_MY" /> + <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 1051e11..3a0c0ee2 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -215,6 +215,7 @@ static const struct { { "hu_HU", lcl_DATA_OTHERS }, { "id_ID", lcl_DATA_OTHERS }, { "ms_MY", lcl_DATA_OTHERS }, + { "en_MY", lcl_DATA_OTHERS }, { "ia", lcl_DATA_OTHERS }, { "mn_Cyrl_MN", lcl_DATA_OTHERS }, { "az_AZ", lcl_DATA_OTHERS }, _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
