From 26f69ece4d1d4245f903ba484c1fa3c6d844824a Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@digia.com>
Date: Thu, 4 Sep 2014 11:27:02 +0200
Subject: [PATCH] Dialogs: add qsTr() wrappers to all QML strings for
translation
Change-Id: If5304902f7167df56266542969723481477a7ba9
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
---
src/dialogs/DefaultColorDialog.qml | 4 +--
src/dialogs/DefaultDialogWrapper.qml | 2 +-
src/dialogs/DefaultFileDialog.qml | 20 +++++++-------
src/dialogs/DefaultMessageDialog.qml | 40 ++++++++++++++--------------
4 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/dialogs/DefaultColorDialog.qml b/src/dialogs/DefaultColorDialog.qml
index efb893b6a..6cd1eda9f 100644
--- a/src/dialogs/DefaultColorDialog.qml
+++ b/src/dialogs/DefaultColorDialog.qml
@@ -395,12 +395,12 @@ AbstractColorDialog {
anchors.right: parent.right
Button {
id: cancelButton
- text: "Cancel"
+ text: qsTr("Cancel")
onClicked: root.reject()
}
Button {
id: okButton
- text: "OK"
+ text: qsTr("OK")
onClicked: root.accept()
}
}
diff --git a/src/dialogs/DefaultDialogWrapper.qml b/src/dialogs/DefaultDialogWrapper.qml
index 9f2959148..a10249001 100644
--- a/src/dialogs/DefaultDialogWrapper.qml
+++ b/src/dialogs/DefaultDialogWrapper.qml
@@ -110,7 +110,7 @@ AbstractDialog {
Button {
id: moreButton
- text: "Show Details..."
+ text: qsTr("Show Details...")
visible: false
}
}
diff --git a/src/dialogs/DefaultFileDialog.qml b/src/dialogs/DefaultFileDialog.qml
index d1af7b180..47d594815 100644
--- a/src/dialogs/DefaultFileDialog.qml
+++ b/src/dialogs/DefaultFileDialog.qml
@@ -116,7 +116,7 @@ AbstractFileDialog {
text: "\ue810"
shortcut: "Ctrl+U"
onTriggered: dirUp()
- tooltip: "Go up to the folder containing this one"
+ tooltip: qsTr("Go up to the folder containing this one")
}
Rectangle {
@@ -243,7 +243,7 @@ AbstractFileDialog {
id: favoriteCtxMenu
title: root.favoriteFolders[index]
MenuItem {
- text: "Remove favorite"
+ text: qsTr("Remove favorite")
onTriggered: {
root.favoriteFolders.splice(index, 1)
favorites.model = root.favoriteFolders
@@ -285,7 +285,7 @@ AbstractFileDialog {
id: plusButton
style: IconButtonStyle { }
text: "\ue83e"
- tooltip: "Add the current directory as a favorite"
+ tooltip: qsTr("Add the current directory as a favorite")
width: height
onClicked: {
root.favoriteFolders.push(root.folder)
@@ -329,7 +329,7 @@ AbstractFileDialog {
TableViewColumn {
id: fileNameColumn
role: "fileName"
- title: "Filename"
+ title: qsTr("Filename")
delegate: Item {
implicitWidth: pathText.implicitWidth + pathText.anchors.leftMargin + pathText.anchors.rightMargin
IconGlyph {
@@ -356,7 +356,7 @@ AbstractFileDialog {
}
TableViewColumn {
role: "fileSuffix"
- title: "Type"
+ title: qsTr("Type", "file type (extension)")
// TODO should not need to create a whole new component just to customize the text value
// something like textFormat: function(text) { return view.model.get(styleData.row, "fileIsDir") ? "folder" : text }
delegate: Item {
@@ -379,11 +379,11 @@ AbstractFileDialog {
}
TableViewColumn {
role: "fileSize"
- title: "Size"
+ title: qsTr("Size", "file size")
horizontalAlignment: Text.AlignRight
}
- TableViewColumn { role: "fileModified" ; title: "Modified" }
- TableViewColumn { role: "fileAccessed" ; title: "Accessed" }
+ TableViewColumn { id: modifiedColumn; role: "fileModified" ; title: qsTr("Modified", "last-modified time") }
+ TableViewColumn { id: accessedColumn; role: "fileAccessed" ; title: qsTr("Accessed", "last-accessed time") }
}
}
@@ -446,12 +446,12 @@ AbstractFileDialog {
}
Button {
id: cancelButton
- text: "Cancel"
+ text: qsTr("Cancel")
onClicked: root.reject()
}
Button {
id: okButton
- text: "OK"
+ text: qsTr("OK")
onClicked: {
if (view.model.isFolder(view.currentIndex) && !selectFolder)
dirDown(view.model.get(view.currentIndex, "filePath"))
diff --git a/src/dialogs/DefaultMessageDialog.qml b/src/dialogs/DefaultMessageDialog.qml
index 5fa46cc33..b41b3743c 100644
--- a/src/dialogs/DefaultMessageDialog.qml
+++ b/src/dialogs/DefaultMessageDialog.qml
@@ -140,115 +140,115 @@ AbstractMessageDialog {
x: -content.outerSpacing
Button {
id: okButton
- text: "OK"
+ text: qsTr("OK")
onClicked: root.click(StandardButton.Ok)
visible: root.standardButtons & StandardButton.Ok
}
Button {
id: openButton
- text: "Open"
+ text: qsTr("Open")
onClicked: root.click(StandardButton.Open)
visible: root.standardButtons & StandardButton.Open
}
Button {
id: saveButton
- text: "Save"
+ text: qsTr("Save")
onClicked: root.click(StandardButton.Save)
visible: root.standardButtons & StandardButton.Save
}
Button {
id: saveAllButton
- text: "Save All"
+ text: qsTr("Save All")
onClicked: root.click(StandardButton.SaveAll)
visible: root.standardButtons & StandardButton.SaveAll
}
Button {
id: retryButton
- text: "Retry"
+ text: qsTr("Retry")
onClicked: root.click(StandardButton.Retry)
visible: root.standardButtons & StandardButton.Retry
}
Button {
id: ignoreButton
- text: "Ignore"
+ text: qsTr("Ignore")
onClicked: root.click(StandardButton.Ignore)
visible: root.standardButtons & StandardButton.Ignore
}
Button {
id: applyButton
- text: "Apply"
+ text: qsTr("Apply")
onClicked: root.click(StandardButton.Apply)
visible: root.standardButtons & StandardButton.Apply
}
Button {
id: yesButton
- text: "Yes"
+ text: qsTr("Yes")
onClicked: root.click(StandardButton.Yes)
visible: root.standardButtons & StandardButton.Yes
}
Button {
id: yesAllButton
- text: "Yes to All"
+ text: qsTr("Yes to All")
onClicked: root.click(StandardButton.YesToAll)
visible: root.standardButtons & StandardButton.YesToAll
}
Button {
id: noButton
- text: "No"
+ text: qsTr("No")
onClicked: root.click(StandardButton.No)
visible: root.standardButtons & StandardButton.No
}
Button {
id: noAllButton
- text: "No to All"
+ text: qsTr("No to All")
onClicked: root.click(StandardButton.NoToAll)
visible: root.standardButtons & StandardButton.NoToAll
}
Button {
id: discardButton
- text: "Discard"
+ text: qsTr("Discard")
onClicked: root.click(StandardButton.Discard)
visible: root.standardButtons & StandardButton.Discard
}
Button {
id: resetButton
- text: "Reset"
+ text: qsTr("Reset")
onClicked: root.click(StandardButton.Reset)
visible: root.standardButtons & StandardButton.Reset
}
Button {
id: restoreDefaultsButton
- text: "Restore Defaults"
+ text: qsTr("Restore Defaults")
onClicked: root.click(StandardButton.RestoreDefaults)
visible: root.standardButtons & StandardButton.RestoreDefaults
}
Button {
id: cancelButton
- text: "Cancel"
+ text: qsTr("Cancel")
onClicked: root.click(StandardButton.Cancel)
visible: root.standardButtons & StandardButton.Cancel
}
Button {
id: abortButton
- text: "Abort"
+ text: qsTr("Abort")
onClicked: root.click(StandardButton.Abort)
visible: root.standardButtons & StandardButton.Abort
}
Button {
id: closeButton
- text: "Close"
+ text: qsTr("Close")
onClicked: root.click(StandardButton.Close)
visible: root.standardButtons & StandardButton.Close
}
Button {
id: moreButton
- text: "Show Details..."
+ text: qsTr("Show Details...")
onClicked: content.state = (content.state === "" ? "expanded" : "")
visible: root.detailedText.length > 0
}
Button {
id: helpButton
- text: "Help"
+ text: qsTr("Help")
onClicked: root.click(StandardButton.Help)
visible: root.standardButtons & StandardButton.Help
}
@@ -303,7 +303,7 @@ AbstractMessageDialog {
}
PropertyChanges {
target: moreButton
- text: "Hide Details"
+ text: qsTr("Hide Details")
}
}
]
--
GitLab