i18nlangtag/source/isolang/isolang.cxx | 1
i18npool/Library_localedata_euro.mk | 1
i18npool/source/localedata/data/fr_GN.xml | 41 ++++++++++++++++++++++++++++++
i18npool/source/localedata/localedata.cxx | 1
include/i18nlangtag/lang.h | 1
svtools/inc/langtab.hrc | 3 +-
6 files changed, 47 insertions(+), 1 deletion(-)
New commits:
commit 03b2f4afc57973fa61284782f7e3d45be99f5eec
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Mon Nov 18 19:22:11 2024 +0100
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Mon Nov 18 22:45:54 2024 +0100
Resolves: tdf#163903 Add French (Republic of Guinea) {fr-GN} locale data
Change-Id: I46eb65f05a2015f7bd884585a544e030e143f5b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176735
Tested-by: Jenkins
Reviewed-by: Eike Rathke <er...@redhat.com>
diff --git a/i18npool/Library_localedata_euro.mk
b/i18npool/Library_localedata_euro.mk
index 6a1b9ddd64b1..65c43d596adb 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -50,6 +50,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,localedata_euro,\
CustomTarget/i18npool/localedata/localedata_fr_CH \
CustomTarget/i18npool/localedata/localedata_fr_CI \
CustomTarget/i18npool/localedata/localedata_fr_FR \
+ CustomTarget/i18npool/localedata/localedata_fr_GN \
CustomTarget/i18npool/localedata/localedata_fr_LU \
CustomTarget/i18npool/localedata/localedata_fr_MC \
CustomTarget/i18npool/localedata/localedata_fr_ML \
diff --git a/i18npool/source/localedata/data/fr_GN.xml
b/i18npool/source/localedata/data/fr_GN.xml
new file mode 100644
index 000000000000..182bdeec666f
--- /dev/null
+++ b/i18npool/source/localedata/data/fr_GN.xml
@@ -0,0 +1,41 @@
+<?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>fr</LangID>
+ <DefaultName>French</DefaultName>
+ </Language>
+ <Country>
+ <CountryID>GN</CountryID>
+ <DefaultName>Republic of Guinea</DefaultName>
+ </Country>
+ </LC_INFO>
+ <LC_CTYPE ref="fr_BF" />
+ <LC_FORMAT ref="fr_BF" replaceFrom="[CURRENCY]" replaceTo="[$FG-0x940C]" />
+ <LC_COLLATION ref="fr_BF" />
+ <LC_SEARCH ref="fr_BF" />
+ <LC_INDEX ref="fr_BF" />
+ <LC_CALENDAR ref="fr_BF" />
+ <LC_CURRENCY>
+ <Currency default="true" usedInCompatibleFormatCodes="true">
+ <CurrencyID>GNF</CurrencyID>
+ <CurrencySymbol>FG</CurrencySymbol>
+ <BankSymbol>GNF</BankSymbol>
+ <CurrencyName>Franc Guinéen</CurrencyName>
+ <DecimalPlaces>2</DecimalPlaces>
+ </Currency>
+ </LC_CURRENCY>
+ <LC_TRANSLITERATION ref="fr_BF" />
+ <LC_MISC ref="fr_BF" />
+ <LC_NumberingLevel ref="fr_BF" />
+ <LC_OutLineNumberingLevel ref="fr_BF"/>
+</Locale>
diff --git a/i18npool/source/localedata/localedata.cxx
b/i18npool/source/localedata/localedata.cxx
index 5bdf1f8c3048..eb0da4fbc8ef 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -146,6 +146,7 @@ constexpr struct {
{ "fr_BJ", DataLocaleLibrary::EURO },
{ "fr_NE", DataLocaleLibrary::EURO },
{ "fr_TG", DataLocaleLibrary::EURO },
+ { "fr_GN", DataLocaleLibrary::EURO },
{ "it_IT", DataLocaleLibrary::EURO },
{ "it_CH", DataLocaleLibrary::EURO },
{ "sl_SI", DataLocaleLibrary::EURO },
commit 6acaa433762624b29eaeca39c5a60eb7824788d6
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Mon Nov 18 18:59:59 2024 +0100
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Mon Nov 18 22:45:45 2024 +0100
Related: tdf#163903 Add French (Republic of Guinea) {fr-GN} [0x940C]
Change-Id: I2ebea83a757533088fc49a3c849e6b7890277d1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176734
Tested-by: Jenkins
Reviewed-by: Eike Rathke <er...@redhat.com>
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 1ce95c43c731..88521f1587c5 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -682,6 +682,7 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_ENGLISH_ANTIGUA_BARBUDA,"en", "AG", k0 },
{ LANGUAGE_USER_SARAIKI, "skr", "PK", k0 },
{ LANGUAGE_USER_MORISYEN, "mfe", "MU", k0 },
+ { LANGUAGE_USER_FRENCH_GUINEA, "fr", "GN", 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 524b9243e00d..d37c8bbe7090 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -792,6 +792,7 @@ namespace o3tl
#define LANGUAGE_USER_ROHINGYA_HANIFI LanguageType(0x06B1)
#define LANGUAGE_USER_MORISYEN LanguageType(0x06B2)
#define LANGUAGE_USER_SANTALI_OLCHIKI_INDIA LanguageType(0x06B3)
+#define LANGUAGE_USER_FRENCH_GUINEA LanguageType(0x940C) /*
makeLangID( 0x25, getPrimaryLanguage( LANGUAGE_FRENCH)) */
/* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index eba0db6d1b3a..e2a3e82d016a 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -445,7 +445,8 @@ const std::pair<TranslateId, LanguageType>
STR_ARR_SVT_LANGUAGE_TABLE[] =
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Saraiki") , LANGUAGE_USER_SARAIKI },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Rohingya Hanifi") ,
LANGUAGE_USER_ROHINGYA_HANIFI },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Morisyen") , LANGUAGE_USER_MORISYEN },
- { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Santali, Ol Chiki") ,
LANGUAGE_USER_SANTALI_OLCHIKI_INDIA }
+ { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Santali, Ol Chiki") ,
LANGUAGE_USER_SANTALI_OLCHIKI_INDIA },
+ { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "French (Republic of Guinea)") ,
LANGUAGE_USER_FRENCH_GUINEA }
};
