From 127790e4a11151b8b02dfd4117c0c9526bc7b0a2 Mon Sep 17 00:00:00 2001
From: Jaquee <jaquee.monero@gmail.com>
Date: Tue, 23 May 2017 14:03:03 +0200
Subject: [PATCH 1/2] set correct seed lang when recovering from keys

---
 wizard/WizardRecoveryWallet.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
 

From 41b2c282bd5d2a919eb6a078621b8cf3f2b234a5 Mon Sep 17 00:00:00 2001
From: Jaquee <jaquee.monero@gmail.com>
Date: Tue, 23 May 2017 14:03:23 +0200
Subject: [PATCH 2/2] Fallback to english seed lang if not set

---
 pages/Settings.qml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pages/Settings.qml b/pages/Settings.qml
index 26ae6054..94155cf4 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