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

Python-i18n: add /usr/local/share/locale to search

Browse Source
This commit is contained in:
Adriaan de Groot 2017-08-21 12:34:38 -04:00
parent d6d5f54d00
commit 538c59adb9
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libcalamares/PythonJobApi.cpp
View File

@ -271,8 +271,16 @@ gettext_path()
// TODO: can we detect DESTDIR-installs? // TODO: can we detect DESTDIR-installs?
QStringList candidatePaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "locale", QStandardPaths::LocateDirectory); QStringList candidatePaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "locale", QStandardPaths::LocateDirectory);
QString extra = QCoreApplication::applicationDirPath(); QString extra = QCoreApplication::applicationDirPath();
_add_localedirs(candidatePaths, extra); _add_localedirs(candidatePaths, extra); // Often /usr/local/bin
_add_localedirs(candidatePaths, QDir().canonicalPath()); if ( !extra.isEmpty() )
{
QDir d(extra);
if (d.cd("../share/locale")) // Often /usr/local/bin/../share/locale -> /usr/local/share/locale
{
_add_localedirs(candidatePaths, d.canonicalPath());
}
}
_add_localedirs(candidatePaths, QDir().canonicalPath()); // .
cDebug() << "Standard paths" << candidatePaths; cDebug() << "Standard paths" << candidatePaths;