i18nlangtag/source/isolang/isolang.cxx | 2 ++
include/i18nlangtag/lang.h | 2 ++
2 files changed, 4 insertions(+)
New commits:
commit 55418c609c8febed022a8412430c65cbe5cb5f6e
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Wed Jan 15 12:44:15 2025 +0100
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Fri Jan 17 02:46:20 2025 +0100
Related: tdf#164276 Add English (Guyana) [0xBC09] {en-GY} mapping
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180274
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 795ac9ab988b1408029c333eec14857e08ead400)
Conflicts:
i18nlangtag/source/isolang/isolang.cxx
include/i18nlangtag/lang.h
Change-Id: I87a3d6f7bb8ea70578312ac2894c6badac48652b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180301
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 88521f1587c5..e5c5071e77c2 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -683,6 +683,7 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_SARAIKI, "skr", "PK", k0 },
{ LANGUAGE_USER_MORISYEN, "mfe", "MU", k0 },
{ LANGUAGE_USER_FRENCH_GUINEA, "fr", "GN", 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 e430fd193311..43839916b778 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -787,6 +787,7 @@ namespace o3tl
#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)) */
+#define LANGUAGE_USER_ENGLISH_GUYANA LanguageType(0xBC09) /*
makeLangID( 0x2F, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
/* XXX Add new user defined LCIDs ^^^ there.
commit fcb3752baa4cf0a4aea89ef0e0efb066ecf93692
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Mon Nov 18 18:59:59 2024 +0100
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Fri Jan 17 02:46:08 2025 +0100
Related: tdf#163903 Add French (Republic of Guinea) {fr-GN} [0x940C]
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176734
Tested-by: Jenkins
Reviewed-by: Eike Rathke <er...@redhat.com>
(cherry picked from commit 6acaa433762624b29eaeca39c5a60eb7824788d6)
Without langtab.hrc UI string change.
Change-Id: I5da2a4e98deb73c00841c09e650956b9bebd8abd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180300
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.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 442df43d859f..e430fd193311 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -786,6 +786,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.
