[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag svtools/inc
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
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
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 svtools/inc
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 svtools/inc
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 svtools/inc
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 svtools/inc
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
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 svtools/inc
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 svtools/inc
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
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
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
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
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
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
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/inc
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 RathkeDate: 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
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 RathkeDate: 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
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 RathkeDate: 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
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 RathkeDate: 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 svtools/inc
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 RathkeDate: 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
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 RathkeDate: 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