github/monero-gui
1
Fork 0
mirror of https://github.com/monero-project/monero-gui synced 2024-11-15 15:16:57 +01:00
Code Releases Activity

Merge pull request #737

Browse Source 
41b2c28 Fallback to english seed lang if not set (Jaquee)
127790e set correct seed lang when recovering from keys (Jaquee)
This commit is contained in:
Riccardo Spagni 2017-05-30 21:49:51 +02:00
commit affbb454fa
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pages/Settings.qml
View File

@ -467,6 +467,11 @@ Rectangle {
onAccepted: { onAccepted: {
if(appWindow.password === settingsPasswordDialog.password){ 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.title = qsTr("Wallet seed & keys") + translationManager.emptyString;
seedPopup.text = "<b>Wallet Mnemonic seed</b> <br>" + currentWallet.seed seedPopup.text = "<b>Wallet Mnemonic seed</b> <br>" + currentWallet.seed
+ "<br><br> <b>" + qsTr("Secret view key") + ":</b> " + currentWallet.secretViewKey + "<br><br> <b>" + qsTr("Secret view key") + ":</b> " + currentWallet.secretViewKey

2
wizard/WizardRecoveryWallet.qml
View File

@ -85,7 +85,7 @@ ColumnLayout {
if(fromSeed) if(fromSeed)
var wallet = walletManager.recoveryWallet(tmp_wallet_filename, settingsObject.words, testnet, restoreHeight) var wallet = walletManager.recoveryWallet(tmp_wallet_filename, settingsObject.words, testnet, restoreHeight)
else 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_address, settingsObject.recover_viewkey,
settingsObject.recover_spendkey, restoreHeight) settingsObject.recover_spendkey, restoreHeight)