[Libreoffice-commits] .: i18npool/inc i18npool/source svtools/source

[Caolán McNamara]

 i18npool/inc/i18npool/lang.h        |    1 +
 i18npool/source/isolang/isolang.cxx |    4 +++-
 svtools/source/misc/langtab.src     |    1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit b51eaf4c5083ec35366d18c522a7dd50f9c9b3c0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 14 15:13:46 2010 +0100

    fdo#30773# add support for Kabyle
    
    Stuff Kabyle in as the default member for collective Berber languages using
    Latin. Distinguish it from the LANGUAGE_TAMAZIGHT_LATIN families

diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index fd6a08a..aa1472a 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -351,6 +351,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_TAJIK                      0x0428
 #define LANGUAGE_TAMAZIGHT_ARABIC           0x045F
 #define LANGUAGE_TAMAZIGHT_LATIN            0x085F
+#define LANGUAGE_TAMAZIGHT_TIFINAGH         0x0C5F
 #define LANGUAGE_TAMIL                      0x0449
 #define LANGUAGE_TATAR                      0x0444
 #define LANGUAGE_TELUGU                     0x044A
diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx
index 2ebe2e4..b795bbe 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -384,7 +384,9 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
     { LANGUAGE_ENGLISH_PHILIPPINES,         "en", "PH" },
 //  { LANGUAGE_IBIBIO_NIGERIA,             "nic", "NG" },   // ISO "nic" is only a collective language code
     { LANGUAGE_YI,                          "ii", "CN" },
-//  { LANGUAGE_TAMAZIGHT_LATIN,            "ber", ""   },   // ISO "ber" only collective!
+    { LANGUAGE_TAMAZIGHT_LATIN,            "kab", "DZ" },   // In practice Kabyle is the language used for this
+    { LANGUAGE_TAMAZIGHT_LATIN,            "ber", "DZ" },   // In practice Algeria has standardized on Kabyle as the member of the "ber" collective which gets used there.
+    { LANGUAGE_TAMAZIGHT_TIFINAGH,         "ber", "MA" },   // Morocco is officially using Tifinagh for its Berber languages so store it to distinguish explicitly from LANGUAGE_TAMAZIGHT_LATIN, even though as a collective language its not of much use
 //  { LANGUAGE_TAMAZIGHT_ARABIC,           "ber", ""   },   // ISO "ber" only collective!
     { LANGUAGE_LATIN,                       "la", "VA" },
     { LANGUAGE_OBSOLETE_USER_LATIN,         "la", "VA" },
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 902e365..b28a57e 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -323,6 +323,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Yoruba" ; LANGUAGE_YORUBA ; > ;
         < "Rusyn (Ukraine)" ; LANGUAGE_USER_RUSYN_UKRAINE ; > ;
         < "Rusyn (Slovakia)" ; LANGUAGE_USER_RUSYN_SLOVAKIA ; > ;
+        < "Kabyle Latin" ; LANGUAGE_TAMAZIGHT_LATIN ; > ;
     };
 };