mirror of https://github.com/BTCPrivate/copay.git
Fix wording. Hide ":" if prefix does not exist
This commit is contained in:
parent
441bb94e4b
commit
435e8f54ab
|
@ -35,8 +35,8 @@ angular.module('copayApp.services')
|
||||||
root._createAddress(walletId, cb);
|
root._createAddress(walletId, cb);
|
||||||
}, 5000);
|
}, 5000);
|
||||||
} else if (err.code && err.code == 'MAIN_ADDRESS_GAP_REACHED') {
|
} else if (err.code && err.code == 'MAIN_ADDRESS_GAP_REACHED') {
|
||||||
prefix = gettextCatalog.getString('Limit of address generation reached');
|
|
||||||
$log.warn(err.message);
|
$log.warn(err.message);
|
||||||
|
prefix = null;
|
||||||
client.getMainAddresses({reverse: true, limit : 1}, function(err, addr) {
|
client.getMainAddresses({reverse: true, limit : 1}, function(err, addr) {
|
||||||
if (err) return cb(err);
|
if (err) return cb(err);
|
||||||
return cb(null, addr[0].address);
|
return cb(null, addr[0].address);
|
||||||
|
|
|
@ -94,7 +94,7 @@ angular.module('copayApp.services')
|
||||||
body = gettextCatalog.getString('Wallet seed is invalid');
|
body = gettextCatalog.getString('Wallet seed is invalid');
|
||||||
break;
|
break;
|
||||||
case 'MAIN_ADDRESS_GAP_REACHED':
|
case 'MAIN_ADDRESS_GAP_REACHED':
|
||||||
body = gettextCatalog.getString('You cannot generate more until you register any activity');
|
body = gettextCatalog.getString('Empty addresses limit reached. New addresses cannot be generated.');
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'ERROR':
|
case 'ERROR':
|
||||||
|
@ -112,7 +112,7 @@ angular.module('copayApp.services')
|
||||||
body = gettextCatalog.getString(err);
|
body = gettextCatalog.getString(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
var msg = prefix + ( body ? ': ' + body : '');
|
var msg = prefix + ( body ? (prefix ? ': ' : '') + body : '');
|
||||||
return msg;
|
return msg;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue