Skip to content

Fix app using a wrong language with some local versions of language #4733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xkello wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix app using a wrong language with some local versions of language #4733

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 35 additions & 5 deletions app/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,38 @@ static void setEnvironmentQgisPrefixPath()
qDebug() << "QGIS_PREFIX_PATH: " << QString::fromLocal8Bit( qgetenv( "QGIS_PREFIX_PATH" ) );
}

// Resolves one preferred language at a time, since uiLanguages() can rank a
// language's own base form behind an exact match for a less-preferred one.
static bool loadInputTranslation( QTranslator &translator )
{
auto tryLanguage = [ &translator ]( QLocale::Language language )
{
return translator.load( QLocale( language ), "input", "_", ":/" );
};

QLocale::Language previousTierLanguage = QLocale::AnyLanguage;

for ( const QString &lang : QLocale().uiLanguages() )
{
QLocale candidate( lang );

if ( previousTierLanguage != QLocale::AnyLanguage && candidate.language() != previousTierLanguage
&& tryLanguage( previousTierLanguage ) )
{
return true;
}

if ( translator.load( candidate, "input", "_", ":/" ) )
{
return true;
}

previousTierLanguage = candidate.language();
}

return previousTierLanguage != QLocale::AnyLanguage && tryLanguage( previousTierLanguage );
}

static void init_qgis( const QString &pkgPath )
{
QgsApplication::init();
Expand Down Expand Up @@ -436,17 +468,15 @@ int main( int argc, char *argv[] )
setEnvironmentQgisPrefixPath();

// Initialize translations
QLocale locale;

QTranslator inputTranslator;
if ( inputTranslator.load( locale, "input", "_", ":/" ) )
if ( loadInputTranslation( inputTranslator ) )
{
app.installTranslator( &inputTranslator );
qDebug() << "Loaded input translation" << app.locale() << "for" << locale;
qDebug() << "Loaded input translation" << inputTranslator.language() << "(" << inputTranslator.filePath() << ")";
}
else
{
qDebug() << "Error in loading input translation for " << locale;
qDebug() << "No input translation found, using built-in strings";
}

QString appBundleDir;
Expand Down
Loading