i18nlangtag/source/isolang/isolang.cxx | 2 ++
include/i18nlangtag/lang.h | 2 ++
svtools/inc/langtab.hrc | 4 +++-
3 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 430a6fea4012752eed0c61bff4936e9c366aa750
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Sat Dec 18 00:04:07 2021 +0100
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Sat Dec 18 01:40:48 2021 +0100
Resolves: tdf#145853 Add Interslavic Latin|Cyrillic to language list
Interslavic Latin {art-x-interslv} 0x06AD
Interslavic Cyrillic {art-Cyrl-x-interslv} 0x06AE
Change-Id: I487d6593db89af038555a192674298e2dabf5582
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127018
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 36b69f0fe6a6..b29726342733 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -781,6 +781,8 @@ Bcp47CountryEntry const aImplBcp47CountryEntries[] =
// { LANGUAGE_YUE_CHINESE_HONGKONG, "zh-yue-HK", "HK", "", 0 }, //
MS reserved, prefer yue-HK; do not add unless LanguageTag::simpleExtract() can
handle it to not call liblangtag for rsc!
{ LANGUAGE_YIDDISH, "yi-001", "", "", k0 }, //
MS since rev.15, was "yi-Hebr" reserved, "001"="World"
{ LANGUAGE_FRENCH_WEST_INDIES, "fr-029", "", "", k0 }, //
MS since rev.15, was "Neither defined nor reserved", "029"="Caribbean"
+ { LANGUAGE_USER_INTERSLAVIC_LATIN, "art-x-interslv", "", "", k0 }, //
see discussion in tdf#145853
+ { LANGUAGE_USER_INTERSLAVIC_CYRILLIC, "art-Cyrl-x-interslv", "", "", k0 },
{ LANGUAGE_DONTKNOW, "", "", "", k0 } // marks end
of table
};
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index ae434fd0c06a..39f9abf8de56 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -771,6 +771,8 @@ namespace o3tl
#define LANGUAGE_USER_YIDDISH_ISRAEL LanguageType(0x843D) /*
makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_YIDDISH)) */
#define LANGUAGE_USER_KLINGON LanguageType(0x06AC)
#define LANGUAGE_USER_ENGLISH_ISRAEL LanguageType(0xB409) /*
makeLangID( 0x2D, getPrimaryLanguage( LANGUAGE_ENGLISH_US)) */
+#define LANGUAGE_USER_INTERSLAVIC_LATIN LanguageType(0x06AD)
+#define LANGUAGE_USER_INTERSLAVIC_CYRILLIC LanguageType(0x06AE)
/* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index c6f05ea033e5..9241485e2a7e 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -434,7 +434,9 @@ const std::pair<TranslateId, LanguageType>
STR_ARR_SVT_LANGUAGE_TABLE[] =
{ 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", "Klingon") , LANGUAGE_USER_KLINGON },
- { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Israel)") ,
LANGUAGE_USER_ENGLISH_ISRAEL }
+ { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Israel)") ,
LANGUAGE_USER_ENGLISH_ISRAEL },
+ { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Interslavic Latin") ,
LANGUAGE_USER_INTERSLAVIC_LATIN },
+ { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Interslavic Cyrillic") ,
LANGUAGE_USER_INTERSLAVIC_CYRILLIC }
};
