add translate text

5 files changed, 128 insertions, 70 deletions

diff --git a/app/Dashboard.qml b/app/Dashboard.qml
index e031d34..33db7f2 100644
--- a/app/Dashboard.qml
+++ b/app/Dashboard.qml
@@ -282,19 +282,34 @@ ApplicationWindow {
 
     RowLayout {
 //        visible: false
-        anchors.left: parent.left
         anchors.bottom: parent.bottom
-        anchors.right: parent.right
+        anchors.horizontalCenter: parent.horizontalCenter
         Repeater {
-            model: ['C', 'fr_FR', 'ja_JP', 'zh_CN']
+            model: ListModel {
+                ListElement {
+                    code: 'C'
+                    language: QT_TR_NOOP('English')
+                }
+                ListElement {
+                    code: 'fr_FR'
+                    language: QT_TR_NOOP('French')
+                }
+                ListElement {
+                    code: 'ja_JP'
+                    language: QT_TR_NOOP('日本語')
+                }
+                ListElement {
+                    code: 'zh_CN'
+                    language: QT_TR_NOOP('中文简体')
+                }
+            }
 
             Button {
-                text: model.modelData
+                text: qsTr(model.language)
                 onClicked: {
-                    translator.language = model.modelData
+                    translator.language = model.code
                     console.log ("Scale = " + screenInfo.scale_factor())
                 }
-                Layout.fillWidth: true
             }
         }
     }
diff --git a/app/main.cpp b/app/main.cpp
index 97e1217..3520605 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -22,7 +22,7 @@ int main(int argc, char *argv[])
 {
     AGLApplication app(argc, argv);
     app.setApplicationName("Dashboard");
-    app.setupApplicationRole("Dashboard");
+    app.setupApplicationRole("dashboard");
 
     qmlRegisterType<Translator>("Translator", 1, 0, "Translator");
     app.load(QUrl(QStringLiteral("qrc:/Dashboard.qml")));
diff --git a/app/translations/dashboard_fr_FR.ts b/app/translations/dashboard_fr_FR.ts
index 2b7cf6e..c7c7fa7 100644
--- a/app/translations/dashboard_fr_FR.ts
+++ b/app/translations/dashboard_fr_FR.ts
@@ -4,85 +4,103 @@
 <context>
     <name>Dashboard</name>
     <message>
-        <location filename="../Dashboard.qml" line="120"/>
+        <location filename="../Dashboard.qml" line="138"/>
         <source>LEFT FRONT TIRE</source>
         <translation>Pneu Avant Gauche</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="121"/>
-        <location filename="../Dashboard.qml" line="130"/>
-        <location filename="../Dashboard.qml" line="140"/>
-        <location filename="../Dashboard.qml" line="150"/>
+        <location filename="../Dashboard.qml" line="139"/>
+        <location filename="../Dashboard.qml" line="149"/>
+        <location filename="../Dashboard.qml" line="158"/>
+        <location filename="../Dashboard.qml" line="168"/>
         <source>%1 PSI</source>
         <translation>Pression %1</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="129"/>
+        <location filename="../Dashboard.qml" line="148"/>
         <source>LEFT REAR TIRE</source>
         <translation>Pneu Arrière Gauche</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="139"/>
+        <location filename="../Dashboard.qml" line="157"/>
         <source>RIGHT FRONT TIRE</source>
         <translation>Pneu Avant Droit</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="149"/>
+        <location filename="../Dashboard.qml" line="167"/>
         <source>RIGHT REAR TIRE</source>
         <translation>Pneu Arrière Droit</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="171"/>
+        <location filename="../Dashboard.qml" line="189"/>
         <source>(RPM)</source>
         <translation>Tr/mn</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="201"/>
+        <location filename="../Dashboard.qml" line="219"/>
         <source>LEVEL:</source>
         <translation>Niveau:</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="210"/>
+        <location filename="../Dashboard.qml" line="228"/>
         <source>%1 GALLONS</source>
         <translation>%1 Litres</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="220"/>
+        <location filename="../Dashboard.qml" line="238"/>
         <source>RANGE:</source>
         <translation>Autonomie:</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="229"/>
+        <location filename="../Dashboard.qml" line="247"/>
         <source>%1 MI</source>
         <translation>%1 Km</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="239"/>
+        <location filename="../Dashboard.qml" line="257"/>
         <source>AVG:</source>
         <translation>Moyenne:</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="248"/>
+        <location filename="../Dashboard.qml" line="266"/>
         <source>%1 MPG</source>
         <translation>%1 l/100km</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="259"/>
+        <location filename="../Dashboard.qml" line="277"/>
         <source>FUEL</source>
         <translation>Carburant</translation>
     </message>
+    <message>
+        <location filename="../Dashboard.qml" line="291"/>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Dashboard.qml" line="295"/>
+        <source>French</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Dashboard.qml" line="299"/>
+        <source>日本語</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Dashboard.qml" line="303"/>
+        <source>中文简体</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>main</name>
     <message>
-        <location filename="../main.cpp" line="50"/>
         <source>port for binding</source>
-        <translation>Port du Binder</translation>
+        <translation type="vanished">Port du Binder</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="51"/>
         <source>secret for binding</source>
-        <translation>Secret Binder</translation>
+        <translation type="vanished">Secret Binder</translation>
     </message>
 </context>
 </TS>
diff --git a/app/translations/dashboard_ja_JP.ts b/app/translations/dashboard_ja_JP.ts
index 06b25dc..8bb6bf7 100644
--- a/app/translations/dashboard_ja_JP.ts
+++ b/app/translations/dashboard_ja_JP.ts
@@ -4,84 +4,91 @@
 <context>
     <name>Dashboard</name>
     <message>
-        <location filename="../Dashboard.qml" line="115"/>
+        <location filename="../Dashboard.qml" line="138"/>
         <source>LEFT FRONT TIRE</source>
         <translation>左前輪</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="116"/>
-        <location filename="../Dashboard.qml" line="125"/>
-        <location filename="../Dashboard.qml" line="135"/>
-        <location filename="../Dashboard.qml" line="145"/>
+        <location filename="../Dashboard.qml" line="139"/>
+        <location filename="../Dashboard.qml" line="149"/>
+        <location filename="../Dashboard.qml" line="158"/>
+        <location filename="../Dashboard.qml" line="168"/>
         <source>%1 PSI</source>
         <translation>空気圧 %1</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="124"/>
+        <location filename="../Dashboard.qml" line="148"/>
         <source>LEFT REAR TIRE</source>
         <translation>左後輪</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="134"/>
+        <location filename="../Dashboard.qml" line="157"/>
         <source>RIGHT FRONT TIRE</source>
         <translation>右前輪</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="144"/>
+        <location filename="../Dashboard.qml" line="167"/>
         <source>RIGHT REAR TIRE</source>
         <translation>右後輪</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="166"/>
+        <location filename="../Dashboard.qml" line="189"/>
         <source>(RPM)</source>
         <translation>(RPM)</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="196"/>
+        <location filename="../Dashboard.qml" line="219"/>
         <source>LEVEL:</source>
         <translation>レベル:</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="205"/>
+        <location filename="../Dashboard.qml" line="228"/>
         <source>%1 GALLONS</source>
         <translation>%1 ガロン</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="215"/>
+        <location filename="../Dashboard.qml" line="238"/>
         <source>RANGE:</source>
         <translation>レンジ:</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="224"/>
+        <location filename="../Dashboard.qml" line="247"/>
         <source>%1 MI</source>
         <translation>%1 MI</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="234"/>
+        <location filename="../Dashboard.qml" line="257"/>
         <source>AVG:</source>
         <translation>平均:</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="243"/>
+        <location filename="../Dashboard.qml" line="266"/>
         <source>%1 MPG</source>
         <translation>%1 MPG</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="254"/>
+        <location filename="../Dashboard.qml" line="277"/>
         <source>FUEL</source>
         <translation>燃料</translation>
     </message>
-</context>
-<context>
-    <name>main</name>
     <message>
-        <location filename="../main.cpp" line="49"/>
-        <source>port for binding</source>
+        <location filename="../Dashboard.qml" line="291"/>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Dashboard.qml" line="295"/>
+        <source>French</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Dashboard.qml" line="299"/>
+        <source>日本語</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="50"/>
-        <source>secret for binding</source>
+        <location filename="../Dashboard.qml" line="303"/>
+        <source>中文简体</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/app/translations/dashboard_zh_CN.ts b/app/translations/dashboard_zh_CN.ts
index ece07f9..aa81e28 100644
--- a/app/translations/dashboard_zh_CN.ts
+++ b/app/translations/dashboard_zh_CN.ts
@@ -4,85 +4,103 @@
 <context>
     <name>Dashboard</name>
     <message>
-        <location filename="../Dashboard.qml" line="120"/>
+        <location filename="../Dashboard.qml" line="138"/>
         <source>LEFT FRONT TIRE</source>
         <translation>左前车胎</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="121"/>
-        <location filename="../Dashboard.qml" line="130"/>
-        <location filename="../Dashboard.qml" line="140"/>
-        <location filename="../Dashboard.qml" line="150"/>
+        <location filename="../Dashboard.qml" line="139"/>
+        <location filename="../Dashboard.qml" line="149"/>
+        <location filename="../Dashboard.qml" line="158"/>
+        <location filename="../Dashboard.qml" line="168"/>
         <source>%1 PSI</source>
         <translation>%1 磅每平方英寸(PSI)</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="129"/>
+        <location filename="../Dashboard.qml" line="148"/>
         <source>LEFT REAR TIRE</source>
         <translation>左后车胎</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="139"/>
+        <location filename="../Dashboard.qml" line="157"/>
         <source>RIGHT FRONT TIRE</source>
         <translation>右前车胎</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="149"/>
+        <location filename="../Dashboard.qml" line="167"/>
         <source>RIGHT REAR TIRE</source>
         <translation>右后车胎</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="171"/>
+        <location filename="../Dashboard.qml" line="189"/>
         <source>(RPM)</source>
         <translation>引擎转速</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="201"/>
+        <location filename="../Dashboard.qml" line="219"/>
         <source>LEVEL:</source>
         <translation>剩余油量:</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="210"/>
+        <location filename="../Dashboard.qml" line="228"/>
         <source>%1 GALLONS</source>
         <translation>%1 加仑</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="220"/>
+        <location filename="../Dashboard.qml" line="238"/>
         <source>RANGE:</source>
         <translation>续航里程:</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="229"/>
+        <location filename="../Dashboard.qml" line="247"/>
         <source>%1 MI</source>
         <translation>%1 英里</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="239"/>
+        <location filename="../Dashboard.qml" line="257"/>
         <source>AVG:</source>
         <translation type="unfinished">平均油耗:</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="248"/>
+        <location filename="../Dashboard.qml" line="266"/>
         <source>%1 MPG</source>
         <translation type="unfinished">%1 英里每加仑(MPG)</translation>
     </message>
     <message>
-        <location filename="../Dashboard.qml" line="259"/>
+        <location filename="../Dashboard.qml" line="277"/>
         <source>FUEL</source>
         <translation>燃油</translation>
     </message>
+    <message>
+        <location filename="../Dashboard.qml" line="291"/>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Dashboard.qml" line="295"/>
+        <source>French</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Dashboard.qml" line="299"/>
+        <source>日本語</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Dashboard.qml" line="303"/>
+        <source>中文简体</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>main</name>
     <message>
-        <location filename="../main.cpp" line="50"/>
         <source>port for binding</source>
-        <translation>Binder端口</translation>
+        <translation type="vanished">Binder端口</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="51"/>
         <source>secret for binding</source>
-        <translation>Binder令牌</translation>
+        <translation type="vanished">Binder令牌</translation>
     </message>
 </context>
 </TS>