i18npool/inc/i18npool/lang.h | 2 ++ i18npool/source/isolang/isolang.cxx | 2 ++ svtools/source/misc/langtab.src | 2 ++ 3 files changed, 6 insertions(+)
New commits: commit 4bee7187cd8df7b6e8f71b4c45ef6af7af837f2c Author: Eike Rathke <er...@redhat.com> Date: Wed Feb 1 00:15:59 2012 +0100 corrections to Komi languages patch * Changed LCID 0x0A69 to 0x066A to comply with the user-assigned space. * Added RU country for mapping to locales' ISO codes. * All locales should consist of language and country, except those where the language is not mappable to any country. diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h index 502afdd..49cf2bc 100644 --- a/i18npool/inc/i18npool/lang.h +++ b/i18npool/inc/i18npool/lang.h @@ -539,7 +539,7 @@ typedef unsigned short LanguageType; #define LANGUAGE_USER_PALI_LATIN 0x0667 #define LANGUAGE_USER_KYRGYZ_CHINA 0x0668 /* not derived from LANGUAGE_KIRGHIZ as these may be different scripts, see http://www.omniglot.com/writing/kirghiz.htm */ #define LANGUAGE_USER_KOMI_ZYRIAN 0x0669 -#define LANGUAGE_USER_KOMI_PERMYAK 0x0A69 +#define LANGUAGE_USER_KOMI_PERMYAK 0x066A #endif /* INCLUDED_I18NPOOL_LANG_H */ diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx index 00af58c..2207512 100644 --- a/i18npool/source/isolang/isolang.cxx +++ b/i18npool/source/isolang/isolang.cxx @@ -483,8 +483,8 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] = { LANGUAGE_USER_KEYID, "qtz", "" }, // key id pseudolanguage used for UI testing { LANGUAGE_USER_PALI_LATIN, "pli", "" }, // Pali with Latin script { LANGUAGE_USER_KYRGYZ_CHINA, "ky", "CN" }, - { LANGUAGE_USER_KOMI_ZYRIAN, "kpv", "" }, - { LANGUAGE_USER_KOMI_PERMYAK, "koi", "" }, + { LANGUAGE_USER_KOMI_ZYRIAN, "kpv", "RU" }, + { LANGUAGE_USER_KOMI_PERMYAK, "koi", "RU" }, { LANGUAGE_NONE, "zxx", "" }, // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information { LANGUAGE_DONTKNOW, "", "" } // marks end of table }; commit 38b94d743eceb7bcc69acbed0207a51f780dbd4c Author: Harri Pitkänen <hatap...@iki.fi> Date: Fri Jan 27 20:28:45 2012 +0200 Support Komi-Zyrian and Komi-Permyak as text language for spell checking diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h index 177d2a7..502afdd 100644 --- a/i18npool/inc/i18npool/lang.h +++ b/i18npool/inc/i18npool/lang.h @@ -538,6 +538,8 @@ typedef unsigned short LanguageType; #define LANGUAGE_USER_KEYID 0x0666 /* key id pseudolanguage */ #define LANGUAGE_USER_PALI_LATIN 0x0667 #define LANGUAGE_USER_KYRGYZ_CHINA 0x0668 /* not derived from LANGUAGE_KIRGHIZ as these may be different scripts, see http://www.omniglot.com/writing/kirghiz.htm */ +#define LANGUAGE_USER_KOMI_ZYRIAN 0x0669 +#define LANGUAGE_USER_KOMI_PERMYAK 0x0A69 #endif /* INCLUDED_I18NPOOL_LANG_H */ diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx index 610ea7f..00af58c 100644 --- a/i18npool/source/isolang/isolang.cxx +++ b/i18npool/source/isolang/isolang.cxx @@ -483,6 +483,8 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] = { LANGUAGE_USER_KEYID, "qtz", "" }, // key id pseudolanguage used for UI testing { LANGUAGE_USER_PALI_LATIN, "pli", "" }, // Pali with Latin script { LANGUAGE_USER_KYRGYZ_CHINA, "ky", "CN" }, + { LANGUAGE_USER_KOMI_ZYRIAN, "kpv", "" }, + { LANGUAGE_USER_KOMI_PERMYAK, "koi", "" }, { LANGUAGE_NONE, "zxx", "" }, // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information { LANGUAGE_DONTKNOW, "", "" } // marks end of table }; diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index 01b2846..fc83ec7 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -344,6 +344,8 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE < "KeyID" ; LANGUAGE_USER_KEYID ; > ; < "Pali Latin" ; LANGUAGE_USER_PALI_LATIN ; > ; < "Kyrgyz (China)" ; LANGUAGE_USER_KYRGYZ_CHINA ; > ; + < "Komi-Zyrian" ; LANGUAGE_USER_KOMI_ZYRIAN ; > ; + < "Komi-Permyak" ; LANGUAGE_USER_KOMI_PERMYAK ; > ; }; };
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits