subject:"\[Libreoffice\-commits\] core.git\: i18nlangtag\/source include\/i18nlangtag"

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

2023-04-16 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |2 +-
 include/i18nlangtag/lang.h |2 +-
 svtools/inc/langtab.hrc|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8a11d2e0b1ff09b3637a369eb468a15288dad7e8
Author: Eike Rathke 
AuthorDate: Sun Apr 16 12:33:09 2023 +0200
Commit: Eike Rathke 
CommitDate: Sun Apr 16 14:11:56 2023 +0200

Related: tdf#154832 Official name is Morisyen

Change-Id: Ieae2d95318184e76cd8e533ba37d5a31eb9d2a1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150453
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 3c97eabe4cf8..242785ade4ae 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -681,7 +681,7 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_SPANISH_PHILIPPINES,"es", "PH", k0},
 { LANGUAGE_USER_ENGLISH_ANTIGUA_BARBUDA,"en", "AG", k0},
 { LANGUAGE_USER_SARAIKI,   "skr", "PK", k0},
-{ LANGUAGE_USER_CREOLE_MAURITIUS,  "mfe", "MU", k0},
+{ LANGUAGE_USER_MORISYEN,  "mfe", "MU", k0},
 // Add new languages ^^^ there.
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 2c5262409485..c9870969c6a9 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -784,7 +784,7 @@ namespace o3tl
 #define LANGUAGE_USER_ENGLISH_ANTIGUA_BARBUDA LanguageType(0xB809)  /* 
makeLangID( 0x2E, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_SARAIKI   LanguageType(0x06B0)
 #define LANGUAGE_USER_ROHINGYA_HANIFI   LanguageType(0x06B1)
-#define LANGUAGE_USER_CREOLE_MAURITIUS  LanguageType(0x06B2)
+#define LANGUAGE_USER_MORISYEN  LanguageType(0x06B2)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 11c509f24ae7..92b7e954349a 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -442,7 +442,7 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Portuguese (Mozambique)") , 
LANGUAGE_USER_PORTUGUESE_MOZAMBIQUE },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Saraiki") , LANGUAGE_USER_SARAIKI },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Rohingya Hanifi") , 
LANGUAGE_USER_ROHINGYA_HANIFI },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Creole (Mauritius)") , 
LANGUAGE_USER_CREOLE_MAURITIUS }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Morisyen") , LANGUAGE_USER_MORISYEN }
 };

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

2023-03-15 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx  |1 +
 i18nlangtag/source/isolang/mslangid.cxx |2 ++
 include/i18nlangtag/lang.h  |1 +
 svtools/inc/langtab.hrc |3 ++-
 4 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 48fac1585feaad3982c2bf4ec2f831d53def21b7
Author: Eike Rathke 
AuthorDate: Wed Mar 15 11:04:55 2023 +0100
Commit: Eike Rathke 
CommitDate: Wed Mar 15 17:01:36 2023 +

Resolves: tdf#154031 Add Rohingya Hanifi {rhg-Rohg-MM} [0x06B1] CTL, RTL

Change-Id: Icb18349ceb4614e777bed15bbc2108e85a0db54d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148911
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index e9b140f447ff..192f979dcc0b 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -778,6 +778,7 @@ IsoLanguageScriptCountryEntry const 
aImplIsoLangScriptEntries[] =
 { LANGUAGE_KAZAKH_CYRILLIC_LSO, "kk-Cyrl", ""  , k0},  
 // MS reserved
 { LANGUAGE_KANURI_NIGERIA,  "kr-Latn", "NG", k0},  
 // macrolanguage code; MS since rev.15
 { LANGUAGE_TAMAZIGHT_ARABIC_MOROCCO,   "tzm-Arab", "MA", k0},  
 // MS since rev.15, was reserved
+{ LANGUAGE_USER_ROHINGYA_HANIFI,   "rhg-Rhog", "MM", k0},
 };
 
 Bcp47CountryEntry const aImplBcp47CountryEntries[] =
diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index caa983416a3d..aa913a7f7ff4 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -260,6 +260,7 @@ bool MsLangId::isRightToLeft( LanguageType nLang )
 LANGUAGE_USER_KURDISH_SOUTHERN_IRAQ,
 LANGUAGE_USER_HUNGARIAN_ROVAS,
 LANGUAGE_USER_MALAY_ARABIC_MALAYSIA,
+LANGUAGE_USER_ROHINGYA_HANIFI,
 LANGUAGE_USER_MALAY_ARABIC_BRUNEI))
 {
 return true;
@@ -382,6 +383,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
  LANGUAGE_USER_XIBE,
  LANGUAGE_USER_MALAY_ARABIC_MALAYSIA,
  LANGUAGE_USER_MALAY_ARABIC_BRUNEI,
+ LANGUAGE_USER_ROHINGYA_HANIFI,
  LANGUAGE_USER_PALI_THAI))
 {
 nScript = css::i18n::ScriptType::COMPLEX;
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 5a724644dcb4..6dcff976fa9a 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -783,6 +783,7 @@ namespace o3tl
 #define LANGUAGE_USER_CATALAN_ITALY LanguageType(0x8C03)  /* 
makeLangID( 0x23, getPrimaryLanguage( LANGUAGE_CATALAN)) */
 #define LANGUAGE_USER_ENGLISH_ANTIGUA_BARBUDA LanguageType(0xB809)  /* 
makeLangID( 0x2E, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_SARAIKI   LanguageType(0x06B0)
+#define LANGUAGE_USER_ROHINGYA_HANIFI   LanguageType(0x06B1)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index a6c411bab910..b605e0ef061f 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -440,7 +440,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Interslavic Cyrillic") , 
LANGUAGE_USER_INTERSLAVIC_CYRILLIC },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Pennsylvania Dutch") , 
LANGUAGE_USER_PENNSYLVANIA_DUTCH },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Portuguese (Mozambique)") , 
LANGUAGE_USER_PORTUGUESE_MOZAMBIQUE },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Saraiki") , LANGUAGE_USER_SARAIKI }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Saraiki") , LANGUAGE_USER_SARAIKI },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Rohingya Hanifi") , 
LANGUAGE_USER_ROHINGYA_HANIFI }
 };

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

2023-02-17 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx  |1 +
 i18nlangtag/source/isolang/mslangid.cxx |4 +++-
 include/i18nlangtag/lang.h  |1 +
 svtools/inc/langtab.hrc |3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 9042340ef99e099a87630eea089b4cae7e38649e
Author: Eike Rathke 
AuthorDate: Fri Feb 17 18:03:23 2023 +0100
Commit: Eike Rathke 
CommitDate: Fri Feb 17 22:52:15 2023 +

Add Saraiki {skr-PK} [0x06B0] to language list, CTL, RTL

Change-Id: I2bc1462acbcc69023586333a4c6b10ba415e5ca2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147233
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index d64b00f0694a..2c9784a9c8c6 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -679,6 +679,7 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_SPANISH_EQUATORIAL_GUINEA, "es", "GQ", k0},
 { LANGUAGE_USER_SPANISH_PHILIPPINES,"es", "PH", k0},
 { LANGUAGE_USER_ENGLISH_ANTIGUA_BARBUDA,"en", "AG", k0},
+{ LANGUAGE_USER_SARAIKI,   "skr", "PK", k0},
 // Add new languages ^^^ there.
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index cac12347fc54..caa983416a3d 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -246,7 +246,8 @@ bool MsLangId::isRightToLeft( LanguageType nLang )
 primary(LANGUAGE_SINDHI),
 primary(LANGUAGE_UIGHUR_CHINA),
 primary(LANGUAGE_USER_KYRGYZ_CHINA),
-primary(LANGUAGE_USER_NKO)))
+primary(LANGUAGE_USER_NKO),
+primary(LANGUAGE_USER_SARAIKI)))
 {
 return true;
 }
@@ -443,6 +444,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
 primary(LANGUAGE_USER_LIMBU  ),
 primary(LANGUAGE_USER_MAITHILI_INDIA ),
 primary(LANGUAGE_USER_NKO),
+primary(LANGUAGE_USER_SARAIKI),
 primary(LANGUAGE_YIDDISH )))
 {
 nScript = css::i18n::ScriptType::COMPLEX;
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 55be18878209..5a724644dcb4 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -782,6 +782,7 @@ namespace o3tl
 #define LANGUAGE_USER_CATALAN_FRANCELanguageType(0x8803)  /* 
makeLangID( 0x22, getPrimaryLanguage( LANGUAGE_CATALAN)) */
 #define LANGUAGE_USER_CATALAN_ITALY LanguageType(0x8C03)  /* 
makeLangID( 0x23, getPrimaryLanguage( LANGUAGE_CATALAN)) */
 #define LANGUAGE_USER_ENGLISH_ANTIGUA_BARBUDA LanguageType(0xB809)  /* 
makeLangID( 0x2E, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
+#define LANGUAGE_USER_SARAIKI   LanguageType(0x06B0)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 5d1ed4a7e987..a6c411bab910 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -439,7 +439,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Interslavic Latin") , 
LANGUAGE_USER_INTERSLAVIC_LATIN },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Interslavic Cyrillic") , 
LANGUAGE_USER_INTERSLAVIC_CYRILLIC },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Pennsylvania Dutch") , 
LANGUAGE_USER_PENNSYLVANIA_DUTCH },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Portuguese (Mozambique)") , 
LANGUAGE_USER_PORTUGUESE_MOZAMBIQUE }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Portuguese (Mozambique)") , 
LANGUAGE_USER_PORTUGUESE_MOZAMBIQUE },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Saraiki") , LANGUAGE_USER_SARAIKI }
 };

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

2023-01-06 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |7 ++-
 include/i18nlangtag/lang.h |6 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 54d25b36c0bf3dcc715f2098ad658bb113e868ec
Author: Eike Rathke 
AuthorDate: Fri Jan 6 18:53:11 2023 +0100
Commit: Eike Rathke 
CommitDate: Sat Jan 7 02:20:26 2023 +

Related: tdf#152781 Pin some known on-the-fly langtags to user-defined LCIDs

These are pulled in by either our own bundled extension
dictionaries (es-*, ca-*), or hunspell dictionary (en-AG), but
have no language listbox entry (and don't need one until someone
insists) thus are generated.

So if selected and in case stored in binary MS file formats ensure
a stable back-and-forth conversion. The on-the-fly 0x7e1, 0x7e2,
... are generated arbitrarily in order as encountered.

Change-Id: I0dc72bf1301b26d5b82e1b271c58fc77c82eea0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145161
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 2bd6b5e5e229..d64b00f0694a 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -343,7 +343,9 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_SINDHI,  "sd", "IN", kSAME },// 
Devanagari script
 { LANGUAGE_BELARUSIAN,  "be", "BY", k0},
 { LANGUAGE_CATALAN, "ca", "ES", k0},// Spain 
(default)
-{ LANGUAGE_CATALAN, "ca", "AD", k0},// Andorra
+{ LANGUAGE_USER_CATALAN_ANDORRA,"ca", "AD", k0},
+{ LANGUAGE_USER_CATALAN_FRANCE, "ca", "FR", k0},
+{ LANGUAGE_USER_CATALAN_ITALY,  "ca", "IT", k0},
 //LANGUAGE_CATALAN_VALENCIAN ca-ES-valencia Bcp47CountryEntry takes 
precedence
 { LANGUAGE_CATALAN_VALENCIAN,   "ca", "XV", kSAME },// XV: ISO 
3166 user-assigned; old workaround for UI localization only, in case it escaped 
to document content
 { LANGUAGE_CATALAN_VALENCIAN,  "qcv", "ES", kSAME },// qcv: 
ISO 639-3 reserved-for-local-use; old UI localization quirk only, in case it 
escaped to document content
@@ -674,6 +676,9 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_ENGLISH_ISRAEL, "en", "IL", k0},
 { LANGUAGE_USER_PENNSYLVANIA_DUTCH,"pdc", "US", k0},
 { LANGUAGE_USER_PORTUGUESE_MOZAMBIQUE,  "pt", "MZ", k0},
+{ LANGUAGE_USER_SPANISH_EQUATORIAL_GUINEA, "es", "GQ", k0},
+{ LANGUAGE_USER_SPANISH_PHILIPPINES,"es", "PH", k0},
+{ LANGUAGE_USER_ENGLISH_ANTIGUA_BARBUDA,"en", "AG", k0},
 // Add new languages ^^^ there.
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 59e20669cddd..55be18878209 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -776,6 +776,12 @@ namespace o3tl
 #define LANGUAGE_USER_INTERSLAVIC_CYRILLIC  LanguageType(0x06AE)
 #define LANGUAGE_USER_PENNSYLVANIA_DUTCHLanguageType(0x06AF)
 #define LANGUAGE_USER_PORTUGUESE_MOZAMBIQUE LanguageType(0x8416)  /* 
makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_PORTUGUESE)) */
+#define LANGUAGE_USER_SPANISH_EQUATORIAL_GUINEA LanguageType(0x840A)  /* 
makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_SPANISH)) */
+#define LANGUAGE_USER_SPANISH_PHILIPPINES   LanguageType(0x880A)  /* 
makeLangID( 0x22, getPrimaryLanguage( LANGUAGE_SPANISH)) */
+#define LANGUAGE_USER_CATALAN_ANDORRA   LanguageType(0x8403)  /* 
makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_CATALAN)) */
+#define LANGUAGE_USER_CATALAN_FRANCELanguageType(0x8803)  /* 
makeLangID( 0x22, getPrimaryLanguage( LANGUAGE_CATALAN)) */
+#define LANGUAGE_USER_CATALAN_ITALY LanguageType(0x8C03)  /* 
makeLangID( 0x23, getPrimaryLanguage( LANGUAGE_CATALAN)) */
+#define LANGUAGE_USER_ENGLISH_ANTIGUA_BARBUDA LanguageType(0xB809)  /* 
makeLangID( 0x2E, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 
 
 /* XXX Add new user defined LCIDs ^^^ there.

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

2023-01-05 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx  |3 ++-
 i18nlangtag/source/isolang/mslangid.cxx |2 ++
 include/i18nlangtag/lang.h  |3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 375630ae76f46c096421dfadee8d37b406bc10c5
Author: Eike Rathke 
AuthorDate: Thu Jan 5 18:12:59 2023 +0100
Commit: Eike Rathke 
CommitDate: Thu Jan 5 21:35:29 2023 +

Related: tdf#152781 Stab the 0xE40A {es} vs Latin America quirk

First, the LANGUAGE_SPANISH_LATIN_AMERICA 0xE40A is not a MS
system LCID, it is Spanish 0x00a with sublanguage 0x39 => user
defined (in the range 0x20 to 0x3f). Meanwhile MS reserved 0x580A
for {es-419}, so obsolete the legacy 0xE40A definition and replace
with 0x580A when encountered.

Second, due to the legacy plain {es} mapping being present, an
encountered 'es' (from our bundled dictionary extension) got
mapped to 0xE40A instead of 0xA and thus was added to the
character language listbox (that otherwise suppresses LCIDs
without sublanguage), resulting in a "Spanish {es}" entry.

Besides, it's currently not clear how to actually proceed with
such dictionary situation when, for example, both 'es-ES' and 'es'
dictionaries are present and the 'es' dictionary apparently is
meant as base and contains entries the 'es-ES' does not or 'es-ES'
overrides entries. It might be it's handled half-way in
linguistics, but maybe not even that, I didn't investigate.

Change-Id: Id859731ba5efa65d4a6de429b7f52027aa69327c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145093
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index c5259a53886d..2bd6b5e5e229 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -273,7 +273,6 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_SPANISH_NICARAGUA,   "es", "NI", k0},
 { LANGUAGE_SPANISH_PUERTO_RICO, "es", "PR", k0},
 { LANGUAGE_SPANISH_UNITED_STATES,   "es", "US", k0},
-{ LANGUAGE_SPANISH_LATIN_AMERICA,   "es", ""  , k0},
 { LANGUAGE_TURKISH, "tr", "TR", k0},
 { LANGUAGE_UKRAINIAN,   "uk", "UA", k0},
 { LANGUAGE_VIETNAMESE,  "vi", "VN", k0},
@@ -791,6 +790,8 @@ Bcp47CountryEntry const aImplBcp47CountryEntries[] =
 //  { LANGUAGE_YUE_CHINESE_HONGKONG, "zh-yue-HK", "HK", "", 0 },   // 
MS reserved, prefer yue-HK; do not add unless LanguageTag::simpleExtract() can 
handle it to not call liblangtag for rsc!
 { LANGUAGE_YIDDISH,  "yi-001",   "", "", k0 },  // 
MS since rev.15, was "yi-Hebr" reserved, "001"="World"
 { LANGUAGE_FRENCH_WEST_INDIES,   "fr-029",   "", "", k0 },  // 
MS since rev.15, was "Neither defined nor reserved", "029"="Caribbean"
+{ LANGUAGE_SPANISH_LATIN_AMERICA,"es-419",   "", "", k0 },  // 
MS reserved since rev.15, "419"="Latin America and the Caribbean"
+{ LANGUAGE_OBSOLETE_USER_SPANISH_LATIN_AMERICA, "es-419", "", "", 
LANGUAGE_SPANISH_LATIN_AMERICA },
 { LANGUAGE_USER_INTERSLAVIC_LATIN, "art-Latn-x-interslv", "", "", k0 },  
// see discussion in tdf#145853
 { LANGUAGE_USER_INTERSLAVIC_CYRILLIC, "art-Cyrl-x-interslv", "", "", k0 },
 { LANGUAGE_DONTKNOW,"", "", "", k0 }// marks end 
of table
diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index 4e446d568858..cac12347fc54 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -567,6 +567,8 @@ LanguageType MsLangId::getReplacementForObsoleteLanguage( 
LanguageType nLang )
 nLang = LANGUAGE_KURDISH_ARABIC_IRAQ;
 else if (nLang == LANGUAGE_OBSOLETE_USER_SPANISH_CUBA)
 nLang = LANGUAGE_SPANISH_CUBA;
+else if (nLang == LANGUAGE_OBSOLETE_USER_SPANISH_LATIN_AMERICA)
+nLang = LANGUAGE_SPANISH_LATIN_AMERICA;
 
 // The following are not strictly obsolete but should be mapped to a
 // replacement locale when encountered.
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 158a7c7fe5be..59e20669cddd 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -389,7 +389,6 @@ namespace o3tl
 #define LANGUAGE_SPANISH_EL_SALVADORLanguageType(0x440A)
 #define LANGUAGE_SPANISH_GUATEMALA  LanguageType(0x100A)
 #define LANGUAGE_SPANISH_HONDURAS   LanguageType(0x480A)
-#define LANGUAGE_SPANISH_LATIN_AMERICA  LanguageType(0xE40A)  /* no locale 
possible */
 #define LANGUAGE_SPANISH_MEXICANLanguageType(0x080A)
 #define LANGUAGE_SPANISH_MODERN LanguageType(0x0C0A)
 #define LANGUAGE_SPANISH_NICARAGUA  LanguageType(0x4C0A)
@@ -532,6 +531,8 @@ namespace o3tl

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

2022-09-01 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/languagetag/languagetag.cxx |   21 ++---
 include/i18nlangtag/languagetag.hxx|6 --
 svx/source/dialog/langbox.cxx  |2 +-
 3 files changed, 19 insertions(+), 10 deletions(-)

New commits:
commit 24d382a18ec2ade0d9e9b9c6e6c3e86bed6cde14
Author: Eike Rathke 
AuthorDate: Wed Aug 31 21:54:51 2022 +0200
Commit: Eike Rathke 
CommitDate: Thu Sep 1 11:30:56 2022 +0200

Resolves: tdf#150370 Accept 'art-x-...' private-use input in language box

... for artificial constructed languages.

Change-Id: Ifd0f2ca63738eb9bbe78361cd3fdf507f3e397f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139135
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 0b1ab1ac5a3e..239215a187c1 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -2868,28 +2868,35 @@ bool LanguageTag::isValidBcp47( const OUString& 
rString, OUString* o_pCanonicali
 bValid = true;
 if (ePrivateUse != PrivateUse::ALLOW)
 {
-const lt_string_t* pPrivate = lt_tag_get_privateuse( 
aVar.mpLangtag);
-if (pPrivate && lt_string_length( pPrivate) > 0)
-bValid = false;
-else
+do
 {
+const char* pLang = nullptr;
 const lt_lang_t* pLangT = lt_tag_get_language( 
aVar.mpLangtag);
 if (pLangT)
 {
-const char* pLang = lt_lang_get_tag( pLangT);
+pLang = lt_lang_get_tag( pLangT);
 if (pLang && strcmp( pLang, I18NLANGTAG_QLT_ASCII) == 
0)
 {
-// Disallow 'qlt' privateuse code to prevent
+// Disallow 'qlt' localuse code to prevent
 // confusion with our internal usage.
 bValid = false;
+break;
 }
 }
+if (ePrivateUse == PrivateUse::ALLOW_ART_X && pLang && 
strcmp( pLang, "art") == 0)
+{
+// Allow anything 'art' which includes 'art-x-...' and 
'art-Latn-x-...'.
+break;
+}
+const lt_string_t* pPrivate = lt_tag_get_privateuse( 
aVar.mpLangtag);
+if (pPrivate && lt_string_length( pPrivate) > 0)
+bValid = false;
 }
+while (false);
 }
 if (o_pCanonicalized)
 *o_pCanonicalized = OUString::createFromAscii( pTag);
 free( pTag);
-return bValid;
 }
 }
 else
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index 5b9a43c05d81..79ffc28d771a 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -518,8 +518,10 @@ public:
 /** Enums to be used with isValidBcp47(). */
 enum PrivateUse
 {
-ALLOW = 0,
-DISALLOW
+ALLOW = 0,  ///< Allow all private-use and local-use including (!) 
'qlt' local-use.
+DISALLOW,   ///< Disallow all private-use and 'qlt' local-use, 
other 'qaa' to 'qtz' local-use are allowed.
+ALLOW_ART_X ///< Disallow all private-use and 'qlt' local-use, but 
allow 'art-x-...' private-use
+///  for artificial constructed languages (and 
'art-Latn-x-...' and other scripts).
 };
 
 /** If rString represents a valid BCP 47 language tag.
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index ead5f11404a8..5db46c695493 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -430,7 +430,7 @@ IMPL_LINK(SvxLanguageBox, ChangeHdl, weld::ComboBox&, 
rControl, void)
 else
 {
 OUString aCanonicalized;
-bool bValid = LanguageTag::isValidBcp47( aStr, 
, LanguageTag::PrivateUse::DISALLOW);
+bool bValid = LanguageTag::isValidBcp47( aStr, 
, LanguageTag::PrivateUse::ALLOW_ART_X);
 m_eEditedAndValid = (bValid ? EditedAndValid::Valid : 
EditedAndValid::Invalid);
 if (bValid && aCanonicalized != aStr)
 {

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

2022-04-28 Thread Noel Grandin (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |   28 ++--
 include/i18nlangtag/mslangid.hxx   |4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 6c724e18c2af227c2ad865342531ff35b0d511ac
Author: Noel Grandin 
AuthorDate: Wed Apr 27 16:09:10 2022 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 28 11:45:56 2022 +0200

use more string_view in i18nlangtag

Change-Id: I92e3d60180c31d765994a2212e1c4547c09c93d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133517
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index e8a50c6ea02f..d374bcd62213 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -1455,34 +1455,34 @@ IsoLangGLIBCModifiersEntry const 
aImplIsoLangGLIBCModifiersEntries[] =
 
 // static
 LanguageType MsLangId::convertUnxByteStringToLanguage(
-const OString& rString )
+std::string_view rString )
 {
 OString  aLang;
 OString  aCountry;
 OString  aAtString;
 
-sal_Int32  nLangSepPos= rString.indexOf( '_' );
-sal_Int32  nCountrySepPos = rString.indexOf( '.' );
-sal_Int32  nAtPos = rString.indexOf( '@' );
+size_t  nLangSepPos= rString.find( '_' );
+size_t  nCountrySepPos = rString.find( '.' );
+size_t  nAtPos = rString.find( '@' );
 
-if (nCountrySepPos < 0)
+if (nCountrySepPos == std::string_view::npos)
 nCountrySepPos = nAtPos;
-if (nCountrySepPos < 0)
-nCountrySepPos = rString.getLength();
+if (nCountrySepPos == std::string_view::npos)
+nCountrySepPos = rString.size();
 
-if (nAtPos >= 0)
-aAtString = rString.copy( nAtPos+1 );
+if (nAtPos != std::string_view::npos)
+aAtString = OString(rString.substr( nAtPos+1 ));
 
-if (((nLangSepPos >= 0) && (nLangSepPos > nCountrySepPos)) || (nLangSepPos 
< 0))
+if (((nLangSepPos != std::string_view::npos) && (nLangSepPos > 
nCountrySepPos)) || (nLangSepPos == std::string_view::npos))
 {
 // eg. "el.sun_eu_greek", "tchinese", "es.ISO8859-15"
-aLang= rString.copy( 0, nCountrySepPos );
+aLang= OString(rString.substr( 0, nCountrySepPos ));
 }
-else if ( nLangSepPos >= 0 )
+else if ( nLangSepPos != std::string_view::npos )
 {
 // well formed iso names like "en_US.UTF-8", "sh_BA.ISO8859-2@bosnia"
-aLang= rString.copy( 0, nLangSepPos );
-aCountry = rString.copy( nLangSepPos+1, nCountrySepPos - nLangSepPos - 
1);
+aLang= OString(rString.substr( 0, nLangSepPos ));
+aCountry = OString(rString.substr( nLangSepPos+1, nCountrySepPos - 
nLangSepPos - 1));
 }
 
 //  if there is a glibc modifier, first look for exact match in modifier 
table
diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx
index aee1f23eb816..cb2e244556b1 100644
--- a/include/i18nlangtag/mslangid.hxx
+++ b/include/i18nlangtag/mslangid.hxx
@@ -120,7 +120,7 @@ public:
 // TODO: refactor to LanguageTag, used only in
 // i18npool/source/isolang/inunx.cxx to convert Unix locale string
 
-static LanguageType convertUnxByteStringToLanguage( const OString& rString 
);
+static LanguageType convertUnxByteStringToLanguage( std::string_view 
rString );
 
 
 static LanguageType resolveSystemLanguageByScriptType( LanguageType nLang, 
sal_Int16 nType );
@@ -245,7 +245,7 @@ public:
 const css::lang::Locale & rLocale );
 
 friend LanguageType MsLangId::convertUnxByteStringToLanguage(
-const OString& rString );
+std::string_view rString );
 
 
 /** Convert a Locale to a LanguageType with handling of an empty

[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag include/vcl sfx2/source starmath/inc starmath/source svl/source sw/source unotools/source vcl/source

2022-03-24 Thread Noel Grandin (via logerrit)

 i18nlangtag/source/languagetag/languagetag.cxx |4 +--
 include/i18nlangtag/languagetag.hxx|9 ++-
 include/vcl/TaskStopwatch.hxx  |9 +++
 include/vcl/menu.hxx   |2 -
 sfx2/source/dialog/StyleList.cxx   |2 -
 sfx2/source/dialog/templdlg.cxx|   11 +++--
 sfx2/source/inc/templdgi.hxx   |2 -
 starmath/inc/edit.hxx  |2 -
 starmath/source/dialog.cxx |4 +--
 starmath/source/edit.cxx   |4 +--
 svl/source/misc/adrparse.cxx   |   30 +
 svl/source/numbers/numfmuno.cxx|2 -
 sw/source/uibase/docvw/romenu.cxx  |2 -
 sw/source/uibase/lingu/olmenu.cxx  |4 +--
 unotools/source/i18n/localedatawrapper.cxx |   29 ++--
 vcl/source/window/menu.cxx |4 +--
 16 files changed, 47 insertions(+), 73 deletions(-)

New commits:
commit ceb8f5d62c7afc5547c9a6de8eb570a11b5fbd67
Author: Noel Grandin 
AuthorDate: Thu Mar 24 08:54:35 2022 +0200
Commit: Noel Grandin 
CommitDate: Thu Mar 24 15:06:24 2022 +0100

loplugin:constantparam

Change-Id: I86592be0717c062a918108bf4437074b0f70b372
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132029
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 29c85cd710fc..f61ccc8ec235 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -2828,9 +2828,9 @@ css::lang::Locale 
LanguageTag::convertToLocaleWithFallback( const OUString& rBcp
 
 
 // static
-LanguageType LanguageTag::convertToLanguageTypeWithFallback( const 
css::lang::Locale& rLocale, bool bResolveSystem )
+LanguageType LanguageTag::convertToLanguageTypeWithFallback( const 
css::lang::Locale& rLocale )
 {
-if (rLocale.Language.isEmpty() && !bResolveSystem)
+if (rLocale.Language.isEmpty())
 return LANGUAGE_SYSTEM;
 
 return LanguageTag( rLocale).makeFallback().getLanguageType();
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index 500f84da00f7..3b5fb3d6d445 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -510,13 +510,10 @@ public:
 
 /** Convert Locale to MS-LangID with fallback.
 
-@param bResolveSystem
-   If TRUE, resolve an empty language tag denoting the system
-   locale to the real locale used and fallback.
-   If FALSE, return LANGUAGE_SYSTEM for such a tag and do not 
fallback.
+Resolves an empty language tag denoting the system
+locale to LANGUAGE_SYSTEM and does not fallback.
  */
