From d2e7358db7ea5acd8a38aa005b450f173213d407 Mon Sep 17 00:00:00 2001 From: selsta Date: Tue, 16 Jul 2019 14:08:22 +0200 Subject: [PATCH] PasswordDialog: label improvements --- components/PasswordDialog.qml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml index 67ffce96..33942df9 100644 --- a/components/PasswordDialog.qml +++ b/components/PasswordDialog.qml @@ -139,10 +139,13 @@ Item { Label { text: { - var device = passwordDialogMode ? qsTr("wallet password") : qsTr("wallet device passphrase"); - (root.walletName.length > 0 ? qsTr("Please enter %1 for: ").arg(device) + root.walletName : qsTr("Please enter %1").arg(device)) + translationManager.emptyString; + if (newPasswordDialogMode) { + return qsTr("Please enter new wallet password") + translationManager.emptyString; + } else { + var device = passwordDialogMode ? qsTr("wallet password") : qsTr("wallet device passphrase"); + return (root.walletName.length > 0 ? qsTr("Please enter %1 for: ").arg(device) + root.walletName : qsTr("Please enter %1").arg(device)) + translationManager.emptyString; + } } - visible: !newPasswordDialogMode Layout.fillWidth: true font.pixelSize: 16 @@ -284,7 +287,7 @@ Item { Label { visible: !passwordDialogMode - text: qsTr("Please confirm new password") + translationManager.emptyString + text: newPasswordDialogMode ? qsTr("Please confirm new password") : qsTr("Please confirm wallet device passphrase") + translationManager.emptyString Layout.fillWidth: true font.pixelSize: 16