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

add translations and some fixes

Browse source
This commit is contained in:
Gabriel Bazán 2016-12-13 12:08:05 -03:00
commit b005bbf6c7
9 changed files with 155 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/backup.js
View file

@ -72,7 +72,7 @@ angular.module('copayApp.controllers').controller('backupController',
var showBackupResult = function() {
if ($scope.backupError) {
var title = 'Uh oh...';
var title = gettextCatalog.getString('Uh oh...');
var message = gettextCatalog.getString("It's important that you write your backup phrase down correctly. If something happens to your wallet, you'll need this backup to recover your money. Please review your backup and try again.");
popupService.showAlert(title, message, function() {
$scope.setFlow(2);

3
src/js/controllers/confirm.js
View file

@ -45,7 +45,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
};
var config = configService.getSync().wallet;
$scope.feeLevel = config.settings && config.settings.feeLevel ? config.settings.feeLevel : 'normal';
var feeLevel = config.settings && config.settings.feeLevel ? config.settings.feeLevel : 'normal';
$scope.feeLevel = feeService.feeOpts[feeLevel];
if ($scope.isGlidera) $scope.network = glideraService.getEnvironment();
else $scope.network = (new bitcore.Address($scope.toAddress)).network.name;
resetValues();

8
src/js/controllers/walletDetails.js
View file

@ -284,7 +284,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
var scrollWatcherInitialized;
$scope.$on("$ionicView.enter", function(event, data) {
setAndroidStatusBarColor();
if ($scope.isCordova && $scope.isAndroid) setAndroidStatusBarColor();
$timeout(function() {
screenInactive = false;
}, 200);
@ -336,9 +336,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
function setAndroidStatusBarColor() {
var SUBTRACT_AMOUNT = 15;
if (!$scope.isAndroid) {
return;
}
var rgb = hexToRgb($scope.wallet.color);
var keys = Object.keys(rgb);
keys.forEach(function(k) {
@ -349,7 +346,8 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
}
});
var statusBarColorHexString = rgbToHex(rgb.r, rgb.g, rgb.b);
$window.StatusBar.backgroundColorByHexString(statusBarColorHexString);
if ($window.StatusBar)
$window.StatusBar.backgroundColorByHexString(statusBarColorHexString);
}
function hexToRgb(hex) {

8
src/js/services/feeService.js
View file

@ -5,10 +5,10 @@ angular.module('copayApp.services').factory('feeService', function($log, $stateP
// Constant fee options to translate
root.feeOpts = {
priority: gettext('Priority'),
normal: gettext('Normal'),
economy: gettext('Economy'),
superEconomy: gettext('Super Economy')
priority: gettextCatalog.getString('Priority'),
normal: gettextCatalog.getString('Normal'),
economy: gettextCatalog.getString('Economy'),
superEconomy: gettextCatalog.getString('Super Economy')
};
root.getCurrentFeeLevel = function() {

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

@ -834,9 +834,9 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
root.encrypt = function(wallet, cb) {
askPassword(wallet.name, gettext('Enter new spending password'), function(password) {
askPassword(wallet.name, gettextCatalog.getString('Enter new spending password'), function(password) {
if (!password) return cb('no password');
askPassword(wallet.name, gettext('Confirm you new spending password'), function(password2) {
askPassword(wallet.name, gettextCatalog.getString('Confirm you new spending password'), function(password2) {
if (!password2 || password != password2)
return cb('password mismatch');