-static LanguageType convertToLanguageTypeWithFallback( const 
css::lang::Locale& rLocale,
-   bool bResolveSystem 
= true );
+static LanguageType convertToLanguageTypeWithFallback( const 
css::lang::Locale& rLocale );
 
 /** If rString represents a valid BCP 47 language tag.
 
diff --git a/include/vcl/TaskStopwatch.hxx b/include/vcl/TaskStopwatch.hxx
index 1ca2c21a7e46..b27b3a316abe 100644
--- a/include/vcl/TaskStopwatch.hxx
+++ b/include/vcl/TaskStopwatch.hxx
@@ -39,14 +39,14 @@ class VCL_DLLPUBLIC TaskStopwatch
 bool m_bConsiderLastIterTime;
 VclInputFlags m_eInputStop;
 
-bool nextIter(bool bQueryOnly)
+bool nextIter()
 {
 sal_uInt64 nCurTicks = tools::Time::GetSystemTicks();
 // handle system ticks wrap as exceeded time slice
 if (nCurTicks < m_nStartTicks)
 return false;
 
-if (!bQueryOnly && m_bConsiderLastIterTime)
+if (m_bConsiderLastIterTime)
 {
 // based on the last iter runtime, we don't expect to finish in 
time
 // m_nTimeSlice < (nCurTicks - m_nStartTicks) + (nCurTicks - 
m_nIterStartTicks)
@@ -57,8 +57,7 @@ class VCL_DLLPUBLIC TaskStopwatch
 else if (m_nTimeSlice < nCurTicks - m_nStartTicks)
 return false;
 
-if (!bQueryOnly)
-m_nIterStartTicks = nCurTicks;
+m_nIterStartTicks = nCurTicks;
 
 return !Application::AnyInput(m_eInputStop);
 }
@@ -84,7 +83,7 @@ public:
 /**
  * Returns true, if another iteration will probably pass in the time slot
  **/
-bool continueIter() { return nextIter(false); }
+bool continueIter() { return nextIter(); }
 
 /**
  * Reset the stopwatch
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index a6699a7e71d9..54df7ee66631 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -289,7 +289,7 @@ public:
 bool IsMenuVisible() const;
 virtual bool IsMenuBar() const = 0;
 
-void RemoveDisabledEntries( bool bCheckPopups =

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

2022-01-26 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/inc/langtab.hrc|3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 083c93d406a9653922e9510509333f7ee64049fa
Author: Eike Rathke 
AuthorDate: Wed Jan 26 15:47:58 2022 +0100
Commit: Eike Rathke 
CommitDate: Wed Jan 26 17:03:52 2022 +0100

tdf#146602 Add Pennsylvania Dutch {pdc-US} 0x06AF to language list

Change-Id: Icc4ed353c1bad53c2e2bf85fc098a50d66ee5b33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128988
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 5d0a23c1f6d7..e8a50c6ea02f 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -673,6 +673,7 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_SESOTHO_LESOTHO,"st", "LS", k0},
 { LANGUAGE_USER_KLINGON,   "tlh", ""  , k0},
 { LANGUAGE_USER_ENGLISH_ISRAEL, "en", "IL", k0},
+{ LANGUAGE_USER_PENNSYLVANIA_DUTCH,"pdc", "US", k0},
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 39f9abf8de56..0e4c6d23a9b4 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -773,6 +773,7 @@ namespace o3tl
 #define LANGUAGE_USER_ENGLISH_ISRAELLanguageType(0xB409)  /* 
makeLangID( 0x2D, getPrimaryLanguage( LANGUAGE_ENGLISH_US)) */
 #define LANGUAGE_USER_INTERSLAVIC_LATIN LanguageType(0x06AD)
 #define LANGUAGE_USER_INTERSLAVIC_CYRILLIC  LanguageType(0x06AE)
+#define LANGUAGE_USER_PENNSYLVANIA_DUTCHLanguageType(0x06AF)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 9241485e2a7e..944ebecd9ab8 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -436,7 +436,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Klingon") , LANGUAGE_USER_KLINGON },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Israel)") , 
LANGUAGE_USER_ENGLISH_ISRAEL },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Interslavic Latin") , 
LANGUAGE_USER_INTERSLAVIC_LATIN },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Interslavic Cyrillic") , 
LANGUAGE_USER_INTERSLAVIC_CYRILLIC }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Interslavic Cyrillic") , 
LANGUAGE_USER_INTERSLAVIC_CYRILLIC },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Pennsylvania Dutch") , 
LANGUAGE_USER_PENNSYLVANIA_DUTCH }
 };

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

2022-01-07 Thread Hossein (via logerrit)

 i18nlangtag/source/isolang/mslangid.cxx |   21 +
 include/i18nlangtag/mslangid.hxx|3 +++
 sw/source/core/text/inftxt.cxx  |4 +++-
 3 files changed, 27 insertions(+), 1 deletion(-)

New commits:
commit 151c56ed547490a99d912524c0e56b5d6d4a1939
Author: Hossein 
AuthorDate: Tue Jan 4 21:12:14 2022 +0100
Commit: Eike Rathke 
CommitDate: Fri Jan 7 21:38:54 2022 +0100

tdf#146084 Don't warn for languages without hyphenation

Upon opening a Writer document containing some languages that do not
use hyphen, an alert is created with the text:

'Missing hyphenation data Please install the hyphenation package for
locale "ab_CD".'

in which 'ab_CD' is the locale.

This patch removes the warning for these languages, that do not use
hyphenation:

* Arabic script languages (except Uighur)
 + Persian (Farsi)
 + Kashmiri
 + Kurdish (Central Kurdish and Southern Kurdish with Arabic script)
 + Punjabi
 + Sindhi
 + Malai
 + Somali
 + Swahili
 + Urdu
"Words are not hyphenated in Arabic language text, however hyphenation
is possible for Uighur text written in the Arabic script"
https://www.w3.org/International/i18n-tests/results/word-break-shaping
The list from MS documents is lenghty, but some of the languages are
were not available in LibreOffice, so they are ommited:
https://docs.microsoft.com/en-us/typography/script-development/arabic
There were languages like Hausa and Kanuri from Nigeria that use both
Latin and Arabic script, but only Latin script was listed in the
LibreOffice languages, so they were also ommited.

* CJK languages
 + Japanese
 + Korean
 + Chinese
 + Yue Chinese
"CJK languages differ from European languages in that there are no
hyphenation rules"
https://tug.org/TUGboat/tb25-0/cho.pdf

* Vietnamese
"In Vietnamese all words consist of single syllables, so they are
often very short; hyphenation is not allowed at all."
https://tug.org/TUGboat/tb29-1/tb91thanh-vntex.pdf
Hyphenation is declined in Vietnamese orthography since 1975
https://www.quora.com/When-did-hyphenation-decline-in-Vietnamese-orthography

The fix for Japanese (tdf#143422) was previously done in:
53df13371252874ec962dee4643168d26780 and the functionality is
preserverd with the current patch.

An alternate approach would be adding all the unicode scripts,
specifying the script for each langauge, and decide upon the script
(mostly) and not (only) the language.

More information about the hyphenation usage of many scripts can be
found in:
https://r12a.github.io/scripts/

This is the list of Unicode scripts:
https://unicode.org/standard/supported.html
https://en.wikipedia.org/wiki/Script_(Unicode)#List_of_scripts_in_Unicode

Change-Id: I7d2b4ee55a0893d1f0d1f9cd3b7cc037a49589b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126435
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index 71f6b7b49e66..ad062a8d3dcf 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -165,6 +165,27 @@ LanguageType MsLangId::resolveSystemLanguageByScriptType( 
LanguageType nLang, sa
 return nLang;
 }
 
+// static
+bool MsLangId::usesHyphenation(LanguageType nLang)
+{
+if (primary(nLang).anyOf(
+primary(LANGUAGE_ARABIC_PRIMARY_ONLY),
+primary(LANGUAGE_FARSI),
+primary(LANGUAGE_KASHMIRI),
+primary(LANGUAGE_KURDISH_ARABIC_IRAQ),
+primary(LANGUAGE_PUNJABI),
+primary(LANGUAGE_SINDHI),
+primary(LANGUAGE_USER_MALAY_ARABIC_MALAYSIA),
+primary(LANGUAGE_SOMALI),
+primary(LANGUAGE_SWAHILI),
+primary(LANGUAGE_URDU_PAKISTAN))
+|| isCJK(nLang))
+{
+return false;
+}
+return true;
+}
+
 
 // static
 css::lang::Locale MsLangId::Conversion::convertLanguageToLocale(
diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx
index 4966fde852f3..aee1f23eb816 100644
--- a/include/i18nlangtag/mslangid.hxx
+++ b/include/i18nlangtag/mslangid.hxx
@@ -126,6 +126,9 @@ public:
 static LanguageType resolveSystemLanguageByScriptType( LanguageType nLang, 
sal_Int16 nType );
 
 
+/** Whether the language uses hyphenation. */
+static bool usesHyphenation( LanguageType nLang );
+
 /** Whether locale has a Right-To-Left orientation for text. */
 static bool isRightToLeft( LanguageType nLang );
 
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 14eb8b13c11d..a5e588ebad0b 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -66,6 +66,7 @@
 #include 
 #include 
 #include

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

2021-12-17 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |2 ++
 include/i18nlangtag/lang.h |2 ++
 svtools/inc/langtab.hrc|4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 430a6fea4012752eed0c61bff4936e9c366aa750
Author: Eike Rathke 
AuthorDate: Sat Dec 18 00:04:07 2021 +0100
Commit: Eike Rathke 
CommitDate: Sat Dec 18 01:40:48 2021 +0100

Resolves: tdf#145853 Add Interslavic Latin|Cyrillic to language list

Interslavic Latin {art-x-interslv} 0x06AD
Interslavic Cyrillic {art-Cyrl-x-interslv} 0x06AE

Change-Id: I487d6593db89af038555a192674298e2dabf5582
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127018
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 36b69f0fe6a6..b29726342733 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -781,6 +781,8 @@ Bcp47CountryEntry const aImplBcp47CountryEntries[] =
 //  { LANGUAGE_YUE_CHINESE_HONGKONG, "zh-yue-HK", "HK", "", 0 },   // 
MS reserved, prefer yue-HK; do not add unless LanguageTag::simpleExtract() can 
handle it to not call liblangtag for rsc!
 { LANGUAGE_YIDDISH,  "yi-001",   "", "", k0 },  // 
MS since rev.15, was "yi-Hebr" reserved, "001"="World"
 { LANGUAGE_FRENCH_WEST_INDIES,   "fr-029",   "", "", k0 },  // 
MS since rev.15, was "Neither defined nor reserved", "029"="Caribbean"
+{ LANGUAGE_USER_INTERSLAVIC_LATIN, "art-x-interslv", "", "", k0 },  // 
see discussion in tdf#145853
+{ LANGUAGE_USER_INTERSLAVIC_CYRILLIC, "art-Cyrl-x-interslv", "", "", k0 },
 { LANGUAGE_DONTKNOW,"", "", "", k0 }// marks end 
of table
 };
 
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index ae434fd0c06a..39f9abf8de56 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -771,6 +771,8 @@ namespace o3tl
 #define LANGUAGE_USER_YIDDISH_ISRAELLanguageType(0x843D)  /* 
makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_YIDDISH)) */
 #define LANGUAGE_USER_KLINGON   LanguageType(0x06AC)
 #define LANGUAGE_USER_ENGLISH_ISRAELLanguageType(0xB409)  /* 
makeLangID( 0x2D, getPrimaryLanguage( LANGUAGE_ENGLISH_US)) */
+#define LANGUAGE_USER_INTERSLAVIC_LATIN LanguageType(0x06AD)
+#define LANGUAGE_USER_INTERSLAVIC_CYRILLIC  LanguageType(0x06AE)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index c6f05ea033e5..9241485e2a7e 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -434,7 +434,9 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Denmark)") , 
LANGUAGE_USER_ENGLISH_DENMARK },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sesotho") , 
LANGUAGE_USER_SESOTHO_LESOTHO },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Klingon") , LANGUAGE_USER_KLINGON },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Israel)") , 
LANGUAGE_USER_ENGLISH_ISRAEL }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Israel)") , 
LANGUAGE_USER_ENGLISH_ISRAEL },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Interslavic Latin") , 
LANGUAGE_USER_INTERSLAVIC_LATIN },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Interslavic Cyrillic") , 
LANGUAGE_USER_INTERSLAVIC_CYRILLIC }
 };

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

2021-11-29 Thread Noel Grandin (via logerrit)

 i18nlangtag/source/languagetag/languagetag.cxx |2 +-
 include/i18nlangtag/languagetag.hxx|3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6a2352ca8abbdcd6a6376144e6dd185ffeaef5d0
Author: Noel Grandin 
AuthorDate: Mon Nov 29 13:24:08 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Nov 29 17:58:06 2021 +0100

loplugin:stringliteraldefine in i18nlangtag

Change-Id: Ibc4758235ad15858d288e6f3015e2dfcb1650a26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126042
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 1390dfe06213..29c85cd710fc 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -2876,7 +2876,7 @@ bool LanguageTag::isValidBcp47( const OUString& rString, 
OUString* o_pCanonicali
 if (pLangT)
 {
 const char* pLang = lt_lang_get_tag( pLangT);
-if (pLang && strcmp( pLang, I18NLANGTAG_QLT) == 0)
+if (pLang && strcmp( pLang, I18NLANGTAG_QLT_ASCII) == 
0)
 {
 // Disallow 'qlt' privateuse code to prevent
 // confusion with our internal usage.
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index 4fbb6d0c2e11..500f84da00f7 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -32,7 +32,8 @@
 LanguageTag contains a plain language/country combination or a more
 detailed BCP 47 language tag use LanguageTag::isIsoLocale() instead.
  */
-#define I18NLANGTAG_QLT "qlt"
+#define I18NLANGTAG_QLT_ASCII "qlt"
+inline constexpr OUStringLiteral I18NLANGTAG_QLT = u"qlt";
 
 
 class LanguageTagImpl;

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

2021-10-25 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/languagetag/languagetag.cxx |   10 ++
 include/i18nlangtag/languagetag.hxx|   10 ++
 2 files changed, 20 insertions(+)

New commits:
commit a6baab25b53d0a87686a5fcdabf86747e9678021
Author: Eike Rathke 
AuthorDate: Mon Oct 25 11:41:09 2021 +0200
Commit: Eike Rathke 
CommitDate: Mon Oct 25 13:07:50 2021 +0200

Introduce LanguageTag::convertToLanguageTypeWithFallback(Locale)

... with keeping LANGUAGE_SYSTEM not resolved or falling back.

Change-Id: I10211c2b2140a9822f1403dc00af3ee9ded08f69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124140
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index ebad94022615..6f6a766e861f 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -2812,6 +2812,16 @@ css::lang::Locale 
LanguageTag::convertToLocaleWithFallback( const OUString& rBcp
 }
 
 
+// static
+LanguageType LanguageTag::convertToLanguageTypeWithFallback( const 
css::lang::Locale& rLocale, bool bResolveSystem )
+{
+if (rLocale.Language.isEmpty() && !bResolveSystem)
+return LANGUAGE_SYSTEM;
+
+return LanguageTag( rLocale).makeFallback().getLanguageType();
+}
+
+
 // static
 bool LanguageTag::isValidBcp47( const OUString& rString, OUString* 
o_pCanonicalized, bool bDisallowPrivate )
 {
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index 62957f1f7f70..4fbb6d0c2e11 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -507,6 +507,16 @@ public:
  */
 static css::lang::Locale convertToLocaleWithFallback( const OUString& 
rBcp47 );
 
+/** Convert Locale to MS-LangID with fallback.
+
+@param bResolveSystem
+   If TRUE, resolve an empty language tag denoting the system
+   locale to the real locale used and fallback.
+   If FALSE, return LANGUAGE_SYSTEM for such a tag and do not 
fallback.
+ */
+static LanguageType convertToLanguageTypeWithFallback( const 
css::lang::Locale& rLocale,
+   bool bResolveSystem 
= true );
+
 /** If rString represents a valid BCP 47 language tag.
 
 Never resolves an empty tag to the system locale, in fact an empty

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

2021-10-19 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/inc/langtab.hrc|3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 29c41568f1df622e4132a2055698255e01597902
Author: Eike Rathke 
AuthorDate: Tue Oct 19 18:12:03 2021 +0200
Commit: Eike Rathke 
CommitDate: Tue Oct 19 20:16:13 2021 +0200

Related: tdf#145173 Add English (Israel) {en-IL} 0xB409 to language list

Change-Id: I0c1d89a8869e3788f18851ae004bac24275923b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123829
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index eea9592d907c..87051fb999bb 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -694,6 +694,7 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_ENGLISH_DENMARK,"en", "DK", k0},
 { LANGUAGE_USER_SESOTHO_LESOTHO,"st", "LS", k0},
 { LANGUAGE_USER_KLINGON,   "tlh", ""  , k0},
+{ LANGUAGE_USER_ENGLISH_ISRAEL, "en", "IL", k0},
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 6303ac111b7b..ae434fd0c06a 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -770,6 +770,7 @@ namespace o3tl
 #define LANGUAGE_USER_SESOTHO_LESOTHO   LanguageType(0x8030)  /* 
makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_SESOTHO)) */
 #define LANGUAGE_USER_YIDDISH_ISRAELLanguageType(0x843D)  /* 
makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_YIDDISH)) */
 #define LANGUAGE_USER_KLINGON   LanguageType(0x06AC)
+#define LANGUAGE_USER_ENGLISH_ISRAELLanguageType(0xB409)  /* 
makeLangID( 0x2D, getPrimaryLanguage( LANGUAGE_ENGLISH_US)) */
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index a0bc4d375b72..c6f05ea033e5 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -433,7 +433,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Bribri") , LANGUAGE_USER_BRIBRI },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Denmark)") , 
LANGUAGE_USER_ENGLISH_DENMARK },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sesotho") , 
LANGUAGE_USER_SESOTHO_LESOTHO },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Klingon") , LANGUAGE_USER_KLINGON }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Klingon") , LANGUAGE_USER_KLINGON },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Israel)") , 
LANGUAGE_USER_ENGLISH_ISRAEL }
 };

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

2021-10-18 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/mslangid.cxx |   46 +++-
 include/i18nlangtag/mslangid.hxx|   37 +
 2 files changed, 54 insertions(+), 29 deletions(-)

New commits:
commit 20081a8ea052b2f31915bd127c3b282cf5025d59
Author: Eike Rathke 
AuthorDate: Mon Oct 18 22:02:52 2021 +0200
Commit: Eike Rathke 
CommitDate: Mon Oct 18 23:23:56 2021 +0200

Introduce MsLangId::getConfiguredSystemLanguage()

To be used instead of getSystemLanguage() in a subsequent change.
For details see commit summary of

commit aec5312ffab24236876693d7a8b55843847f2a48
CommitDate: Mon Oct 18 21:14:24 2021 +0200

Related: tdf#145173 Ensure known supported system and default 
document locale

Change-Id: I5bed125e47c2a03fe2e7a4f84988b2e8841143c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123766
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index d3bcee020a00..4cc448768f3a 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -81,19 +81,9 @@ LanguageType MsLangId::getRealLanguage( LanguageType nLang )
 {
 LanguageType simplifyLang = simplifySystemLanguages( nLang);
 if (simplifyLang == LANGUAGE_SYSTEM )
-{
-if (nConfiguredSystemLanguage == LANGUAGE_SYSTEM)
-nLang = getSystemLanguage();
-else
-nLang = nConfiguredSystemLanguage;
-}
+nLang = getConfiguredSystemLanguage();
 else if (simplifyLang == LANGUAGE_HID_HUMAN_INTERFACE_DEVICE)
-{
-if (nConfiguredSystemUILanguage == LANGUAGE_SYSTEM)
-nLang = getSystemUILanguage();
-else
-nLang = nConfiguredSystemUILanguage;
-}
+nLang = getConfiguredSystemUILanguage();
 else
 {
 /* TODO: would this be useful here? */
@@ -106,6 +96,38 @@ LanguageType MsLangId::getRealLanguage( LanguageType nLang )
 }
 
 
+// static
+LanguageType MsLangId::getConfiguredSystemLanguage()
+{
+if (nConfiguredSystemLanguage != LANGUAGE_SYSTEM)
+return nConfiguredSystemLanguage;
+return getSystemLanguage();
+}
+
+
+// static
+LanguageType MsLangId::getConfiguredSystemUILanguage()
+{
+if (nConfiguredSystemUILanguage != LANGUAGE_SYSTEM)
+return nConfiguredSystemUILanguage;
+return getSystemUILanguage();
+}
+
+
+// static
+LanguageType MsLangId::getSystemLanguage()
+{
+return getPlatformSystemLanguage();
+}
+
+
+// static
+LanguageType MsLangId::getSystemUILanguage()
+{
+return getPlatformSystemUILanguage();
+}
+
+
 // static
 LanguageType MsLangId::resolveSystemLanguageByScriptType( LanguageType nLang, 
sal_Int16 nType )
 {
diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx
index 9376458bdf6f..4966fde852f3 100644
--- a/include/i18nlangtag/mslangid.hxx
+++ b/include/i18nlangtag/mslangid.hxx
@@ -57,14 +57,31 @@ public:
 return LanguageType((sal_uInt16(nLangID) & ~LANGUAGE_MASK_PRIMARY) >> 
10);
 }
 
+/** Get the configured system language/locale.
+If not set yet then getSystemLanguage().
+
+Prefer this over getSystemLanguage() unless you exactly know why you
+would not. */
+static LanguageType getConfiguredSystemLanguage();
+
+/** Get the configured system UI language/locale.
+If not set yet then getSystemUILanguage().
+
+Prefer this over getSystemUILanguage() unless you exactly know why you
+would not. */
+static LanguageType getConfiguredSystemUILanguage();
+
+
 /** Language/locale of category LC_CTYPE (on Unix, else the system
 language).
-Evaluation order: LC_ALL, LC_CTYPE, LANG */
+Evaluation order: LC_ALL, LC_CTYPE, LANG
+Note this may return an unknown unsupported locale. */
 static LanguageType getSystemLanguage();
 
 /** Language/locale of category LC_MESSAGES (on Unix, else same as
-GetSystemLanguage()).
-Evaluation order: LANGUAGE, LC_ALL, LC_MESSAGES, LANG */
+getSystemLanguage()).
+Evaluation order: LANGUAGE, LC_ALL, LC_MESSAGES, LANG
+Note this may return an unknown unsupported locale. */
 static LanguageType getSystemUILanguage();
 
 
@@ -312,20 +329,6 @@ private:
 I18NLANGTAG_DLLPRIVATE static inline LanguageType simplifySystemLanguages( 
LanguageType nLang );
 };
 
-
-// static
-inline LanguageType MsLangId::getSystemLanguage()
-{
-return getPlatformSystemLanguage();
-}
-
-
-// static
-inline LanguageType MsLangId::getSystemUILanguage()
-{
-return getPlatformSystemUILanguage();
-}
-
 #endif // INCLUDED_I18NLANGTAG_MSLANGID_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

2021-08-20 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/languagetag/languagetagicu.cxx |   22 ++
 include/i18nlangtag/languagetagicu.hxx|   17 +
 2 files changed, 39 insertions(+)

New commits:
commit c482aefe08e4486aa35ba87edea1a341c97b8610
Author: Eike Rathke 
AuthorDate: Fri Aug 20 22:47:08 2021 +0200
Commit: Eike Rathke 
CommitDate: Sat Aug 21 00:11:47 2021 +0200

Introduce LanguageTagIcu::getDisplayName()

To be used in generating display names for on-the-fly language
tags in the language listbox.

Change-Id: Ibb36fe312e550f77f1e2d3acc2dbff9e83c15f7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120797
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/languagetag/languagetagicu.cxx 
b/i18nlangtag/source/languagetag/languagetagicu.cxx
index c35e7a85ef8b..fd1c9bc75670 100644
--- a/i18nlangtag/source/languagetag/languagetagicu.cxx
+++ b/i18nlangtag/source/languagetag/languagetagicu.cxx
@@ -46,4 +46,26 @@ icu::Locale LanguageTagIcu::getIcuLocale( const LanguageTag 
& rLanguageTag, std:
);
 }
 
+// static
+OUString LanguageTagIcu::getDisplayName( const LanguageTag & rLanguageTag, 
const LanguageTag & rDisplayLanguage )
+{
+// This will be initialized by the first call; as the UI language doesn't
+// change the tag mostly stays the same, unless someone overrides it for a
+// call here, and thus obtaining the UI icu::Locale has to be done only
+// once.
+static thread_local LanguageTag aUITag( LANGUAGE_SYSTEM);
+static thread_local icu::Locale aUILocale;
+
+if (aUITag != rDisplayLanguage)
+{
+aUITag = rDisplayLanguage;
+aUILocale = getIcuLocale( rDisplayLanguage);
+}
+
+icu::Locale aLocale( getIcuLocale( rLanguageTag));
+icu::UnicodeString aResult;
+aLocale.getDisplayName( aUILocale, aResult);
+return OUString( reinterpret_cast(aResult.getBuffer()), aResult.length());
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/i18nlangtag/languagetagicu.hxx 
b/include/i18nlangtag/languagetagicu.hxx
index 755d8eb12c76..430c483f344d 100644
--- a/include/i18nlangtag/languagetagicu.hxx
+++ b/include/i18nlangtag/languagetagicu.hxx
@@ -15,6 +15,7 @@
 #include 
 
 #include 
+#include 
 #include 
 
 class LanguageTag;
@@ -49,6 +50,22 @@ public:
 Always resolves an empty tag to the system locale.
  */
 static  icu::Locale getIcuLocale( const LanguageTag & rLanguageTag, 
std::u16string_view rVariant, std::u16string_view rKeywords);
+
+/** Obtain the display name for a language tag.
+
+Gets a localized name from icu::Locale::getDisplayName(). Meant to be
+used only with language tags that do not have a language list entry in
+svtools/inc/langtab.hrc STR_ARR_SVT_LANGUAGE_TABLE, thus used by
+SvtLanguageTable::GetLanguageString()
+
+@param  rLanguageTag
+The language tag for which the name is to be displayed.
+
+@param  rDisplayLanguage
+The language in which the name is to be displayed.
+Usually Application::GetSettings().GetUILanguageTag().
+ */
+static  OUStringgetDisplayName( const LanguageTag & rLanguageTag, 
const LanguageTag & rDisplayLanguage );
 };
 
 #endif  // INCLUDED_I18NLANGTAG_LANGUAGETAGICU_HXX

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

