diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-05-30 21:49:51 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-05-30 21:49:51 +0200 |
| commit | affbb454fa81e2573a7fd5df6e949acff1b459a3 (patch) | |
| tree | 0a99c61ececce334b8b52e29cd9f6b3f77f8f284 | |
| parent | a6f13f7ba2456b7824b4e86a333a5f24699b2fcc (diff) | |
| parent | 41b2c282bd5d2a919eb6a078621b8cf3f2b234a5 (diff) | |
| download | monzero-gui-affbb454fa81e2573a7fd5df6e949acff1b459a3.tar.gz monzero-gui-affbb454fa81e2573a7fd5df6e949acff1b459a3.tar.xz monzero-gui-affbb454fa81e2573a7fd5df6e949acff1b459a3.zip | |
Merge pull request #737
41b2c28 Fallback to english seed lang if not set (Jaquee)
127790e set correct seed lang when recovering from keys (Jaquee)
| -rw-r--r-- | pages/Settings.qml | 5 | ||||
| -rw-r--r-- | wizard/WizardRecoveryWallet.qml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pages/Settings.qml b/pages/Settings.qml index 6e203c51..b64d4752 100644 --- a/pages/Settings.qml +++ b/pages/Settings.qml @@ -467,6 +467,11 @@ Rectangle { onAccepted: { if(appWindow.password === settingsPasswordDialog.password){ + if(currentWallet.seedLanguage == "") { + console.log("No seed language set. Using English as default"); + currentWallet.setSeedLanguage("English"); + } + seedPopup.title = qsTr("Wallet seed & keys") + translationManager.emptyString; seedPopup.text = "<b>Wallet Mnemonic seed</b> <br>" + currentWallet.seed + "<br><br> <b>" + qsTr("Secret view key") + ":</b> " + currentWallet.secretViewKey diff --git a/wizard/WizardRecoveryWallet.qml b/wizard/WizardRecoveryWallet.qml index f0ec0e6d..240641e0 100644 --- a/wizard/WizardRecoveryWallet.qml +++ b/wizard/WizardRecoveryWallet.qml @@ -85,7 +85,7 @@ ColumnLayout { if(fromSeed) var wallet = walletManager.recoveryWallet(tmp_wallet_filename, settingsObject.words, testnet, restoreHeight) else - var wallet = walletManager.createWalletFromKeys(tmp_wallet_filename, settingsObject.language, testnet, + var wallet = walletManager.createWalletFromKeys(tmp_wallet_filename, settingsObject.wallet_language, testnet, settingsObject.recover_address, settingsObject.recover_viewkey, settingsObject.recover_spendkey, restoreHeight) |