mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use proper language tag fallback for language guesser result

Browse Source 
Change-Id: Icd912361ebca0e618bc76fa7017039cc116bef40
This commit is contained in:
Eike Rathke
2013-04-12 19:41:14 +02:00
parent cbcdf190e8
commit cabde84509
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
editeng/source/editeng/editview.cxx
View File

@@ -87,24 +87,22 @@ static LanguageType lcl_CheckLanguage(
if (!xLangGuess.is())
return nLang;
lang::Locale aLocale( xLangGuess->guessPrimaryLanguage( rText, 0, rText.getLength()) );
LanguageTag aGuessTag( xLangGuess->guessPrimaryLanguage( rText, 0, rText.getLength()) );
// get language as from "Tools/Options - Language Settings - Languages: Locale setting"
LanguageType nTmpLang = Application::GetSettings().GetLanguageTag().getLanguageType();
// if the result from language guessing does not provide a 'Country' part
// try to get it by looking up the locale setting of the office.
/* FIXME-BCP47: handle language tags */
if ( aLocale.Country.isEmpty( ) )
// If the result from language guessing does not provide a 'Country'
// part, try to get it by looking up the locale setting of the office,
// "Tools/Options - Language Settings - Languages: Locale setting", if
// the language matches.
if ( aGuessTag.getCountry().isEmpty() )
{
lang::Locale aTmpLocale = LanguageTag( nTmpLang ).getLocale();
if (aTmpLocale.Language == aLocale.Language)
nLang = nTmpLang;
const LanguageTag& rAppLocaleTag = Application::GetSettings().GetLanguageTag();
if (rAppLocaleTag.getLanguage() == aGuessTag.getLanguage())
nLang = rAppLocaleTag.getLanguageType();
}
if (nLang == LANGUAGE_NONE) // language not found by looking up the sytem language...
nLang = LanguageTag( aLocale ).makeFallback().getLanguageType();
nLang = aGuessTag.makeFallback().getLanguageType(); // best known locale match
if (nLang == LANGUAGE_SYSTEM)
nLang = nTmpLang;
nLang = Application::GetSettings().GetLanguageTag().getLanguageType();
if (nLang == LANGUAGE_DONTKNOW)
nLang = LANGUAGE_NONE;
}