-
Sale initiated
-
+
Sale initiated
+
A transfer has been initiated to your bank account and should arrive in 4-6 business days.
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 047936eeb..50b4db9a7 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -123,7 +123,8 @@
{{(index.alias || index.walletName)}}
- Multisignature wallet ({{index.m}} of {{index.n}})
+ Multisignature wallet
+ ({{index.m}}-of-{{index.n}})
- Testnet
- No Private key
diff --git a/src/js/controllers/buyGlidera.js b/src/js/controllers/buyGlidera.js
index c3ffbfbcf..f4c2df44b 100644
--- a/src/js/controllers/buyGlidera.js
+++ b/src/js/controllers/buyGlidera.js
@@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('buyGlideraController',
- function($scope, $timeout, $modal, profileService, addressService, glideraService, gettext, gettextCatalog, bwsError, lodash, isChromeApp) {
+ function($scope, $timeout, $modal, profileService, addressService, glideraService, bwsError, lodash, isChromeApp) {
var self = this;
this.show2faCodeInput = null;
@@ -36,13 +36,13 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
$scope.selectWallet = function(walletId, walletName) {
if (!profileService.getClient(walletId).isComplete()) {
- self.error = bwsError.msg({'code': 'WALLET_NOT_COMPLETE'}, gettextCatalog.getString('Could not choose the wallet'));
+ self.error = bwsError.msg({'code': 'WALLET_NOT_COMPLETE'}, 'Could not choose the wallet');
$modalInstance.dismiss('cancel');
return;
}
addressService.getAddress(walletId, false, function(err, walletAddr) {
if (err) {
- self.error = bwsError.cb(err, gettext('Could not create address'));
+ self.error = bwsError.cb(err, 'Could not create address');
$modalInstance.dismiss('cancel');
return;
}
@@ -87,7 +87,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
glideraService.buyPrice(token, price, function(err, buyPrice) {
self.gettingBuyPrice = false;
if (err) {
- self.error = gettext('Could not get exchange information. Please, try again.');
+ self.error = 'Could not get exchange information. Please, try again.';
}
else {
self.buyPrice = buyPrice;
@@ -97,12 +97,12 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
this.get2faCode = function(token) {
var self = this;
- this.loading = gettext('Sending 2FA code...');
+ this.loading = 'Sending 2FA code...';
$timeout(function() {
glideraService.get2faCode(token, function(err, sent) {
self.loading = null;
if (err) {
- self.error = gettext('Could not send confirmation code to your phone');
+ self.error = 'Could not send confirmation code to your phone';
}
else {
self.error = null;
@@ -115,7 +115,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
this.sendRequest = function(token, permissions, twoFaCode) {
var self = this;
self.error = null;
- self.loading = gettext('Buying bitcoin...');
+ self.loading = 'Buying bitcoin...';
var data = {
destinationAddress: self.selectedWalletAddr,
qty: self.buyPrice.qty,
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 9e864a742..9dfcd0efc 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -880,7 +880,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
getToken(function(err, accessToken) {
if (err || !accessToken) return;
else {
- self.glideraLoading = gettext('Connecting to Glidera...');
+ self.glideraLoading = 'Connecting to Glidera...';
glideraService.getAccessTokenPermissions(accessToken, function(err, p) {
self.glideraLoading = null;
if (err) {
@@ -912,7 +912,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
});
if (permissions.transaction_history) {
- self.glideraLoadingHistory = gettext('Getting Glidera transactions...');
+ self.glideraLoadingHistory = 'Getting Glidera transactions...';
glideraService.getTransactions(accessToken, function(err, data) {
self.glideraLoadingHistory = null;
self.glideraTxs = data;
@@ -920,14 +920,14 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}
if (permissions.view_email_address && opts.fullUpdate) {
- self.glideraLoadingEmail = gettext('Getting Glidera Email...');
+ self.glideraLoadingEmail = 'Getting Glidera Email...';
glideraService.getEmail(accessToken, function(err, data) {
self.glideraLoadingEmail = null;
self.glideraEmail = data.email;
});
}
if (permissions.personal_info && opts.fullUpdate) {
- self.glideraLoadingPersonalInfo = gettext('Getting Glidera Personal Information...');
+ self.glideraLoadingPersonalInfo = 'Getting Glidera Personal Information...';
glideraService.getPersonalInfo(accessToken, function(err, data) {
self.glideraLoadingPersonalInfo = null;
self.glideraPersonalInfo = data;
diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js
index e3f6c7e07..4bac5037f 100644
--- a/src/js/controllers/sellGlidera.js
+++ b/src/js/controllers/sellGlidera.js
@@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('sellGlideraController',
- function($scope, $timeout, $log, $modal, gettext, gettextCatalog, configService, profileService, addressService, feeService, glideraService, bwsError, lodash, isChromeApp) {
+ function($scope, $timeout, $log, $modal, configService, profileService, addressService, feeService, glideraService, bwsError, lodash, isChromeApp) {
var self = this;
var config = configService.getSync();
@@ -40,7 +40,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
$scope.selectWallet = function(walletId, walletName) {
if (!profileService.getClient(walletId).isComplete()) {
- self.error = bwsError.msg({'code': 'WALLET_NOT_COMPLETE'}, gettextCatalog.getString('Could not choose the wallet'));
+ self.error = bwsError.msg({'code': 'WALLET_NOT_COMPLETE'}, 'Could not choose the wallet');
$modalInstance.dismiss('cancel');
return;
}
@@ -83,7 +83,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
glideraService.sellPrice(token, price, function(err, sellPrice) {
self.gettingSellPrice = false;
if (err) {
- self.error = gettext('Could not get exchange information. Please, try again.');
+ self.error = 'Could not get exchange information. Please, try again.';
}
else {
self.error = null;
@@ -94,12 +94,12 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
this.get2faCode = function(token) {
var self = this;
- this.loading = gettext('Sending 2FA code...');
+ this.loading = 'Sending 2FA code...';
$timeout(function() {
glideraService.get2faCode(token, function(err, sent) {
self.loading = null;
if (err) {
- self.error = gettext('Could not send confirmation code to your phone');
+ self.error = 'Could not send confirmation code to your phone';
}
else {
self.show2faCodeInput = sent;
@@ -112,18 +112,18 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
var self = this;
self.error = null;
- this.loading = gettext('Selling Bitcoin...');
+ this.loading = 'Selling Bitcoin...';
$timeout(function() {
addressService.getAddress(fc.credentials.walletId, null, function(err, refundAddress) {
if (!refundAddress) {
self.loading = null;
- self.error = bwsError.msg(err, gettext('Could not create address'));
+ self.error = bwsError.msg(err, 'Could not create address');
return;
}
glideraService.getSellAddress(token, function(error, sellAddress) {
if (!sellAddress) {
self.loading = null;
- self.error = gettext('Could not get the destination bitcoin address');
+ self.error = 'Could not get the destination bitcoin address';
return;
}
var amount = parseInt((self.sellPrice.qty * 100000000).toFixed(0));
@@ -144,7 +144,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
$log.error(err);
$timeout(function() {
self.loading = null;
- self.error = bwsError.msg(err, gettextCatalog.getString('Error'));
+ self.error = bwsError.msg(err, 'Error');
}, 1);
return;
}
@@ -201,7 +201,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
fc.signTxProposal(txp, function(err, signedTx) {
profileService.lockFC();
if (err) {
- err = bwsError.msg(err, gettextCatalog.getString('Could not accept payment'));
+ err = bwsError.msg(err, 'Could not accept payment');
return cb(err);
}
else {
@@ -209,7 +209,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
return cb(null, txp, signedTx.raw);
} else {
- return cb(gettext('The transaction could not be signed'));
+ return cb('The transaction could not be signed');
}
}
});
