diff options
| author | Eike Rathke <erack@redhat.com> | 2013-10-24 01:47:25 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-10-24 01:54:59 +0200 |
| commit | 6b678c135da07f34da1bf7b19562366361e95085 (patch) | |
| tree | 70661894df40cf42f1f0278d4e2fb9d1bea29c8f /svtools | |
| parent | 315a0e277ab929ab77bb6ecd761abb24af0beb8b (diff) | |
added/checked/aligned MS-LangIDs and mappings from new MS-LCID.pdf
... found at http://msdn.microsoft.com/library/cc233965.aspx (the 5th or
6th place I'm aware of where MS defines LCIDs, all different ...)
* a bunch of new definitions up to Windows 8.1
* lots of cross-checks done with SIL, Ethnologue, ...
Change-Id: Ifae8e676558c6712fe752856acca600d05d0a63f
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/misc/langtab.src | 10 | ||||
| -rw-r--r-- | svtools/source/misc/sampletext.cxx | 14 |
2 files changed, 16 insertions, 8 deletions
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index d782bce46006..42f93e8c624d 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -152,8 +152,8 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE < "Romanian (Moldova)" ; LANGUAGE_ROMANIAN_MOLDOVA ; > ; < "Russian" ; LANGUAGE_RUSSIAN ; > ; < "Sanskrit" ; LANGUAGE_SANSKRIT ; > ; - < "Serbian Cyrillic (Serbia and Montenegro)" ; LANGUAGE_SERBIAN_CYRILLIC ; > ; - < "Serbian Latin (Serbia and Montenegro)" ; LANGUAGE_SERBIAN_LATIN ; > ; + < "Serbian Cyrillic (Serbia and Montenegro)" ; LANGUAGE_SERBIAN_CYRILLIC_SAM ; > ; + < "Serbian Latin (Serbia and Montenegro)" ; LANGUAGE_SERBIAN_LATIN_SAM ; > ; < "Serbian Cyrillic (Serbia)" ; LANGUAGE_USER_SERBIAN_CYRILLIC_SERBIA ; > ; < "Serbian Latin (Serbia)" ; LANGUAGE_USER_SERBIAN_LATIN_SERBIA ; > ; < "Serbian Cyrillic (Montenegro)" ; LANGUAGE_USER_SERBIAN_CYRILLIC_MONTENEGRO ; > ; @@ -205,8 +205,8 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE < "Dhivehi" ; LANGUAGE_DHIVEHI ; > ; < "Northern Sotho" ; LANGUAGE_SEPEDI ; > ; < "Gaelic (Scotland)" ; LANGUAGE_GAELIC_SCOTLAND ; > ; - < "Mongolian Cyrillic" ; LANGUAGE_MONGOLIAN ; > ; - < "Mongolian Mongolian" ; LANGUAGE_MONGOLIAN_MONGOLIAN ; > ; + < "Mongolian Cyrillic" ; LANGUAGE_MONGOLIAN_CYRILLIC_MONGOLIA ; > ; + < "Mongolian Mongolian" ; LANGUAGE_MONGOLIAN_MONGOLIAN_MONGOLIA ; > ; < "Interlingua" ; LANGUAGE_USER_INTERLINGUA ; > ; < "Bosnian" ; LANGUAGE_BOSNIAN_BOSNIA_HERZEGOVINA ; > ; < "Bengali (Bangladesh)" ; LANGUAGE_BENGALI_BANGLADESH ; > ; @@ -315,7 +315,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE < "Yoruba" ; LANGUAGE_YORUBA ; > ; < "Rusyn (Ukraine)" ; LANGUAGE_USER_RUSYN_UKRAINE ; > ; < "Rusyn (Slovakia)" ; LANGUAGE_USER_RUSYN_SLOVAKIA ; > ; - < "Kabyle Latin" ; LANGUAGE_TAMAZIGHT_LATIN ; > ; + < "Kabyle Latin" ; LANGUAGE_TAMAZIGHT_LATIN_ALGERIA ; > ; < "Yiddish (USA)" ; LANGUAGE_USER_YIDDISH_US ; > ; < "Hawaiian" ; LANGUAGE_HAWAIIAN_UNITED_STATES ; > ; < "Limbu" ; LANGUAGE_USER_LIMBU ; > ; diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index c8ba114c6ebf..3523383ccfa5 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -586,9 +586,17 @@ OUString makeRepresentativeTextForLanguage(LanguageType eLang) case LANGUAGE_KHMER & LANGUAGE_MASK_PRIMARY: sRet = makeRepresentativeTextForScript(USCRIPT_KHMER); break; - case LANGUAGE_MONGOLIAN & LANGUAGE_MASK_PRIMARY: - if (eLang == LANGUAGE_MONGOLIAN_MONGOLIAN) - sRet = makeRepresentativeTextForScript(USCRIPT_MONGOLIAN); + case LANGUAGE_MONGOLIAN_MONGOLIAN_LSO & LANGUAGE_MASK_PRIMARY: + switch (eLang) + { + case LANGUAGE_MONGOLIAN_MONGOLIAN_MONGOLIA: + case LANGUAGE_MONGOLIAN_MONGOLIAN_CHINA: + case LANGUAGE_MONGOLIAN_MONGOLIAN_LSO: + sRet = makeRepresentativeTextForScript(USCRIPT_MONGOLIAN); + break; + default: + break; + } break; case LANGUAGE_JAPANESE & LANGUAGE_MASK_PRIMARY: sRet = makeRepresentativeTextForScript(USCRIPT_JAPANESE); |