smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: also check qt6 paths for translations

Browse source
This commit is contained in:
sithlord48 2025-11-20 06:38:41 -05:00 committed by Chris Rizzitello
parent 4285361413
commit 56bb41a291
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/lib/common/I18N.cpp
View file

@ -24,12 +24,15 @@ I18N *I18N::instance()
I18N::I18N(QObject *parent) : QObject{parent} I18N::I18N(QObject *parent) : QObject{parent}
{ {
const auto appDir = QCoreApplication::applicationDirPath();
const auto homeDir = QDir::homePath();
const QList<QDir> appTrDirs{ const QList<QDir> appTrDirs{
{QStringLiteral("%1/%2").arg(QCoreApplication::applicationDirPath(), QStringLiteral("translations"))}, {QStringLiteral("%1/%2").arg(appDir, QStringLiteral("translations"))},
{QStringLiteral("%1/../translations").arg(QCoreApplication::applicationDirPath())}, {QStringLiteral("%1/../translations").arg(appDir)},
{QStringLiteral("%1/../Resources/translations").arg(QCoreApplication::applicationDirPath())}, {QStringLiteral("%1/../Resources/translations").arg(appDir)},
{QStringLiteral("%1/../share/%2/translations").arg(QCoreApplication::applicationDirPath(), kAppId)}, {QStringLiteral("%1/../share/%2/translations").arg(appDir, kAppId)},
{QStringLiteral("%1/.local/share/%2/translations").arg(QDir::homePath(), kAppId)}, {QStringLiteral("%1/.local/share/%2/translations").arg(homeDir, kAppId)},
{QStringLiteral("/usr/local/share/%1/translations").arg(kAppId)}, {QStringLiteral("/usr/local/share/%1/translations").arg(kAppId)},
{QStringLiteral("/usr/share/%1/translations").arg(kAppId)} {QStringLiteral("/usr/share/%1/translations").arg(kAppId)}
}; };
@ -46,14 +49,21 @@ I18N::I18N(QObject *parent) : QObject{parent}
qInfo() << "no app translations found"; qInfo() << "no app translations found";
} }
const auto qt = QStringLiteral("qt");
const auto qt6 = QStringLiteral("qt6");
const QList<QDir> qtTrDirs{ const QList<QDir> qtTrDirs{
{QStringLiteral("%1/%2").arg(QCoreApplication::applicationDirPath(), QStringLiteral("translations"))}, {QStringLiteral("%1/%2").arg(appDir, QStringLiteral("translations"))},
{QStringLiteral("%1/../Resources/translations").arg(QCoreApplication::applicationDirPath())}, {QStringLiteral("%1/../Resources/translations").arg(appDir)},
{QStringLiteral("%1/../qt-depends/translations").arg(QCoreApplication::applicationDirPath())}, {QStringLiteral("%1/../qt-depends/translations").arg(appDir)},
{QStringLiteral("%1/../share/qt/translations").arg(QCoreApplication::applicationDirPath())}, {QStringLiteral("%1/../share/%2/translations").arg(appDir, qt6)},
{QStringLiteral("%1/.local/share/%2/translations").arg(QDir::homePath(), QStringLiteral("qt"))}, {QStringLiteral("%1/../share/%2/translations").arg(appDir, qt)},
{QStringLiteral("/usr/local/share/qt/translations")}, {QStringLiteral("%1/.local/share/%2/translations").arg(homeDir, qt6)},
{QStringLiteral("/usr/share/qt/translations")} {QStringLiteral("%1/.local/share/%2/translations").arg(homeDir, qt)},
{QStringLiteral("/usr/local/share/%2/translations").arg(qt6)},
{QStringLiteral("/usr/local/share/%2/translations").arg(qt)},
{QStringLiteral("/usr/share/%2/translations").arg(qt6)},
{QStringLiteral("/usr/share/%2/translations").arg(qt)}
}; };
const QStringList qtTrFilter{QStringLiteral("qt_*.qm")}; const QStringList qtTrFilter{QStringLiteral("qt_*.qm")};