summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2012-02-01 00:15:59 +0100
committerEike Rathke <erack@redhat.com>2012-02-01 00:44:02 +0100
commit4bee7187cd8df7b6e8f71b4c45ef6af7af837f2c (patch)
treeb6aecf15c5d1911c430e1290b663d2d882cff25e
parent38b94d743eceb7bcc69acbed0207a51f780dbd4c (diff)
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.
-rw-r--r--i18npool/inc/i18npool/lang.h2
-rw-r--r--i18npool/source/isolang/isolang.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index 502afddceefb..49cf2bcd43e5 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 00af58c579cd..2207512551de 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
};