strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Override [sd-IN] with [sd-Deva-IN]

Browse source 
Deva is not listed as Suppress-Script for sd in
https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry

Also, this seems to be what MS expects, see
https://msdn.microsoft.com/en-us/library/cc233965

Change-Id: I974b0032c1c0485135690e68ed0a71c43f2adf6e
Reviewed-on: https://gerrit.libreoffice.org/59217
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
This commit is contained in:
Eike Rathke 2018-08-16 18:53:38 +02:00
parent a4c9e4539e
commit f000f9f1a5
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
i18nlangtag/qa/cppunit/test_languagetag.cxx
View file

@ -744,6 +744,7 @@ bool checkMapping( const OUString& rStr1, const OUString& rStr2 )
if (rStr1 == "crk-Cans-CN" ) return rStr2 == "crk-Cans-CA";
if (rStr1 == "en-GB-oed" ) return rStr2 == "en-GB-oxendict";
if (rStr1 == "es-ES_tradnl") return rStr2 == "es-ES-u-co-trad";
if (rStr1 == "sd-IN" ) return rStr2 == "sd-Deva-IN";
return rStr1 == rStr2;
}

4
i18nlangtag/source/isolang/isolang.cxx
View file

@ -360,7 +360,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_PUNJABI_PAKISTAN, "lah", "PK", kSAME }, // macrolanguage code, earlier preferred 'lah' over 'pa' for Western Panjabi, now there is 'pnb'
{ LANGUAGE_PUNJABI_PAKISTAN, "pa", "PK", kSAME }, // MS maps this to 'pa-Arab-PK', but 'pa'='pan' Eastern Panjabi is not used in PK, only in
{ LANGUAGE_SINDHI_PAKISTAN, "sd", "PK", kSAME }, // Arabic script
{ LANGUAGE_SINDHI, "sd", "IN", k0 }, // TODO: there's Deva(nagari) and Arab(ic) script, MS maps this to 'sd-Deva-IN'
{ LANGUAGE_SINDHI, "sd", "IN", kSAME }, // Devanagari script
{ LANGUAGE_BELARUSIAN, "be", "BY", k0 },
{ LANGUAGE_CATALAN, "ca", "ES", k0 }, // Spain (default)
{ LANGUAGE_CATALAN, "ca", "AD", k0 }, // Andorra
@ -721,7 +721,7 @@ static IsoLanguageScriptCountryEntry const aImplIsoLangScriptEntries[] =
{ LANGUAGE_YIDDISH, "yi-Hebr", "IL", kSAME }, // macrolanguage code; MS, Hebr is suppress-script
{ LANGUAGE_UZBEK_LATIN, "uz-Latn", "UZ", k0 }, // macrolanguage code
{ LANGUAGE_UZBEK_LATIN_LSO, "uz-Latn", "" , k0 },
// { LANGUAGE_SINDHI, "sd-Deva", "IN", k0 }, // MS, TODO: see comment above in aImplIsoLangEntries
{ LANGUAGE_SINDHI, "sd-Deva", "IN", k0 }, // MS
{ LANGUAGE_SINDHI_PAKISTAN, "sd-Arab", "PK", k0 }, // MS
{ LANGUAGE_SINDHI_ARABIC_LSO, "sd-Arab", "" , k0 },
{ LANGUAGE_CHEROKEE_UNITED_STATES, "chr-Cher", "US", k0 }, // MS