[fingerterm] Add translations. Contributes JB#53018

fingerterm.desktop

@@ -1,10 +1,5 @@
 [Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=FingerTerm
-GenericName=FingerTerm
-Comment=Terminal emulator
-Exec=/usr/bin/invoker --single-instance --type=e /opt/fingerterm/bin/fingerterm
-Terminal=false
 Type=Application
-Icon=/usr/share/icons/hicolor/80x80/apps/fingerterm.png
+Name=Terminal
+Exec=fingerterm
+Icon=icon-launcher-shell

fingerterm.pro

@@ -83,19 +83,44 @@ userdata.files = data/menu.xml \
 userdata.path = $$DEPLOYMENT_PATH/data
 INSTALLS += userdata
 
-target.path = /usr/bin
-INSTALLS += target
+desktopfile.path = /usr/share/applications
+desktopfile.files = $${TARGET}.desktop
 
-contains(MEEGO_EDITION,nemo) {
-    desktopfile.extra = cp $${TARGET}.desktop.nemo $${TARGET}.desktop
-    desktopfile.path = /usr/share/applications
-    desktopfile.files = $${TARGET}.desktop
-    INSTALLS += desktopfile
-}
+# translations
+TS_FILE = $$OUT_PWD/fingerterm.ts
+EE_QM = $$OUT_PWD/fingerterm_eng_en.qm
+
+ts.commands += lupdate $$PWD -ts $$TS_FILE
+ts.CONFIG += no_check_exist
+ts.output = $$TS_FILE
+ts.input = .
+
+ts_install.files = $$TS_FILE
+ts_install.path = /usr/share/translations/source
+ts_install.CONFIG += no_check_exist
+
+# should add -markuntranslated "-" when proper translations are in place (or for testing)
+engineering_english.commands += lrelease -idbased $$TS_FILE -qm $$EE_QM
+engineering_english.CONFIG += no_check_exist
+engineering_english.depends = ts
+engineering_english.input = $$TS_FILE
+engineering_english.output = $$EE_QM
+
+TRANSLATIONS_PATH = /usr/share/translations
+engineering_english_install.path = $$TRANSLATIONS_PATH
+engineering_english_install.files = $$EE_QM
+engineering_english_install.CONFIG += no_check_exist
+
+DEFINES += TRANSLATIONS_PATH=\"\\\"\"$${TRANSLATIONS_PATH}\"\\\"\"
+
+QMAKE_EXTRA_TARGETS += ts engineering_english
+PRE_TARGETDEPS += ts engineering_english
+
+target.path = /usr/bin
+INSTALLS += target desktopfile ts_install engineering_english_install
 
 DISTFILES += \
     data/* \
     icons/*.png \
     qml/*.qml \
-    rpm/fingerterm.changes \
     rpm/fingerterm.spec

main.cpp

@@ -24,6 +24,8 @@
 #include <QQuickView>
 #include <QDir>
 #include <QString>
+#include <QLocale>
+#include <QTranslator>
 
 extern "C" {
 #include <pty.h>
@@ -86,7 +88,14 @@ int main(int argc, char *argv[])
         exit(0);
     }
 
+    QScopedPointer<QTranslator> engineeringEnglish(new QTranslator);
+    engineeringEnglish->load("fingerterm_eng_en", TRANSLATIONS_PATH);
+    QScopedPointer<QTranslator> translator(new QTranslator);
+    translator->load(QLocale(), "fingerterm", "-", TRANSLATIONS_PATH);
+
     QGuiApplication app(argc, argv);
+    app.installTranslator(engineeringEnglish.data());
+    app.installTranslator(translator.data());
 
     QScreen* sc = app.primaryScreen();
     if(sc){

qml/Keyboard.qml

@@ -129,7 +129,8 @@ Item {
         onKeyboardLayoutChanged: {
             var ret = keyLoader.loadLayout(util.keyboardLayout)
             if (!ret) {
-                showErrorMessage("There was an error loading the keyboard layout.<br>\nUsing the default one instead.");
+                //% "There was an error loading the keyboard layout. Using the default one instead."
+                showErrorMessage(qsTrId("fingerterm-keyboard_la_erro-loading"));
                 util.keyboardLayout = "english"
                 ret = keyLoader.loadLayout(":/data/english.layout"); //try the default as a fallback (load from resources to ensure it will succeed)
                 if (!ret) {

qml/LayoutWindow.qml

@@ -65,7 +65,8 @@ PopupWindow {
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: parent.top
         color: "#ffffff"
-        text: "Keyboard layout"
+        //% "Keyboard layout"
+        text: qsTrId("fingerterm-keyboard-layout_la_keyboard-layout")
         font.pointSize: window.uiFontSize + 4*window.pixelRatio;
     }
 
@@ -83,7 +84,9 @@ PopupWindow {
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.bottom: parent.bottom
         anchors.bottomMargin: window.paddingMedium
-        text: "Back"
+        //: Return to the previous page
+        //% "Back"
+        text: qsTrId("fingerterm-keyboard-layout_la_back")
         onClicked: layoutWindow.show = false
     }
 }

qml/Main.qml

@@ -313,18 +313,34 @@ Item {
                 id: aboutDialog
 
                 text: {
-                    var str = "<font size=\"+3\">FingerTerm " + util.versionString() + "</font><br>\n" +
+                    //% "Fingerterm"
+                    var title = qsTrId("fingerterm-about_la_fingerterm")
+                    //% "Author: "
+                    var author = qsTrId("fingerterm-about_la_author")
+                    //% "Config files for adjusting settings are at:"
+                    var configFiles = qsTrId("fingerterm-about_la_config-files-location")
+                    //% "Source code:"
+                    var sourceCode = qsTrId("fingerterm-about_la_source-code")
+                    //% "Current window title:"
+                    var windowTitle = qsTrId("fingerterm-about_la_window-title")
+                    //% "Current terminal size:"
+                    var terminalSize = qsTrId("fingerterm-about_la_terminal-size")
+                    //% "Charset:"
+                    var charSet = qsTrId("fingerterm-about_la_charset")
+
+
+                    var str = "<font size=\"+3\">" + title + " " + util.versionString() + "</font><br>\n" +
                             "<font size=\"+1\">" +
-                            "by Heikki Holstila &lt;<a href=\"mailto:heikki.holstila@gmail.com?subject=FingerTerm\">heikki.holstila@gmail.com</a>&gt;<br><br>\n\n" +
-                            "Config files for adjusting settings are at:<br>\n" +
+                            author + "Heikki Holstila &lt;<a href=\"mailto:heikki.holstila@gmail.com?subject=FingerTerm\">heikki.holstila@gmail.com</a>&gt;<br><br>\n\n" +
+                            configFiles + "<br>\n" +
                             util.configPath() + "/<br><br>\n" +
-                            "Source code:<br>\n<a href=\"https://git.merproject.org/mer-core/fingerterm/\">https://git.merproject.org/mer-core/fingerterm/</a>"
+                            sourceCode + "<br>\n<a href=\"https://git.merproject.org/mer-core/fingerterm/\">https://git.merproject.org/mer-core/fingerterm/</a>"
                     if (term.rows != 0 && term.columns != 0) {
-                        str += "<br><br>Current window title: <font color=\"gray\">" + util.windowTitle.substring(0,40) + "</font>"; //cut long window title
+                        str += "<br><br>" + windowTitle + " <font color=\"gray\">" + util.windowTitle.substring(0,40) + "</font>"; //cut long window title
                         if(util.windowTitle.length>40)
                             str += "...";
-                        str += "<br>Current terminal size: <font color=\"gray\">" + term.columns + "×" + term.rows + "</font>";
-                        str += "<br>Charset: <font color=\"gray\">" + util.charset + "</font>";
+                        str += "<br>" + terminalSize + " <font color=\"gray\">" + term.columns + "×" + term.rows + "</font>";
+                        str += "<br>" + charSet + " <font color=\"gray\">" + util.charset + "</font>";
                     }
                     str += "</font>";
                     return str;