i18nlangtag/source/isolang/isolang.cxx | 1 i18npool/Library_localedata_en.mk | 1 i18npool/source/localedata/data/en_GY.xml | 42 ++++++++++++++++++++++++++++++ i18npool/source/localedata/localedata.cxx | 1 include/i18nlangtag/lang.h | 2 + 5 files changed, 47 insertions(+)
New commits: commit ff7ea6b660b4e6bcd6575106c160882076c066a2 Author: Eike Rathke <er...@redhat.com> AuthorDate: Wed Jan 15 12:46:41 2025 +0100 Commit: Eike Rathke <er...@redhat.com> CommitDate: Wed Jan 15 20:20:42 2025 +0100 Resolves: tdf#164276 Add English (Guyana) {en-GY} locale data Change-Id: I6571e4c58efed00a9c7120d6cab9139223283741 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180275 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 4db3bc86b3cd..5c70cdeba443 100644 --- a/i18npool/Library_localedata_en.mk +++ b/i18npool/Library_localedata_en.mk @@ -20,6 +20,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_en,\ CustomTarget/i18npool/localedata/localedata_en_GB \ CustomTarget/i18npool/localedata/localedata_en_GH \ CustomTarget/i18npool/localedata/localedata_en_GM \ + CustomTarget/i18npool/localedata/localedata_en_GY \ CustomTarget/i18npool/localedata/localedata_en_IE \ CustomTarget/i18npool/localedata/localedata_en_JM \ CustomTarget/i18npool/localedata/localedata_en_KE \ diff --git a/i18npool/source/localedata/data/en_GY.xml b/i18npool/source/localedata/data/en_GY.xml new file mode 100644 index 000000000000..ae6de0de69fc --- /dev/null +++ b/i18npool/source/localedata/data/en_GY.xml @@ -0,0 +1,42 @@ +<?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>GY</CountryID> + <DefaultName>Guyana</DefaultName> + </Country> + </LC_INFO> + <LC_CTYPE ref="en_GB" /> + <LC_FORMAT ref="en_GB" replaceFrom="[CURRENCY]" replaceTo="[$$-BC09]"/> + <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>GYD</CurrencyID> + <CurrencySymbol>$</CurrencySymbol> + <BankSymbol>GYD</BankSymbol> + <CurrencyName>Guyanese dollar</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> +<!--Version 1.0 --> diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index eb0da4fbc8ef..6eec14dd8df5 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -105,6 +105,7 @@ constexpr struct { { "en_KE", DataLocaleLibrary::EN }, { "en_DK", DataLocaleLibrary::EN }, { "en_MU", DataLocaleLibrary::EN }, + { "en_GY", DataLocaleLibrary::EN }, { "es_ES", DataLocaleLibrary::ES }, { "es_AR", DataLocaleLibrary::ES }, commit 795ac9ab988b1408029c333eec14857e08ead400 Author: Eike Rathke <er...@redhat.com> AuthorDate: Wed Jan 15 12:44:15 2025 +0100 Commit: Eike Rathke <er...@redhat.com> CommitDate: Wed Jan 15 20:20:32 2025 +0100 Related: tdf#164276 Add English (Guyana) [0xBC09] {en-GY} mapping Change-Id: I87a3d6f7bb8ea70578312ac2894c6badac48652b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180274 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 053f4e16ecd5..8accfe199d36 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -684,6 +684,7 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] = { LANGUAGE_USER_MORISYEN, "mfe", "MU", k0 }, { LANGUAGE_USER_FRENCH_GUINEA, "fr", "GN", k0 }, { LANGUAGE_USER_ABKHAZ, "ab", "" , k0 }, + { LANGUAGE_USER_ENGLISH_GUYANA, "en", "GY", k0 }, // Add new languages ^^^ there. { LANGUAGE_MULTIPLE, "mul", "" , k0 }, // multiple languages, many languages are used { LANGUAGE_UNDETERMINED, "und", "" , k0 }, // undetermined language, language cannot be identified diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h index 3df015a48d57..894b843cfb79 100644 --- a/include/i18nlangtag/lang.h +++ b/include/i18nlangtag/lang.h @@ -794,6 +794,8 @@ namespace o3tl #define LANGUAGE_USER_SANTALI_OLCHIKI_INDIA LanguageType(0x06B3) #define LANGUAGE_USER_FRENCH_GUINEA LanguageType(0x940C) /* makeLangID( 0x25, getPrimaryLanguage( LANGUAGE_FRENCH)) */ #define LANGUAGE_USER_ABKHAZ LanguageType(0x06B4) +#define LANGUAGE_USER_ENGLISH_GUYANA LanguageType(0xBC09) /* makeLangID( 0x2F, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */ + /* XXX Add new user defined LCIDs ^^^ there. * Note that we run out of IDs with sublanguage ID 0x01 after 0x07DF ... */