diff options
| author | Bramastyo Harimukti <bramastyo.harimukti.santoso@pelagicore.com> | 2017-11-03 16:43:25 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2017-11-06 09:17:13 +0000 |
| commit | 2a242aa65f267d010d8c10b8c5da5a1e728d0551 (patch) | |
| tree | 996013f3a3ea505781811650117fd30eb4b5cec1 | |
| parent | 272903fc82f072b0472e38a60adb6860f60bda9d (diff) | |
- current implementation of translation does only work with 5.10
Change-Id: Ic0b39ec42176afd9a76444fe6ee255a96687d4d1
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
| -rw-r--r-- | plugins/translation/translation.cpp | 10 | ||||
| -rw-r--r-- | plugins/translation/translation.h | 4 | ||||
| -rw-r--r-- | sysui/display/FunctionsPage.qml | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/plugins/translation/translation.cpp b/plugins/translation/translation.cpp index 2b79fd4..47e3074 100644 --- a/plugins/translation/translation.cpp +++ b/plugins/translation/translation.cpp @@ -62,6 +62,11 @@ QString Translation::languageLocale() const return m_languageLocale; } +QString Translation::emptyString() const +{ + return ""; +} + bool Translation::loadTranslationFile(const QString &langLocale) { QString fileToLoad(m_languageFilePath); @@ -70,8 +75,9 @@ bool Translation::loadTranslationFile(const QString &langLocale) if ( m_translator.load(fileToLoad) ) { qApp->installTranslator(&m_translator); - QEvent ev(QEvent::LanguageChange); - qApp->sendEvent(QQmlEngine::contextForObject(this)->engine(), &ev); +// NOTE: This only works with 5.10 +// QEvent ev(QEvent::LanguageChange); +// qApp->sendEvent(QQmlEngine::contextForObject(this)->engine(), &ev); return true; } diff --git a/plugins/translation/translation.h b/plugins/translation/translation.h index c2e411b..2648f74 100644 --- a/plugins/translation/translation.h +++ b/plugins/translation/translation.h @@ -41,6 +41,7 @@ class Translation : public QObject Q_OBJECT Q_PROPERTY(QString languageLocale READ languageLocale WRITE setLanguageLocale NOTIFY languageLocaleChanged) + Q_PROPERTY(QString emptyString READ emptyString NOTIFY languageChanged) public: explicit Translation(QObject *parent = nullptr); @@ -50,6 +51,9 @@ public: void setLanguageLocale(const QString &languageLocale); QString languageLocale() const; + // Helper method to notify string change + QString emptyString() const; + signals: void languageLocaleChanged(); void languageChanged(); diff --git a/sysui/display/FunctionsPage.qml b/sysui/display/FunctionsPage.qml index eff2438..edc6e72 100644 --- a/sysui/display/FunctionsPage.qml +++ b/sysui/display/FunctionsPage.qml @@ -97,7 +97,7 @@ UIPage { delegate: FunctionButton { width: GridView.view.cellWidth height: GridView.view.cellHeight - text: qsTrId(model.description) + text: qsTrId(model.description) + Style.translation.emptyString icon: Style.symbolM(model.icon, model.active) highlighted: model.active @@ -105,7 +105,7 @@ UIPage { popupInterface.functionIcon = icon popupInterface.currentState = model.active popupInterface.functionIndex = index - popupInterface.functionName = qsTrId(model.description) + popupInterface.functionName = qsTrId(model.description) + Style.translation.emptyString popupInterface.summary = !model.active ? "Activate " + popupInterface.functionName + " ?" : "Deactivate " + popupInterface.functionName + " ?" popupInterface.show() } |