i18nlangtag/qa/cppunit/test_languagetag.cxx | 1 -
i18nlangtag/source/isolang/isolang.cxx | 2 ++
include/i18nlangtag/lang.h | 1 +
svtools/inc/langtab.hrc | 3 ++-
4 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit bae2fbfd341b2cb5e5053c7977176f68b5d658dd
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Sat Aug 21 12:05:05 2021 +0200
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Sat Aug 21 14:38:35 2021 +0200
Resolves: tdf#143946 Add Klingon, tlhIngan Hol {tlh} 0x06AC to language list
Change-Id: Icf7452b2aef3ecae8ccdbcd4a66ab8b121a8120c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120814
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 8f76fb58d6f1..4b9a462f59fb 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -69,7 +69,6 @@ void TestLanguageTag::testAllTags()
CPPUNIT_ASSERT_EQUAL( OUString("tlh"), aLocale.Language );
CPPUNIT_ASSERT( aLocale.Country.isEmpty() );
CPPUNIT_ASSERT( aLocale.Variant.isEmpty() );
- CPPUNIT_ASSERT( LanguageTag::isOnTheFlyID( klingon.getLanguageType())
);
CPPUNIT_ASSERT( klingon.isValidBcp47() );
CPPUNIT_ASSERT( klingon.isIsoLocale() );
CPPUNIT_ASSERT( klingon.isIsoODF() );
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index cb1d5956d6ea..eea9592d907c 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -693,6 +693,7 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_BRIBRI, "bzd", "CR", k0 },
{ LANGUAGE_USER_ENGLISH_DENMARK, "en", "DK", k0 },
{ LANGUAGE_USER_SESOTHO_LESOTHO, "st", "LS", k0 },
+ { LANGUAGE_USER_KLINGON, "tlh", "" , k0 },
{ LANGUAGE_MULTIPLE, "mul", "" , k0 }, //
multiple languages, many languages are used
{ LANGUAGE_UNDETERMINED, "und", "" , k0 }, //
undetermined language, language cannot be identified
{ LANGUAGE_NONE, "zxx", "" , k0 }, // added
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic
information
@@ -1183,6 +1184,7 @@ css::lang::Locale
MsLangId::Conversion::lookupFallbackLocale(
LANGUAGE_USER_INTERLINGUE,
LANGUAGE_USER_LOJBAN,
LANGUAGE_KASHMIRI,
+ LANGUAGE_USER_KLINGON,
LANGUAGE_USER_KEYID,
// And the special codes without country.
LANGUAGE_MULTIPLE,
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 4b28d9dc3ac6..6303ac111b7b 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -769,6 +769,7 @@ namespace o3tl
#define LANGUAGE_USER_ENGLISH_DENMARK LanguageType(0xB009) /*
makeLangID( 0x2C, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
#define LANGUAGE_USER_SESOTHO_LESOTHO LanguageType(0x8030) /*
makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_SESOTHO)) */
#define LANGUAGE_USER_YIDDISH_ISRAEL LanguageType(0x843D) /*
makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_YIDDISH)) */
+#define LANGUAGE_USER_KLINGON LanguageType(0x06AC)
/* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 155be7b45358..547b9992455d 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -432,7 +432,8 @@ const std::pair<TranslateId, LanguageType>
STR_ARR_SVT_LANGUAGE_TABLE[] =
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Cabécar") , LANGUAGE_USER_CABECAR },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Bribri") , LANGUAGE_USER_BRIBRI },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Denmark)") ,
LANGUAGE_USER_ENGLISH_DENMARK },
- { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sesotho") ,
LANGUAGE_USER_SESOTHO_LESOTHO }
+ { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sesotho") ,
LANGUAGE_USER_SESOTHO_LESOTHO },
+ { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Klingon, tlhIngan Hol") ,
LANGUAGE_USER_KLINGON }
};
