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

Merge pull request #4402 from cmgustavo/bug/UI-translations

Browse source 
Bug/ui translations
This commit is contained in:
Matias Alejo Garcia 2016-06-15 10:57:45 -03:00 • committed by GitHub
commit e4769108e0
6 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/modals/addressbook.html
View file

@ -3,7 +3,7 @@
<ion-content ng-style="{'background-color': '#f6f7f9'}" overflow-scroll="true"> <ion-content ng-style="{'background-color': '#f6f7f9'}" overflow-scroll="true">
<nav class="tab-bar" ng-style="{'background-color':color}"> <nav class="tab-bar" ng-style="{'background-color':color}">
<section class="left-small"> <section class="left-small">
<a ng-show="!editAddressbook && !addAddressbookEntry" ng-click="cancel()" class="p10"> <a ng-show="!editAddressbook && !addAddressbookEntry" ng-click="cancelAddress()" class="p10">
<span class="text-close" translate>Close</span> <span class="text-close" translate>Close</span>
</a> </a>
</section> </section>

4
public/views/preferencesDeleteWallet.html
View file

@ -5,9 +5,9 @@
</div> </div>
<div class="content preferences" ng-controller="preferencesDeleteWalletController"> <div class="content preferences" ng-controller="preferencesDeleteWalletController">
<div class="text-center text-gray m20t size-12"> <div class="text-center text-gray m20v size-12">
<div class="text-warning size-18 m10b" translate>Warning!</div> <div class="text-warning size-18 m10b" translate>Warning!</div>
<div class="m20b" translate>Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED</div> <div class="m10" translate>Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED</div>
</div> </div>
<ul class="no-bullet m0"> <ul class="no-bullet m0">

2
public/views/preferencesLanguage.html
View file

@ -13,7 +13,7 @@
<div class="columns text-center"> <div class="columns text-center">
<p class="size-12 text-black"> <p class="size-12 text-black">
<span translate>All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at</span> <span translate>All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at</span>
<a href="https://crowdin.com/project/copay" target="_blank">https://crowdin.com/project/copay</a>. <a ng-click="$root.openExternalLink('https://crowdin.com/project/copay', '_system')">https://crowdin.com/project/copay</a>.
</p> </p>
<span class="size-12 text-gray" translate> <span class="size-12 text-gray" translate>
Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language. Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language.

2
public/views/translators.html
View file

@ -21,7 +21,7 @@
<div class="columns text-center"> <div class="columns text-center">
<p class="size-12 text-black"> <p class="size-12 text-black">
<span translate>All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at</span> <span translate>All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at</span>
<a href="https://crowdin.com/project/copay" target="_blank">https://crowdin.com/project/copay</a>. <a ng-click="$root.openExternalLink('https://crowdin.com/project/copay', '_system')">https://crowdin.com/project/copay</a>.
</p> </p>
<span class="size-12 text-gray" translate> <span class="size-12 text-gray" translate>
Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language. Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language.

4
src/css/ionic-migration.css
View file

@ -101,6 +101,10 @@ button, .button {
padding: 0; padding: 0;
} }
.create-tab .row {
padding: 0;
}
/* Override the default modal size for large devices */ /* Override the default modal size for large devices */
@media (min-width: 680px) { @media (min-width: 680px) {
.modal { .modal {

48
src/js/services/onGoingProcess.js
View file

@ -1,33 +1,33 @@
'use strict'; 'use strict';
angular.module('copayApp.services').factory('ongoingProcess', function($log, $timeout, lodash, $ionicLoading, gettextCatalog, platformInfo) { angular.module('copayApp.services').factory('ongoingProcess', function($log, $timeout, $filter, lodash, $ionicLoading, gettext, platformInfo) {
var root = {}; var root = {};
var isCordova = platformInfo.isCordova; var isCordova = platformInfo.isCordova;
var ongoingProcess = {}; var ongoingProcess = {};
var processNames = { var processNames = {
'scanning': gettextCatalog.getString('Scanning Wallet funds...'), 'scanning': gettext('Scanning Wallet funds...'),
'recreating': gettextCatalog.getString('Recreating Wallet...'), 'recreating': gettext('Recreating Wallet...'),
'generatingCSV': gettextCatalog.getString('Generating .csv file...'), 'generatingCSV': gettext('Generating .csv file...'),
'creatingTx': gettextCatalog.getString('Creating transaction'), 'creatingTx': gettext('Creating transaction'),
'sendingTx': gettextCatalog.getString('Sending transaction'), 'sendingTx': gettext('Sending transaction'),
'signingTx': gettextCatalog.getString('Signing transaction'), 'signingTx': gettext('Signing transaction'),
'broadcastingTx': gettextCatalog.getString('Broadcasting transaction'), 'broadcastingTx': gettext('Broadcasting transaction'),
'fetchingPayPro': gettextCatalog.getString('Fetching Payment Information'), 'fetchingPayPro': gettext('Fetching Payment Information'),
'calculatingFee': gettextCatalog.getString('Calculating fee'), 'calculatingFee': gettext('Calculating fee'),
'joiningWallet': gettextCatalog.getString('Joining Wallet...'), 'joiningWallet': gettext('Joining Wallet...'),
'retrivingInputs': gettextCatalog.getString('Retrieving inputs information'), 'retrivingInputs': gettext('Retrieving inputs information'),
'creatingWallet': gettextCatalog.getString('Creating Wallet...'), 'creatingWallet': gettext('Creating Wallet...'),
'validatingWallet': gettextCatalog.getString('Validating wallet integrity...'), 'validatingWallet': gettext('Validating wallet integrity...'),
'connectingledger': gettextCatalog.getString('Waiting for Ledger...'), 'connectingledger': gettext('Waiting for Ledger...'),
'connectingtrezor': gettextCatalog.getString('Waiting for Trezor...'), 'connectingtrezor': gettext('Waiting for Trezor...'),
'validatingWords': gettextCatalog.getString('Validating recovery phrase...'), 'validatingWords': gettext('Validating recovery phrase...'),
'connectingCoinbase': gettextCatalog.getString('Connecting to Coinbase...'), 'connectingCoinbase': gettext('Connecting to Coinbase...'),
'connectingGlidera': gettextCatalog.getString('Connecting to Glidera...'), 'connectingGlidera': gettext('Connecting to Glidera...'),
'importingWallet': gettextCatalog.getString('Importing Wallet...'), 'importingWallet': gettext('Importing Wallet...'),
'sweepingWallet': gettextCatalog.getString('Sweeping Wallet...'), 'sweepingWallet': gettext('Sweeping Wallet...'),
'deletingWallet': gettextCatalog.getString('Deleting Wallet...'), 'deletingWallet': gettext('Deleting Wallet...'),
}; };
root.clear = function() { root.clear = function() {
@ -48,7 +48,7 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
// The first one // The first one
root.onGoingProcessName = name; root.onGoingProcessName = name;
var showName = processNames[name] || gettextCatalog.getString(name); var showName = $filter('translate')(processNames[name] || name);
if (root.onGoingProcessName) { if (root.onGoingProcessName) {
if (isCordova) { if (isCordova) {
@ -57,7 +57,7 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
var tmpl = '<ion-spinner class="spinner-stable" icon="lines"></ion-spinner>' + showName; var tmpl = '<ion-spinner class="spinner-stable" icon="lines"></ion-spinner>' + showName;
$ionicLoading.show({ $ionicLoading.show({
template: tmpl, template: tmpl
}); });
} }
} else { } else {