Merge pull request #6 from machinekoder/translation

Translation

Author: machinekoder

Machineface.pro

@@ -1,11 +1,15 @@
 TEMPLATE = app
+NAME = Machineface
 
 QT += qml quick widgets
 
 SOURCES += main.cpp
 
 RESOURCES += qml.qrc
 
+QML_FILES = $$PWD/$$NAME/*.qml
+OTHER_FILES += $$QML_FILES
+
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH =
 
@@ -19,3 +23,7 @@ ios: {
 android: {
     LIBS += -lmachinetalk-protobuf
 }
+
+TRANSLATIONS_PATH = $$PWD/translations
+TRANSLATIONS_OUT_PATH = $$PWD/$$NAME/translations
+include(translation.pri)

Machineface/AboutDialog.qml

@@ -7,7 +7,7 @@ import QtQuick.Window 2.0
 Dialog {
     property string version: "0.9"
     id: aboutDialog
-    title: "About Machineface"
+    title: qsTr("About Machineface")
 
     SystemPalette { id: systemPalette }
 

Machineface/DisplayPanel.qml

@@ -16,21 +16,21 @@ ColumnLayout {
 
     TemperatureControl {
         componentName: "fdm-hbp"
-        labelName: "Heated Bed"
+        labelName: qsTr("Heated Bed")
         logHeight: parent.height * 0.25
     }
 
     TemperatureControl {
         componentName: "fdm-hbc"
-        labelName: "Heated Chamber"
+        labelName: qsTr("Heated Chamber")
         logHeight: parent.height * 0.25
     }
 
     Repeater {
         model: 10
         TemperatureControl {
             componentName: "fdm-e" + index
-            labelName: "Extruder " + index
+            labelName: qsTr("Extruder %1").arg(index)
             logHeight: parent.height * 0.25
         }
     }
@@ -39,15 +39,15 @@ ColumnLayout {
         model: 10
         FanControl {
             componentName: "fdm-f" + index
-            labelName: "Fan " + index
+            labelName: qsTr("Fan %1").arg(index)
         }
     }
 
     Repeater {
         model: 3
         LightControl {
             componentName: "fdm-l" + index
-            labelName: "Light " + index
+            labelName: qsTr("Light %1").arg(index)
         }
     }
 

Machineface/ToggleSettingCheck.qml

@@ -4,7 +4,7 @@ import QtQuick.Controls 1.2
 CheckBox {
     property string groupName: "group"
     property string valueName: "value"
-    text: qsTr("Group Value")
+    text: "Group Value"
     checked: applicationCore.settings.initialized && applicationCore.settings.values[groupName][valueName]
     onClicked: {
         applicationCore.settings.setValue(groupName + "." + valueName, !applicationCore.settings.values[groupName][valueName])

Machineface/VelocityExtrusionControl.qml

@@ -9,7 +9,7 @@ import Machinekit.Service 1.0
 
 ColumnLayout {
     id: root
-    property string labelName: "Velocity Extrusion"
+    property string labelName: qsTr("Velocity Extrusion")
     property bool wasConnected: false
 
     visible: halRemoteComponent.ready || wasConnected

Machineface/translations/machineface_de.qm

@@ -1,5 +1,7 @@
 #include <QApplication>
 #include <QQmlApplicationEngine>
+#include <QTranslator>
+#include <QLibraryInfo>
 
 int main(int argc, char *argv[])
 {
@@ -10,6 +12,13 @@ int main(int argc, char *argv[])
     engine.addImportPath(QStringLiteral("assets:/imports"));
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
 
+    QTranslator translator;
+    if (translator.load(QLocale(), QLatin1String("machineface"),
+                          QLatin1String("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
+    {
+        QCoreApplication::installTranslator(&translator);
+    }
+
     return app.exec();
 }
 

Machineface/translations/machineface_en.qm

@@ -0,0 +1,38 @@
+TARGET_NAME = $$lower($$NAME)
+LANGUAGES = en ru de
+OUTPUT_DIR = $$TRANSLATIONS_OUT_PATH
+
+defineReplace(prependAll) {
+    for(a,$$1):result += $$2$${a}$$3
+    return($$result)
+}
+
+TRANSLATIONS = $$prependAll(LANGUAGES, $${TRANSLATIONS_PATH}/$${TARGET_NAME}_, .ts)
+TRANSLATIONS_OUT = $$prependAll(LANGUAGES, $${OUTPUT_DIR}/$${TARGET_NAME}_, .qm)
+
+isEmpty(QMAKE_LUPDATE) {
+    win32:QMAKE_LUPDATE = $$[QT_INSTALL_BINS]\lupdate.exe
+    else:QMAKE_LUPDATE = $$[QT_INSTALL_BINS]/lupdate
+}
+
+for(a,TRANSLATIONS): {
+    system($$QMAKE_LUPDATE $$join(QML_FILES, " ") -locations none -no-ui-lines -ts $${a})
+}
+
+isEmpty(QMAKE_LRELEASE) {
+    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
+    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+}
+updateqm.input = TRANSLATIONS
+updateqm.output = $${OUTPUT_DIR}/${QMAKE_FILE_BASE}.qm
+updateqm.commands = $$QMAKE_MKDIR $$shell_path($$dirname(updateqm.output)) $$escape_expand(\n\t)
+updateqm.commands = $$QMAKE_LRELEASE $$shell_path(${QMAKE_FILE_IN}) -qm $$shell_path($${OUTPUT_DIR}/${QMAKE_FILE_BASE}.qm)
+updateqm.CONFIG += no_link
+updateqm.variable_out = PRE_TARGETDEPS
+QMAKE_EXTRA_COMPILERS += updateqm
+
+updateqm_install.files = $$TRANSLATIONS_OUT
+updateqm_install.path = $$[QT_INSTALL_TRANSLATIONS]
+INSTALLS += updateqm_install
+
+OTHER_FILES += $$TRANSLATIONS_OUT