2021-07-12 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 4e0a7df2dfa10bc52d5dbda34f43e0bc0df22ae7
Author: Eike Rathke 
AuthorDate: Mon Jul 12 18:53:46 2021 +0200
Commit: Eike Rathke 
CommitDate: Mon Jul 12 22:00:10 2021 +0200

Resolves: tdf#123466 Add Microsoft ill-used {x-none} to known language tags

'x-none' is a private-use tag and letting it escape into the wild
isn't such a private use..

This just prevents the lt_string_value assertion that doesn't harm
anyway but seems to confuse people and makes the tag known to
LibreOffice with a reproducible assigned LCID instead of an
on-the-fly generated one.

Whatever it may take to actually support something tagged with
'x-none'.

Change-Id: I3f32c9ba18a2528584a112157509c1dfda75e29c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118788
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 1ca95bb35244..941a73b25766 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -955,6 +955,7 @@ IsoLangOtherEntry const aImplPrivateUseEntries[] =
 { LANGUAGE_USER_PRIV_NOTRANSLATE,   "x-no-translate" }, //! not BCP47 
but legacy in .xcu configmgr
 { LANGUAGE_USER_PRIV_DEFAULT,   "x-default"  },
 { LANGUAGE_USER_PRIV_COMMENT,   "x-comment"  },
+{ LANGUAGE_USER_PRIV_NONE,  "x-none" },
 { LANGUAGE_USER_PRIV_JOKER, "*"  }, //! not BCP47 
but transferable in configmgr
 { LANGUAGE_DONTKNOW,nullptr }  // marks 
end of table
 };
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index b4b6aa69fa6d..c319b068b215 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -781,6 +781,7 @@ namespace o3tl
 #define LANGUAGE_ON_THE_FLY_SUB_END LanguageType(0x3E)
 
 /* 0xFFE0 to 0x reserved for privateuse and specials. */
+#define LANGUAGE_USER_PRIV_NONE LanguageType(0xFFEA)  /* 
privateuse "x-none", MS ill-escaped into the wild, primary 0x3ea, sub 0x3f */
 #define LANGUAGE_USER_PRIV_JOKERLanguageType(0xFFEB)  /* 
privateuse "*" (sic! bad! nasty!), primary 0x3eb, sub 0x3f */
 #define LANGUAGE_USER_PRIV_COMMENT  LanguageType(0xFFEC)  /* 
privateuse "x-comment", primary 0x3ec, sub 0x3f */
 #define LANGUAGE_USER_PRIV_DEFAULT  LanguageType(0xFFED)  /* 
privateuse "x-default", primary 0x3ed, sub 0x3f */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-06-01 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 solenv/inc/langlist.mk |1 +
 svtools/inc/langtab.hrc|3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 75458bfab180a57597e674d38e2953c440cf118d
Author: Eike Rathke 
AuthorDate: Tue Jun 1 20:05:09 2021 +0200
Commit: Eike Rathke 
CommitDate: Tue Jun 1 21:24:17 2021 +0200

Add Sesotho {st-LS} 0x8030 to language list

Change-Id: Ifb304fb1a5ed05e79bcaaaf96e12171377973222
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116552
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 04ff6c1a52ea..1ca95bb35244 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -693,6 +693,7 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_CABECAR,   "cjp", "CR", k0},
 { LANGUAGE_USER_BRIBRI,"bzd", "CR", k0},
 { LANGUAGE_USER_ENGLISH_DENMARK,"en", "DK", k0},
+{ LANGUAGE_USER_SESOTHO_LESOTHO,"st", "LS", k0},
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index ee404aefd6c0..b4b6aa69fa6d 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -766,6 +766,7 @@ namespace o3tl
 #define LANGUAGE_USER_CABECAR   LanguageType(0x06AA)
 #define LANGUAGE_USER_BRIBRILanguageType(0x06AB)
 #define LANGUAGE_USER_ENGLISH_DENMARK   LanguageType(0xB009)  /* 
makeLangID( 0x2C, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
+#define LANGUAGE_USER_SESOTHO_LESOTHO   LanguageType(0x8030)  /* 
makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_SESOTHO)) */
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index 54e2666fc8a9..b3cb87610fcc 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -115,6 +115,7 @@ sq \
 sr \
 ss \
 st \
+st-LS \
 sv \
 sw-TZ \
 szl \
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 628393d59982..e66375e115ac 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -431,7 +431,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Pali Thai") , LANGUAGE_USER_PALI_THAI 
},
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Cabécar") , LANGUAGE_USER_CABECAR },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Bribri") , LANGUAGE_USER_BRIBRI },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Denmark)") , 
LANGUAGE_USER_ENGLISH_DENMARK }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Denmark)") , 
LANGUAGE_USER_ENGLISH_DENMARK },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sesotho") , 
LANGUAGE_USER_SESOTHO_LESOTHO }
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-02-12 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |2 ++
 include/i18nlangtag/lang.h |2 ++
 svtools/inc/langtab.hrc|4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 9b6a84916a8f58f2c4db2c970eb2c366465c6472
Author: Eike Rathke 
AuthorDate: Fri Feb 12 21:27:40 2021 +0100
Commit: Eike Rathke 
CommitDate: Sat Feb 13 00:05:47 2021 +0100

Resolves: tdf#138839 Add Cabécar {cjp-CR} 0x06AA, Bribri {bzd-CR} 0x06AB

Change-Id: Ib80d080fc69ba2c87c9a859a0571f9d82f7c7bac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110832
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index b1dc5dfe4b69..29b957a63976 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -690,6 +690,8 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_SUNDANESE, "sun", "ID", k0},
 { LANGUAGE_USER_YAKA_DRCONGO,  "yaf", "CD", k0},
 { LANGUAGE_USER_ENGLISH_KENYA,  "en", "KE", k0},
+{ LANGUAGE_USER_CABECAR,   "cjp", "CR", k0},
+{ LANGUAGE_USER_BRIBRI,"bzd", "CR", k0},
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 73f839eac9ee..ec264556 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -763,6 +763,8 @@ namespace o3tl
 #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)) */
+#define LANGUAGE_USER_CABECAR   LanguageType(0x06AA)
+#define LANGUAGE_USER_BRIBRILanguageType(0x06AB)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 49e0f8672945..280219f8e960 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -428,7 +428,9 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { 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", "Pali Thai") , LANGUAGE_USER_PALI_THAI 
}
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Pali Thai") , LANGUAGE_USER_PALI_THAI 
},
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Cabécar") , LANGUAGE_USER_CABECAR },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Bribri") , LANGUAGE_USER_BRIBRI }
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-02-01 Thread Eike Rathke (via logerrit)

 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 
AuthorDate: Mon Feb 1 16:09:45 2021 +0100
Commit: Eike Rathke 
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 
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 
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

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

2020-09-24 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 23ff2c96709e48e06aa0a9dee237b73935cd60e5
Author: Eike Rathke 
AuthorDate: Thu Sep 24 11:42:15 2020 +0200
Commit: Eike Rathke 
CommitDate: Thu Sep 24 14:20:36 2020 +0200

Add English Kenya LCID 0xAC09 {en-KE} langtag mapping, tdf#115436

Change-Id: I0c32ffa2d7f316b3e97dc597da8539842ad51367
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103300
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 9d521a499ef4..ecab61113ab1 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -689,6 +689,7 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_MINANGKABAU,   "min", "ID", k0},
 { LANGUAGE_USER_SUNDANESE, "sun", "ID", k0},
 { LANGUAGE_USER_YAKA_DRCONGO,  "yaf", "CD", k0},
+{ LANGUAGE_USER_ENGLISH_KENYA,  "en", "KE", k0},
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 96df56181159..d3b0ece0bce6 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -761,6 +761,7 @@ namespace o3tl
 #define LANGUAGE_USER_MINANGKABAU   LanguageType(0x06A7)
 #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)) */
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-12 Thread Eike Rathke (via logerrit)

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

New commits:
commit e1873e961169f6a90820bb6d26a16f3fd32ccaca
Author: Eike Rathke 
AuthorDate: Fri Jun 12 00:08:38 2020 +0200
Commit: Eike Rathke 
CommitDate: Fri Jun 12 23:15:33 2020 +0200

Language list: + Aka (CAR); Yaka -> Yaka (Congo), + Yaka (DRC) [yaf-CD]

Change-Id: I4bf1e1affa046fcc9c7f06c8bbf6a40fc9c26cf9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96167
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index c9e623b390de..8151d5e29640 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -688,6 +688,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_LIGURIAN,  "lij", "IT", k0},
 { LANGUAGE_USER_MINANGKABAU,   "min", "ID", k0},
 { LANGUAGE_USER_SUNDANESE, "sun", "ID", k0},
+{ LANGUAGE_USER_YAKA_DRCONGO,  "yaf", "CD", k0},
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index f4d1266a3e0d..96df56181159 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -760,6 +760,7 @@ namespace o3tl
 #define LANGUAGE_USER_LIGURIAN  LanguageType(0x06A6)
 #define LANGUAGE_USER_MINANGKABAU   LanguageType(0x06A7)
 #define LANGUAGE_USER_SUNDANESE LanguageType(0x06A8)
+#define LANGUAGE_USER_YAKA_DRCONGO  LanguageType(0x06A9)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 33002f07e51d..5242b7ec116f 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -350,6 +350,7 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Veps") , LANGUAGE_USER_VEPS },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Võro") , LANGUAGE_USER_VORO },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Nenets") , LANGUAGE_USER_NENETS },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Aka (Central African Republic)") , 
LANGUAGE_USER_AKA },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Aka (Congo)") , 
LANGUAGE_USER_AKA_CONGO },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Dibole") , LANGUAGE_USER_DIBOLE },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Doondo") , LANGUAGE_USER_DOONDO },
@@ -362,7 +363,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Suundi") , LANGUAGE_USER_SUUNDI },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Teke-Kukuya") , 
LANGUAGE_USER_TEKE_KUKUYA },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Tsaangi") , LANGUAGE_USER_TSAANGI },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Yaka") , LANGUAGE_USER_YAKA },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Yaka (Congo)") , LANGUAGE_USER_YAKA },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Yaka (Democratic Republic of the 
Congo)") , LANGUAGE_USER_YAKA_DRCONGO },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Yombe (Congo)") , 
LANGUAGE_USER_YOMBE_CONGO },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "N'ko") , LANGUAGE_USER_NKO },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Udmurt") , LANGUAGE_USER_UDMURT },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-27 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |7 +--
 include/i18nlangtag/lang.h |3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 41d8b41767032681a9897b7551f011d450e3725e
Author: Eike Rathke 
AuthorDate: Wed May 27 19:58:05 2020 +0200
Commit: Eike Rathke 
CommitDate: Wed May 27 22:16:40 2020 +0200

Add LCIDs of [MS-LCID] from 3/4/2020 14.0 revision

See also

commit 574c57090642347980d2395e1e183cc7b5c171ad
CommitDate: Wed May 27 13:56:28 2020 +0200

update list of [MS-LCID] from 3/4/2020 14.0 rev.

Change-Id: Ia0d068081a309dbefadceac986be83bac2d900d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94998
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 5abdc085fb11..c9e623b390de 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -378,7 +378,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_FRENCH_MOROCCO,  "fr", "MA", k0},
 { LANGUAGE_FRENCH_REUNION,  "fr", "RE", k0},
 { LANGUAGE_FRENCH,  "fr", ""  , k0},// needed 
as a catcher before other "fr" entries!
-{ LANGUAGE_FRENCH_NORTH_AFRICA, "fr", ""  , k0},
+{ LANGUAGE_FRENCH_NORTH_AFRICA, "fr", ""  , k0},// MS 
reserved, "fr-015"
 { LANGUAGE_FRENCH_WEST_INDIES,  "fr", ""  , k0},// no ISO 
country code; MS "Neither defined nor reserved"
 { LANGUAGE_FRISIAN_NETHERLANDS, "fy", "NL", k0},
 { LANGUAGE_GAELIC_IRELAND,  "ga", "IE", k0},
@@ -485,7 +485,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_ENGLISH_PHILIPPINES, "en", "PH", k0},
 { LANGUAGE_IBIBIO_NIGERIA, "ibb", "NG", k0},
 { LANGUAGE_YI,  "ii", "CN", k0},
-{ LANGUAGE_ENGLISH_ARAB_EMIRATES,   "en", "AE", k0},// MS 
reserved
+{ LANGUAGE_ENGLISH_ARAB_EMIRATES,   "en", "AE", k0},
 { LANGUAGE_ENGLISH_BAHRAIN, "en", "BH", k0},// MS 
reserved
 { LANGUAGE_ENGLISH_EGYPT,   "en", "EG", k0},// MS 
reserved
 { LANGUAGE_ENGLISH_JORDAN,  "en", "JO", k0},// MS 
reserved
@@ -774,6 +774,9 @@ static IsoLanguageScriptCountryEntry const 
aImplIsoLangScriptEntries[] =
 { 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_KAZAKH_LATIN,"kk-Latn", "KZ", k0},  
 // MS reserved
+{ LANGUAGE_KAZAKH_LATIN_LSO,"kk-Latn", ""  , k0},  
 // MS reserved
+{ LANGUAGE_KAZAKH_CYRILLIC_LSO, "kk-Cyrl", ""  , k0},  
 // MS reserved
 { LANGUAGE_DONTKNOW,"",""  , k0}   
 // marks end of table
 };
 
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 1cae83ef8356..f4d1266a3e0d 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -275,6 +275,9 @@ namespace o3tl
 #define LANGUAGE_KASHMIRI   LanguageType(0x0460)
 #define LANGUAGE_KASHMIRI_INDIA LanguageType(0x0860)
 #define LANGUAGE_KAZAKH LanguageType(0x043F)
+#define LANGUAGE_KAZAKH_LATIN   LanguageType(0x083F)
+#define LANGUAGE_KAZAKH_CYRILLIC_LSOLanguageType(0x783F)
+#define LANGUAGE_KAZAKH_LATIN_LSO   LanguageType(0x7C3F)
 #define LANGUAGE_KHMER  LanguageType(0x0453)
 #define LANGUAGE_KICHE_GUATEMALALanguageType(0x0486)  /* AKA 
K'iche', West Central Quiche,  */
 #define LANGUAGE_KINYARWANDA_RWANDA LanguageType(0x0487)  /* obsoletes 
LANGUAGE_USER_KINYARWANDA 0x0621 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-12 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/inc/langtab.hrc|3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit e51057591defa93dbb4c48aff3598053890a7bd2
Author: Eike Rathke 
AuthorDate: Thu Mar 12 13:42:56 2020 +0100
Commit: Eike Rathke 
CommitDate: Thu Mar 12 15:08:03 2020 +0100

tdf#131297 Add Sundanese [sun-ID] to language list

Change-Id: I2935811e1fb3bc13cb61a849aeaf9e628a55cdf5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90383
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index d052d19cecce..67aedf85763d 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -687,6 +687,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_GUADELOUPEAN_CREOLE_FRENCH, "gcf", "GP", k0 },
 { LANGUAGE_USER_LIGURIAN,  "lij", "IT", k0},
 { LANGUAGE_USER_MINANGKABAU,   "min", "ID", k0},
+{ LANGUAGE_USER_SUNDANESE, "sun", "ID", k0},
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index c39605967f96..63f21579a0ed 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -756,6 +756,7 @@ namespace o3tl
 #define LANGUAGE_USER_GUADELOUPEAN_CREOLE_FRENCHLanguageType(0x06A5)
 #define LANGUAGE_USER_LIGURIAN  LanguageType(0x06A6)
 #define LANGUAGE_USER_MINANGKABAU   LanguageType(0x06A7)
+#define LANGUAGE_USER_SUNDANESE LanguageType(0x06A8)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index a00df25110c4..ed15bf3d8e26 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -422,7 +422,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kabardian") , LANGUAGE_USER_KABARDIAN 
},
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Guadeloupean Creole French") , 
LANGUAGE_USER_GUADELOUPEAN_CREOLE_FRENCH },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Ligurian") , LANGUAGE_USER_LIGURIAN },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Minangkabau") , 
LANGUAGE_USER_MINANGKABAU }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Minangkabau") , 
LANGUAGE_USER_MINANGKABAU },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sundanese") , LANGUAGE_USER_SUNDANESE 
}
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-18 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/inc/langtab.hrc|3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a8529d471a4a1f761bf74f46542af7c3c59118bb
Author: Eike Rathke 
AuthorDate: Tue Feb 18 20:57:28 2020 +0100
Commit: Eike Rathke 
CommitDate: Tue Feb 18 23:00:32 2020 +0100

Resolves: tdf#130757 Add Minangkabau [min-ID] to language list

Change-Id: I901e64c223723bf2eac908dda80796a7a2799147
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88985
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index a3910ddff3c2..d052d19cecce 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -686,6 +686,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_KABARDIAN, "kbd", "RU", k0},// 
Cyrillic script
 { LANGUAGE_USER_GUADELOUPEAN_CREOLE_FRENCH, "gcf", "GP", k0 },
 { LANGUAGE_USER_LIGURIAN,  "lij", "IT", k0},
+{ LANGUAGE_USER_MINANGKABAU,   "min", "ID", k0},
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 26580e9c7310..c39605967f96 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -755,6 +755,7 @@ namespace o3tl
 #define LANGUAGE_USER_KABARDIAN LanguageType(0x06A4)
 #define LANGUAGE_USER_GUADELOUPEAN_CREOLE_FRENCHLanguageType(0x06A5)
 #define LANGUAGE_USER_LIGURIAN  LanguageType(0x06A6)
+#define LANGUAGE_USER_MINANGKABAU   LanguageType(0x06A7)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 6924c13dd7c7..a00df25110c4 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -421,7 +421,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Nigeria)") , 
LANGUAGE_USER_ENGLISH_NIGERIA },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kabardian") , LANGUAGE_USER_KABARDIAN 
},
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Guadeloupean Creole French") , 
LANGUAGE_USER_GUADELOUPEAN_CREOLE_FRENCH },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Ligurian") , LANGUAGE_USER_LIGURIAN }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Ligurian") , LANGUAGE_USER_LIGURIAN },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Minangkabau") , 
LANGUAGE_USER_MINANGKABAU }
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-10 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/inc/langtab.hrc|3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 86a42619213d6543e77ceb55f069926a2090f823
Author: Eike Rathke 
AuthorDate: Mon Feb 10 14:31:13 2020 +0100
Commit: Eike Rathke 
CommitDate: Mon Feb 10 20:50:27 2020 +0100

Resolves: tdf#130550 Add Ligurian [lij-IT] to language list

Change-Id: I6a83bd754ebebf877d6638d5672194aefcf179bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88372
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 68cb253c6b3f..a3910ddff3c2 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -685,6 +685,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_ENGLISH_NIGERIA,"en", "NG", k0},
 { LANGUAGE_USER_KABARDIAN, "kbd", "RU", k0},// 
Cyrillic script
 { LANGUAGE_USER_GUADELOUPEAN_CREOLE_FRENCH, "gcf", "GP", k0 },
+{ LANGUAGE_USER_LIGURIAN,  "lij", "IT", k0},
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 1b2a672b9ea7..26580e9c7310 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -754,6 +754,7 @@ namespace o3tl
 #define LANGUAGE_USER_ENGLISH_NIGERIA   LanguageType(0xA809)  /* 
makeLangID( 0x2A, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_KABARDIAN LanguageType(0x06A4)
 #define LANGUAGE_USER_GUADELOUPEAN_CREOLE_FRENCHLanguageType(0x06A5)
+#define LANGUAGE_USER_LIGURIAN  LanguageType(0x06A6)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index c00a58802b25..6924c13dd7c7 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -420,7 +420,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Sri Lanka)") , 
LANGUAGE_USER_ENGLISH_SRI_LANKA },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Nigeria)") , 
LANGUAGE_USER_ENGLISH_NIGERIA },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kabardian") , LANGUAGE_USER_KABARDIAN 
},
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Guadeloupean Creole French") , 
LANGUAGE_USER_GUADELOUPEAN_CREOLE_FRENCH }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Guadeloupean Creole French") , 
LANGUAGE_USER_GUADELOUPEAN_CREOLE_FRENCH },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Ligurian") , LANGUAGE_USER_LIGURIAN }
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-11-27 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/inc/langtab.hrc|3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 38891ff0510228300c1530a96a45d25f495cd826
Author: Eike Rathke 
AuthorDate: Wed Nov 27 23:50:05 2019 +0100
Commit: Eike Rathke 
CommitDate: Thu Nov 28 02:43:25 2019 +0100

Resolves: tdf#129045 add Guadeloupean Creole French [gcf-GP] to language 
list

Change-Id: I8c595cb81ab2017d6c1ec95501f06dade081093a
Reviewed-on: https://gerrit.libreoffice.org/83958
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 60fbe5ff4e0a..3a915cc56416 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -684,6 +684,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_ENGLISH_SRI_LANKA,  "en", "LK", k0},
 { LANGUAGE_USER_ENGLISH_NIGERIA,"en", "NG", k0},
 { LANGUAGE_USER_KABARDIAN, "kbd", "RU", k0},// 
Cyrillic script
+{ LANGUAGE_USER_GUADELOUPEAN_CREOLE_FRENCH, "gcf", "GP", k0 },
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index a9ee385f1cee..1b2a672b9ea7 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -753,6 +753,7 @@ namespace o3tl
 #define LANGUAGE_USER_ENGLISH_SRI_LANKA LanguageType(0xA409)  /* 
makeLangID( 0x29, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_ENGLISH_NIGERIA   LanguageType(0xA809)  /* 
makeLangID( 0x2A, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_KABARDIAN LanguageType(0x06A4)
+#define LANGUAGE_USER_GUADELOUPEAN_CREOLE_FRENCHLanguageType(0x06A5)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 6f8c4a21a833..f40e9502a8e6 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -420,7 +420,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Zambia)") , 
LANGUAGE_USER_ENGLISH_ZAMBIA },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Sri Lanka)") , 
LANGUAGE_USER_ENGLISH_SRI_LANKA },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Nigeria)") , 
LANGUAGE_USER_ENGLISH_NIGERIA },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kabardian") , LANGUAGE_USER_KABARDIAN 
}
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kabardian") , LANGUAGE_USER_KABARDIAN 
},
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Guadeloupean Creole French") , 
LANGUAGE_USER_GUADELOUPEAN_CREOLE_FRENCH }
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-11-19 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/inc/langtab.hrc|3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit b4008306febc147e9f8a3c91102304ec40671a07
Author: Eike Rathke 
AuthorDate: Mon Nov 18 15:57:47 2019 +0100
Commit: Eike Rathke 
CommitDate: Tue Nov 19 10:45:50 2019 +0100

Resolves: tdf#128855 Add Kabardian [kbd-RU] to language list

Change-Id: I84cfc3aa3f018de1d6950617fe2a06402ce2ac2b
Reviewed-on: https://gerrit.libreoffice.org/83103
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 9e6d87fdd927..3d8da21708b1 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -680,6 +680,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_ENGLISH_ZAMBIA, "en", "ZM", k0},
 { LANGUAGE_USER_ENGLISH_SRI_LANKA,  "en", "LK", k0},
 { LANGUAGE_USER_ENGLISH_NIGERIA,"en", "NG", k0},
+{ LANGUAGE_USER_KABARDIAN, "kbd", "RU", k0},// 
Cyrillic script
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index d149016d2ae4..a9ee385f1cee 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -752,6 +752,7 @@ namespace o3tl
 #define LANGUAGE_USER_ENGLISH_ZAMBIALanguageType(0xA009)  /* 
makeLangID( 0x28, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_ENGLISH_SRI_LANKA LanguageType(0xA409)  /* 
makeLangID( 0x29, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_ENGLISH_NIGERIA   LanguageType(0xA809)  /* 
makeLangID( 0x2A, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
+#define LANGUAGE_USER_KABARDIAN LanguageType(0x06A4)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 7ca5feb8156b..6f8c4a21a833 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -419,7 +419,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Iloko") , LANGUAGE_USER_ILOKO },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Zambia)") , 
LANGUAGE_USER_ENGLISH_ZAMBIA },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Sri Lanka)") , 
LANGUAGE_USER_ENGLISH_SRI_LANKA },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Nigeria)") , 
LANGUAGE_USER_ENGLISH_NIGERIA }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Nigeria)") , 
LANGUAGE_USER_ENGLISH_NIGERIA },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kabardian") , LANGUAGE_USER_KABARDIAN 
}
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-08-20 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/inc/langtab.hrc|3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a66098e901dc06cd09d7243dde6552fa15129c28
Author: Eike Rathke 
AuthorDate: Tue Aug 20 20:18:20 2019 +0200
Commit: Eike Rathke 
CommitDate: Tue Aug 20 21:08:09 2019 +0200

Related: tdf#127011 add English (Nigeria) [en-NG] 0xA809 to language list

Change-Id: I017d68a7c86bf28e60f68d48208ecb13ddf9ac13
Reviewed-on: https://gerrit.libreoffice.org/77855
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 612efc294db5..ac8e0b565215 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -679,6 +679,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_ILOKO, "ilo", "PH", k0},
 { LANGUAGE_USER_ENGLISH_ZAMBIA, "en", "ZM", k0},
 { LANGUAGE_USER_ENGLISH_SRI_LANKA,  "en", "LK", k0},
+{ LANGUAGE_USER_ENGLISH_NIGERIA,"en", "NG", k0},
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index fb7ee80118bf..0978e822e669 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -751,6 +751,7 @@ namespace o3tl
 #define LANGUAGE_USER_ILOKO LanguageType(0x06A3)
 #define LANGUAGE_USER_ENGLISH_ZAMBIALanguageType(0xA009)  /* 
makeLangID( 0x28, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_ENGLISH_SRI_LANKA LanguageType(0xA409)  /* 
makeLangID( 0x29, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
+#define LANGUAGE_USER_ENGLISH_NIGERIA   LanguageType(0xA809)  /* 
makeLangID( 0x2A, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 48a6126edc39..7ca5feb8156b 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -418,7 +418,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Naro") , LANGUAGE_USER_NARO },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Iloko") , LANGUAGE_USER_ILOKO },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Zambia)") , 
LANGUAGE_USER_ENGLISH_ZAMBIA },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Sri Lanka)") , 
LANGUAGE_USER_ENGLISH_SRI_LANKA }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Sri Lanka)") , 
LANGUAGE_USER_ENGLISH_SRI_LANKA },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Nigeria)") , 
LANGUAGE_USER_ENGLISH_NIGERIA }
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-07-18 Thread Eike Rathke (via logerrit)

 i18nlangtag/source/isolang/isolang.cxx |2 +-
 include/i18nlangtag/lang.h |2 +-
 svtools/inc/langtab.hrc|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 647060ece2df49e2655a4015c581543ac9ad1e19
Author: Eike Rathke 
AuthorDate: Thu Jul 18 14:11:11 2019 +0200
Commit: Eike Rathke 
CommitDate: Thu Jul 18 20:42:20 2019 +0200

It's Classical Armenian, not Classic [xcl-AM]

Change-Id: I1c714c8a9ecfd3cf73e645e1693101e7fce433e4
Reviewed-on: https://gerrit.libreoffice.org/75856
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index be183839fb59..ca511f9989df 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -673,7 +673,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_FON,   "fon", "BJ", k0},
 { LANGUAGE_USER_PLAUTDIETSCH,  "pdt", "CA", k0},
 { LANGUAGE_USER_ARMENIAN_WESTERN,  "hyw", "AM", k0},
-{ LANGUAGE_USER_ARMENIAN_CLASSIC,  "xcl", "AM", k0},
+{ LANGUAGE_USER_ARMENIAN_CLASSICAL,"xcl", "AM", k0},
 { LANGUAGE_USER_JUHOAN,"ktz", "NA", k0},
 { LANGUAGE_USER_NARO,  "nhr", "BW", k0},
 { LANGUAGE_USER_ILOKO, "ilo", "PH", k0},
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 0863e5a1a9ae..37dba1cc5123 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -743,7 +743,7 @@ namespace o3tl
 #define LANGUAGE_USER_ARMENIAN_RUSSIA   LanguageType(0x802B)  /* 
makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_ARMENIAN)) */
 #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_ARMENIAN_CLASSICALLanguageType(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)) */
 #define LANGUAGE_USER_JUHOANLanguageType(0x06A1)
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 43394d03e2a1..13fb8a89070a 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -411,7 +411,7 @@ const std::pair 
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, Classical (Armenia)") , 
LANGUAGE_USER_ARMENIAN_CLASSICAL },
 { 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 },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Juǀ’hoan") , LANGUAGE_USER_JUHOAN },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-10-20 Thread Libreoffice Gerrit user

 i18nlangtag/source/languagetag/languagetag.cxx |2 +-
 include/i18nlangtag/languagetag.hxx|2 +-
 svtools/source/misc/langtab.cxx|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 06eb767c39d8e42698ce8497d0d3fb867c2b
