diff options
| author | Eike Rathke <erack@redhat.com> | 2017-01-16 21:16:11 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-01-17 00:03:02 +0000 |
| commit | 285194c1cceb07868eca9415b67a9b1aaae1ba56 (patch) | |
| tree | 908928d4e01a37d7e30575af18462697dc57f969 | |
| parent | 0d79ceecab091221025fb7ad657627c89e089712 (diff) | |
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
(cherry picked from commit 4cc33214a5acf278b9549e21627ff44a01ce5f5f)
Reviewed-on: https://gerrit.libreoffice.org/33185
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -rw-r--r-- | i18npool/Library_localedata_others.mk | 1 | ||||
| -rw-r--r-- | i18npool/source/localedata/data/en_MY.xml | 34 | ||||
| -rw-r--r-- | i18npool/source/localedata/localedata.cxx | 1 |
3 files changed, 36 insertions, 0 deletions
diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index b485379792b6..b447d061c4d1 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 000000000000..09a9369933a5 --- /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 e2b9aa674793..53e831b8f1db 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 }, |