From 78f54e2441863a5fd88f3f8158833b0a6aa50628 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Tue, 17 Nov 2020 00:14:17 +0100 Subject: [PATCH] Internalisation++ --- .../NeoChat/Dialog/AcceptInvitationDialog.qml | 10 +++--- imports/NeoChat/Dialog/CreateRoomDialog.qml | 6 ++-- imports/NeoChat/Dialog/FontFamilyDialog.qml | 35 ------------------- imports/NeoChat/Dialog/StartChatDialog.qml | 8 ++--- res.qrc | 1 - 5 files changed, 12 insertions(+), 48 deletions(-) delete mode 100644 imports/NeoChat/Dialog/FontFamilyDialog.qml diff --git a/imports/NeoChat/Dialog/AcceptInvitationDialog.qml b/imports/NeoChat/Dialog/AcceptInvitationDialog.qml index a0840d00b..7f9470251 100644 --- a/imports/NeoChat/Dialog/AcceptInvitationDialog.qml +++ b/imports/NeoChat/Dialog/AcceptInvitationDialog.qml @@ -14,16 +14,16 @@ Dialog { id: root - title: "Invitation Received" + title: i18n("Invitation Received") modal: true contentItem: Label { - text: "Accept this invitation?" + text: i18n("Accept this invitation?") } footer: DialogButtonBox { Button { - text: "Accept" + text: i18n("Accept") flat: true onClicked: { @@ -33,7 +33,7 @@ Dialog { } Button { - text: "Reject" + text: i18n("Reject") flat: true onClicked: { @@ -43,7 +43,7 @@ Dialog { } Button { - text: "Cancel" + text: i18n("Cancel") flat: true onClicked: close() diff --git a/imports/NeoChat/Dialog/CreateRoomDialog.qml b/imports/NeoChat/Dialog/CreateRoomDialog.qml index 3257b66de..c05ee74a0 100644 --- a/imports/NeoChat/Dialog/CreateRoomDialog.qml +++ b/imports/NeoChat/Dialog/CreateRoomDialog.qml @@ -17,7 +17,7 @@ Dialog { id: root - title: "Create a Room" + title: i18n("Create a Room") contentItem: ColumnLayout { AutoTextField { @@ -25,7 +25,7 @@ Dialog { id: roomNameField - placeholderText: "Room Name" + placeholderText: i18n("Room Name") } AutoTextField { @@ -33,7 +33,7 @@ Dialog { id: roomTopicField - placeholderText: "Room Topic" + placeholderText: i18n("Room Topic") } } diff --git a/imports/NeoChat/Dialog/FontFamilyDialog.qml b/imports/NeoChat/Dialog/FontFamilyDialog.qml deleted file mode 100644 index 5c237d880..000000000 --- a/imports/NeoChat/Dialog/FontFamilyDialog.qml +++ /dev/null @@ -1,35 +0,0 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 - -import NeoChat.Component 1.0 -import NeoChat.Setting 1.0 - -Dialog { - anchors.centerIn: parent - width: 360 - - id: root - - title: "Enter Font Family" - - contentItem: AutoTextField { - Layout.fillWidth: true - - id:fontFamilyField - - text: MSettings.fontFamily - placeholderText: "Font Family" - } - - standardButtons: Dialog.Ok | Dialog.Cancel - - onAccepted: MSettings.fontFamily = fontFamilyField.text - - onClosed: destroy() -} diff --git a/imports/NeoChat/Dialog/StartChatDialog.qml b/imports/NeoChat/Dialog/StartChatDialog.qml index 5f5c0933b..7782e08e8 100644 --- a/imports/NeoChat/Dialog/StartChatDialog.qml +++ b/imports/NeoChat/Dialog/StartChatDialog.qml @@ -22,7 +22,7 @@ Dialog { id: root - title: "Start a Chat" + title: i18n("Start a Chat") contentItem: ColumnLayout { spacing: 0 @@ -37,7 +37,7 @@ Dialog { id: identifierField - placeholderText: "Find a user..." + placeholderText: i18n("Find a user...") onAccepted: { userDictListModel.search() @@ -47,7 +47,7 @@ Dialog { Button { visible: identifierField.isUserID - text: "Chat" + text: i18n("Chat") highlighted: true onClicked: { @@ -176,7 +176,7 @@ Dialog { visible: userDictListView.count < 1 - text: "No users available" + text: i18n("No users available") color: MPalette.foreground } } diff --git a/res.qrc b/res.qrc index 485496246..c44cfc2c0 100644 --- a/res.qrc +++ b/res.qrc @@ -50,7 +50,6 @@ imports/NeoChat/Dialog/CreateRoomDialog.qml imports/NeoChat/Dialog/AcceptInvitationDialog.qml imports/NeoChat/Dialog/StartChatDialog.qml - imports/NeoChat/Dialog/FontFamilyDialog.qml imports/NeoChat/Dialog/OpenFileDialog.qml imports/NeoChat/Dialog/OpenFolderDialog.qml imports/NeoChat/Menu/qmldir