mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Malay Arabic [ms-Arab-MY] and [ms-Arab-BN] to language list, both CTL

Browse Source 
Change-Id: Iac7dddf8b29048c504b9ec695ecd08e5bf12a768
Reviewed-on: https://gerrit.libreoffice.org/53828
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
This commit is contained in:
Eike Rathke 2018-05-04 00:21:33 +02:00
parent 672501c91f
commit 10a047ae8a
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
i18nlangtag/source/isolang/isolang.cxx
View File

@ -758,6 +758,8 @@ static IsoLanguageScriptCountryEntry const aImplIsoLangScriptEntries[] =
{ LANGUAGE_USER_CREE_PLAINS_LATIN, "crk-Latn", "CN", kSAME }, // erroneous tdf#73973
{ LANGUAGE_USER_CREE_PLAINS_SYLLABICS, "crk-Cans", "CN", kSAME }, // erroneous tdf#73973
{ LANGUAGE_USER_HUNGARIAN_ROVAS, "hu-Hung", "HU", k0 },
{ LANGUAGE_USER_MALAY_ARABIC_MALAYSIA, "ms-Arab", "MY", k0 },
{ LANGUAGE_USER_MALAY_ARABIC_BRUNEI, "ms-Arab", "BN", k0 },
{ LANGUAGE_DONTKNOW, "", "" , k0 } // marks end of table
};

8
i18nlangtag/source/isolang/mslangid.cxx
View File

@ -215,7 +215,9 @@ bool MsLangId::isRightToLeft( LanguageType nLang )
LANGUAGE_KURDISH_ARABIC_LSO,
LANGUAGE_USER_KURDISH_SOUTHERN_IRAN,
LANGUAGE_USER_KURDISH_SOUTHERN_IRAQ,
LANGUAGE_USER_HUNGARIAN_ROVAS))
LANGUAGE_USER_HUNGARIAN_ROVAS,
LANGUAGE_USER_MALAY_ARABIC_MALAYSIA,
LANGUAGE_USER_MALAY_ARABIC_BRUNEI))
{
return true;
}
@ -332,7 +334,9 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
LANGUAGE_USER_KYRGYZ_CHINA,
LANGUAGE_USER_HUNGARIAN_ROVAS,
LANGUAGE_USER_MANCHU,
LANGUAGE_USER_XIBE))
LANGUAGE_USER_XIBE,
LANGUAGE_USER_MALAY_ARABIC_MALAYSIA,
LANGUAGE_USER_MALAY_ARABIC_BRUNEI))
{
nScript = css::i18n::ScriptType::COMPLEX;
}

2
i18nlangtag/source/languagetag/languagetag.cxx
View File

@ -3117,7 +3117,7 @@ LanguageTag makeLanguageTagFromAppleLanguageId(AppleLanguageId nLanguage)
nLang = LANGUAGE_MALAY_MALAYSIA;
break;
case AppleLanguageId::MALAY_ARABIC:
return LanguageTag("ms-Arab");
nLang = LANGUAGE_USER_MALAY_ARABIC_MALAYSIA;
break;
case AppleLanguageId::AMHARIC:
nLang = LANGUAGE_AMHARIC_ETHIOPIA;

2
include/i18nlangtag/lang.h
View File

@ -740,6 +740,8 @@ namespace o3tl
#define LANGUAGE_USER_ARMENIAN_IRAN LanguageType(0x842B) /* makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_ARMENIAN)) */
#define LANGUAGE_USER_ARMENIAN_WESTERN LanguageType(0x069F)
#define LANGUAGE_USER_ARMENIAN_CLASSIC LanguageType(0x06A0)
#define LANGUAGE_USER_MALAY_ARABIC_MALAYSIA LanguageType(0x803E) /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_MALAY_MALAYSIA)) */
#define LANGUAGE_USER_MALAY_ARABIC_BRUNEI LanguageType(0x843E) /* makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_MALAY_BRUNEI_DARUSSALAM)) */
/* XXX Add new user defined LCIDs ^^^ there.

4
svtools/inc/langtab.hrc
View File

@ -410,7 +410,9 @@ const std::pair<const char*, LanguageType> STR_ARR_SVT_LANGUAGE_TABLE[] =
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Eastern (Russia)") , LANGUAGE_USER_ARMENIAN_RUSSIA },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Eastern (Iran)") , LANGUAGE_USER_ARMENIAN_IRAN },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Western (Armenia)") , LANGUAGE_USER_ARMENIAN_WESTERN },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Classic (Armenia)") , LANGUAGE_USER_ARMENIAN_CLASSIC }
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Classic (Armenia)") , LANGUAGE_USER_ARMENIAN_CLASSIC },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Malay Arabic (Malaysia)") , LANGUAGE_USER_MALAY_ARABIC_MALAYSIA },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Malay Arabic (Brunei Darussalam)") , LANGUAGE_USER_MALAY_ARABIC_BRUNEI }
};
#endif