Author: Stephan Bergmann 
AuthorDate: Fri Oct 19 15:53:45 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Sat Oct 20 10:39:28 2018 +0200

Turn LanguageTag::ScriptType into scoped enum

...to avoid -Werror,-Wshadow from Clang trunk with
 "Improve -Wshadow warnings with 
enumerators",
warning about shadowing of UNKNOWN in e.g. enum ESCHER_BlibType in
include/filter/msfilter/escherex.hxx

Change-Id: Id6608474e76730be4c439f480c31f661b8b5748e
Reviewed-on: https://gerrit.libreoffice.org/62013
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index ba3d82cce475..c0e27492f912 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -673,7 +673,7 @@ LanguageTag::ScriptType LanguageTag::getOnTheFlyScriptType( 
LanguageType nRegist
 if (itID != rMapLangID.end())
 return (*itID).second->getScriptType();
 else
-return UNKNOWN;
+return ScriptType::UNKNOWN;
 }
 
 
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index 9f3dc877d9de..08fc60dac933 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -62,7 +62,7 @@ public:
 These need to correspond to the ExtraLanguages.ScriptType template
 property in officecfg/registry/schema/org/openoffice/VCL.xcs
  */
-enum ScriptType
+enum class ScriptType
 {
 UNKNOWN = 0,
 WESTERN = 1,  // Copies css::i18n::ScriptType for strong types
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index da486b63b90c..5ba340c2efc3 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -186,7 +186,7 @@ SvtLanguageTableImpl::SvtLanguageTableImpl()
 {
 LanguageTag aLang(rBcp47);
 LanguageType nLangType = aLang.getLanguageType();
-if (nType <= LanguageTag::ScriptType::RTL && nType > 
LanguageTag::ScriptType::UNKNOWN)
+if (nType <= sal_Int32(LanguageTag::ScriptType::RTL) && nType > 
sal_Int32(LanguageTag::ScriptType::UNKNOWN))
 aLang.setScriptType(LanguageTag::ScriptType(nType));
 sal_uInt32 nPos = FindIndex(nLangType);
 if (nPos == RESARRAY_INDEX_NOTFOUND)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-26 Thread Libreoffice Gerrit user

 i18nlangtag/source/languagetag/languagetag.cxx |6 --
 include/i18nlangtag/languagetag.hxx|2 --
 2 files changed, 8 deletions(-)

New commits:
commit e9cca2f5e66604ec9bf38fccc6949c7d68a6010c
Author: Stephan Bergmann 
AuthorDate: Thu Jul 26 11:34:38 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jul 26 15:25:56 2018 +0200

i18nlangtag: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)

...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future.  (Even if a dtor 
was
declared non-inline in an include file, the apparently-used 
implicitly-defined
copy functions are already inline, so why bother with a non-inline dtor.)

Change-Id: I6de6b84ebd177f494864d7de91e538fa5a64985c
Reviewed-on: https://gerrit.libreoffice.org/58058
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index d46ff8bba324..fd3f1156c744 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -559,12 +559,6 @@ LanguageTag::LanguageTag( const rtl_Locale & rLocale )
 convertFromRtlLocale();
 }
 
-
-LanguageTag::~LanguageTag()
-{
-}
-
-
 LanguageTag::ImplPtr LanguageTagImpl::registerOnTheFly( LanguageType 
nRegisterID )
 {
 LanguageTag::ImplPtr pImpl;
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index 1bab1806e959..9f3dc877d9de 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -107,8 +107,6 @@ public:
  */
 explicit LanguageTag( const rtl_Locale & rLocale );
 
-~LanguageTag();
-
 /** Obtain BCP 47 language tag.
 
 @param bResolveSystem
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-05-15 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/inc/langtab.hrc|3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit ed9416446def1a9c9af3869c3113d041ad33884e
Author: Eike Rathke 
Date:   Tue May 15 20:20:03 2018 +0200

Resolves: tdf#117617 Add Iloko [ilo-PH] to language list

Change-Id: If8444a847fa652de8b7b834e08c3e5116721c987

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 38e8f6d89476..0570be841736 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -676,6 +676,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_ARMENIAN_CLASSIC,  "xcl", "AM", k0},
 { LANGUAGE_USER_JUHOAN,"ktz", "NA", k0},
 { LANGUAGE_USER_NARO,  "nhr", "BW", k0},
+{ LANGUAGE_USER_ILOKO, "ilo", "PH", k0},
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index ae7235288cfb..84adccafc6bf 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -744,6 +744,7 @@ namespace o3tl
 #define LANGUAGE_USER_MALAY_ARABIC_BRUNEI   LanguageType(0x843E)  /* 
makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_MALAY_BRUNEI_DARUSSALAM)) */
 #define LANGUAGE_USER_JUHOANLanguageType(0x06A1)
 #define LANGUAGE_USER_NARO  LanguageType(0x06A2)
+#define LANGUAGE_USER_ILOKO LanguageType(0x06A3)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 68e64d8a238a..ff23fc65f31c 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -414,7 +414,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { 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 },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Juǀ’hoan") , LANGUAGE_USER_JUHOAN },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Naro") , LANGUAGE_USER_NARO }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Naro") , LANGUAGE_USER_NARO },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Iloko") , LANGUAGE_USER_ILOKO }
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-05-08 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |2 ++
 include/i18nlangtag/lang.h |2 ++
 svtools/inc/langtab.hrc|4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 6b2fa7792a8e4feafb6920f0b289bf2c525d14e5
Author: Eike Rathke 
Date:   Tue May 8 19:42:19 2018 +0200

Add Ju|’hoansi [ktz-NA] and Naro [nhr-BW] to language list

Change-Id: I65c048a7d52432a7d268b9a0f58aba7efc12a16e

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index f2af1092ed42..38e8f6d89476 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -674,6 +674,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_PLAUTDIETSCH,  "pdt", "CA", k0},
 { LANGUAGE_USER_ARMENIAN_WESTERN,  "hyw", "AM", k0},
 { LANGUAGE_USER_ARMENIAN_CLASSIC,  "xcl", "AM", k0},
+{ LANGUAGE_USER_JUHOAN,"ktz", "NA", k0},
+{ LANGUAGE_USER_NARO,  "nhr", "BW", k0},
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 4030651e9123..ae7235288cfb 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -742,6 +742,8 @@ namespace o3tl
 #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)) */
+#define LANGUAGE_USER_JUHOANLanguageType(0x06A1)
+#define LANGUAGE_USER_NARO  LanguageType(0x06A2)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 69f397cfab29..ab173f8ec7a0 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -412,7 +412,9 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { 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", "Malay Arabic (Malaysia)") , 
LANGUAGE_USER_MALAY_ARABIC_MALAYSIA },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Malay Arabic (Brunei Darussalam)") , 
LANGUAGE_USER_MALAY_ARABIC_BRUNEI }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Malay Arabic (Brunei Darussalam)") , 
LANGUAGE_USER_MALAY_ARABIC_BRUNEI },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Ju|’hoansi") , LANGUAGE_USER_JUHOAN },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Naro") , LANGUAGE_USER_NARO }
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-05-04 Thread 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 
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 
Reviewed-by: Eike Rathke 

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 
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",

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

2018-03-01 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |4 
 include/i18nlangtag/lang.h |6 +-
 svtools/inc/langtab.hrc|8 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 01d9d5b491d03004b3690c2a1ff4d7e02a5a
Author: Eike Rathke 
Date:   Thu Mar 1 18:46:36 2018 +0100

Resolves: tdf#116058 add Armenian [hy-IR] [hy-RU] [hyw-AM] [xcl-AM]

Change-Id: I00890f8a7787c7cb9f6016c4283d38b25523a0c9

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index af2f48cb3151..afe71714d86f 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -325,6 +325,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_SERBIAN_LATIN_BOSNIA_HERZEGOVINA,  "sh", "BA", kSAME }, 
 // legacy kludge, is sr-Latn-BA now
 { LANGUAGE_SERBIAN_LATIN_LSO, "sh", ""  , kSAME }, 
 // legacy kludge, is sr-Latn now
 { LANGUAGE_ARMENIAN,"hy", "AM", k0 },
+{ LANGUAGE_USER_ARMENIAN_RUSSIA,"hy", "RU", k0 },
+{ LANGUAGE_USER_ARMENIAN_IRAN,  "hy", "IR", k0 },
 { LANGUAGE_AZERI_LATIN, "az", "AZ", k0 },// 
macrolanguage code
 { LANGUAGE_UZBEK_LATIN, "uz", "UZ", k0 },// 
macrolanguage code
 { LANGUAGE_UZBEK_LATIN_LSO, "uz", ""  , k0 },// 
macrolanguage code
@@ -670,6 +672,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_KITUBA_DRCONGO,"ktu", "CD", k0 },
 { LANGUAGE_USER_FON,   "fon", "BJ", k0 },
 { LANGUAGE_USER_PLAUTDIETSCH,  "pdt", "CA", k0 },
+{ LANGUAGE_USER_ARMENIAN_WESTERN,  "hyw", "AM", k0 },
+{ LANGUAGE_USER_ARMENIAN_CLASSIC,  "xcl", "AM", k0 },
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0 },// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0 },// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0 },// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 74d404e3a91b..e1645f31d94f 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -144,7 +144,7 @@ namespace o3tl
 #define LANGUAGE_ARABIC_TUNISIA LanguageType(0x1C01)
 #define LANGUAGE_ARABIC_UAE LanguageType(0x3801)
 #define LANGUAGE_ARABIC_YEMEN   LanguageType(0x2401)
-#define LANGUAGE_ARMENIAN   LanguageType(0x042B)
+#define LANGUAGE_ARMENIAN   LanguageType(0x042B)  /* Eastern 
Armenian */
 #define LANGUAGE_ASSAMESE   LanguageType(0x044D)
 #define LANGUAGE_AZERI_CYRILLIC LanguageType(0x082C)
 #define LANGUAGE_AZERI_CYRILLIC_LSO LanguageType(0x742C)
@@ -736,6 +736,10 @@ namespace o3tl
 #define LANGUAGE_USER_KITUBA_DRCONGOLanguageType(0x069C)
 #define LANGUAGE_USER_FON   LanguageType(0x069D)
 #define LANGUAGE_USER_PLAUTDIETSCH  LanguageType(0x069E)
+#define LANGUAGE_USER_ARMENIAN_RUSSIA   LanguageType(0x802B)  /* 
makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_ARMENIAN)) */
+#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)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index b23d30e6fb8a..a054dbe3232c 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -59,7 +59,7 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (UAE)") , LANGUAGE_ARABIC_UAE 
},
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Arabic (Yemen)") , 
LANGUAGE_ARABIC_YEMEN },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Aragonese") , LANGUAGE_USER_ARAGONESE 
},
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian") , LANGUAGE_ARMENIAN },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Eastern (Armenia)") , 
LANGUAGE_ARMENIAN },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Assamese") , LANGUAGE_ASSAMESE },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Azerbaijani Latin") , 
LANGUAGE_AZERI_LATIN },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Azerbaijani Cyrillic") , 
LANGUAGE_AZERI_CYRILLIC },
@@ -406,7 +406,11 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Xibe") , LANGUAGE_USER_XIBE },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kituba (Democratic Republic of the 
Congo)"), LANGUAGE_USER_KITUBA_DRCONGO },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Fon"),

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

2018-01-05 Thread Caolán McNamara

 i18nlangtag/source/languagetag/languagetag.cxx |   12 ++--
 include/i18nlangtag/languagetag.hxx|3 +++
 unotools/source/config/configmgr.cxx   |2 ++
 3 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit cadfee0a72cf032314833959f7b7f3f6688a3079
Author: CaolÃ¡n McNamara 
Date:   Fri Jan 5 15:15:15 2018 +

ofz#4952 avoid liblangtag config when fuzzing enabled

Change-Id: I9f2b0cbb5108f57ec2f80ebe24f748c33ea9cf59
Reviewed-on: https://gerrit.libreoffice.org/47477
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 28842ccace6d..f9945f10c5c9 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -702,6 +702,14 @@ void LanguageTag::setConfiguredSystemLanguage( 
LanguageType nLang )
 aLanguageTag.registerImpl();
 }
 
+static bool lt_tag_parse_disabled = false;
+
+// static
+void LanguageTag::disable_lt_tag_parse()
+{
+lt_tag_parse_disabled = true;
+}
+
 static bool lcl_isKnownOnTheFlyID( LanguageType nLang )
 {
 return nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM &&
@@ -1197,7 +1205,7 @@ bool LanguageTagImpl::canonicalize()
 
 myLtError aError;
 
-if (lt_tag_parse( mpImplLangtag, OUStringToOString( maBcp47, 
RTL_TEXTENCODING_UTF8).getStr(), ))
+if (!lt_tag_parse_disabled && lt_tag_parse(mpImplLangtag, 
OUStringToOString(maBcp47, RTL_TEXTENCODING_UTF8).getStr(), ))
 {
 char* pTag = lt_tag_canonicalize( mpImplLangtag, );
 SAL_WARN_IF( !pTag, "i18nlangtag", "LanguageTagImpl::canonicalize: 
could not canonicalize '" << maBcp47 << "'");
@@ -2809,7 +2817,7 @@ bool LanguageTag::isValidBcp47( const OUString& rString, 
OUString* o_pCanonicali
 
 myLtError aError;
 
-if (lt_tag_parse( aVar.mpLangtag, OUStringToOString( rString, 
RTL_TEXTENCODING_UTF8).getStr(), ))
+if (!lt_tag_parse_disabled && lt_tag_parse(aVar.mpLangtag, 
OUStringToOString(rString, RTL_TEXTENCODING_UTF8).getStr(), ))
 {
 char* pTag = lt_tag_canonicalize( aVar.mpLangtag, );
 SAL_WARN_IF( !pTag, "i18nlangtag", "LanguageTag:isValidBcp47: could 
not canonicalize '" << rString << "'");
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index a9937205ef8c..f337d147b414 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -528,6 +528,9 @@ public:
 /** @ATTENTION: _ONLY_ to be called by the application's configuration! */
 static void setConfiguredSystemLanguage( LanguageType nLang );
 
+/** @ATTENTION: _ONLY_ to be called by fuzzing setup */
+static void disable_lt_tag_parse();
+
 typedef std::shared_ptr< LanguageTagImpl > ImplPtr;
 
 private:
diff --git a/unotools/source/config/configmgr.cxx 
b/unotools/source/config/configmgr.cxx
index 417bfc311bbf..1f83a94830d2 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -205,6 +206,7 @@ bool utl::ConfigManager::IsFuzzing()
 void utl::ConfigManager::EnableFuzzing()
 {
 bIsFuzzing = true;
+LanguageTag::disable_lt_tag_parse();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-04 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/inc/langtab.hrc|3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 01c7c4e1cb074f88440336068285495743bd6b37
Author: Eike Rathke 
Date:   Mon Dec 4 20:04:27 2017 +0100

Add Plautdietsch [pdt-CA] to language listbox

Change-Id: Icf2307649858721a7cde38e8fa892fc3cb1ff08c

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index c2bdbf567b2a..af2f48cb3151 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -669,6 +669,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_XIBE,  "sjo", "CN", k0 },
 { LANGUAGE_USER_KITUBA_DRCONGO,"ktu", "CD", k0 },
 { LANGUAGE_USER_FON,   "fon", "BJ", k0 },
+{ LANGUAGE_USER_PLAUTDIETSCH,  "pdt", "CA", k0 },
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0 },// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0 },// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0 },// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 2c90af7110fe..74d404e3a91b 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -735,6 +735,7 @@ namespace o3tl
 #define LANGUAGE_USER_XIBE  LanguageType(0x069B)
 #define LANGUAGE_USER_KITUBA_DRCONGOLanguageType(0x069C)
 #define LANGUAGE_USER_FON   LanguageType(0x069D)
+#define LANGUAGE_USER_PLAUTDIETSCH  LanguageType(0x069E)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 54e356feb1d1..b23d30e6fb8a 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -405,7 +405,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Manchu") , LANGUAGE_USER_MANCHU },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Xibe") , LANGUAGE_USER_XIBE },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kituba (Democratic Republic of the 
Congo)"), LANGUAGE_USER_KITUBA_DRCONGO },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Fon"), LANGUAGE_USER_FON }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Fon"), LANGUAGE_USER_FON },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Plautdietsch"), 
LANGUAGE_USER_PLAUTDIETSCH }
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-14 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/inc/langtab.hrc|3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a6259d1a9572f766d01d573d3d5bdf80d43df762
Author: Eike Rathke 
Date:   Tue Nov 14 19:41:09 2017 +0100

Resolves: tdf#113835 add Fon [fon-BJ] to language list

Change-Id: Iee741421d8f6a9a2b9b14439612890426cdf4712

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 46343d3751ea..c2bdbf567b2a 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -668,6 +668,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_MANCHU,"mnc", "CN", k0 },
 { LANGUAGE_USER_XIBE,  "sjo", "CN", k0 },
 { LANGUAGE_USER_KITUBA_DRCONGO,"ktu", "CD", k0 },
+{ LANGUAGE_USER_FON,   "fon", "BJ", k0 },
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0 },// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0 },// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0 },// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index c83bd82e041e..2c90af7110fe 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -734,6 +734,7 @@ namespace o3tl
 #define LANGUAGE_USER_MANCHULanguageType(0x069A)
 #define LANGUAGE_USER_XIBE  LanguageType(0x069B)
 #define LANGUAGE_USER_KITUBA_DRCONGOLanguageType(0x069C)
+#define LANGUAGE_USER_FON   LanguageType(0x069D)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 95a6b23b62bf..54e356feb1d1 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -404,7 +404,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Malaysia)") , 
LANGUAGE_ENGLISH_MALAYSIA },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Manchu") , LANGUAGE_USER_MANCHU },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Xibe") , LANGUAGE_USER_XIBE },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kituba (Democratic Republic of the 
Congo)"), LANGUAGE_USER_KITUBA_DRCONGO }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Kituba (Democratic Republic of the 
Congo)"), LANGUAGE_USER_KITUBA_DRCONGO },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Fon"), LANGUAGE_USER_FON }
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-09 Thread Jochen Nitschke

 i18nlangtag/source/languagetag/languagetag.cxx |   32 -
 include/i18nlangtag/languagetag.hxx|2 -
 2 files changed, 34 deletions(-)

New commits:
commit d12699bab3eab6e29f0667f042148e5634c9efe4
Author: Jochen Nitschke 
Date:   Thu Nov 9 21:01:51 2017 +0100

clang-tidy modernize-use-equals-default LanguageTag

mbIsFallback was added to ctor but not to copy assignment in
commit 258d9fac7544f925c8250bad99b9554cc49578d5
CID#1103756 missing initialization

Change-Id: I91ee5daf68c3c3682b5d7007c028eaf3579a0715
Reviewed-on: https://gerrit.libreoffice.org/44563
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 3f887de7d6c1..28842ccace6d 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -561,38 +561,6 @@ LanguageTag::LanguageTag( const rtl_Locale & rLocale )
 }
 
 
-LanguageTag::LanguageTag( const LanguageTag & rLanguageTag )
-:
-maLocale( rLanguageTag.maLocale),
-maBcp47( rLanguageTag.maBcp47),
-mnLangID( rLanguageTag.mnLangID),
-mpImpl( rLanguageTag.mpImpl),
-mbSystemLocale( rLanguageTag.mbSystemLocale),
-mbInitializedBcp47( rLanguageTag.mbInitializedBcp47),
-mbInitializedLocale( rLanguageTag.mbInitializedLocale),
-mbInitializedLangID( rLanguageTag.mbInitializedLangID),
-mbIsFallback(rLanguageTag.mbIsFallback)
-{
-}
-
-
-LanguageTag& LanguageTag::operator=( const LanguageTag & rLanguageTag )
-{
-if ( == this)
-return *this;
-
-maLocale= rLanguageTag.maLocale;
-maBcp47 = rLanguageTag.maBcp47;
-mnLangID= rLanguageTag.mnLangID;
-mpImpl  = rLanguageTag.mpImpl;
-mbSystemLocale  = rLanguageTag.mbSystemLocale;
-mbInitializedBcp47  = rLanguageTag.mbInitializedBcp47;
-mbInitializedLocale = rLanguageTag.mbInitializedLocale;
-mbInitializedLangID = rLanguageTag.mbInitializedLangID;
-return *this;
-}
-
-
 LanguageTag::~LanguageTag()
 {
 }
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index 42da7cc88179..a9937205ef8c 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -107,9 +107,7 @@ public:
  */
 explicit LanguageTag( const rtl_Locale & rLocale );
 
-LanguageTag( const LanguageTag & rLanguageTag );
 ~LanguageTag();
-LanguageTag& operator=( const LanguageTag & rLanguageTag );
 
 /** Obtain BCP 47 language tag.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag include/linguistic jvmfwk/source linguistic/source

2017-10-31 Thread Noel Grandin

 i18nlangtag/source/isolang/mslangid.cxx|   30 +++--
 i18nlangtag/source/languagetag/languagetag.cxx |6 +--
 include/i18nlangtag/mslangid.hxx   |   10 +
 include/linguistic/spelldta.hxx|3 -
 jvmfwk/source/elements.cxx |   11 ++
 linguistic/source/spelldta.cxx |   42 ++---
 6 files changed, 40 insertions(+), 62 deletions(-)

New commits:
commit eb5d232342b1d0f596b6e9c5f8df740a6ec614ff
Author: Noel Grandin 
Date:   Tue Oct 31 09:07:27 2017 +0200

loplugin:constantparam in i18nlangtag

Change-Id: I148a47a9b63b78651ec18cd947f45b8f4dbb9345
Reviewed-on: https://gerrit.libreoffice.org/44094
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index 5e2df2ee86c4..6d4b98781640 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -144,26 +144,20 @@ LanguageType MsLangId::resolveSystemLanguageByScriptType( 
LanguageType nLang, sa
 
 // static
 css::lang::Locale MsLangId::Conversion::convertLanguageToLocale(
-LanguageType nLang, bool bResolveSystem )
+LanguageType nLang )
 {
 css::lang::Locale aLocale;
-if (!bResolveSystem && simplifySystemLanguages( nLang) == LANGUAGE_SYSTEM)
-;   // nothing => empty locale
-else
+// Still resolve LANGUAGE_DONTKNOW if resolving is not requested,
+// but not LANGUAGE_SYSTEM or others.
+LanguageType nOrigLang = nLang;
+nLang = MsLangId::getRealLanguage(nLang);
+convertLanguageToLocaleImpl( nLang, aLocale, true );
+if (aLocale.Language.isEmpty() && simplifySystemLanguages(nOrigLang) == 
LANGUAGE_SYSTEM)
 {
-// Still resolve LANGUAGE_DONTKNOW if resolving is not requested,
-// but not LANGUAGE_SYSTEM or others.
-LanguageType nOrigLang = nLang;
-if (bResolveSystem || nLang == LANGUAGE_DONTKNOW)
-nLang = MsLangId::getRealLanguage( nLang);
-convertLanguageToLocaleImpl( nLang, aLocale, true);
-if (bResolveSystem && aLocale.Language.isEmpty() && 
simplifySystemLanguages( nOrigLang) == LANGUAGE_SYSTEM)
-{
-// None found but resolve requested, last resort is "en-US".
-aLocale.Language = "en";
-aLocale.Country  = "US";
-aLocale.Variant.clear();
-}
+// None found but resolve requested, last resort is "en-US".
+aLocale.Language = "en";
+aLocale.Country  = "US";
+aLocale.Variant.clear();
 }
 return aLocale;
 }
@@ -187,7 +181,7 @@ css::lang::Locale MsLangId::getFallbackLocale(
 {
 // empty language => LANGUAGE_SYSTEM
 if (rLocale.Language.isEmpty())
-return Conversion::lookupFallbackLocale( 
Conversion::convertLanguageToLocale( LANGUAGE_SYSTEM, true));
+return Conversion::lookupFallbackLocale( 
Conversion::convertLanguageToLocale( LANGUAGE_SYSTEM ));
 else
 return Conversion::lookupFallbackLocale( rLocale);
 }
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 1e65fe593f6d..3f887de7d6c1 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -961,7 +961,7 @@ LanguageTag::ImplPtr LanguageTag::registerImpl() const
 // May have involved canonicalize(), so compare with
 // pImpl->maBcp47 instead of maBcp47!
 aBcp47 = LanguageTagImpl::convertToBcp47(
-MsLangId::Conversion::convertLanguageToLocale( 
pImpl->mnLangID, true));
+MsLangId::Conversion::convertLanguageToLocale( 
pImpl->mnLangID ));
 bInsert = (aBcp47 == pImpl->maBcp47);
 }
 }
@@ -1344,7 +1344,7 @@ void LanguageTagImpl::convertLocaleToBcp47()
 // locale via LanguageTag::convertToBcp47(LanguageType) and
 // LanguageTag::convertToLocale(LanguageType) would instantiate another
 // LanguageTag.
-maLocale = MsLangId::Conversion::convertLanguageToLocale( 
LANGUAGE_SYSTEM, true);
+maLocale = MsLangId::Conversion::convertLanguageToLocale( 
LANGUAGE_SYSTEM );
 }
 if (maLocale.Language.isEmpty())
 {
@@ -1488,7 +1488,7 @@ void LanguageTagImpl::convertLangToLocale()
 mbInitializedLangID = true;
 }
 // Resolve system here! The original is remembered as mbSystemLocale.
-maLocale = MsLangId::Conversion::convertLanguageToLocale( mnLangID, true);
+maLocale = MsLangId::Conversion::convertLanguageToLocale( mnLangID );
 mbInitializedLocale = true;
 }
 
diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx
index

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

2017-06-19 Thread Eike Rathke

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

New commits:
commit ecf88f83f877fd08a6d5a418c17fdf36b82a8369
Author: Eike Rathke 
Date:   Mon Jun 19 19:25:15 2017 +0200

Add Kituba (Democratic Republic of the Congo) [ktu-CD] to language list

Change-Id: I9ba7a9d104dd6a5e47aa62058d0602101053e9af

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 9ee33709f041..87bc329e9596 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -668,6 +668,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_SILESIAN,  "szl", "PL", k0 },
 { LANGUAGE_USER_MANCHU,"mnc", "CN", k0 },
 { LANGUAGE_USER_XIBE,  "sjo", "CN", k0 },
+{ LANGUAGE_USER_KITUBA_DRCONGO,"ktu", "CD", k0 },
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0 },// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0 },// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0 },// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index cc87c8283b1b..0fbd4d3d597c 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -736,6 +736,7 @@ namespace o3tl
 #define LANGUAGE_USER_HUNGARIAN_ROVAS   LanguageType(0x800E)  /* 
makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_HUNGARIAN)) */
 #define LANGUAGE_USER_MANCHULanguageType(0x069A)
 #define LANGUAGE_USER_XIBE  LanguageType(0x069B)
