[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag svtools/inc

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx         |    2 ++
 i18nlangtag/source/isolang/mslangid.cxx        |    8 ++++++--
 i18nlangtag/source/languagetag/languagetag.cxx |    2 +-
 include/i18nlangtag/lang.h                     |    2 ++
 svtools/inc/langtab.hrc                        |    4 +++-
 5 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 10a047ae8a6e5c47edc1ca11ed573f340b249f61
Author: Eike Rathke <erack at redhat.com>
Date:   Fri May 4 00:21:33 2018 +0200

    Add Malay Arabic [ms-Arab-MY] and [ms-Arab-BN] to language list, both CTL
    
    Change-Id: Iac7dddf8b29048c504b9ec695ecd08e5bf12a768
    Reviewed-on: https://gerrit.libreoffice.org/53828
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index c994fd1c7cc0..f2af1092ed42 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -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
 };
 
diff --git a/i18nlangtag/source/isolang/mslangid.cxx b/i18nlangtag/source/isolang/mslangid.cxx
index 6d4b98781640..dc15bf30662e 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -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;
     }
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index 8d9c2424c9b9..d46ff8bba324 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -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;
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index e1645f31d94f..4030651e9123 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -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.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index a054dbe3232c..69f397cfab29 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -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