mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-04-28 11:56:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(src/app/translator/DefaultTranslator): ignore qrc QtQuick files

Browse source
This commit is contained in:
Ronan Abhamon 2017-04-05 11:12:48 +02:00
parent f50be47456
commit cf938262cb
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-desktop/src/app/App.cpp
View file

@ -92,7 +92,7 @@ App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true) {
} }
App::~App () { App::~App () {
qInfo() << "Destroying app..."; qInfo() << QStringLiteral("Destroying app...");
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

11
linphone-desktop/src/app/translator/DefaultTranslator.cpp
View file

@ -34,8 +34,12 @@ DefaultTranslator::DefaultTranslator (QObject *parent) : QTranslator(parent) {
if (info.suffix() == "qml") { if (info.suffix() == "qml") {
// Ignore extra selectors. // Ignore extra selectors.
QString dir = info.absoluteDir().dirName(); QString dir = info.absoluteDir().absolutePath();
if (dir == "+linux" || dir == "+mac" || dir == "+windows") if (dir.contains("+linux") || dir.contains("+mac") || dir.contains("+windows"))
continue;
// Ignore default imports.
if (dir.startsWith(":/QtQuick"))
continue; continue;
QString basename = info.baseName(); QString basename = info.baseName();
@ -53,6 +57,9 @@ QString DefaultTranslator::translate (
const char *disambiguation, const char *disambiguation,
int n int n
) const { ) const {
if (!context)
return QStringLiteral("");
QString translation = QTranslator::translate(context, source_text, disambiguation, n); QString translation = QTranslator::translate(context, source_text, disambiguation, n);
if (translation.length() == 0 && m_contexts.contains(context)) if (translation.length() == 0 && m_contexts.contains(context))