+#define LANGUAGE_USER_KITUBA_DRCONGOLanguageType(0x069C)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index ebdffae445a9..bf088d4c112b 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -321,7 +321,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
 < "Haitian" ; LANGUAGE_USER_HAITIAN ; > ;
 < "Beembe" ; LANGUAGE_USER_BEEMBE ; > ;
 < "Bekwel" ; LANGUAGE_USER_BEKWEL ; > ;
-< "Kituba" ; LANGUAGE_USER_KITUBA ; > ;
+< "Kituba (Congo)" ; LANGUAGE_USER_KITUBA ; > ;
 < "Lari" ; LANGUAGE_USER_LARI ; > ;
 < "Mbochi" ; LANGUAGE_USER_MBOCHI ; > ;
 < "Teke-Eboo" ; LANGUAGE_USER_TEKE_EBOO ; > ;
@@ -402,6 +402,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
 < "English (Malaysia)" ; LANGUAGE_ENGLISH_MALAYSIA ; > ;
 < "Manchu" ; LANGUAGE_USER_MANCHU ; > ;
 < "Xibe" ; LANGUAGE_USER_XIBE ; > ;
+< "Kituba (Democratic Republic of the Congo)" ; 
LANGUAGE_USER_KITUBA_DRCONGO ; > ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-15 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx  |2 +-
 i18nlangtag/source/isolang/mslangid.cxx |1 +
 include/i18nlangtag/lang.h  |2 +-
 svtools/source/misc/langtab.src |2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e0d86cff2b3314576c6cb857da06d6b6d217f89b
Author: Eike Rathke 
Date:   Wed Mar 15 18:49:07 2017 +0100

tdf#105448 add Xibe [sjo-CN] to language list (and remove Sibe [nco-PG])

... the latter which was a misunderstanding and erroneous.

Change-Id: I4ec8eaf14348aaaed43ea4578d46b5488279c85b

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index a35fef0..837fee44 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -666,7 +666,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_FRENCH_MAURITIUS,   "fr", "MU", 0 },
 { LANGUAGE_USER_SILESIAN,  "szl", "PL", 0 },
 { LANGUAGE_USER_MANCHU,"mnc", "CN", 0 },
-{ LANGUAGE_USER_SIBE,  "nco", "PG", 0 },
+{ LANGUAGE_USER_XIBE,  "sjo", "CN", 0 },
 { LANGUAGE_MULTIPLE,   "mul", ""  , 0 },// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , 0 },// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , 0 },// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index 9552318..d13d7bb 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -360,6 +360,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
 case LANGUAGE_USER_KYRGYZ_CHINA:
 case LANGUAGE_USER_HUNGARIAN_ROVAS:
 case LANGUAGE_USER_MANCHU:
+case LANGUAGE_USER_XIBE:
 nScript = css::i18n::ScriptType::COMPLEX;
 break;
 
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 3b39dee..0287c8d 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -719,7 +719,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_SILESIAN  0x0699
 #define LANGUAGE_USER_HUNGARIAN_ROVAS   0x800E  /* makeLangID( 0x20, 
getPrimaryLanguage( LANGUAGE_HUNGARIAN)) */
 #define LANGUAGE_USER_MANCHU0x069A
-#define LANGUAGE_USER_SIBE  0x069B
+#define LANGUAGE_USER_XIBE  0x069B
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index deb6282..b3056b3 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -405,7 +405,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
 < "Hungarian (Szekely-Hungarian Rovas)" ; 
LANGUAGE_USER_HUNGARIAN_ROVAS ; > ;
 < "English (Malaysia)" ; LANGUAGE_ENGLISH_MALAYSIA ; > ;
 < "Manchu" ; LANGUAGE_USER_MANCHU ; > ;
-< "Sibe" ; LANGUAGE_USER_SIBE ; > ;
+< "Xibe" ; LANGUAGE_USER_XIBE ; > ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-08-29 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx  |2 +-
 i18nlangtag/source/isolang/mslangid.cxx |4 ++--
 include/i18nlangtag/lang.h  |2 +-
 svtools/source/misc/langtab.src |2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e5cd5627ae21f68643c07d2f6330aa8b8cbf8659
Author: Eike Rathke 
Date:   Mon Aug 29 21:54:11 2016 +0200

name it Hungarian Rovas, tdf#97406 follow-up

Change-Id: I62d5a503b199922b82e7cec3e0ef971bbbd43d09

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index ba440df..435a220 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -747,7 +747,7 @@ static IsoLanguageScriptCountryEntry const 
aImplIsoLangScriptEntries[] =
 { LANGUAGE_USER_CREE_PLAINS_SYLLABICS, "crk-Cans", "CA", 0 },
 { 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_RUNIC,"hu-Hung", "HU", 0 },
+{ LANGUAGE_USER_HUNGARIAN_ROVAS,"hu-Hung", "HU", 0 },
 { LANGUAGE_DONTKNOW,"",""  , 0 }   
 // marks end of table
 };
 
diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index 860db40..71535d6 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -224,7 +224,7 @@ bool MsLangId::isRightToLeft( LanguageType nLang )
 case LANGUAGE_KURDISH_ARABIC_LSO:
 case LANGUAGE_USER_KURDISH_SOUTHERN_IRAN:
 case LANGUAGE_USER_KURDISH_SOUTHERN_IRAQ:
-case LANGUAGE_USER_HUNGARIAN_RUNIC:
+case LANGUAGE_USER_HUNGARIAN_ROVAS:
 return true;
 
 default:
@@ -353,7 +353,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
 case LANGUAGE_USER_KURDISH_SOUTHERN_IRAN:
 case LANGUAGE_USER_KURDISH_SOUTHERN_IRAQ:
 case LANGUAGE_USER_KYRGYZ_CHINA:
-case LANGUAGE_USER_HUNGARIAN_RUNIC:
+case LANGUAGE_USER_HUNGARIAN_ROVAS:
 nScript = css::i18n::ScriptType::COMPLEX;
 break;
 
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 68648d8..eeca00c 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -717,7 +717,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_ENGLISH_MAURITIUS 0x9C09  /* makeLangID( 0x27, 
getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_FRENCH_MAURITIUS  0x900C  /* makeLangID( 0x24, 
getPrimaryLanguage( LANGUAGE_FRENCH)) */
 #define LANGUAGE_USER_SILESIAN  0x0699
-#define LANGUAGE_USER_HUNGARIAN_RUNIC   0x800E  /* makeLangID( 0x20, 
getPrimaryLanguage( LANGUAGE_HUNGARIAN)) */
+#define LANGUAGE_USER_HUNGARIAN_ROVAS   0x800E  /* makeLangID( 0x20, 
getPrimaryLanguage( LANGUAGE_HUNGARIAN)) */
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 7f743f8..1240f41 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -402,7 +402,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
 < "English (Mauritius)" ; LANGUAGE_USER_ENGLISH_MAURITIUS ; > ;
 < "French (Mauritius)" ; LANGUAGE_USER_FRENCH_MAURITIUS ; > ;
 < "Silesian" ; LANGUAGE_USER_SILESIAN ; > ;
-< "Old Hungarian (Hungarian Rovas)" ; LANGUAGE_USER_HUNGARIAN_RUNIC ; 
> ;
+< "Hungarian Rovas" ; LANGUAGE_USER_HUNGARIAN_ROVAS ; > ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-08-26 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/source/misc/langtab.src|1 +
 3 files changed, 3 insertions(+)

New commits:
commit a0e60062d90652a3de5739630b152cd6215b6b6c
Author: Eike Rathke 
Date:   Fri Aug 26 12:54:50 2016 +0200

add Old Hungarian (Hungarian Rovas) [hu-Hung-HU] to language list, tdf#97406

Change-Id: I1804a08c69d496d6d1a7a8bb657b65fbfc24beb3

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index ee2de00..ba440df 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -747,6 +747,7 @@ static IsoLanguageScriptCountryEntry const 
aImplIsoLangScriptEntries[] =
 { LANGUAGE_USER_CREE_PLAINS_SYLLABICS, "crk-Cans", "CA", 0 },
 { 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_RUNIC,"hu-Hung", "HU", 0 },
 { LANGUAGE_DONTKNOW,"",""  , 0 }   
 // marks end of table
 };
 
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 48772ab..68648d8 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -717,6 +717,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_ENGLISH_MAURITIUS 0x9C09  /* makeLangID( 0x27, 
getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_FRENCH_MAURITIUS  0x900C  /* makeLangID( 0x24, 
getPrimaryLanguage( LANGUAGE_FRENCH)) */
 #define LANGUAGE_USER_SILESIAN  0x0699
+#define LANGUAGE_USER_HUNGARIAN_RUNIC   0x800E  /* makeLangID( 0x20, 
getPrimaryLanguage( LANGUAGE_HUNGARIAN)) */
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index f8c2211..7f743f8 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -402,6 +402,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
 < "English (Mauritius)" ; LANGUAGE_USER_ENGLISH_MAURITIUS ; > ;
 < "French (Mauritius)" ; LANGUAGE_USER_FRENCH_MAURITIUS ; > ;
 < "Silesian" ; LANGUAGE_USER_SILESIAN ; > ;
+< "Old Hungarian (Hungarian Rovas)" ; LANGUAGE_USER_HUNGARIAN_RUNIC ; 
> ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-08-16 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/source/misc/langtab.src|1 +
 3 files changed, 3 insertions(+)

New commits:
commit dd2679ecaa2b75670d5bf57fbe94147cf081654a
Author: Eike Rathke 
Date:   Tue Aug 16 11:41:20 2016 +0200

Resolves: tdf#101540 add Silesian [szl-PL] to language list

Change-Id: I7f73a6286d080a5ebf1b7a1bb834a06f51be6529

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index b39461d..ee2de00 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -663,6 +663,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_APATANI,   "apt", "IN", 0 },
 { LANGUAGE_USER_ENGLISH_MAURITIUS,  "en", "MU", 0 },
 { LANGUAGE_USER_FRENCH_MAURITIUS,   "fr", "MU", 0 },
+{ LANGUAGE_USER_SILESIAN,  "szl", "PL", 0 },
 { LANGUAGE_MULTIPLE,   "mul", ""  , 0 },// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , 0 },// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , 0 },// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 9cd943b..48772ab 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -716,6 +716,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_APATANI   0x0698
 #define LANGUAGE_USER_ENGLISH_MAURITIUS 0x9C09  /* makeLangID( 0x27, 
getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_FRENCH_MAURITIUS  0x900C  /* makeLangID( 0x24, 
getPrimaryLanguage( LANGUAGE_FRENCH)) */
+#define LANGUAGE_USER_SILESIAN  0x0699
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 3b23229..f8c2211 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -401,6 +401,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
 < "Apatani" ; LANGUAGE_USER_APATANI ; > ;
 < "English (Mauritius)" ; LANGUAGE_USER_ENGLISH_MAURITIUS ; > ;
 < "French (Mauritius)" ; LANGUAGE_USER_FRENCH_MAURITIUS ; > ;
+< "Silesian" ; LANGUAGE_USER_SILESIAN ; > ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-04-25 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |2 ++
 include/i18nlangtag/lang.h |2 ++
 svtools/source/misc/langtab.src|2 ++
 3 files changed, 6 insertions(+)

New commits:
commit 7e0eeacd1d1aa4c8643f1f490cdd5102ee0434a8
Author: Eike Rathke 
Date:   Mon Apr 25 14:47:03 2016 +0200

add English (Mauritius) [en-MU] and French (Mauritius) [fr-MU], tdf#99372

Change-Id: I98a0bc42a7d7f5c0943c9861556392399b9d0313

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 09d1b87..b39461d 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -661,6 +661,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_ARPITAN_ITALY, "frp", "IT", 0 },
 { LANGUAGE_USER_ARPITAN_SWITZERLAND,   "frp", "CH", 0 },
 { LANGUAGE_USER_APATANI,   "apt", "IN", 0 },
+{ LANGUAGE_USER_ENGLISH_MAURITIUS,  "en", "MU", 0 },
+{ LANGUAGE_USER_FRENCH_MAURITIUS,   "fr", "MU", 0 },
 { LANGUAGE_MULTIPLE,   "mul", ""  , 0 },// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , 0 },// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , 0 },// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 177cbc7..9cd943b 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -714,6 +714,8 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_ENGLISH_BOTSWANA  0x9809  /* makeLangID( 0x26, 
getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_INTERLINGUE   0x0697  /* no locale */
 #define LANGUAGE_USER_APATANI   0x0698
+#define LANGUAGE_USER_ENGLISH_MAURITIUS 0x9C09  /* makeLangID( 0x27, 
getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
+#define LANGUAGE_USER_FRENCH_MAURITIUS  0x900C  /* makeLangID( 0x24, 
getPrimaryLanguage( LANGUAGE_FRENCH)) */
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 1b6b0cf..3b23229 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -399,6 +399,8 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
 < "English (Botswana)" ; LANGUAGE_USER_ENGLISH_BOTSWANA ; > ;
 < "Interlingue Occidental" ; LANGUAGE_USER_INTERLINGUE ; > ;
 < "Apatani" ; LANGUAGE_USER_APATANI ; > ;
+< "English (Mauritius)" ; LANGUAGE_USER_ENGLISH_MAURITIUS ; > ;
+< "French (Mauritius)" ; LANGUAGE_USER_FRENCH_MAURITIUS ; > ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-04-20 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |   59 +
 i18nlangtag/source/languagetag/languagetag.cxx |   27 ++-
 include/i18nlangtag/mslangid.hxx   |4 -
 3 files changed, 59 insertions(+), 31 deletions(-)

New commits:
commit b7e3c63f1a384a278da4f6515f5279dbd5f46772
Author: Eike Rathke 
Date:   Wed Apr 20 18:56:33 2016 +0200

explicitly map 'C' locale and other known definitions to LanguageTag

Starting up a dbgutil build with LC_ALL=C gave

i18nlangtag/source/languagetag/languagetag.cxx:1362:
LanguageTagImpl::convertLocaleToLang: with bAllowOnTheFlyID invalid 'C'
i18nlangtag/source/languagetag/languagetag.cxx:1533:
LanguageTag::getLanguageFromLangtag: pLangT==NULL for 'C'
i18nlangtag/source/languagetag/languagetag.cxx:1593:
LanguageTag::getRegionFromLangtag: pRegionT==NULL for 'C'

Nothing harmful in this case as the default fallback is 'en-US', but it
also indicated that other known non-standard "locales" such as
"sr-latin" or "german" were not resolved to the defined values. Likely
such weird values are not in use anymore, but..

Change-Id: Ib3469354ceb236552540da5fd11d8f9e9c5ab1fd

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 1444c79..6add6e3 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -1259,27 +1259,31 @@ css::lang::Locale MsLangId::Conversion::getOverride( 
const css::lang::Locale& rL
 
 // static
 LanguageType MsLangId::Conversion::convertIsoNamesToLanguage( const OUString& 
rLang,
-const OUString& rCountry )
+const OUString& rCountry, bool bSkipIsoTable )
 {
 // language is lower case in table
 OUString aLowerLang = rLang.toAsciiLowerCase();
 // country is upper case in table
 OUString aUpperCountry = rCountry.toAsciiUpperCase();
 
-//  first look for exact match
 const IsoLanguageCountryEntry* pFirstLang = nullptr;
-for (const IsoLanguageCountryEntry* pEntry = aImplIsoLangEntries;
-pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry)
+
+if (!bSkipIsoTable)
 {
-if ( aLowerLang.equalsAscii( pEntry->maLanguage ) )
+//  first look for exact match
+for (const IsoLanguageCountryEntry* pEntry = aImplIsoLangEntries;
+pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry)
 {
-if ( aUpperCountry.isEmpty() ||
- aUpperCountry.equalsAscii( pEntry->maCountry ) )
-return pEntry->mnLang;
-if ( !pFirstLang )
-pFirstLang = pEntry;
-else if ( !*pEntry->maCountry )
-pFirstLang = pEntry;
+if ( aLowerLang.equalsAscii( pEntry->maLanguage ) )
+{
+if ( aUpperCountry.isEmpty() ||
+aUpperCountry.equalsAscii( pEntry->maCountry ) )
+return pEntry->mnLang;
+if ( !pFirstLang )
+pFirstLang = pEntry;
+else if ( !*pEntry->maCountry )
+pFirstLang = pEntry;
+}
 }
 }
 
@@ -1316,22 +1320,25 @@ LanguageType 
MsLangId::Conversion::convertIsoNamesToLanguage( const OUString& rL
 }
 }
 
-// If the language is correct, then we return the default language
-if ( pFirstLang )
-return pFirstLang->mnLang;
-
-//  if only the country is set, look for any entry matching the country
-//  (to allow reading country and language in separate steps, in any order)
-if ( !rCountry.isEmpty() && rLang.isEmpty() )
+if (!bSkipIsoTable)
 {
-for (const IsoLanguageCountryEntry* pEntry2 = aImplIsoLangEntries;
-pEntry2->mnLang != LANGUAGE_DONTKNOW; ++pEntry2)
+// If the language is correct, then we return the default language
+if ( pFirstLang )
+return pFirstLang->mnLang;
+
+//  if only the country is set, look for any entry matching the country
+//  (to allow reading country and language in separate steps, in any 
order)
+if ( !rCountry.isEmpty() && rLang.isEmpty() )
 {
-if ( aUpperCountry.equalsAscii( pEntry2->maCountry ) )
-return pEntry2->mnLang;
-}
+for (const IsoLanguageCountryEntry* pEntry2 = aImplIsoLangEntries;
+pEntry2->mnLang != LANGUAGE_DONTKNOW; ++pEntry2)
+{
+if ( aUpperCountry.equalsAscii( pEntry2->maCountry ) )
+return pEntry2->mnLang;
+}
 
-aLowerLang = aUpperCountry.toAsciiLowerCase();
+aLowerLang = aUpperCountry.toAsciiLowerCase();
+}
 }
 
 // Look for privateuse definitions.
