From 3bc8dbc888ad58879147ca78607e9e3fd05bbe7e Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Sat, 30 Jul 2011 11:03:47 -0400 Subject: fix Kabyle_Algeria [kab_DZ] absent currency symbol. * In locale data replaceTo must not be empty if replaceFrom isn't. + Also added check to locale data compiler to prevent this in future. * Fixed a currency format's group separator. * Marked LANGUAGE_USER_KABYLE (0x0659) obsolete as LANGUAGE_TAMAZIGHT_LATIN (0x085F) is used instead, actually commit 909c9aa4550a068513300bc3e899c0466d9287b4 crossed b51eaf4c5083ec35366d18c522a7dd50f9c9b3c0 - Removed the corresponding duplicated entry from langtab.src. --- i18npool/inc/i18npool/lang.h | 3 ++- i18npool/source/isolang/isolang.cxx | 2 +- i18npool/source/isolang/mslangid.cxx | 3 +++ i18npool/source/localedata/LocaleNode.cxx | 5 ++++- i18npool/source/localedata/data/kab_DZ.xml | 4 ++-- 5 files changed, 12 insertions(+), 5 deletions(-) (limited to 'i18npool') diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h index 0059a1b6978e..0b6e891896dc 100644 --- a/i18npool/inc/i18npool/lang.h +++ b/i18npool/inc/i18npool/lang.h @@ -520,7 +520,8 @@ typedef unsigned short LanguageType; #define LANGUAGE_USER_YIDDISH_US 0x083D /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_YIDDISH)) */ #define LANGUAGE_USER_LIMBU 0x0657 #define LANGUAGE_USER_LOJBAN 0x0658 /* no locale */ -#define LANGUAGE_USER_KABYLE 0x0659 +#define LANGUAGE_OBSOLETE_USER_KABYLE 0x0659 +#define LANGUAGE_USER_KABYLE LANGUAGE_TAMAZIGHT_LATIN #define LANGUAGE_USER_HAITIAN 0x065A #define LANGUAGE_USER_BEEMBE 0x065B #define LANGUAGE_USER_BEKWEL 0x065C diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx index 5cce2af8c350..4c18ca1d0769 100644 --- a/i18npool/source/isolang/isolang.cxx +++ b/i18npool/source/isolang/isolang.cxx @@ -386,6 +386,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] = // { LANGUAGE_IBIBIO_NIGERIA, "nic", "NG" }, // ISO "nic" is only a collective language code { LANGUAGE_YI, "ii", "CN" }, { LANGUAGE_TAMAZIGHT_LATIN, "kab", "DZ" }, // In practice Kabyle is the language used for this + { LANGUAGE_OBSOLETE_USER_KABYLE, "kab", "DZ" }, { LANGUAGE_TAMAZIGHT_LATIN, "ber", "DZ" }, // In practice Algeria has standardized on Kabyle as the member of the "ber" collective which gets used there. { LANGUAGE_TAMAZIGHT_TIFINAGH, "ber", "MA" }, // Morocco is officially using Tifinagh for its Berber languages so store it to distinguish explicitly from LANGUAGE_TAMAZIGHT_LATIN, even though as a collective language its not of much use // { LANGUAGE_TAMAZIGHT_ARABIC, "ber", "" }, // ISO "ber" only collective! @@ -467,7 +468,6 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] = { LANGUAGE_USER_RUSYN_SLOVAKIA, "rue", "SK" }, { LANGUAGE_USER_LIMBU, "lif", "NP" }, { LANGUAGE_USER_LOJBAN, "jbo", "" }, - { LANGUAGE_USER_KABYLE, "kab", "DZ" }, { LANGUAGE_USER_HAITIAN, "ht", "HT" }, { LANGUAGE_FRENCH_HAITI, "fr", "HT" }, { LANGUAGE_USER_BEEMBE, "beq", "CG" }, diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx index 2b5c59e865a7..4ec3c5cbaf09 100644 --- a/i18npool/source/isolang/mslangid.cxx +++ b/i18npool/source/isolang/mslangid.cxx @@ -414,6 +414,9 @@ LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang ) case LANGUAGE_OBSOLETE_USER_LUXEMBOURGISH: nLang = LANGUAGE_LUXEMBOURGISH_LUXEMBOURG; break; + case LANGUAGE_OBSOLETE_USER_KABYLE: + nLang = LANGUAGE_TAMAZIGHT_LATIN; + break; // The following are not strictly obsolete but should be mapped to a // replacement locale when encountered. diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index caa40746fd31..83c197251bd3 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -598,8 +598,11 @@ void LCFormatNode::generateCode (const OFileWriter &of) const OUString str; if (mnSection >= 2) incError("more than 2 LC_FORMAT sections"); - of.writeParameter("replaceFrom", getAttr().getValueByName("replaceFrom"), mnSection); + OUString strFrom( getAttr().getValueByName("replaceFrom")); + of.writeParameter("replaceFrom", strFrom, mnSection); str = getAttr().getValueByName("replaceTo"); + if (strFrom.getLength() && !str.getLength()) + incErrorStr("replaceFrom=\"%s\" replaceTo=\"\" is empty replacement.", strFrom); // Locale data generator inserts FFFF for LangID, we need to adapt that. if (str.endsWithIgnoreAsciiCaseAsciiL( "-FFFF]", 6)) incErrorStr("replaceTo=\"%s\" needs FFFF to be adapted to the real LangID value.", str); diff --git a/i18npool/source/localedata/data/kab_DZ.xml b/i18npool/source/localedata/data/kab_DZ.xml index 41e3ab270518..0e3ac54b0ff4 100644 --- a/i18npool/source/localedata/data/kab_DZ.xml +++ b/i18npool/source/localedata/data/kab_DZ.xml @@ -34,7 +34,7 @@ n tmeddit metric - + General @@ -69,7 +69,7 @@ [CURRENCY]#.##0;-[CURRENCY]#.##0 -[CURRENCY]#.##0,00;-[CURRENCY]#,##0,00 +[CURRENCY]#.##0,00;-[CURRENCY]#.##0,00 [CURRENCY]#.##0;[RED]-[CURRENCY]#.##0 -- cgit