i18nlangtag/source/isolang/isolang.cxx | 1 +
i18nlangtag/source/isolang/mslangid.cxx | 7 +++++--
include/i18nlangtag/lang.h | 1 +
svtools/inc/langtab.hrc | 3 ++-
4 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 6e3877e4da10284d91813cc0b52ea79a7e9c39f0
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Mon Feb 1 16:09:45 2021 +0100
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Mon Feb 1 19:43:13 2021 +0100
Resolves: tdf#139607 Add Pali Thai {pi-Thai} 0x0A67 to CTL language list
Change-Id: Iccd2c93e220c0580ed27d414477b81ebe8efdf45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110257
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 ae1b42ba3ab0..b1dc5dfe4b69 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -725,6 +725,7 @@ IsoLanguageScriptCountryEntry const
aImplIsoLangScriptEntries[] =
{ LANGUAGE_MONGOLIAN_MONGOLIAN_CHINA, "mn-Mong", "CN", k0 },
// macrolanguage code; MS, should actually be mvf-CN
{ LANGUAGE_MONGOLIAN_MONGOLIAN_LSO, "mn-Mong", "" , k0 },
// macrolanguage code
{ LANGUAGE_USER_PALI_LATIN, "pi-Latn", "" , k0 },
+ { LANGUAGE_USER_PALI_THAI, "pi-Thai", "" , k0 },
{ LANGUAGE_USER_KARAKALPAK_LATIN, "kaa-Latn", "UZ", k0 },
{ LANGUAGE_TAJIK, "tg-Cyrl", "TJ", k0 },
// MS
{ LANGUAGE_TAJIK_LSO, "tg-Cyrl", "" , k0 },
// MS
diff --git a/i18nlangtag/source/isolang/mslangid.cxx
b/i18nlangtag/source/isolang/mslangid.cxx
index 0d76ba3b8288..ae6cd6291672 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -310,7 +310,9 @@ bool MsLangId::needsSequenceChecking( LanguageType nLang )
primary(LANGUAGE_BURMESE),
primary(LANGUAGE_KHMER),
primary(LANGUAGE_LAO),
- primary(LANGUAGE_THAI));
+ primary(LANGUAGE_THAI))
+ || nLang.anyOf(
+ LANGUAGE_USER_PALI_THAI);
}
@@ -335,7 +337,8 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
LANGUAGE_USER_MANCHU,
LANGUAGE_USER_XIBE,
LANGUAGE_USER_MALAY_ARABIC_MALAYSIA,
- LANGUAGE_USER_MALAY_ARABIC_BRUNEI))
+ LANGUAGE_USER_MALAY_ARABIC_BRUNEI,
+ LANGUAGE_USER_PALI_THAI))
{
nScript = css::i18n::ScriptType::COMPLEX;
}
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index d3b0ece0bce6..73f839eac9ee 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -762,6 +762,7 @@ namespace o3tl
#define LANGUAGE_USER_SUNDANESE LanguageType(0x06A8)
#define LANGUAGE_USER_YAKA_DRCONGO LanguageType(0x06A9)
#define LANGUAGE_USER_ENGLISH_KENYA LanguageType(0xAC09) /*
makeLangID( 0x2B, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
+#define LANGUAGE_USER_PALI_THAI LanguageType(0x0A67) /*
makeLangID( 0x02, getPrimaryLanguage( LANGUAGE_USER_PALI_LATIN)) */
/* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 47bce2b1aa76..49e0f8672945 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -427,7 +427,8 @@ const std::pair<const char*, LanguageType>
STR_ARR_SVT_LANGUAGE_TABLE[] =
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Minangkabau") ,
LANGUAGE_USER_MINANGKABAU },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sundanese") , LANGUAGE_USER_SUNDANESE
},
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Hong Kong)") ,
LANGUAGE_ENGLISH_HONG_KONG_SAR },
- { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Kenya)") ,
LANGUAGE_USER_ENGLISH_KENYA }
+ { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Kenya)") ,
LANGUAGE_USER_ENGLISH_KENYA },
+ { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Pali Thai") , LANGUAGE_USER_PALI_THAI
}
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
