napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] Special case sr@latin

Browse Source 
QLocale::name() doesn't include script information, and if it did
it would probably use sr_RS@Latin; when searching for translation
files it won't consider dropping just the country.
This commit is contained in:
Adriaan de Groot 2018-04-19 09:04:29 -04:00
parent a9ffd3351d
commit b9ed96d4f8
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libcalamares/utils/CalamaresUtils.cpp
View File

@ -147,6 +147,12 @@ installTranslator( const QLocale& locale,
if ( localeName == "C" )
localeName = "en";
// Special case of sr@latin
if ( locale.language() == QLocale::Language::Serbian && locale.script() == QLocale::Script::LatinScript )
localeName = QStringLiteral( "sr@latin" );
cDebug() << "Looking for translations for" << localeName;
QTranslator* translator = nullptr;
// Branding translations
@ -167,11 +173,11 @@ installTranslator( const QLocale& locale,
"_",
brandingTranslationsDir.absolutePath() ) )
{
cDebug() << "Translation: Branding using locale:" << localeName;
cDebug() << " .. Branding using locale:" << localeName;
}
else
{
cDebug() << "Translation: Branding using default, system locale not found:" << localeName;
cDebug() << " .. Branding using default, system locale not found:" << localeName;
translator->load( brandingTranslationsPrefix + "en" );
}
@ -190,11 +196,11 @@ installTranslator( const QLocale& locale,
translator = new QTranslator( parent );
if ( translator->load( QString( ":/lang/calamares_" ) + localeName ) )
{
cDebug() << "Translation: Calamares using locale:" << localeName;
cDebug() << " .. Calamares using locale:" << localeName;
}
else
{
cDebug() << "Translation: Calamares using default, system locale not found:" << localeName;
cDebug() << " .. Calamares using default, system locale not found:" << localeName;
translator->load( QString( ":/lang/calamares_en" ) );
}