From 7ba6eac43a55367748e52f6a86d07dae5fe373da Mon Sep 17 00:00:00 2001 From: Jonathan Cross Date: Fri, 1 Dec 2017 15:38:57 +0100 Subject: [PATCH] Cleanup html/css in text to be translated. --- pages/Receive.qml | 9 ++++++--- pages/Sign.qml | 9 ++++++--- pages/Transfer.qml | 15 ++++++++++----- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/pages/Receive.qml b/pages/Receive.qml index b22ddfcd..5e5e9337 100644 --- a/pages/Receive.qml +++ b/pages/Receive.qml @@ -331,9 +331,12 @@ Rectangle { Label { id: trackingLabel textFormat: Text.RichText - text: qsTr("\ - Tracking (help)") - + translationManager.emptyString + text: "" + + qsTr("Tracking") + + " (" + + qsTr("help") + + ")" + + translationManager.emptyString width: mainLayout.labelWidth onLinkActivated: { trackingHowToUseDialog.title = qsTr("Tracking payments") + translationManager.emptyString; diff --git a/pages/Sign.qml b/pages/Sign.qml index 3c57fac7..69862ada 100644 --- a/pages/Sign.qml +++ b/pages/Sign.qml @@ -383,9 +383,12 @@ Rectangle { Text { id: verifyAddressLabel - text: qsTr("\ - Signing address ( Paste in or select from Address book )").arg(14 * scaleRatio).arg(2 * scaleRatio).arg(2 * scaleRatio) - + translationManager.emptyString + text: "" + + qsTr("Signing address") + + " ( " + + qsTr("Paste in or select from Address book") + + " )" + + translationManager.emptyString wrapMode: Text.Wrap font.pixelSize: 14 * scaleRatio Layout.fillWidth: true diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 29ca46ed..ac75f6ac 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -41,7 +41,10 @@ Rectangle { signal sweepUnmixableClicked() color: "#F0EEEE" - property string startLinkText: qsTr(" (Start daemon)") + translationManager.emptyString + property string startLinkText: " (" + + qsTr("Start daemon") + + ")" + + translationManager.emptyString property bool showAdvanced: false function scaleValueToMixinCount(scaleValue) { @@ -222,10 +225,12 @@ Rectangle { Label { id: addressLabel textFormat: Text.RichText - text: qsTr("\ - Address ( Paste in or select from Address book )") - + translationManager.emptyString - + text: "" + + qsTr("Address") + + " ( " + + qsTr("Paste in or select from Address book") + + " )" + + translationManager.emptyString onLinkActivated: appWindow.showPageRequest("AddressBook") Layout.fillWidth: true }