i18nlangtag/source/isolang/isolang.cxx | 1 + include/i18nlangtag/lang.h | 1 + include/xmloff/xmltoken.hxx | 5 +++++ svtools/source/misc/langtab.src | 1 + xmloff/source/core/xmltoken.cxx | 5 +++++ 5 files changed, 13 insertions(+)
New commits: commit 93f53e400da509bc21ab78fe2ce79d73c82771ae Author: Eike Rathke <er...@redhat.com> Date: Fri Jul 5 12:41:21 2013 +0200 added Ngäbere_Panama [gym-PA] to language list, fdo#66602 Change-Id: I4592f868c4d17ece745db39b604aa0b75181ca27 diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index a27331f..a581b3e 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -516,6 +516,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] = { LANGUAGE_USER_UDMURT, "udm", "RU" }, { LANGUAGE_USER_CORNISH, "kw", "UK" }, { LANGUAGE_USER_SAMI_PITE_SWEDEN, "sje", "SE" }, + { LANGUAGE_USER_NGAEBERE, "gym", "PA" }, { 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 c2281cb..a970bdb 100644 --- a/include/i18nlangtag/lang.h +++ b/include/i18nlangtag/lang.h @@ -559,6 +559,7 @@ typedef unsigned short LanguageType; #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_NGAEBERE 0x0689 #define LANGUAGE_USER_PRIV_JOKER 0xFFEB /* 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 15abc14..5c177e9 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -365,6 +365,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE < "Tibetan (India)" ; LANGUAGE_USER_TIBETAN_INDIA ; > ; < "Cornish" ; LANGUAGE_USER_CORNISH ; > ; < "Sami, Pite (Sweden)" ; LANGUAGE_USER_SAMI_PITE_SWEDEN ; > ; + < "Ngäbere" ; LANGUAGE_USER_NGAEBERE ; > ; }; }; commit 9f1c9edb7a914aa03a6236000aa45189a38bddf9 Author: Eike Rathke <er...@redhat.com> Date: Tue Jul 2 21:32:18 2013 +0200 added rfc-language-tag* tokens Change-Id: Ifef5ebf638863f4b0fa6f985ad2e84359b75b708 diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index 651732e2..a47dedd 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -3203,6 +3203,11 @@ namespace xmloff { namespace token { XML_ERROR_STANDARD_WEIGHT, // errorbar standard deviation error weight + // erAck: 2013-07-02 BCP 47 language tags + XML_RFC_LANGUAGE_TAG, + XML_RFC_LANGUAGE_TAG_ASIAN, + XML_RFC_LANGUAGE_TAG_COMPLEX, + XML_TOKEN_END }; diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 5004a4c..07934bb 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -3204,6 +3204,11 @@ namespace xmloff { namespace token { TOKEN( "std-weight", XML_ERROR_STANDARD_WEIGHT ), + // erAck: 2013-07-02 BCP 47 language tags + TOKEN( "rfc-language-tag", XML_RFC_LANGUAGE_TAG ), + TOKEN( "rfc-language-tag-asian", XML_RFC_LANGUAGE_TAG_ASIAN ), + TOKEN( "rfc-language-tag-complex", XML_RFC_LANGUAGE_TAG_COMPLEX ), + #if OSL_DEBUG_LEVEL > 0 { 0, NULL, NULL, XML_TOKEN_END } #else
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits