anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Change Seed to Recovery Phrase, and more. (#4201)

Browse source 
* Seed -> Recovery Phrase ; Passphrase -> Password ; Password -> Spending Password

* More Spending Password
This commit is contained in:
Kirvx 2016-05-09 20:23:20 +02:00 • committed by Gustavo Maximiliano Cortez
commit aee30ec151
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
16 changed files with 68 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/controllers/create.js
View file

@ -44,10 +44,10 @@ angular.module('copayApp.controllers').controller('createController',
self.seedOptions = [{
id: 'new',
label: gettext('New Random Seed'),
label: gettext('New Random Recovery Phrase'),
}, {
id: 'set',
label: gettext('Specify Seed...'),
label: gettext('Specify Recovery Phrase...'),
}];
$scope.seedSource = self.seedOptions[0];
@ -123,7 +123,7 @@ angular.module('copayApp.controllers').controller('createController',
}
if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {
this.error = gettext('Please enter the wallet seed');
this.error = gettext('Please enter the wallet recovery phrase');
return;
}

6
src/js/controllers/import.js
View file

@ -51,7 +51,7 @@ angular.module('copayApp.controllers').controller('importController',
try {
str2 = sjcl.decrypt(self.password, str);
} catch (e) {
err = gettext('Could not decrypt file, check your password');
err = gettext('Could not decrypt file, check your spending password');
$log.warn(e);
};
@ -190,14 +190,14 @@ angular.module('copayApp.controllers').controller('importController',
this.error = null;
if (!words) {
this.error = gettext('Please enter the seed words');
this.error = gettext('Please enter the recovery phrase');
} else if (words.indexOf('xprv') == 0 || words.indexOf('tprv') == 0) {
return _importExtendedPrivateKey(words, opts);
} else {
var wordList = words.split(/[\u3000\s]+/);
if ((wordList.length % 3) != 0)
this.error = gettext('Wrong number of seed words:') + wordList.length;
this.error = gettext('Wrong number of recovery words:') + wordList.length;
}
if (this.error) {

6
src/js/controllers/join.js
View file

@ -19,10 +19,10 @@ angular.module('copayApp.controllers').controller('joinController',
var updateSeedSourceSelect = function() {
self.seedOptions = [{
id: 'new',
label: gettext('New Random Seed'),
label: gettext('New Random Recovery Phrase'),
}, {
id: 'set',
label: gettext('Specify Seed...'),
label: gettext('Specify Recovery Phrase...'),
}];
$scope.seedSource = self.seedOptions[0];
@ -85,7 +85,7 @@ angular.module('copayApp.controllers').controller('joinController',
}
if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {
this.error = gettext('Please enter the wallet seed');
this.error = gettext('Please enter the wallet recovery phrase');
return;
}

4
src/js/controllers/password.js
View file

@ -10,7 +10,7 @@ angular.module('copayApp.controllers').controller('passwordController',
document.getElementById("passwordInput").focus();
this.close = function(cb) {
return cb('No password given');
return cb('No spending password given');
};
this.set = function(isSetup, cb) {
@ -30,7 +30,7 @@ angular.module('copayApp.controllers').controller('passwordController',
}
if (isSetup && pass1 != $scope.password) {
self.loading = false;
self.error = gettext('Passwords do not match');
self.error = gettext('Spending Passwords do not match');
self.isVerification = false;
$scope.password = null;
pass1 = null;

4
src/js/services/bwsError.js
View file

@ -23,10 +23,10 @@ angular.module('copayApp.services')
if (name) {
switch (name) {
case 'INVALID_BACKUP':
body = gettextCatalog.getString('Wallet seed is invalid');
body = gettextCatalog.getString('Wallet Recovery Phrase is invalid');
break;
case 'WALLET_DOES_NOT_EXIST':
body = gettextCatalog.getString('Wallet not registered at the wallet service. Recreate it from "Create Wallet" using "Advanced Options" to set your seed');
body = gettextCatalog.getString('Wallet not registered at the wallet service. Recreate it from "Create Wallet" using "Advanced Options" to set your recovery phrase');
break;
case 'MISSING_PRIVATE_KEY':
body = gettextCatalog.getString('Missing private keys to sign');

12
src/js/services/profileService.js
View file

@ -227,7 +227,7 @@ angular.module('copayApp.services')
} catch (ex) {
$log.info(ex);
return cb(gettext('Could not create: Invalid wallet seed'));
return cb(gettext('Could not create: Invalid wallet recovery phrase'));
}
} else if (opts.extendedPrivateKey) {
try {
@ -256,9 +256,9 @@ angular.module('copayApp.services')
account: 0,
});
} catch (e) {
$log.info('Error creating seed: ' + e.message);
$log.info('Error creating recovery phrase: ' + e.message);
if (e.message.indexOf('language') > 0) {
$log.info('Using default language for mnemonic');
$log.info('Using default language for recovery phrase');
walletClient.seedFromRandomWithMnemonic({
network: network,
passphrase: opts.passphrase,
@ -471,7 +471,7 @@ angular.module('copayApp.services')
password: opts.password
});
} catch (err) {
return cb(gettext('Could not import. Check input file and password'));
return cb(gettext('Could not import. Check input file and spending password'));
}
str = JSON.parse(str);
@ -682,13 +682,13 @@ angular.module('copayApp.services')
return cb(err2);
if (!password)
return cb(gettext('Password needed'));
return cb(gettext('Spending Password needed'));
try {
fc.unlock(password);
} catch (e) {
$log.warn('Error decrypting wallet:', e);
return cb(gettext('Wrong password'));
return cb(gettext('Wrong spending password'));
}
return cb();
});