diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-07-16 11:37:19 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-07-16 11:37:19 -0500 |
| commit | cb3c310eb8df0cd78a2564ada619d7c97dc9efc6 (patch) | |
| tree | 7934c52eaa6d582fb5601047794e520d4b7cb1a2 | |
| parent | c426f1eb831e88c2fe9036a10721cc7299aec009 (diff) | |
| parent | d2e7358db7ea5acd8a38aa005b450f173213d407 (diff) | |
| download | monzero-gui-cb3c310eb8df0cd78a2564ada619d7c97dc9efc6.tar.gz monzero-gui-cb3c310eb8df0cd78a2564ada619d7c97dc9efc6.tar.xz monzero-gui-cb3c310eb8df0cd78a2564ada619d7c97dc9efc6.zip | |
Merge pull request #2286
d2e7358 PasswordDialog: label improvements (selsta)
| -rw-r--r-- | components/PasswordDialog.qml | 11 |
1 files 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 |