@@ -1357,7 +1364,7 @@ LanguageType 
MsLangId::Conversion::convertIsoNamesToLanguage( const OString& rLa
 {
 OUString aLang = OStringToOUString( rLang,

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

2016-04-04 Thread Noel Grandin

 i18nlangtag/source/languagetag/languagetag.cxx |6 +++---
 include/i18nlangtag/languagetag.hxx|   13 +
 svl/source/numbers/zforlist.cxx|2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

New commits:
commit 8372d8532ba3aa3d1ec346a73d8fe9f406001f79
Author: Noel Grandin 
Date:   Mon Apr 4 11:11:21 2016 +0200

loplugin:constantparam in i18nlangtag

Change-Id: I3d7cbac7ca58f3de9771a1221196f851255f3fb9
Reviewed-on: https://gerrit.libreoffice.org/23802
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index dc8708b..e8df2a4 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -2268,15 +2268,15 @@ LanguageTag & LanguageTag::makeFallback()
 }
 
 
-bool LanguageTag::equals( const LanguageTag & rLanguageTag, bool 
bResolveSystem ) const
+bool LanguageTag::equals( const LanguageTag & rLanguageTag ) const
 {
 // If SYSTEM is not to be resolved or either both are SYSTEM or none, we
 // can use the operator==() optimization.
-if (!bResolveSystem || isSystemLocale() == rLanguageTag.isSystemLocale())
+if (isSystemLocale() == rLanguageTag.isSystemLocale())
 return operator==( rLanguageTag);
 
 // Compare full language tag strings.
-return getBcp47( bResolveSystem) == rLanguageTag.getBcp47( bResolveSystem);
+return getBcp47() == rLanguageTag.getBcp47();
 }
 
 
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index 2bbf033..f494d78 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -361,19 +361,16 @@ public:
 
 /** Test equality of two LanguageTag, possibly resolving system locale.
 
-@param bResolveSystem
-   If TRUE, resolve empty language tags denoting the system
-   locale to the real locale used before comparing.
-   If FALSE, the behavior is identical to operator==(), system
-   locales are not resolved first.
+Resolve empty language tags denoting the system
+locale to the real locale used before comparing.
   */
-boolequals( const LanguageTag & rLanguageTag, 
bool bResolveSystem = false ) const;
+boolequals( const LanguageTag & rLanguageTag ) const;
 
 /** Test equality of two LanguageTag.
 
 Does NOT resolve system, i.e. if the system locale is en-US
 LanguageTag("")==LanguageTag("en-US") returns false! Use
-equals(...,true) instead if system locales shall be resolved.
+equals(...) instead if system locales shall be resolved.
  */
 booloperator==( const LanguageTag & rLanguageTag ) const;
 
@@ -381,7 +378,7 @@ public:
 
 Does NOT resolve system, i.e. if the system locale is en-US
 LanguageTag("")!=LanguageTag("en-US") returns true! Use
-!equals(,...true) instead if system locales shall be resolved.
+!equals(,..) instead if system locales shall be resolved.
  */
 booloperator!=( const LanguageTag & rLanguageTag ) const;
 
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 70a013a..e7f 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -954,7 +954,7 @@ sal_uInt32 SvNumberFormatter::ImpGenerateCL( LanguageType 
eLnge )
 if (LocaleDataWrapper::areChecksEnabled())
 {
 const LanguageTag& rLoadedLocale = 
xLocaleData->getLoadedLanguageTag();
-if ( !rLoadedLocale.equals( maLanguageTag, true) )
+if ( !rLoadedLocale.equals( maLanguageTag ) )
 {
 OUString aMsg("SvNumberFormatter::ImpGenerateCL: locales don't 
match:");
 LocaleDataWrapper::outputCheckMessage( 
xLocaleData->appendLocaleInfo( aMsg ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-08 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |2 ++
 include/i18nlangtag/lang.h |1 +
 svtools/source/misc/langtab.src|1 +
 3 files changed, 4 insertions(+)

New commits:
commit 57a5912dacef57c3c447ef90c70972191ac12b6e
Author: Eike Rathke 
Date:   Fri Jan 8 17:28:16 2016 +0100

tdf#96647 add Interlingue Occidental [ie] to language list

Change-Id: I79f4581ee5d371f22f94043f1e5fa62a2ad430ff

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 3b50dd5..c005c19 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -498,6 +498,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_LATIN_LSO,   "la", ""  , 0 },
 { LANGUAGE_USER_ESPERANTO,  "eo", ""  , 0 },
 { LANGUAGE_USER_INTERLINGUA,"ia", ""  , 0 },
+{ LANGUAGE_USER_INTERLINGUE,"ie", ""  , 0 },
 { LANGUAGE_MAORI_NEW_ZEALAND,   "mi", "NZ", 0 },
 { LANGUAGE_OBSOLETE_USER_MAORI, "mi", "NZ", 0 },
 { LANGUAGE_KINYARWANDA_RWANDA,  "rw", "RW", 0 },
@@ -1116,6 +1117,7 @@ css::lang::Locale 
MsLangId::Conversion::lookupFallbackLocale(
 case LANGUAGE_BASQUE:
 case LANGUAGE_USER_ESPERANTO:
 case LANGUAGE_USER_INTERLINGUA:
+case LANGUAGE_USER_INTERLINGUE:
 case LANGUAGE_USER_LOJBAN:
 case LANGUAGE_KASHMIRI:
 case LANGUAGE_USER_KEYID:
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 12acef8..51310f9 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -702,6 +702,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_ARPITAN_ITALY 0x0A96  /* makeLangID( 0x02, 
getPrimaryLanguage( LANGUAGE_USER_ARPITAN_FRANCE)) */
 #define LANGUAGE_USER_ARPITAN_SWITZERLAND   0x0E96  /* makeLangID( 0x03, 
getPrimaryLanguage( LANGUAGE_USER_ARPITAN_FRANCE)) */
 #define LANGUAGE_USER_ENGLISH_BOTSWANA  0x9809  /* makeLangID( 0x26, 
getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
+#define LANGUAGE_USER_INTERLINGUE   0x0697  /* no locale */
 
 
 /* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 4163c91..4f8b933 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -397,6 +397,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
 < "Arpitan (Italy)" ; LANGUAGE_USER_ARPITAN_ITALY ; > ;
 < "Arpitan (Switzerland)" ; LANGUAGE_USER_ARPITAN_SWITZERLAND ; > ;
 < "English (Botswana)" ; LANGUAGE_USER_ENGLISH_BOTSWANA ; > ;
+< "Interlingue Occidental" ; LANGUAGE_USER_INTERLINGUE ; > ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-08-25 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/source/misc/langtab.src|1 +
 3 files changed, 3 insertions(+)

New commits:
commit 76bc0e061b7fb9d0da90e4099d9f429496fe6b4d
Author: Eike Rathke er...@redhat.com
Date:   Tue Aug 25 12:53:58 2015 +0200

tdf#93468 add Arpitan (Switzerland) [frp-CH]

Change-Id: Icb96b45c936b974938c2dfae48960f727a1dc84d

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 8fe729f..7edfb70 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -658,6 +658,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_OCCITAN_ARANESE,oc, ES, 0 },
 { LANGUAGE_USER_ARPITAN_FRANCE,frp, FR, 0 },
 { LANGUAGE_USER_ARPITAN_ITALY, frp, IT, 0 },
+{ LANGUAGE_USER_ARPITAN_SWITZERLAND,   frp, CH, 0 },
 { LANGUAGE_MULTIPLE,   mul,   , 0 },// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   und,   , 0 },// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   zxx,   , 0 },// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index a79d2db..aeccf95 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -700,6 +700,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_ENGLISH_UK_OXENDICT   0x9409  /* makeLangID( 0x25, 
getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_ARPITAN_FRANCE0x0696
 #define LANGUAGE_USER_ARPITAN_ITALY 0x0A96  /* makeLangID( 0x02, 
getPrimaryLanguage( LANGUAGE_USER_ARPITAN_FRANCE)) */
+#define LANGUAGE_USER_ARPITAN_SWITZERLAND   0x0E96  /* makeLangID( 0x03, 
getPrimaryLanguage( LANGUAGE_USER_ARPITAN_FRANCE)) */
 
 
 /* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index c03ee9c..fd27105 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -395,6 +395,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  Aranese ; LANGUAGE_USER_OCCITAN_ARANESE ;  ;
  Arpitan (France) ; LANGUAGE_USER_ARPITAN_FRANCE ;  ;
  Arpitan (Italy) ; LANGUAGE_USER_ARPITAN_ITALY ;  ;
+ Arpitan (Switzerland) ; LANGUAGE_USER_ARPITAN_SWITZERLAND ;  ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-08-21 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |2 ++
 include/i18nlangtag/lang.h |2 ++
 svtools/source/misc/langtab.src|2 ++
 3 files changed, 6 insertions(+)

New commits:
commit b1aba5781af8a5e5a1ba88d525b2463063878ec0
Author: Eike Rathke er...@redhat.com
Date:   Fri Aug 21 15:25:09 2015 +0200

Resolves: tdf#93468 add Arpitan (France,Italy) [frp-FR] [frp-IT]

Change-Id: I3a50722f07f4dbaf89b4e8829dea7b41b829c038

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index e1c331b..b43424a 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -652,6 +652,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_VENETIAN,  vec, IT, 0 },
 { LANGUAGE_USER_ENGLISH_GAMBIA, en, GM, 0 },
 { LANGUAGE_USER_OCCITAN_ARANESE,oc, ES, 0 },
+{ LANGUAGE_USER_ARPITAN_FRANCE,frp, FR, 0 },
+{ LANGUAGE_USER_ARPITAN_ITALY, frp, IT, 0 },
 { LANGUAGE_MULTIPLE,   mul,   , 0 },// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   und,   , 0 },// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   zxx,   , 0 },// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 22b0ed1..0592072 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -696,6 +696,8 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_ENGLISH_GAMBIA0x9009  /* makeLangID( 0x24, 
getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_OCCITAN_ARANESE   0x8082  /* makeLangID( 0x20, 
getPrimaryLanguage( LANGUAGE_OCCITAN_FRANCE)) */
 #define LANGUAGE_USER_ENGLISH_UK_OXENDICT   0x9409  /* makeLangID( 0x25, 
getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
+#define LANGUAGE_USER_ARPITAN_FRANCE0x0696
+#define LANGUAGE_USER_ARPITAN_ITALY 0x0A96  /* makeLangID( 0x02, 
getPrimaryLanguage( LANGUAGE_USER_ARPITAN_FRANCE)) */
 
 
 /* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 19c1d6c..dfe85df 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -393,6 +393,8 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  Venetian ; LANGUAGE_USER_VENETIAN ;  ;
  English (Gambia) ; LANGUAGE_USER_ENGLISH_GAMBIA ;  ;
  Aranese ; LANGUAGE_USER_OCCITAN_ARANESE ;  ;
+ Arpitan (France) ; LANGUAGE_USER_ARPITAN_FRANCE ;  ;
+ Arpitan (Italy) ; LANGUAGE_USER_ARPITAN_ITALY ;  ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-08-21 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx  |3 ++-
 i18nlangtag/source/isolang/mslangid.cxx |3 +++
 include/i18nlangtag/lang.h  |4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit cbb675a6ccdbd8ac4f9a0af3eee7427b6b28fe92
Author: Eike Rathke er...@redhat.com
Date:   Fri Aug 21 16:29:10 2015 +0200

MS finally acknowledged Cuba

As per

http://download.microsoft.com/download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/%5BMS-LCID%5D.pdf
from https://msdn.microsoft.com/library/cc233965.aspx
Release: June 30, 2015; Revision 7.0

So do the mapping from the now obsolete user defined LCID.

Change-Id: I57cc5f4bb5d5b86d3c056123fdda9bb50b5b8968

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index b43424a..02b6fb0 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -555,7 +555,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_ENGLISH_MALAWI, en, MW, 0 },   /* en 
default for MW */
 { LANGUAGE_USER_NYANJA, ny, MW, 0 },
 { LANGUAGE_USER_KASHUBIAN, csb, PL, 0 },
-{ LANGUAGE_USER_SPANISH_CUBA,   es, CU, 0 },
+{ LANGUAGE_SPANISH_CUBA,es, CU, 0 },
+{ LANGUAGE_OBSOLETE_USER_SPANISH_CUBA,  es, CU, 0 },
 { LANGUAGE_USER_QUECHUA_NORTH_BOLIVIA, qul, BO, 0 },
 { LANGUAGE_USER_QUECHUA_SOUTH_BOLIVIA, quh, BO, 0 },
 { LANGUAGE_USER_BODO_INDIA,brx, IN, 0 },
diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index 38951c1..3cc456d 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -552,6 +552,9 @@ LanguageType MsLangId::getReplacementForObsoleteLanguage( 
LanguageType nLang, bo
 case LANGUAGE_OBSOLETE_USER_KURDISH_IRAQ:
 nLang = LANGUAGE_KURDISH_ARABIC_IRAQ;
 break;
+case LANGUAGE_OBSOLETE_USER_SPANISH_CUBA:
+nLang = LANGUAGE_SPANISH_CUBA;
+break;
 
 // The following are not strictly obsolete but should be mapped to a
 // replacement locale when encountered.
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 0592072..a8a0cab 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -364,6 +364,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_SPANISH_CHILE  0x340A
 #define LANGUAGE_SPANISH_COLOMBIA   0x240A
 #define LANGUAGE_SPANISH_COSTARICA  0x140A
+#define LANGUAGE_SPANISH_CUBA   0x5C0A
 #define LANGUAGE_SPANISH_DOMINICAN_REPUBLIC 0x1C0A
 #define LANGUAGE_SPANISH_ECUADOR0x300A
 #define LANGUAGE_SPANISH_EL_SALVADOR0x440A
@@ -564,7 +565,8 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_HILIGAYNON0x063D
 #define LANGUAGE_USER_NYANJA0x063E
 #define LANGUAGE_USER_KASHUBIAN 0x063F
-#define LANGUAGE_USER_SPANISH_CUBA  0x800A  /* makeLangID( 0x20, 
getPrimaryLanguage( LANGUAGE_SPANISH)) */
+#define LANGUAGE_OBSOLETE_USER_SPANISH_CUBA 0x800A  /* makeLangID( 0x20, 
getPrimaryLanguage( LANGUAGE_SPANISH)) */
+#define LANGUAGE_USER_SPANISH_CUBA  LANGUAGE_SPANISH_CUBA
 #define LANGUAGE_USER_TETUN 0x0640
 #define LANGUAGE_USER_QUECHUA_NORTH_BOLIVIA 0x0641
 #define LANGUAGE_USER_QUECHUA_SOUTH_BOLIVIA 0x0642
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag vcl/generic

2015-04-20 Thread Noel Grandin

 i18nlangtag/source/languagetag/languagetag.cxx |  236 
 include/i18nlangtag/applelangid.hxx|  240 -
 vcl/generic/fontmanager/fontmanager.cxx|5 
 3 files changed, 242 insertions(+), 239 deletions(-)

New commits:
commit 20ce82d5d5f936438d5e9c08d308754d39037ede
Author: Noel Grandin n...@peralex.com
Date:   Sat Apr 18 17:20:22 2015 +0200

convert AppleLanguageId to scoped enum

Change-Id: I6646872f76bb9365a8c2ef809bc942f28b690a32
Reviewed-on: https://gerrit.libreoffice.org/15378
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 2ac7ca4..c5366f7 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -2762,358 +2762,358 @@ LanguageTag 
makeLanguageTagFromAppleLanguageId(AppleLanguageId nLanguage)
 
 switch (nLanguage)
 {
-case APPLE_LANG_ENGLISH:
+case AppleLanguageId::ENGLISH:
 nLang = LANGUAGE_ENGLISH;
 break;
-case APPLE_LANG_FRENCH:
+case AppleLanguageId::FRENCH:
 nLang = LANGUAGE_FRENCH;
 break;
-case APPLE_LANG_GERMAN:
+case AppleLanguageId::GERMAN:
 nLang = LANGUAGE_GERMAN;
 break;
-case APPLE_LANG_ITALIAN:
+case AppleLanguageId::ITALIAN:
 nLang = LANGUAGE_ITALIAN;
 break;
-case APPLE_LANG_DUTCH:
+case AppleLanguageId::DUTCH:
 nLang = LANGUAGE_DUTCH;
 break;
-case APPLE_LANG_SWEDISH:
+case AppleLanguageId::SWEDISH:
 nLang = LANGUAGE_SWEDISH;
 break;
-case APPLE_LANG_SPANISH:
+case AppleLanguageId::SPANISH:
 nLang = LANGUAGE_SPANISH;
 break;
-case APPLE_LANG_DANISH:
+case AppleLanguageId::DANISH:
 nLang = LANGUAGE_DANISH;
 break;
-case APPLE_LANG_PORTUGUESE:
+case AppleLanguageId::PORTUGUESE:
 nLang = LANGUAGE_PORTUGUESE;
 break;
-case APPLE_LANG_NORWEGIAN:
+case AppleLanguageId::NORWEGIAN:
 nLang = LANGUAGE_NORWEGIAN;
 break;
-case APPLE_LANG_HEBREW:
+case AppleLanguageId::HEBREW:
 nLang = LANGUAGE_HEBREW;
 break;
-case APPLE_LANG_JAPANESE:
+case AppleLanguageId::JAPANESE:
 nLang = LANGUAGE_JAPANESE;
 break;
-case APPLE_LANG_ARABIC:
+case AppleLanguageId::ARABIC:
 nLang = LANGUAGE_ARABIC_PRIMARY_ONLY;
 break;
-case APPLE_LANG_FINNISH:
+case AppleLanguageId::FINNISH:
 nLang = LANGUAGE_FINNISH;
 break;
-case APPLE_LANG_GREEK:
+case AppleLanguageId::GREEK:
 nLang = LANGUAGE_GREEK;
 break;
-case APPLE_LANG_ICELANDIC:
+case AppleLanguageId::ICELANDIC:
 nLang = LANGUAGE_ICELANDIC;
 break;
-case APPLE_LANG_MALTESE:
+case AppleLanguageId::MALTESE:
 nLang = LANGUAGE_MALTESE;
 break;
-case APPLE_LANG_TURKISH:
+case AppleLanguageId::TURKISH:
 nLang = LANGUAGE_TURKISH;
 break;
-case APPLE_LANG_CROATIAN:
+case AppleLanguageId::CROATIAN:
 nLang = LANGUAGE_CROATIAN;
 break;
-case APPLE_LANG_CHINESE_TRADITIONAL:
+case AppleLanguageId::CHINESE_TRADITIONAL:
 nLang = LANGUAGE_CHINESE_TRADITIONAL;
 break;
-case APPLE_LANG_URDU:
+case AppleLanguageId::URDU:
 nLang = LANGUAGE_URDU_PAKISTAN; //probably, otherwise we need a 
LANGUAGE_URDU_PRIMARY_ONLY
 break;
-case APPLE_LANG_HINDI:
+case AppleLanguageId::HINDI:
 nLang = LANGUAGE_HINDI;
 break;
-case APPLE_LANG_THAI:
+case AppleLanguageId::THAI:
 nLang = LANGUAGE_THAI;
 break;
-case APPLE_LANG_KOREAN:
+case AppleLanguageId::KOREAN:
 nLang = LANGUAGE_KOREAN;
 break;
-case APPLE_LANG_LITHUANIAN:
+case AppleLanguageId::LITHUANIAN:
 nLang = LANGUAGE_LITHUANIAN;
 break;
-case APPLE_LANG_POLISH:
+case AppleLanguageId::POLISH:
 nLang = LANGUAGE_POLISH;
 break;
-case APPLE_LANG_HUNGARIAN:
+case AppleLanguageId::HUNGARIAN:
 nLang = LANGUAGE_HUNGARIAN;
 break;
-case APPLE_LANG_ESTONIAN:
+case AppleLanguageId::ESTONIAN:
 nLang = LANGUAGE_ESTONIAN;
 break;
-case APPLE_LANG_LATVIAN:
+case AppleLanguageId::LATVIAN:
 nLang = LANGUAGE_LATVIAN;

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

2014-09-17 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/source/misc/langtab.src|1 +
 3 files changed, 3 insertions(+)

New commits:
commit 636dd4aba3bf9fbe83f74532c2df4bace3fdf712
Author: Eike Rathke er...@redhat.com
Date:   Wed Sep 17 18:40:43 2014 +0200

add Kven Finnish [fkv-NO] to language list, fdo#83332

Change-Id: I3faa39ebc32e909bd2e76ae67c6f3148fb7c

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index e91b09e..8e1ac7e 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -647,6 +647,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_FRENCH_BENIN,   fr, BJ, 0 },
 { LANGUAGE_USER_FRENCH_NIGER,   fr, NE, 0 },
 { LANGUAGE_USER_FRENCH_TOGO,fr, TG, 0 },
+{ LANGUAGE_USER_KVEN_FINNISH,  fkv, NO, 0 },
 { LANGUAGE_MULTIPLE,   mul,   , 0 },// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   und,   , 0 },// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   zxx,   , 0 },// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 1c47be7..8bd8572 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -701,6 +701,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_FRENCH_BENIN  0x840C  /* makeLangID( 0x21, 
getPrimaryLanguage( LANGUAGE_FRENCH)) */
 #define LANGUAGE_USER_FRENCH_NIGER  0x880C  /* makeLangID( 0x22, 
getPrimaryLanguage( LANGUAGE_FRENCH)) */
 #define LANGUAGE_USER_FRENCH_TOGO   0x8C0C  /* makeLangID( 0x23, 
getPrimaryLanguage( LANGUAGE_FRENCH)) */
+#define LANGUAGE_USER_KVEN_FINNISH  0x0693
 
 
 /* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 67fcfd3..f3a4ae9 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -388,6 +388,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  French (Benin) ; LANGUAGE_USER_FRENCH_BENIN ;  ;
  French (Niger) ; LANGUAGE_USER_FRENCH_NIGER ;  ;
  French (Togo) ; LANGUAGE_USER_FRENCH_TOGO ;  ;
+ Kven Finnish ; LANGUAGE_USER_KVEN_FINNISH ;  ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-25 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/source/misc/langtab.src|1 +
 3 files changed, 3 insertions(+)

New commits:
commit da4a8dbb1057acd0bdc18b3aa97b7f378ac19b31
Author: Eike Rathke er...@redhat.com
Date:   Tue Feb 25 22:39:32 2014 +0100

added Maninkakan, Eastern, Latin [emk-Latn-GN], fdo#74672

Change-Id: Ib75136c6f0604cb6e3125e39a1514bbcc9ade079

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 57690c0..12f3831 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -720,6 +720,7 @@ static IsoLanguageScriptCountryEntry const 
aImplIsoLangScriptEntries[] =
 { LANGUAGE_BOSNIAN_LATIN_BOSNIA_HERZEGOVINA,bs-Latn, BA, kSAME },  
 // MS, though Latn is suppress-script
 { LANGUAGE_BOSNIAN_LATIN_LSO,   bs-Latn,   , 
LANGUAGE_BOSNIAN_LSO },   // MS, though Latn is suppress-script
 { LANGUAGE_CHINESE_TRADITIONAL_LSO, zh-Hant,   , 0 },
+{ LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN,  emk-Latn, GN, 0 },
 { LANGUAGE_DONTKNOW,,  , 0 }   
 // marks end of table
 };
 
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index f936fce..ab7ba7a 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -693,6 +693,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_TIBETAN_BHUTAN0x8451  /* makeLangID( 0x21, 
getPrimaryLanguage( LANGUAGE_TIBETAN)) */
 #define LANGUAGE_USER_FRENCH_BURKINA_FASO   0x800C  /* makeLangID( 0x20, 
getPrimaryLanguage( LANGUAGE_FRENCH)) */
 #define LANGUAGE_USER_PUINAVE   0x068E
+#define LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN  0x068F
 
 
 /* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 341fa4a..ad9201f 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -378,6 +378,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  Ladin ; LANGUAGE_USER_LADIN ;  ;
  French (Burkina Faso) ; LANGUAGE_USER_FRENCH_BURKINA_FASO ;  ;
  Puinave ; LANGUAGE_USER_PUINAVE ;  ;
+ Maninkakan, Eastern, Latin ; 
LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN ;  ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-25 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/source/misc/langtab.src|1 +
 3 files changed, 3 insertions(+)

New commits:
commit 9c2515f8e05c44b74ab2887cceaade0c4d87446a
Author: Eike Rathke er...@redhat.com
Date:   Tue Feb 25 23:50:31 2014 +0100

added Avar [av-RU], fdo#75161

Change-Id: Id8e32dab357d0eda90d36ab4e53f3eb2da769029

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 12f3831..f388e7f 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -642,6 +642,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_LADIN, lld, IT, 0 },
 { LANGUAGE_USER_FRENCH_BURKINA_FASO,fr, BF, 0 },
 { LANGUAGE_USER_PUINAVE,   pui, CO, 0 },
+{ LANGUAGE_USER_AVAR,   av, RU, 0 },
 { LANGUAGE_MULTIPLE,   mul,   , 0 },// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   und,   , 0 },// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   zxx,   , 0 },// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index ab7ba7a..b36acd4 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -694,6 +694,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_FRENCH_BURKINA_FASO   0x800C  /* makeLangID( 0x20, 
getPrimaryLanguage( LANGUAGE_FRENCH)) */
 #define LANGUAGE_USER_PUINAVE   0x068E
 #define LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN  0x068F
+#define LANGUAGE_USER_AVAR  0x0690
 
 
 /* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index ad9201f..df3d008 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -379,6 +379,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  French (Burkina Faso) ; LANGUAGE_USER_FRENCH_BURKINA_FASO ;  ;
  Puinave ; LANGUAGE_USER_PUINAVE ;  ;
  Maninkakan, Eastern, Latin ; 
LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN ;  ;
+ Avar ; LANGUAGE_USER_AVAR ;  ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-25 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |2 ++
 include/i18nlangtag/lang.h |2 ++
 svtools/source/misc/langtab.src|2 ++
 3 files changed, 6 insertions(+)

New commits:
commit 75a22a9fb88b128bb31eb51dc763e42cb76e26c2
Author: Eike Rathke er...@redhat.com
Date:   Wed Feb 26 00:12:29 2014 +0100

added Cree, Plains, Latin [crk-Latn-CN] and Syllabics [crk-Cans-CN], 
fdo#73973

Change-Id: I66b2923a59e06c5798d8debb14eb2282c9a4fb1d

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index f388e7f..95f01ca 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -722,6 +722,8 @@ static IsoLanguageScriptCountryEntry const 
aImplIsoLangScriptEntries[] =
 { LANGUAGE_BOSNIAN_LATIN_LSO,   bs-Latn,   , 
LANGUAGE_BOSNIAN_LSO },   // MS, though Latn is suppress-script
 { LANGUAGE_CHINESE_TRADITIONAL_LSO, zh-Hant,   , 0 },
 { LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN,  emk-Latn, GN, 0 },
+{ LANGUAGE_USER_CREE_PLAINS_LATIN, crk-Latn, CN, 0 },
+{ LANGUAGE_USER_CREE_PLAINS_SYLLABICS, crk-Cans, CN, 0 },
 { LANGUAGE_DONTKNOW,,  , 0 }   
 // marks end of table
 };
 
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index b36acd4..33c6a84 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -695,6 +695,8 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_PUINAVE   0x068E
 #define LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN  0x068F
 #define LANGUAGE_USER_AVAR  0x0690
+#define LANGUAGE_USER_CREE_PLAINS_LATIN 0x0691
+#define LANGUAGE_USER_CREE_PLAINS_SYLLABICS 0x8291  /* makeLangID( 0x20, 
getPrimaryLanguage( LANGUAGE_USER_CREE_PLAINS_LATIN)) */
 
 
 /* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index df3d008..99a62f7 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -380,6 +380,8 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  Puinave ; LANGUAGE_USER_PUINAVE ;  ;
  Maninkakan, Eastern, Latin ; 
LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN ;  ;
  Avar ; LANGUAGE_USER_AVAR ;  ;
+ Cree, Plains, Latin ; LANGUAGE_USER_CREE_PLAINS_LATIN ;  ;
+ Cree, Plains, Syllabics ; LANGUAGE_USER_CREE_PLAINS_SYLLABICS ;  ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-12-02 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx  |1 +
 i18nlangtag/source/isolang/mslangid.cxx |2 ++
 include/i18nlangtag/lang.h  |1 +
 svtools/source/misc/langtab.src |1 +
 4 files changed, 5 insertions(+)

New commits:
commit fefacbd92f4e3355ecd04841b8eacc75a4a67223
Author: Eike Rathke er...@redhat.com
Date:   Mon Dec 2 12:58:44 2013 +0100

added Kurdish, Southern (Iran) [sdh-IR] to language list, fdo#63460

Change-Id: I575c8a51cff1cf451c776818711d2e0fd458a322

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 5505540..2611dbb 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -513,6 +513,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_KURDISH_ARABIC_IRAQ,ckb, IQ, 0 },
 { LANGUAGE_KURDISH_ARABIC_IRAQ, ku, IQ, kSAME },
 { LANGUAGE_OBSOLETE_USER_KURDISH_IRAQ,  ku, IQ, 
LANGUAGE_KURDISH_ARABIC_IRAQ },
+{ LANGUAGE_USER_KURDISH_SOUTHERN_IRAN, sdh, IR, 0 },
 { LANGUAGE_USER_KURDISH_SOUTHERN_IRAQ, sdh, IQ, 0 },
 { LANGUAGE_USER_KURDISH_IRAN,  ckb, IR, 0 },
 { LANGUAGE_USER_KURDISH_IRAN,   ku, IR, kSAME },
diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index d44256d..772822e 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -222,6 +222,7 @@ bool MsLangId::isRightToLeft( LanguageType nLang )
 case LANGUAGE_OBSOLETE_USER_KURDISH_IRAQ:
 case LANGUAGE_KURDISH_ARABIC_IRAQ:
 case LANGUAGE_KURDISH_ARABIC_LSO:
+case LANGUAGE_USER_KURDISH_SOUTHERN_IRAN:
 case LANGUAGE_USER_KURDISH_SOUTHERN_IRAQ:
 return true;
 
@@ -338,6 +339,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
 case LANGUAGE_OBSOLETE_USER_KURDISH_IRAQ:
 case LANGUAGE_KURDISH_ARABIC_IRAQ:
 case LANGUAGE_KURDISH_ARABIC_LSO:
+case LANGUAGE_USER_KURDISH_SOUTHERN_IRAN:
 case LANGUAGE_USER_KURDISH_SOUTHERN_IRAQ:
 case LANGUAGE_USER_KYRGYZ_CHINA:
 nScript = ::com::sun::star::i18n::ScriptType::COMPLEX;
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index e08c152..be71b0a 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -535,6 +535,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_KURDISH_IRAQ  LANGUAGE_KURDISH_ARABIC_IRAQ
 #define LANGUAGE_USER_KURDISH_IRAN  0x1226  /* sublang 0x04, Arabic 
script */
 #define LANGUAGE_USER_KURDISH_SOUTHERN_IRAQ 0x8092  /* makeLangID( 0x20, 
getPrimaryLanguage( LANGUAGE_KURDISH_ARABIC_LSO)) */
+#define LANGUAGE_USER_KURDISH_SOUTHERN_IRAN 0x8492  /* makeLangID( 0x21, 
getPrimaryLanguage( LANGUAGE_KURDISH_ARABIC_LSO)) */
 #define LANGUAGE_USER_SARDINIAN 0x0627
 /* was reserved for Dzongkha but turned down with #i53497#: 0x0628 */  /* 
obsoleted by LANGUAGE_DZONGKHA */
 #define LANGUAGE_USER_DZONGKHA_MAP_LONLY0xF851  /* to map dz only, 
because of the MS error, and preserve CTL information, sub 0x3e */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 0f5f584..3e51f60 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -216,6 +216,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  Kurdish, Northern (Syria) ; LANGUAGE_USER_KURDISH_SYRIA ;  ;
  Kurdish, Central (Iraq) ; LANGUAGE_USER_KURDISH_IRAQ ;  ;
  Kurdish, Central (Iran) ; LANGUAGE_USER_KURDISH_IRAN ;  ;
+ Kurdish, Southern (Iran) ; LANGUAGE_USER_KURDISH_SOUTHERN_IRAN ;  
;
  Kurdish, Southern (Iraq) ; LANGUAGE_USER_KURDISH_SOUTHERN_IRAQ ;  
;
  Sardinian ; LANGUAGE_USER_SARDINIAN ;  ;
  Dzongkha ; LANGUAGE_DZONGKHA ;  ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-11 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/source/misc/langtab.src|1 +
 3 files changed, 3 insertions(+)

New commits:
commit f72c2a727cb68ead915f3efdaae24a32a92d3243
Author: Eike Rathke er...@redhat.com
Date:   Mon Nov 11 13:01:34 2013 +0100

added Puinave [pui-CO] to language list, fdo#71454

Change-Id: Ib188b2a8dbfbc91f2e89952d6df2c0c357091a78

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index e528c72..f9f34a5 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -633,6 +633,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_NOGAI, nog, RU, 0 },
 { LANGUAGE_USER_LADIN, lld, IT, 0 },
 { LANGUAGE_USER_FRENCH_BURKINA_FASO,fr, BF, 0 },
+{ LANGUAGE_USER_PUINAVE,   pui, CO, 0 },
 { LANGUAGE_MULTIPLE,   mul,   , 0 },// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   und,   , 0 },// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   zxx,   , 0 },// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index c35de28..aefe380 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -689,6 +689,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_LADIN 0x068D
 #define LANGUAGE_USER_TIBETAN_BHUTAN0x8451  /* makeLangID( 0x21, 
getPrimaryLanguage( LANGUAGE_TIBETAN)) */
 #define LANGUAGE_USER_FRENCH_BURKINA_FASO   0x800C  /* makeLangID( 0x20, 
