update

example/qml/page/T_Settings.qml

@@ -9,7 +9,7 @@ import "../global"
 
 FluScrollablePage{
 
-    title:"Settings"
+    title: qsTr("Settings")
 
     SettingsViewModel{
         id:viewmodel_settings
@@ -40,13 +40,13 @@ FluScrollablePage{
             spacing: 20
             anchors.verticalCenter: parent.verticalCenter
             FluText{
-                text:"当前版本 v%1".arg(AppInfo.version)
+                text: "%1 v%2".arg(qsTr("Current Version")).arg(AppInfo.version)
                 font: FluTextStyle.Body
                 anchors.verticalCenter: parent.verticalCenter
             }
             FluLoadingButton{
-                id:btn_checkupdate
-                text:"检查更新"
+                id: btn_checkupdate
+                text: qsTr("Check for Updates")
                 anchors.verticalCenter: parent.verticalCenter
                 onClicked: {
                     loading = true
@@ -62,7 +62,7 @@ FluScrollablePage{
         height: 50
         paddings: 10
         FluCheckBox{
-            text:"Use System AppBar"
+            text: qsTr("Use System AppBar")
             checked: FluApp.useSystemAppBar
             anchors.verticalCenter: parent.verticalCenter
             onClicked: {
@@ -78,7 +78,7 @@ FluScrollablePage{
         height: 50
         paddings: 10
         FluCheckBox{
-            text:"fitsAppBarWindows"
+            text:qsTr("Fits AppBar Windows")
             checked: window.fitsAppBarWindows
             anchors.verticalCenter: parent.verticalCenter
             onClicked: {
@@ -88,13 +88,13 @@ FluScrollablePage{
     }
 
     FluContentDialog{
-        id:dialog_restart
-        title:"友情提示"
-        message:"此操作需要重启才能生效，是否重新启动？"
+        id: dialog_restart
+        title: qsTr("Friendly Reminder")
+        message: qsTr("This action requires a restart of the program to take effect, is it restarted?")
         buttonFlags: FluContentDialogType.NegativeButton | FluContentDialogType.PositiveButton
-        negativeText: "取消"
-        positiveText:"确定"
-        onPositiveClicked:{
+        negativeText: qsTr("Cancel")
+        positiveText: qsTr("OK")
+        onPositiveClicked: {
             FluApp.exit(931)
         }
     }
@@ -112,13 +112,13 @@ FluScrollablePage{
                 left: parent.left
             }
             FluText{
-                text:Lang.dark_mode
+                text: qsTr("Dark Mode")
                 font: FluTextStyle.BodyStrong
                 Layout.bottomMargin: 4
             }
             Repeater{
-                model: [{title:"System",mode:FluThemeType.System},{title:"Light",mode:FluThemeType.Light},{title:"Dark",mode:FluThemeType.Dark}]
-                delegate:  FluRadioButton{
+                model: [{title:qsTr("System"),mode:FluThemeType.System},{title:qsTr("Light"),mode:FluThemeType.Light},{title:qsTr("Dark"),mode:FluThemeType.Dark}]
+                delegate: FluRadioButton{
                     checked : FluTheme.darkMode === modelData.mode
                     text:modelData.title
                     clickListener:function(){
@@ -142,12 +142,12 @@ FluScrollablePage{
                 left: parent.left
             }
             FluText{
-                text:Lang.navigation_view_display_mode
+                text:qsTr("Navigation View Display Mode")
                 font: FluTextStyle.BodyStrong
                 Layout.bottomMargin: 4
             }
             Repeater{
-                model: [{title:"Open",mode:FluNavigationViewType.Open},{title:"Compact",mode:FluNavigationViewType.Compact},{title:"Minimal",mode:FluNavigationViewType.Minimal},{title:"Auto",mode:FluNavigationViewType.Auto}]
+                model: [{title:qsTr("Open"),mode:FluNavigationViewType.Open},{title:qsTr("Compact"),mode:FluNavigationViewType.Compact},{title:qsTr("Minimal"),mode:FluNavigationViewType.Minimal},{title:qsTr("Auto"),mode:FluNavigationViewType.Auto}]
                 delegate: FluRadioButton{
                     checked : viewmodel_settings.displayMode===modelData.mode
                     text:modelData.title
@@ -159,6 +159,16 @@ FluScrollablePage{
         }
     }
 
+    ListModel{
+        id:model_language
+        ListElement{
+            name:"en"
+        }
+        ListElement{
+            name:"zh"
+        }
+    }
+
     FluArea{
         Layout.fillWidth: true
         Layout.topMargin: 20
@@ -171,22 +181,21 @@ FluScrollablePage{
                 top: parent.top
                 left: parent.left
             }
-
             FluText{
-                text:Lang.locale
+                text:qsTr("Language")
                 font: FluTextStyle.BodyStrong
                 Layout.bottomMargin: 4
             }
-
             Flow{
                 spacing: 5
                 Repeater{
-                    model: Lang.__localeList
+                    model: TranslateHelper.languages
                     delegate: FluRadioButton{
-                        checked: Lang.__locale === modelData
+                        checked: TranslateHelper.current === modelData
                         text:modelData
                         clickListener:function(){
-                            Lang.__locale = modelData
+                            TranslateHelper.current = modelData
+                            dialog_restart.open()
                         }
                     }
                 }