From a910d657554d5e413ff48beeaa6f6d52f541dd1e Mon Sep 17 00:00:00 2001 From: AT Date: Thu, 8 Aug 2024 18:42:11 -0400 Subject: [PATCH] Fix the translation change for the default model. (#2815) Signed-off-by: Adam Treat --- gpt4all-chat/qml/AddModelView.qml | 22 +++++++++++++++++++--- gpt4all-chat/qml/ApplicationSettings.qml | 24 +++++++++++++++++++++--- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/gpt4all-chat/qml/AddModelView.qml b/gpt4all-chat/qml/AddModelView.qml index c43b7f56..d366b8f9 100644 --- a/gpt4all-chat/qml/AddModelView.qml +++ b/gpt4all-chat/qml/AddModelView.qml @@ -187,7 +187,12 @@ Rectangle { visible: false MyComboBox { id: comboSort - model: [qsTr("Default"), qsTr("Likes"), qsTr("Downloads"), qsTr("Recent")] + model: ListModel { + ListElement { name: qsTr("Default") } + ListElement { name: qsTr("Likes") } + ListElement { name: qsTr("Downloads") } + ListElement { name: qsTr("Recent") } + } currentIndex: ModelList.discoverSort contentItem: Text { anchors.horizontalCenter: parent.horizontalCenter @@ -207,7 +212,10 @@ Rectangle { } MyComboBox { id: comboSortDirection - model: [qsTr("Asc"), qsTr("Desc")] + model: ListModel { + ListElement { name: qsTr("Asc") } + ListElement { name: qsTr("Desc") } + } currentIndex: { if (ModelList.discoverSortDirection === 1) return 0 @@ -235,7 +243,15 @@ Rectangle { } MyComboBox { id: comboLimit - model: ["5", "10", "20", "50", "100", qsTr("None")] + model: ListModel { + ListElement { name: "5" } + ListElement { name: "10" } + ListElement { name: "20" } + ListElement { name: "50" } + ListElement { name: "100" } + ListElement { name: qsTr("None") } + } + currentIndex: { if (ModelList.discoverLimit === 5) return 0; diff --git a/gpt4all-chat/qml/ApplicationSettings.qml b/gpt4all-chat/qml/ApplicationSettings.qml index 118d9f49..1e459e99 100644 --- a/gpt4all-chat/qml/ApplicationSettings.qml +++ b/gpt4all-chat/qml/ApplicationSettings.qml @@ -108,7 +108,11 @@ MySettingsTab { Layout.fillWidth: false Layout.alignment: Qt.AlignRight // NOTE: indices match values of ChatTheme enum, keep them in sync - model: [qsTr("Light"), qsTr("Dark"), qsTr("LegacyDark")] + model: ListModel { + ListElement { name: qsTr("Light") } + ListElement { name: qsTr("Dark") } + ListElement { name: qsTr("LegacyDark") } + } Accessible.name: themeLabel.text Accessible.description: themeLabel.helpText function updateModel() { @@ -143,7 +147,11 @@ MySettingsTab { Layout.fillWidth: false Layout.alignment: Qt.AlignRight // NOTE: indices match values of FontSize enum, keep them in sync - model: [qsTr("Small"), qsTr("Medium"), qsTr("Large")] + model: ListModel { + ListElement { name: qsTr("Small") } + ListElement { name: qsTr("Medium") } + ListElement { name: qsTr("Large") } + } Accessible.name: fontLabel.text Accessible.description: fontLabel.helpText function updateModel() { @@ -313,6 +321,12 @@ MySettingsTab { defaultModelBox.updateModel() } } + Connections { + target: MySettings + function onLanguageAndLocaleChanged() { + defaultModelBox.rebuildModel() + } + } Connections { target: ModelList function onSelectableModelListChanged() { @@ -335,7 +349,11 @@ MySettingsTab { Layout.maximumWidth: 400 Layout.alignment: Qt.AlignRight // NOTE: indices match values of SuggestionMode enum, keep them in sync - model: [ qsTr("When chatting with LocalDocs"), qsTr("Whenever possible"), qsTr("Never") ] + model: ListModel { + ListElement { name: qsTr("When chatting with LocalDocs") } + ListElement { name: qsTr("Whenever possible") } + ListElement { name: qsTr("Never") } + } Accessible.name: suggestionModeLabel.text Accessible.description: suggestionModeLabel.helpText onActivated: {