Merge pull request #2286

d2e7358 PasswordDialog: label improvements (selsta)
This commit is contained in:
luigi1111 2019-07-16 11:37:19 -05:00
commit cb3c310eb8
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

View File

@ -139,10 +139,13 @@ Item {
Label {
text: {
if (newPasswordDialogMode) {
return qsTr("Please enter new wallet password") + translationManager.emptyString;
} else {
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;
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