diff options
| author | Eike Rathke <erack@redhat.com> | 2013-08-28 12:19:16 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-08-28 12:27:57 +0200 |
| commit | a40afb3f534ea1c655ac728e55a7e4b96b033869 (patch) | |
| tree | 95f03820e310b95725b0bbd7860acac18bba112a /i18nlangtag | |
| parent | 55503ad64689928e6c0c28a34e72a4dd3a3fa438 (diff) | |
added IsoLanguageScriptCountryEntry to getDefinedLanguagetags()
Change-Id: Icc7cecfca05ceb2b1b75422dd97a6d467b3697f4
Diffstat (limited to 'i18nlangtag')
| -rw-r--r-- | i18nlangtag/source/isolang/isolang.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index 8d07617d584b..8d3e6d2bb1ff 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -560,7 +560,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] = static IsoLanguageScriptCountryEntry const aImplIsoLangScriptEntries[] = { -// { LANGUAGE_USER_SERBIAN_LATIN_SERBIA, "sr-Latn", "RS" }, // for example, once we support it in l10n +// { LANGUAGE_USER_SERBIAN_LATIN_SERBIA, "sr-Latn", "RS" }, // for example, once we support it in l10n; TODO: adapt unit test in this case { LANGUAGE_DONTKNOW, "", "" } // marks end of table }; @@ -1116,7 +1116,13 @@ LanguageType MsLangId::convertUnxByteStringToLanguage( ::std::vector< MsLangId::LanguagetagMapping > MsLangId::getDefinedLanguagetags() { ::std::vector< LanguagetagMapping > aVec; - for (const IsoLanguageCountryEntry* pEntry = aImplIsoLangEntries; pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry) + for (const IsoLanguageScriptCountryEntry* pEntry = aImplIsoLangScriptEntries; + pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry) + { + aVec.push_back( LanguagetagMapping( pEntry->getTagString(), pEntry->mnLang)); + } + for (const IsoLanguageCountryEntry* pEntry = aImplIsoLangEntries; + pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry) { aVec.push_back( LanguagetagMapping( pEntry->getTagString(), pEntry->mnLang)); } |