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

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx |    2 +-
 svtools/source/misc/langtab.src        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4256491ffe48b8be09ec66a003988193e8585584
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Dec 18 18:47:20 2013 +0100

    the MS Serbian Latin Neutral mess
    
    There are two LangID values mapping to Serbian Latin (without country)
    which lead to the UI language selector displaying "sr-Latn" instead of
    "Serbian Latin" because conversion picked the other one. Consistently
    use LANGUAGE_SERBIAN_LATIN_LSO and don't trap into
    LANGUAGE_SERBIAN_LATIN_NEUTRAL (whatever that might be).
    
    Change-Id: I6ae6c2027048c99096b4d9d703a0dc73784b52f1

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 2109928..0cf8328 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -659,7 +659,7 @@ static IsoLanguageScriptCountryEntry const aImplIsoLangScriptEntries[] =
     { LANGUAGE_SERBIAN_LATIN_SAM,                   "sr-Latn", "CS", 0     },   // Serbian Latin in Serbia and Montenegro; note that not all applications may know about the 'CS' reusage mess, see https://en.wikipedia.org/wiki/ISO_3166-2:CS
     { LANGUAGE_SERBIAN_LATIN_SAM,                   "sr-Latn", "YU", 0     },   // legacy Serbian Latin in Yugoslavia
     { LANGUAGE_SERBIAN_LATIN_LSO,                   "sr-Latn", ""  , 0     },
-    { LANGUAGE_SERBIAN_LATIN_NEUTRAL,               "sr-Latn", ""  , 0     },   // MS lists this as 'sr' only, what a mess
+    { LANGUAGE_SERBIAN_LATIN_NEUTRAL,               "sr-Latn", ""  , LANGUAGE_SERBIAN_LATIN_LSO },  // MS lists this as 'sr' only, what a mess
     { LANGUAGE_SERBIAN_CYRILLIC_SERBIA,             "sr-Cyrl", "RS", kSAME },   // MS
     { LANGUAGE_SERBIAN_CYRILLIC_MONTENEGRO,         "sr-Cyrl", "ME", kSAME },   // MS
     { LANGUAGE_SERBIAN_CYRILLIC_BOSNIA_HERZEGOVINA, "sr-Cyrl", "BA", kSAME },   // MS
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 93ebdaa..341fa4a 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -158,7 +158,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Serbian Latin (Serbia)" ; LANGUAGE_USER_SERBIAN_LATIN_SERBIA ; > ;
         < "Serbian Cyrillic (Montenegro)" ; LANGUAGE_USER_SERBIAN_CYRILLIC_MONTENEGRO ; > ;
         < "Serbian Latin (Montenegro)" ; LANGUAGE_USER_SERBIAN_LATIN_MONTENEGRO ; > ;
-        < "Serbian Latin" ; LANGUAGE_SERBIAN_LATIN_NEUTRAL ; > ;
+        < "Serbian Latin" ; LANGUAGE_SERBIAN_LATIN_LSO ; > ;
         < "Sidama" ; LANGUAGE_USER_SIDAMA ; > ;
         < "Sindhi" ; LANGUAGE_SINDHI ; > ;
         < "Slovak" ; LANGUAGE_SLOVAK ; > ;