getPrimaryLanguage( LANGUAGE_FRENCH)) */
+#define LANGUAGE_USER_PUINAVE   0x068E
 
 
 /* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index afc5b40..7494617 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -375,6 +375,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  Karakalpak Latin ; LANGUAGE_USER_KARAKALPAK_LATIN ;  ;
  Ladin ; LANGUAGE_USER_LADIN ;  ;
  French (Burkina Faso) ; LANGUAGE_USER_FRENCH_BURKINA_FASO ;  ;
+ Puinave ; LANGUAGE_USER_PUINAVE ;  ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-24 Thread Eike Rathke

 i18nlangtag/source/isolang/mslangid.cxx |   42 
 include/i18nlangtag/mslangid.hxx|3 ++
 2 files changed, 45 insertions(+)

New commits:
commit b796a2030b9814978c904979dc609422d08eb538
Author: Eike Rathke er...@redhat.com
Date:   Thu Oct 24 12:26:02 2013 +0200

added isNonLatinWestern()

Change-Id: Ie2aadab8302f365379a569989bd9640db55b9716

diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index 72d5051..a48693b 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -24,6 +24,10 @@
 
 #include i18nlangtag/mslangid.hxx
 
+// Only very limited few functions that are guaranteed to not be called from
+// LanguageTag may use LanguageTag ...
+#include i18nlangtag/languagetag.hxx
+
 
 LanguageType MsLangId::nConfiguredSystemLanguage   = LANGUAGE_SYSTEM;
 LanguageType MsLangId::nConfiguredSystemUILanguage = LANGUAGE_SYSTEM;
@@ -405,6 +409,44 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
 
 
 // static
+bool MsLangId::isNonLatinWestern( LanguageType nLang )
+{
+switch (nLang)
+{
+case LANGUAGE_AZERI_CYRILLIC:
+case LANGUAGE_AZERI_CYRILLIC_LSO:
+case LANGUAGE_BELARUSIAN:
+case LANGUAGE_BOSNIAN_CYRILLIC_BOSNIA_HERZEGOVINA:
+case LANGUAGE_BOSNIAN_CYRILLIC_LSO:
+case LANGUAGE_BULGARIAN:
+case LANGUAGE_GREEK:
+case LANGUAGE_MONGOLIAN_CYRILLIC_LSO:
+case LANGUAGE_MONGOLIAN_CYRILLIC_MONGOLIA:
+case LANGUAGE_RUSSIAN:
+case LANGUAGE_RUSSIAN_MOLDOVA:
+case LANGUAGE_SERBIAN_CYRILLIC_BOSNIA_HERZEGOVINA:
+case LANGUAGE_SERBIAN_CYRILLIC_LSO:
+case LANGUAGE_SERBIAN_CYRILLIC_MONTENEGRO:
+case LANGUAGE_SERBIAN_CYRILLIC_SAM:
+case LANGUAGE_SERBIAN_CYRILLIC_SERBIA:
+case LANGUAGE_UKRAINIAN:
+case LANGUAGE_UZBEK_CYRILLIC:
+case LANGUAGE_UZBEK_CYRILLIC_LSO:
+return true;
+default:
+{
+if (getScriptType( nLang) != 
com::sun::star::i18n::ScriptType::LATIN)
+return false;
+LanguageTag aLanguageTag( nLang);
+if (aLanguageTag.hasScript())
+return aLanguageTag.getScript() != Latn;
+}
+}
+return false;
+}
+
+
+// static
 LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang, 
bool /*bUserInterfaceSelection*/ )
 {
 switch (nLang)
diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx
index e0582d8..c35996c 100644
--- a/include/i18nlangtag/mslangid.hxx
+++ b/include/i18nlangtag/mslangid.hxx
@@ -148,6 +148,9 @@ public:
 /** Get ::com::sun::star::i18n::ScriptType of locale. */
 static sal_Int16 getScriptType( LanguageType nLang );
 
+/** Whether locale is Western but not Latin script, e.g. Cyrillic or 
Greek. */
+static bool isNonLatinWestern( LanguageType nLang );
+
 
 /** Map an obsolete user defined LANGID (see lang.h
 LANGUAGE_OBSOLETE_USER_...) to the new value defined by MS in the
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-18 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/source/misc/langtab.src|1 +
 3 files changed, 3 insertions(+)

New commits:
commit 21ebbbcb9a98b011f423c7faa72ded5fb40d679d
Author: Eike Rathke er...@redhat.com
Date:   Fri Oct 18 13:02:53 2013 +0200

added Ladin [lld-IT] to language list, fdo#70530

Change-Id: I9bd65a7f66710d94a2c4dbe6d1b28f8ddef8d9a3

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index fb75395..cf4f2e1 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -565,6 +565,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_NGAEBERE,  gym, PA, false },
 { LANGUAGE_USER_KUMYK, kum, RU, false },
 { LANGUAGE_USER_NOGAI, nog, RU, false },
+{ LANGUAGE_USER_LADIN, lld, IT, false },
 { LANGUAGE_MULTIPLE,   mul,   , false },   // multiple 
languages, many languages are used
 { LANGUAGE_UNDETERMINED,   und,   , false },   // 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   zxx,   , false },   // added to 
ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 51e4e56..dfbf7b2 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -591,6 +591,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_KUMYK 0x068A
 #define LANGUAGE_USER_NOGAI 0x068B
 #define LANGUAGE_USER_KARAKALPAK_LATIN  0x068C
+#define LANGUAGE_USER_LADIN 0x068D
 
 
 /* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index e60adbe..d782bce 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -373,6 +373,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  Kumyk ; LANGUAGE_USER_KUMYK ;  ;
  Nogai ; LANGUAGE_USER_NOGAI ;  ;
  Karakalpak Latin ; LANGUAGE_USER_KARAKALPAK_LATIN ;  ;
+ Ladin ; LANGUAGE_USER_LADIN ;  ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-07 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/source/misc/langtab.src|1 +
 3 files changed, 3 insertions(+)

New commits:
commit 9ddfbe4bc502cba5bc07472e50a9c1ef93b28dd3
Author: Eike Rathke er...@redhat.com
Date:   Mon Oct 7 22:28:37 2013 +0200

added Nogai [nog-RU] to language list, fdo#69987

Change-Id: Ib59c75ee13b5e16ef014ab7245540ffdc62c2daa

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 9746569..f1f92b8 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -563,6 +563,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_SAMI_PITE_SWEDEN,  sje, SE, false },
 { LANGUAGE_USER_NGAEBERE,  gym, PA, false },
 { LANGUAGE_USER_KUMYK, kum, RU, false },
+{ LANGUAGE_USER_NOGAI, nog, RU, false },
 { LANGUAGE_MULTIPLE,   mul,   , false },   // multiple 
languages, many languages are used
 { LANGUAGE_UNDETERMINED,   und,   , false },   // 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   zxx,   , false },   // added to 
ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 61da508..5acb329 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -584,6 +584,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_NGAEBERE  0x0689
 #define LANGUAGE_USER_ENGLISH_UK_OED0x8C09  /* makeLangID( 0x23, 
getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_KUMYK 0x068A
+#define LANGUAGE_USER_NOGAI 0x068B
 
 
 /* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index fcd096b..01c8ca0 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -371,6 +371,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  Sami, Pite (Sweden) ; LANGUAGE_USER_SAMI_PITE_SWEDEN ;  ;
  NgÃ¤bere ; LANGUAGE_USER_NGAEBERE ;  ;
  Kumyk ; LANGUAGE_USER_KUMYK ;  ;
+ Nogai ; LANGUAGE_USER_NOGAI ;  ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-07 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/source/misc/langtab.src|1 +
 3 files changed, 3 insertions(+)

New commits:
commit 47e1f1eb505cb8cbcb23069893bc7c430b5621e2
Author: Eike Rathke er...@redhat.com
Date:   Mon Oct 7 23:19:16 2013 +0200

added Karakalpak Latin [kaa-Latn-UZ] to language list, fdo#70217

Change-Id: I202b01e8ac705c11d816a607e3293d8ba56f4640

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index f1f92b8..25e8eb2 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -585,6 +585,7 @@ static IsoLanguageScriptCountryEntry const 
aImplIsoLangScriptEntries[] =
 { LANGUAGE_MONGOLIAN,   mn-Cyrl, MN },  // 
macrolanguage code
 { LANGUAGE_MONGOLIAN_MONGOLIAN, mn-Mong, MN },  // 
macrolanguage code
 { LANGUAGE_USER_PALI_LATIN, pi-Latn,},
+{ LANGUAGE_USER_KARAKALPAK_LATIN,  kaa-Latn, UZ },
 { LANGUAGE_DONTKNOW,,   }   // marks 
end of table
 };
 
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 5acb329..f66de37 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -585,6 +585,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_ENGLISH_UK_OED0x8C09  /* makeLangID( 0x23, 
getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_KUMYK 0x068A
 #define LANGUAGE_USER_NOGAI 0x068B
+#define LANGUAGE_USER_KARAKALPAK_LATIN  0x068C
 
 
 /* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 01c8ca0..e60adbe 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -372,6 +372,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  NgÃ¤bere ; LANGUAGE_USER_NGAEBERE ;  ;
  Kumyk ; LANGUAGE_USER_KUMYK ;  ;
  Nogai ; LANGUAGE_USER_NOGAI ;  ;
+ Karakalpak Latin ; LANGUAGE_USER_KARAKALPAK_LATIN ;  ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-04 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/source/misc/langtab.src|1 +
 3 files changed, 3 insertions(+)

New commits:
commit d281caacbe20b61fd53e4d54f0178b3f83266970
Author: Eike Rathke er...@redhat.com
Date:   Fri Oct 4 17:00:55 2013 +0200

added Kumyk [kum-RU] to language list, fdo#70089

Change-Id: Iebf76555903fec1b533141104d3752735a8be075

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 5b9c967..9746569 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -562,6 +562,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_CORNISH,   kw,  UK, false },
 { LANGUAGE_USER_SAMI_PITE_SWEDEN,  sje, SE, false },
 { LANGUAGE_USER_NGAEBERE,  gym, PA, false },
+{ LANGUAGE_USER_KUMYK, kum, RU, false },
 { LANGUAGE_MULTIPLE,   mul,   , false },   // multiple 
languages, many languages are used
 { LANGUAGE_UNDETERMINED,   und,   , false },   // 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   zxx,   , false },   // added to 
ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index eb2e504..61da508 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -583,6 +583,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_SAMI_PITE_SWEDEN  0x843B  /* makeLangID( 0x21, 
getPrimaryLanguage( LANGUAGE_SAMI_NORTHERN_NORWAY)) */
 #define LANGUAGE_USER_NGAEBERE  0x0689
 #define LANGUAGE_USER_ENGLISH_UK_OED0x8C09  /* makeLangID( 0x23, 
getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
+#define LANGUAGE_USER_KUMYK 0x068A
 
 
 /* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 1752742..fcd096b 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -370,6 +370,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  Cornish ; LANGUAGE_USER_CORNISH ;  ;
  Sami, Pite (Sweden) ; LANGUAGE_USER_SAMI_PITE_SWEDEN ;  ;
  NgÃ¤bere ; LANGUAGE_USER_NGAEBERE ;  ;
+ Kumyk ; LANGUAGE_USER_KUMYK ;  ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-09-20 Thread Eike Rathke

 i18nlangtag/source/languagetag/languagetag.cxx |   54 +
 include/i18nlangtag/languagetag.hxx|2 
 2 files changed, 49 insertions(+), 7 deletions(-)

New commits:
commit df0f34cb9c036f5cf69b72a740c1a8f2741ac966
Author: Eike Rathke er...@redhat.com
Date:   Fri Sep 20 21:46:12 2013 +0200

trigger less conversions

Change-Id: Ie7ab85522b3ab0adb5bddd24b9db6affc10c4665

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 01cd6d2..5779397 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -611,7 +611,7 @@ LanguageTag::ImplPtr LanguageTagImpl::registerOnTheFly()
 pImpl = (*it).second;
 if (pImpl.get() != this)
 {
-SAL_WARN( i18nlangtag, LanguageTag::registerOnTheFly: impl 
should be this);
+SAL_WARN( i18nlangtag, LanguageTag::registerOnTheFly: impl 
should be this for '  maBcp47  ');
 *pImpl = *this; // ensure consistency
 }
 }
@@ -810,7 +810,10 @@ LanguageTag::ImplPtr LanguageTag::registerImpl() const
 LanguageTag::ImplPtr LanguageTag::getImpl() const
 {
 if (!mpImpl)
+{
 mpImpl = registerImpl();
+syncVarsFromRawImpl();
+}
 return mpImpl;
 }
 
@@ -1073,14 +1076,33 @@ void LanguageTag::syncFromImpl()
 SAL_INFO_IF( bRegister, i18nlangtag,
 LanguageTag::syncFromImpl: re-registering, '  pImpl-maBcp47 
 ' vs '  maBcp47 
  and 0x  ::std::hex  pImpl-mnLangID   vs 0x  
::std::hex  mnLangID);
+syncVarsFromRawImpl();
+if (bRegister)
+mpImpl = registerImpl();
+}
+
+
+void LanguageTag::syncVarsFromImpl() const
+{
+getImpl();
+syncVarsFromRawImpl();
+}
+
+
+void LanguageTag::syncVarsFromRawImpl() const
+{
+// Do not use getImpl() here.
+LanguageTagImpl* pImpl = mpImpl.get();
+if (!pImpl)
+return;
+
+// Obviously only mutable variables.
 mbInitializedBcp47  = pImpl-mbInitializedBcp47;
 maBcp47 = pImpl-maBcp47;
 mbInitializedLocale = pImpl-mbInitializedLocale;
 maLocale= pImpl-maLocale;
 mbInitializedLangID = pImpl-mbInitializedLangID;
 mnLangID= pImpl-mnLangID;
-if (bRegister)
-mpImpl = registerImpl();
 }
 
 
@@ -1304,6 +1326,8 @@ const OUString  LanguageTag::getBcp47( bool 
bResolveSystem ) const
 if (!bResolveSystem  mbSystemLocale)
 return theEmptyBcp47::get();
 if (!mbInitializedBcp47)
+syncVarsFromImpl();
+if (!mbInitializedBcp47)
 {
 getImpl()-getBcp47();
 const_castLanguageTag*(this)-syncFromImpl();
@@ -1436,6 +1460,8 @@ const com::sun::star::lang::Locale  
LanguageTag::getLocale( bool bResolveSystem
 if (!bResolveSystem  mbSystemLocale)
 return theEmptyLocale::get();
 if (!mbInitializedLocale)
+syncVarsFromImpl();
+if (!mbInitializedLocale)
 {
 if (mbInitializedBcp47)
 const_castLanguageTag*(this)-convertBcp47ToLocale();
@@ -1451,6 +1477,8 @@ LanguageType LanguageTag::getLanguageType( bool 
bResolveSystem ) const
 if (!bResolveSystem  mbSystemLocale)
 return LANGUAGE_SYSTEM;
 if (!mbInitializedLangID)
+syncVarsFromImpl();
+if (!mbInitializedLangID)
 {
 if (mbInitializedBcp47)
 const_castLanguageTag*(this)-convertBcp47ToLang();
@@ -1565,7 +1593,10 @@ OUString LanguageTagImpl::getLanguage() const
 
 OUString LanguageTag::getLanguage() const
 {
-OUString aRet( getImpl()-getLanguage());
+ImplPtr pImpl = getImpl();
+if (pImpl-mbCachedLanguage)
+return pImpl-maCachedLanguage;
+OUString aRet( pImpl-getLanguage());
 const_castLanguageTag*(this)-syncFromImpl();
 return aRet;
 }
@@ -1584,7 +1615,10 @@ OUString LanguageTagImpl::getScript() const
 
 OUString LanguageTag::getScript() const
 {
-OUString aRet( getImpl()-getScript());
+ImplPtr pImpl = getImpl();
+if (pImpl-mbCachedScript)
+return pImpl-maCachedScript;
+OUString aRet( pImpl-getScript());
 const_castLanguageTag*(this)-syncFromImpl();
 return aRet;
 }
@@ -1617,7 +1651,10 @@ OUString LanguageTagImpl::getCountry() const
 
 OUString LanguageTag::getCountry() const
 {
-OUString aRet( getImpl()-getCountry());
+ImplPtr pImpl = getImpl();
+if (pImpl-mbCachedCountry)
+return pImpl-maCachedCountry;
+OUString aRet( pImpl-getCountry());
 const_castLanguageTag*(this)-syncFromImpl();
 return aRet;
 }
@@ -1650,7 +1687,10 @@ OUString LanguageTagImpl::getVariants() const
 
 OUString LanguageTag::getVariants() const
 {
-OUString aRet( getImpl()-getVariants());
+ImplPtr pImpl = getImpl();
+if (pImpl-mbCachedVariants)
+return pImpl-maCachedVariants;
+OUString aRet( pImpl-getVariants());
 const_castLanguageTag*(this)-syncFromImpl();
 return aRet;
 }
diff --git

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

2013-09-19 Thread Eike Rathke

 i18nlangtag/source/languagetag/languagetag.cxx |  113 ++---
 include/i18nlangtag/languagetag.hxx|   25 +++--
 2 files changed, 117 insertions(+), 21 deletions(-)

New commits:
commit fec4c9b9e6aff625c4cccbc477d416e82fecb8c5
Author: Eike Rathke er...@redhat.com
Date:   Thu Sep 19 18:18:55 2013 +0200

first wave to register tags

Change-Id: I11c6608b5c5074e9b7117449c3eb92e278713598

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 154e70e..68e474f 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -81,6 +81,21 @@ static const KnownTagSet  getKnowns()
 }
 
 
+namespace {
+struct compareIgnoreAsciiCaseLess
+{
+bool operator()( const OUString r1, const OUString r2 ) const
+{
+return r1.compareToIgnoreAsciiCase( r2)  0;
+}
+};
+typedef ::std::map OUString, LanguageTag::ImplPtr, compareIgnoreAsciiCaseLess 
 MapBcp47;
+typedef ::std::map LanguageType, LanguageTag::ImplPtr  MapLangID;
+struct theMapBcp47 : public rtl::Static MapBcp47, theMapBcp47  {};
+struct theMapLangID : public rtl::Static MapLangID, theMapLangID  {};
+}
+
+
 /* TODO: this is how on-the-fly LangID assignment will work, now implement
  * usage and registration. */
 #if 0
@@ -567,11 +582,89 @@ LanguageTag::~LanguageTag()
 }
 
 
-LanguageTagImpl* LanguageTag::getImpl() const
+LanguageTag::ImplPtr LanguageTag::registerImpl() const
+{
+// Do not use LanguageTag::convert...() methods here as they access
+// getImpl() and syncFromImpl()
+
+ImplPtr pImpl;
+
+// Do not register unresolved system locale.
+if (mbSystemLocale  !mbInitializedLangID)
+{
+mnLangID = MsLangId::getRealLanguage( LANGUAGE_SYSTEM);
+mbInitializedLangID = true;
+}
+if (!mbInitializedBcp47  mbInitializedLocale)
+{
+if (maLocale.Language == I18NLANGTAG_QLT)
+maBcp47 = maLocale.Variant;
+else if (!maLocale.Language.isEmpty()  !maLocale.Country.isEmpty())
+maBcp47 = maLocale.Language + - + maLocale.Country;
+else
+maBcp47 = maLocale.Language;
+mbInitializedBcp47 = !maBcp47.isEmpty();
+}
+
+// Prefer LangID map as find+insert needs less comparison work.
+if (mbInitializedLangID)
+{
+MapLangID rMap = theMapLangID::get();
+MapLangID::const_iterator it( rMap.find( mnLangID));
+if (it != rMap.end())
+pImpl = (*it).second;
+else
+{
+SAL_INFO( i18nlangtag, LanguageTag::registerImpl: new impl for 
mnLangID 0x  ::std::hex  mnLangID);
+pImpl.reset( new LanguageTagImpl( *this));
+rMap.insert( ::std::make_pair( mnLangID, pImpl));
+}
+// Try to cross-insert a previously uninitialized tag string.
+if (!pImpl-maBcp47.isEmpty())
+{
+if (theMapBcp47::get().insert( ::std::make_pair( pImpl-maBcp47, 
pImpl)).second)
+{
+SAL_INFO( i18nlangtag, LanguageTag::registerImpl: 
cross-inserted tag '  pImpl-maBcp47  '
+  for 0x  ::std::hex  mnLangID);
+}
+}
+}
+else if (!maBcp47.isEmpty())
+{
+MapBcp47 rMap = theMapBcp47::get();
+MapBcp47::const_iterator it( rMap.find( maBcp47));
+if (it != rMap.end())
+pImpl = (*it).second;
+else
+{
+SAL_INFO( i18nlangtag, LanguageTag::registerImpl: new impl for 
tag '  maBcp47  ');
+pImpl.reset( new LanguageTagImpl( *this));
+rMap.insert( ::std::make_pair( maBcp47, pImpl));
+}
+// Try to cross-insert a previously uninitialized LangID.
+if (pImpl-mbInitializedLangID)
+{
+if (theMapLangID::get().insert( ::std::make_pair( pImpl-mnLangID, 
pImpl)).second)
+{
+SAL_INFO( i18nlangtag, LanguageTag::registerImpl: 
cross-inserted 0x
+ ::std::hex  pImpl-mnLangID   for '  
maBcp47  ');
+}
+}
+}
+else
+{
+SAL_WARN( i18nlangtag, LanguageTag::registerImpl: can't register 
for mnLangID   ::std::hex  mnLangID );
+pImpl.reset( new LanguageTagImpl( *this));
+}
+return pImpl;
+}
+
+
+LanguageTag::ImplPtr LanguageTag::getImpl() const
 {
 if (!mpImpl)
-mpImpl.reset( new LanguageTagImpl( *this));
-return mpImpl.get();
+mpImpl = registerImpl();
+return mpImpl;
 }
 
 
@@ -824,7 +917,7 @@ bool LanguageTagImpl::synCanonicalize()
 
 void LanguageTag::syncFromImpl()
 {
-LanguageTagImpl* pImpl = getImpl();
+ImplPtr pImpl = getImpl();
 mbInitializedBcp47  = pImpl-mbInitializedBcp47;
 maBcp47 = pImpl-maBcp47;
 mbInitializedLocale = pImpl-mbInitializedLocale;
@@ -863,7 +956,7 @@ void LanguageTagImpl::convertLocaleToBcp47()
 
 void LanguageTag::convertLocaleToBcp47()
 {
-

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

2013-09-18 Thread Eike Rathke

 i18nlangtag/source/languagetag/languagetag.cxx |  628 ++---
 include/i18nlangtag/languagetag.hxx|  114 +---
 2 files changed, 497 insertions(+), 245 deletions(-)

New commits:
commit 31db11d7efba6f9ee77e9c1cd1f0e82ce9e8feee
Author: Eike Rathke er...@redhat.com
Date:   Wed Sep 18 22:39:23 2013 +0200

changed to mpImpl

first step to register locales

Change-Id: I1a1f7b3f642cf892e91b17dd30c92a79129f184e

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 93f9823..dde0a2e 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -201,47 +201,276 @@ void LiblantagDataRef::setupDataPath()
 lt_db_set_datadir( maDataPath.getStr());
 }
 
-LanguageTag::LanguageTag( const OUString  rBcp47LanguageTag, bool 
bCanonicalize )
+
+class LanguageTagImpl
+{
+public:
+
+explicit LanguageTagImpl( const LanguageTag  rLanguageTag );
+explicit LanguageTagImpl( const LanguageTagImpl  rLanguageTagImpl );
+~LanguageTagImpl();
+LanguageTagImpl operator=( const LanguageTagImpl  rLanguageTagImpl );
+
+private:
+
+friend class LanguageTag;
+
+enum Decision
+{
+DECISION_DONTKNOW,
+DECISION_NO,
+DECISION_YES
+};
+
+mutable com::sun::star::lang::LocalemaLocale;
+mutable OUStringmaBcp47;
+mutable OUStringmaCachedLanguage;   /// cache 
getLanguage()
+mutable OUStringmaCachedScript; /// cache 
getScript()
+mutable OUStringmaCachedCountry;/// cache 
getCountry()
+mutable OUStringmaCachedVariants;   /// cache 
getVariants()
+mutable void*   mpImplLangtag;  /// actually 
lt_tag_t pointer, encapsulated
+mutable LanguageTypemnLangID;
+mutable DecisionmeIsValid;
+mutable DecisionmeIsIsoLocale;
+mutable DecisionmeIsIsoODF;
+mutable DecisionmeIsLiblangtagNeeded;   /// 
whether processing with liblangtag needed
+boolmbSystemLocale  : 1;
+mutable boolmbInitializedBcp47  : 1;
+mutable boolmbInitializedLocale : 1;
+mutable boolmbInitializedLangID : 1;
+mutable boolmbCachedLanguage: 1;
+mutable boolmbCachedScript  : 1;
+mutable boolmbCachedCountry : 1;
+mutable boolmbCachedVariants: 1;
+
+const OUString getBcp47( bool bResolveSystem = true ) const;
+OUStringgetLanguage() const;
+OUStringgetScript() const;
+OUStringgetCountry() const;
+OUStringgetRegion() const;
+OUStringgetVariants() const;
+boolhasScript() const;
+
+boolisIsoLocale() const;
+boolisIsoODF() const;
+boolisValidBcp47() const;
+
+voidconvertLocaleToBcp47();
+voidconvertLocaleToLang();
+voidconvertBcp47ToLocale();
+voidconvertBcp47ToLang();
+voidconvertLangToLocale();
+voidconvertLangToBcp47();
+
+voidconvertFromRtlLocale();
+
+/** @return whether BCP 47 language tag string was changed. */
+boolcanonicalize();
+
+/** Canonicalize if not yet done and synchronize initialized conversions.
+
+@return whether BCP 47 language tag string was changed.
+ */
+boolsynCanonicalize();
+
+OUStringgetLanguageFromLangtag();
+OUStringgetScriptFromLangtag();
+OUStringgetRegionFromLangtag();
+OUStringgetVariantsFromLangtag();
+
+voidresetVars();
+
+/** Obtain Language, Script, Country and Variants via simpleExtract() and
+assign them to the cached variables if successful.
+
+@return return of simpleExtract()
+ */
+boolcacheSimpleLSCV();
+
+enum Extraction
+{
+EXTRACTED_NONE,
+EXTRACTED_LSC,
+EXTRACTED_LV,
+EXTRACTED_X,
+EXTRACTED_X_JOKER
+};
+
+/** Of a language tag of the form lll[-Ssss][-CC][-] extract the
+portions.
+
+Does not check case or content!
+
+@return EXTRACTED_LSC if simple tag was detected (i.e. one that
+would fulfill the isIsoODF() condition),
+EXTRACTED_LV if a tag with variant was detected,
+EXTRACTED_X if x-... privateuse tag was

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

2013-09-02 Thread Eike Rathke

 i18nlangtag/source/languagetag/languagetag.cxx |  143 -
 include/i18nlangtag/languagetag.hxx|   25 ++--
 2 files changed, 131 insertions(+), 37 deletions(-)

New commits:
commit 49656398d43fa03f8adb70b9be417f2fd65dd9ea
Author: Eike Rathke er...@redhat.com
Date:   Mon Sep 2 18:01:13 2013 +0200

simpleExtract() with variants

rsc needs to resolve all known defined languages without access to
liblangtag because that would need
/usr/local/share/liblangtag/language-subtag-registry.xml so we'd end up
with a bootstrap problem (or would have to pass the database path).

Change-Id: I6b966d45080da26cb89169cdb40cd8a58c04a276

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index b5c24ee..22f82fe 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -155,6 +155,7 @@ LanguageTag::LanguageTag( const OUString  
rBcp47LanguageTag, bool bCanonicalize
 mbCachedLanguage( false),
 mbCachedScript( false),
 mbCachedCountry( false),
+mbCachedVariants( false),
 mbIsFallback( false)
 {
 if (bCanonicalize)
@@ -178,6 +179,7 @@ LanguageTag::LanguageTag( const 
com::sun::star::lang::Locale  rLocale )
 mbCachedLanguage( false),
 mbCachedScript( false),
 mbCachedCountry( false),
+mbCachedVariants( false),
 mbIsFallback( false)
 {
 }
@@ -198,6 +200,7 @@ LanguageTag::LanguageTag( LanguageType nLanguage )
 mbCachedLanguage( false),
 mbCachedScript( false),
 mbCachedCountry( false),
+mbCachedVariants( false),
 mbIsFallback( false)
 {
 }
@@ -220,6 +223,7 @@ LanguageTag::LanguageTag( const OUString rBcp47, const 
OUString rLanguage,
 mbCachedLanguage( false),
 mbCachedScript( false),
 mbCachedCountry( false),
+mbCachedVariants( false),
 mbIsFallback( false)
 {
 if (!mbSystemLocale  !mbInitializedBcp47)
@@ -257,6 +261,7 @@ LanguageTag::LanguageTag( const rtl_Locale  rLocale )
 mbCachedLanguage( false),
 mbCachedScript( false),
 mbCachedCountry( false),
+mbCachedVariants( false),
 mbIsFallback( false)
 {
 convertFromRtlLocale();
@@ -284,6 +289,7 @@ LanguageTag::LanguageTag( const LanguageTag  rLanguageTag )
 mbCachedLanguage( rLanguageTag.mbCachedLanguage),
 mbCachedScript( rLanguageTag.mbCachedScript),
 mbCachedCountry( rLanguageTag.mbCachedCountry),
+mbCachedVariants( rLanguageTag.mbCachedVariants),
 mbIsFallback( rLanguageTag.mbIsFallback)
 {
 if (mpImplLangtag)
@@ -313,6 +319,7 @@ LanguageTag LanguageTag::operator=( const LanguageTag  
rLanguageTag )
 mbCachedLanguage= rLanguageTag.mbCachedLanguage;
 mbCachedScript  = rLanguageTag.mbCachedScript;
 mbCachedCountry = rLanguageTag.mbCachedCountry;
+mbCachedVariants= rLanguageTag.mbCachedVariants;
 mbIsFallback= rLanguageTag.mbIsFallback;
 if (mpImplLangtag)
 theDataRef::get().incRef();
@@ -360,6 +367,7 @@ void LanguageTag::resetVars()
 mbCachedLanguage= false;
 mbCachedScript  = false;
 mbCachedCountry = false;
+mbCachedVariants= false;
 mbIsFallback= false;
 }
 
@@ -441,20 +449,22 @@ bool LanguageTag::canonicalize()
 // and want to determine if parsing it would be possible
 // without using liblangtag just to see if it is a simple known
 // locale.
-OUString aLanguage, aScript, aCountry;
-Extraction eExt = simpleExtract( maBcp47, aLanguage, aScript, 
aCountry);
+OUString aLanguage, aScript, aCountry, aVariants;
+Extraction eExt = simpleExtract( maBcp47, aLanguage, aScript, 
aCountry, aVariants);
 if (eExt != EXTRACTED_NONE)
 {
-if (eExt == EXTRACTED_LSC)
+if (eExt == EXTRACTED_LSC || eExt == EXTRACTED_LV)
 {
 // Rebuild bcp47 with proper casing of tags.
 OUStringBuffer aBuf( aLanguage.getLength() + 1 + 
aScript.getLength() +
-1 + aCountry.getLength());
+1 + aCountry.getLength() + 1 + 
aVariants.getLength());
 aBuf.append( aLanguage);
 if (!aScript.isEmpty())
 aBuf.append(- + aScript);
 if (!aCountry.isEmpty())
 aBuf.append(- + aCountry);
+if (!aVariants.isEmpty())
+aBuf.append(- + aVariants);
 OUString aStr( aBuf.makeStringAndClear());
 
 if (maBcp47 != aStr)
@@ -749,7 +759,7 @@ OUString

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

2013-08-30 Thread Eike Rathke

 i18nlangtag/source/languagetag/languagetag.cxx |   21 -
 include/i18nlangtag/languagetag.hxx|8 
 2 files changed, 29 deletions(-)

New commits:
commit 5f860df7fef263d3260e8074841fffcfdf4717fc
Author: Eike Rathke er...@redhat.com
Date:   Fri Aug 30 18:26:14 2013 +0200

removed LanguageTag(OUString,OUString) ctor

Change-Id: I8450b7d76e8efac302a9d6005eb3ecc72ad195f4

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 887a58e..b5c24ee 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -241,27 +241,6 @@ LanguageTag::LanguageTag( const OUString rBcp47, const 
OUString rLanguage,
 }
 
 
-LanguageTag::LanguageTag( const OUString rLanguage, const OUString rCountry )
-:
-maLocale( rLanguage, rCountry, ),
-mpImplLangtag( NULL),
-mnLangID( LANGUAGE_DONTKNOW),
-meIsValid( DECISION_DONTKNOW),
-meIsIsoLocale( DECISION_DONTKNOW),
-meIsIsoODF( DECISION_DONTKNOW),
-meIsLiblangtagNeeded( DECISION_DONTKNOW),
-mbSystemLocale( rLanguage.isEmpty()),
-mbInitializedBcp47( false),
-mbInitializedLocale( !mbSystemLocale),
-mbInitializedLangID( false),
-mbCachedLanguage( false),
-mbCachedScript( false),
-mbCachedCountry( false),
-mbIsFallback( false)
-{
-}
-
-
 LanguageTag::LanguageTag( const rtl_Locale  rLocale )
 :
 maLocale( rLocale.Language, rLocale.Country, rLocale.Variant),
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index 3843493..403221f 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -79,14 +79,6 @@ public:
 explicit LanguageTag( const OUString rBcp47, const OUString rLanguage,
   const OUString rScript, const OUString rCountry );
 
-/** Init LanguageTag with language and country strings.
-
-This is a convenience ctor for places that so far use only language and
-country to replace the MsLangId::convert...IsoNames...() calls. Avoid
-use in new code.
- */
-explicit LanguageTag( const OUString rLanguage, const OUString rCountry 
);
-
 /** Init LanguageTag with rtl_Locale.
 
 This is a convenience ctor.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-10 Thread Eike Rathke

 i18nlangtag/source/languagetag/languagetag.cxx |   21 +
 include/i18nlangtag/languagetag.hxx|   12 ++--
 xmloff/source/core/xmlexp.cxx  |8 
 xmloff/source/style/chrlohdl.cxx   |   19 +++
 4 files changed, 34 insertions(+), 26 deletions(-)

New commits:
commit 1e744d5d9de568aeef6794365dc6f2bf84537ddb
Author: Eike Rathke er...@redhat.com
Date:   Wed Jul 10 15:57:25 2013 +0200

changed getIsoLanguageCountry() to getIsoLanguageScriptCountry()

And don't write ODF *:script if *:language is not written either.

Change-Id: If6d49cc6fbb8d566cc59edf35ed7991d57d941c0

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 7d47580..13e25f8 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -877,17 +877,22 @@ LanguageType LanguageTag::getLanguageType( bool 
bResolveSystem ) const
 }
 
 
-void LanguageTag::getIsoLanguageCountry( OUString rLanguage, OUString 
rCountry ) const
+void LanguageTag::getIsoLanguageScriptCountry( OUString rLanguage, OUString 
rScript, OUString rCountry ) const
 {
-if (!isIsoLocale())
+// Calling isIsoODF() first is a predicate for getLanguage(), getScript()
+// and getCountry() to work correctly in this context.
+if (isIsoODF())
 {
-rLanguage = OUString();
-rCountry = OUString();
-return;
+rLanguage = getLanguage();
+rScript   = getScript();
+rCountry  = getCountry();
+}
+else
+{
+rLanguage = (isIsoLanguage( getLanguage()) ? getLanguage() : 
OUString());
+rScript   = (isIsoScript(   getScript())   ? getScript()   : 
OUString());
+rCountry  = (isIsoCountry(  getCountry())  ? getCountry()  : 
OUString());
 }
-// After isIsoLocale() it's safe to call getLanguage() for ISO code.
-rLanguage = getLanguage();
-rCountry = getCountry();
 }
 
 
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index 8f23098..d779f9d 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -128,20 +128,20 @@ public:
  */
 LanguageTypegetLanguageType( bool bResolveSystem = 
true ) const;
 
-/** Obtain ISO strings for language and country.
+/** Obtain ISO strings for language, script and country.
 
-This is a convenience method for places that so far use only language 
and
-country to replace the MsLangId::convert...IsoNames...() calls. Avoid
-use in new code.
+This is a convenience method for ODF export places only. Avoid use in
+other code.
 
 ATTENTION! May return empty strings if the language tag is not
 expressable in valid ISO codes!
 
-@see isIsoLocale()
+@see isIsoODF()
 
 Always resolves an empty tag to the system locale.
  */
-voidgetIsoLanguageCountry( OUString 
rLanguage, OUString rCountry ) const;
+voidgetIsoLanguageScriptCountry( OUString 
rLanguage,
+ OUString 
rScript, OUString rCountry ) const;
 
 /** Get ISO 639 language code, or BCP 47 language.
 
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 357999b..3c22c8f 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1113,13 +1113,13 @@ void SvXMLExport::AddLanguageTagAttributes( sal_uInt16 
nPrefix, sal_uInt16 nPref
 // for consumers not handling *:rfc-language-tag, ensuring that only
 // valid ISO codes are stored. Here the bWriteEmpty parameter has no
 // meaning.
-OUString aLanguage, aCountry;
-rLanguageTag.getIsoLanguageCountry( aLanguage, aCountry);
+OUString aLanguage, aScript, aCountry;
+rLanguageTag.getIsoLanguageScriptCountry( aLanguage, aScript, 
aCountry);
 if (!aLanguage.isEmpty())
 {
 AddAttribute( nPrefix, eLanguage, aLanguage);
-if (rLanguageTag.hasScript())
-AddAttribute( nPrefix, eScript, rLanguageTag.getScript());
+if (!aScript.isEmpty())
+AddAttribute( nPrefix, eScript, aScript);
 if (!aCountry.isEmpty())
 AddAttribute( nPrefix, eCountry, aCountry);
 }
diff --git a/xmloff/source/style/chrlohdl.cxx b/xmloff/source/style/chrlohdl.cxx
index 4a0ee09..d23159d 100644
--- a/xmloff/source/style/chrlohdl.cxx
+++ b/xmloff/source/style/chrlohdl.cxx
@@ -115,8 +115,8 @@ sal_Bool XMLCharLanguageHdl::exportXML( OUString 
rStrExpValue, const uno::Any
 else
 {
 LanguageTag aLanguageTag( aLocale);
-OUString aCountry;
-aLanguageTag.getIsoLanguageCountry( rStrExpValue, aCountry);
+OUString aScript,

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

2013-07-09 Thread Eike Rathke

 i18nlangtag/source/languagetag/languagetag.cxx |   15 +--
 include/i18nlangtag/languagetag.hxx|   14 ++
 2 files changed, 19 insertions(+), 10 deletions(-)

New commits:
commit a72ca75e33c351b00801869aec570a277aaa646a
Author: Eike Rathke er...@redhat.com
Date:   Tue Jul 9 12:24:45 2013 +0200

publish the qlt reserved code in header file

Change-Id: Idb0bfa61655aa2f2d4b73661bce8166121727922

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index f0333b8..673960f 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -35,11 +35,6 @@ using namespace com::sun::star;
 #define LANGTAGCAST(p) (reinterpret_castlt_tag_t*(p))
 #define MPLANGTAG LANGTAGCAST(mpImplLangtag)
 
-/** Convention to signal presence of BCP 47 language tag in a Locale's Variant
-field. The Locale's Language field then will contain this ISO 639-2
-reserved for local use code. */
-#define ISO639_LANGUAGE_TAG qlt
-
 
 // Helper to ensure lt_error_t is free'd
 struct myLtError
@@ -474,7 +469,7 @@ bool LanguageTag::canonicalize()
 }
 else
 {
-maLocale.Language = ISO639_LANGUAGE_TAG;
+maLocale.Language = I18NLANGTAG_QLT;
 maLocale.Country  = aCountry;
 maLocale.Variant  = maBcp47;
 }
@@ -574,7 +569,7 @@ void LanguageTag::convertLocaleToBcp47()
 if (mbSystemLocale  !mbInitializedLocale)
 convertLangToLocale();
 
-if (maLocale.Language == ISO639_LANGUAGE_TAG)
+if (maLocale.Language == I18NLANGTAG_QLT)
 {
 maBcp47 = maLocale.Variant;
 meIsIsoLocale = DECISION_NO;
@@ -607,7 +602,7 @@ void LanguageTag::convertLocaleToLang()
 {
 /* FIXME: this is temporary until code base is converted to not use
  * MsLangId::convert...() anymore. After that, proper new method has to
- * be implemented to allow ISO639_LANGUAGE_TAG and sript tag and such. 
*/
+ * be implemented to allow I18NLANGTAG_QLT and sript tag and such. */
 mnLangID = MsLangId::Conversion::convertLocaleToLanguage( maLocale);
 }
 mbInitializedLangID = true;
@@ -625,7 +620,7 @@ void LanguageTag::convertBcp47ToLocale()
 }
 else
 {
-maLocale.Language = ISO639_LANGUAGE_TAG;
+maLocale.Language = I18NLANGTAG_QLT;
 maLocale.Country = getCountry();
 maLocale.Variant = maBcp47;
 }
@@ -661,7 +656,7 @@ void LanguageTag::convertLangToLocale()
 }
 /* FIXME: this is temporary until code base is converted to not use
  * MsLangId::convert...() anymore. After that, proper new method has to be
- * implemented to allow ISO639_LANGUAGE_TAG and script tag and such. */
+ * implemented to allow I18NLANGTAG_QLT and script tag and such. */
 // Resolve system here!
 maLocale = MsLangId::Conversion::convertLanguageToLocale( mnLangID, true);
 mbInitializedLocale = true;
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index 1a9f499..7fa9b96 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -21,6 +21,20 @@
 typedef struct _rtl_Locale rtl_Locale;  // as in rtl/locale.h
 
 
+/** The ISO 639-2 code reserved for local use used to indicate that a
+com::sun::star::Locale contains a BCP 47 string in its Variant field. The
+Locale's Language field then will contain this language code.
+
+@see LanguageTag::getLocale()
+
+Avoid use, only needed internally or if conversion from Locale to
+LanguageTag is not wanted, i.e. during ODF import. To check whether a
+LanguageTag contains a plain language/country combination or a more
+detailed BCP 47 language tag use LanguageTag::isIsoLocale() instead.
+ */
+#define I18NLANGTAG_QLT qlt
+
+
 /** Wrapper for liblangtag BCP 47 language tags, MS-LangIDs, locales and
 conversions in between.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-09 Thread Eike Rathke

 i18nlangtag/source/languagetag/languagetag.cxx |   58 ++---
 include/i18nlangtag/languagetag.hxx|7 +++
 2 files changed, 49 insertions(+), 16 deletions(-)

New commits:
commit 467cef426a84604263923d654213e14b4d29bbef
Author: Eike Rathke er...@redhat.com
Date:   Tue Jul 9 19:58:48 2013 +0200

let getLanguageType() resolve unknown due to present default script

Change-Id: I54170c7f2183ec2615aca875031148c85c939108

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 673960f..7d47580 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -433,6 +433,8 @@ bool LanguageTag::canonicalize()
 dumper aDumper( mpImplLangtag);
 #endif
 
+bool bChanged = false;
+
 // Side effect: have maBcp47 in any case, resolved system.
 // Some methods calling canonicalize() (or not calling it due to
 // meIsLiblangtagNeeded==DECISION_NO) rely on this! Hence do not set
@@ -517,7 +519,7 @@ bool LanguageTag::canonicalize()
 if (meIsLiblangtagNeeded == DECISION_NO)
 {
 meIsValid = DECISION_YES;   // really, known must be valid ...
-return true;// that's it
+return bChanged;// that's it
 }
 meIsLiblangtagNeeded = DECISION_YES;
 SAL_INFO( i18nlangtag, LanguageTag::canonicalize: using liblangtag for 
  maBcp47);
@@ -542,17 +544,20 @@ bool LanguageTag::canonicalize()
 // removes default script and such.
 if (maBcp47 != aOld)
 {
+bChanged = true;
+meIsIsoLocale = DECISION_DONTKNOW;
+meIsIsoODF = DECISION_DONTKNOW;
 if (!lt_tag_parse( MPLANGTAG, pTag, aError.p))
 {
 SAL_WARN( i18nlangtag, LanguageTag::canonicalize: could 
not reparse   maBcp47);
 free( pTag);
 meIsValid = DECISION_NO;
-return false;
+return bChanged;
 }
 }
 free( pTag);
 meIsValid = DECISION_YES;
-return true;
+return bChanged;
 }
 }
 else
@@ -560,7 +565,25 @@ bool LanguageTag::canonicalize()
 SAL_INFO( i18nlangtag, LanguageTag::canonicalize: could not parse  
 maBcp47);
 }
 meIsValid = DECISION_NO;
-return false;
+return bChanged;
+}
+
+
+bool LanguageTag::synCanonicalize()
+{
+bool bChanged = false;
+if (meIsLiblangtagNeeded != DECISION_NO  !mpImplLangtag)
+{
+bChanged = canonicalize();
+if (bChanged)
+{
+if (mbInitializedLocale)
+convertBcp47ToLocale();
+if (mbInitializedLangID)
+convertBcp47ToLang();
+}
+}
+return bChanged;
 }
 
 
@@ -733,8 +756,7 @@ const OUString  LanguageTag::getBcp47( bool bResolveSystem 
) const
 OUString LanguageTag::getLanguageFromLangtag()
 {
 OUString aLanguage;
-if (meIsLiblangtagNeeded != DECISION_NO  !mpImplLangtag)
-canonicalize();
+synCanonicalize();
 if (maBcp47.isEmpty())
 return aLanguage;
 if (mpImplLangtag)
@@ -760,8 +782,7 @@ OUString LanguageTag::getLanguageFromLangtag()
 OUString LanguageTag::getScriptFromLangtag()
 {
 OUString aScript;
-if (meIsLiblangtagNeeded != DECISION_NO  !mpImplLangtag)
-canonicalize();
+synCanonicalize();
 if (maBcp47.isEmpty())
 return aScript;
 if (mpImplLangtag)
@@ -787,8 +808,7 @@ OUString LanguageTag::getScriptFromLangtag()
 OUString LanguageTag::getRegionFromLangtag()
 {
 OUString aRegion;
-if (meIsLiblangtagNeeded != DECISION_NO  !mpImplLangtag)
-canonicalize();
+synCanonicalize();
 if (maBcp47.isEmpty())
 return aRegion;
 if (mpImplLangtag)
@@ -842,7 +862,16 @@ LanguageType LanguageTag::getLanguageType( bool 
bResolveSystem ) const
 if (mbInitializedBcp47)
 const_castLanguageTag*(this)-convertBcp47ToLang();
 else
+{
 const_castLanguageTag*(this)-convertLocaleToLang();
+
+/* Resolve a locale only unknown due to some redundant information,
+ * like 'de-Latn-DE' with script tag. Never call canonicalize()
+ * from within convert...() methods due to possible recursion, so
+ * do it here. */
+if ((!mbSystemLocale  mnLangID == LANGUAGE_SYSTEM) || mnLangID 
== LANGUAGE_DONTKNOW)
+const_castLanguageTag*(this)-synCanonicalize();
+}
 }
 return mnLangID;
 }
@@ -1030,8 +1059,7 @@ bool LanguageTag::isIsoLocale() const
 {
 if (meIsIsoLocale == DECISION_DONTKNOW)
 {
-if (meIsLiblangtagNeeded != DECISION_NO  !mpImplLangtag)
-const_castLanguageTag*(this)-canonicalize();
+const_castLanguageTag*(this)-synCanonicalize();
 // It must be at

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

2013-07-05 Thread Eike Rathke

 i18nlangtag/source/languagetag/languagetag.cxx |   38 +
 include/i18nlangtag/languagetag.hxx|9 +
 2 files changed, 47 insertions(+)

New commits:
commit 4467a4a6280306770107488b4a97c4d496c95a43
Author: Eike Rathke er...@redhat.com
Date:   Fri Jul 5 21:01:35 2013 +0200

added convenience ctor for ODF import

Change-Id: I80fc2d531b612d9e2e94fc4f5efcca594e35a561

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 68c3aeb..f0333b8 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -206,6 +206,44 @@ LanguageTag::LanguageTag( LanguageType nLanguage )
 }
 
 
+LanguageTag::LanguageTag( const OUString rBcp47, const OUString rLanguage,
+  const OUString rScript, const OUString rCountry )
+:
+maBcp47( rBcp47),
+mpImplLangtag( NULL),
+mnLangID( LANGUAGE_DONTKNOW),
+meIsValid( DECISION_DONTKNOW),
+meIsIsoLocale( DECISION_DONTKNOW),
+meIsIsoODF( DECISION_DONTKNOW),
+meIsLiblangtagNeeded( DECISION_DONTKNOW),
+mbSystemLocale( rBcp47.isEmpty()  rLanguage.isEmpty()),
+mbInitializedBcp47( !rBcp47.isEmpty()),
+mbInitializedLocale( false),
+mbInitializedLangID( false),
+mbCachedLanguage( false),
+mbCachedScript( false),
+mbCachedCountry( false),
+mbIsFallback( false)
+{
+if (!mbSystemLocale  !mbInitializedBcp47)
+{
+if (rScript.isEmpty())
+{
+maLocale = lang::Locale( rLanguage, rCountry, );
+mbInitializedLocale = true;
+}
+else
+{
+if (rCountry.isEmpty())
+maBcp47 = rLanguage + - + rScript;
+else
+maBcp47 = rLanguage + - + rScript + - + rCountry;
+mbInitializedBcp47 = true;
+}
+}
+}
+
+
 LanguageTag::LanguageTag( const OUString rLanguage, const OUString rCountry )
 :
 maLocale( rLanguage, rCountry, ),
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index 15ca4ec..1a9f499 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -53,6 +53,15 @@ public:
 /** Init LanguageTag with LanguageType MS-LangID. */
 explicit LanguageTag( LanguageType nLanguage );
 
+/** Init LanguageTag with either BCP 47 language tag (precedence if not
+empty), or a combination of language, script and country.
+
+This is a convenience ctor to be used in ODF import where these are
+distinct attributes.
+ */
+explicit LanguageTag( const OUString rBcp47, const OUString rLanguage,
+  const OUString rScript, const OUString rCountry );
+
 /** Init LanguageTag with language and country strings.
 
 This is a convenience ctor for places that so far use only language and
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-01 Thread Harri Pitkänen

 i18nlangtag/source/isolang/isolang.cxx |2 ++
 include/i18nlangtag/lang.h |2 ++
 svtools/source/misc/langtab.src|2 ++
 3 files changed, 6 insertions(+)

New commits:
commit 30213582c73f2dec6d4a980560192720f2f426ab
Author: Harri PitkÃ¤nen hatap...@iki.fi
Date:   Wed Jun 19 10:07:32 2013 +0300

Add Cornish and Pite Sami to the list of spelling languages

Add Cornish (kw-UK) and Pite Sami (sje-SE) to the list of
available spell checking languages to support spell checkers
that are being currently developed:

  https://victorio.uit.no/langtech/trunk/langs/cor
  https://victorio.uit.no/langtech/trunk/langs/sje

Change-Id: I2f95fe5339e7cc31d64fa13cf2f74268b159215e
Reviewed-on: https://gerrit.libreoffice.org/4609
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index c830673..a27331f 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -514,6 +514,8 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_SIDAMA,sid, ET },
 { LANGUAGE_USER_NKO,   nqo, GN },
 { LANGUAGE_USER_UDMURT,udm, RU },
+{ LANGUAGE_USER_CORNISH,   kw,  UK },
+{ LANGUAGE_USER_SAMI_PITE_SWEDEN,  sje, SE },
 { LANGUAGE_MULTIPLE,   mul,},   // multiple 
languages, many languages are used
 { LANGUAGE_UNDETERMINED,   und,},   // undetermined 
language, language cannot be identified
 { LANGUAGE_NONE,   zxx,},   // added to ISO 
639-2 on 2006-01-11: Used to declare the absence of linguistic information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 53724c9..c2281cb 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -557,6 +557,8 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_NKO   0x0686
 #define LANGUAGE_USER_UDMURT0x0687
 #define LANGUAGE_USER_TIBETAN_INDIA 0x8051  /* makeLangID( 0x20, 
getPrimaryLanguage( LANGUAGE_TIBETAN)) */
+#define LANGUAGE_USER_CORNISH   0x0688
+#define LANGUAGE_USER_SAMI_PITE_SWEDEN  0x843B  /* makeLangID( 0x21, 
getPrimaryLanguage( LANGUAGE_SAMI_NORTHERN_NORWAY)) */
 
 #define LANGUAGE_USER_PRIV_JOKER0xFFEB  /* privateuse * (sic! 
bad! nasty!), primary 0x3eb, sub 0x3f */
 #define LANGUAGE_USER_PRIV_COMMENT  0xFFEC  /* privateuse x-comment, 
primary 0x3ec, sub 0x3f */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index f85ef6a..15abc14 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -363,6 +363,8 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  N'ko ; LANGUAGE_USER_NKO ;  ;
  Udmurt ; LANGUAGE_USER_UDMURT ;  ;
  Tibetan (India) ; LANGUAGE_USER_TIBETAN_INDIA ;  ;
+ Cornish ; LANGUAGE_USER_CORNISH ;  ;
+ Sami, Pite (Sweden) ; LANGUAGE_USER_SAMI_PITE_SWEDEN ;  ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-12 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx  |1 +
 i18nlangtag/source/isolang/mslangid.cxx |1 +
 include/i18nlangtag/lang.h  |1 +
 svtools/source/misc/langtab.src |1 +
 4 files changed, 4 insertions(+)

New commits:
commit ad3105a2933aff80b8fd471d32c0846440a508c5
Author: Eike Rathke er...@redhat.com
Date:   Wed Jun 12 11:24:13 2013 +0200

added Tibetan_India [bo-IN] to language list, fdo#40713

Change-Id: Ied426ee153ccd1a71e3cd0fbb4b417ac8b9b82e4

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 8f291d6..c830673 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -305,6 +305,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_SWAHILI_TANZANIA,   sw, TZ },
 { LANGUAGE_TAJIK,   tg, TJ },
 { LANGUAGE_TIBETAN, bo, CN },   // CN politically 
correct?
+{ LANGUAGE_USER_TIBETAN_INDIA,  bo, IN },
 { LANGUAGE_DZONGKHA,dz, BT },
 { LANGUAGE_TURKMEN, tk, TM },
 { LANGUAGE_WELSH,   cy, GB },
diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index 34c017b..08e618e 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -382,6 +382,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
 case LANGUAGE_THAI:
 case LANGUAGE_TIBETAN:
 case LANGUAGE_DZONGKHA:
+case LANGUAGE_USER_TIBETAN_INDIA:
 case LANGUAGE_URDU:
 case LANGUAGE_URDU_PAKISTAN:
 case LANGUAGE_URDU_INDIA:
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index dcf7d53..53724c9 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -556,6 +556,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_SIDAMA0x0685
 #define LANGUAGE_USER_NKO   0x0686
 #define LANGUAGE_USER_UDMURT0x0687
+#define LANGUAGE_USER_TIBETAN_INDIA 0x8051  /* makeLangID( 0x20, 
getPrimaryLanguage( LANGUAGE_TIBETAN)) */
 
 #define LANGUAGE_USER_PRIV_JOKER0xFFEB  /* privateuse * (sic! 
bad! nasty!), primary 0x3eb, sub 0x3f */
 #define LANGUAGE_USER_PRIV_COMMENT  0xFFEC  /* privateuse x-comment, 
primary 0x3ec, sub 0x3f */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 849a803..f85ef6a 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -362,6 +362,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  Yombe (Congo) ; LANGUAGE_USER_YOMBE_CONGO ;  ;
  N'ko ; LANGUAGE_USER_NKO ;  ;
  Udmurt ; LANGUAGE_USER_UDMURT ;  ;
+ Tibetan (India) ; LANGUAGE_USER_TIBETAN_INDIA ;  ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-13 Thread Andras Timar

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/source/misc/langtab.src|1 +
 3 files changed, 3 insertions(+)

New commits:
commit ec97c59ad376e895c1015e04f638804ce71077a6
Author: Andras Timar ati...@suse.com
Date:   Mon May 13 13:31:07 2013 +0200

added Udmurt [udm-RU] to language list

Change-Id: Ief2413fda7ecbf4cc73bc0d2bf483f9a6c16cca8

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 00d21b5..8f291d6 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -512,6 +512,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_YOMBE_CONGO,   yom, CG },
 { LANGUAGE_USER_SIDAMA,sid, ET },
 { LANGUAGE_USER_NKO,   nqo, GN },
+{ LANGUAGE_USER_UDMURT,udm, RU },
 { LANGUAGE_MULTIPLE,   mul,},   // multiple 
languages, many languages are used
 { LANGUAGE_UNDETERMINED,   und,},   // undetermined 
language, language cannot be identified
 { LANGUAGE_NONE,   zxx,},   // added to ISO 
639-2 on 2006-01-11: Used to declare the absence of linguistic information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index aa6dc46..dcf7d53 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -555,6 +555,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_YOMBE_CONGO   0x8284  /* makeLangID( 0x20, 
getPrimaryLanguage( LANGUAGE_USER_YOMBE)) */
 #define LANGUAGE_USER_SIDAMA0x0685
 #define LANGUAGE_USER_NKO   0x0686
+#define LANGUAGE_USER_UDMURT0x0687
 
 #define LANGUAGE_USER_PRIV_JOKER0xFFEB  /* privateuse * (sic! 
bad! nasty!), primary 0x3eb, sub 0x3f */
 #define LANGUAGE_USER_PRIV_COMMENT  0xFFEC  /* privateuse x-comment, 
primary 0x3ec, sub 0x3f */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 6639472..ba4ffd1 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -361,6 +361,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  Yaka ; LANGUAGE_USER_YAKA ;  ;
  Yombe (Congo) ; LANGUAGE_USER_YOMBE_CONGO ;  ;
  N'ko ; LANGUAGE_USER_NKO ;  ;
+ Udmurt ; LANGUAGE_USER_UDMURT ;  ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

77 matches

Mail list logo