BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3185 from cmgustavo/translate/default-wallet 

Translate default wallet name
This commit is contained in:
Matias Alejo Garcia 2015-09-17 11:12:12 -03:00
parent 16734ec105 eedcc018b5
commit 5256d18935
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/views/importLegacy.html
View File

@ -30,8 +30,10 @@
</label>
<label for="username">
{{importLegacy.fromCloud ? 'Email': 'Username'}}
<input type="text" class="form-control" placeholder="{{importLegacy.fromCloud ? 'Email': 'Username'}}"
<span ng-show="importLegacy.fromCloud" translate>Email</span>
<span ng-show="!importLegacy.fromCloud" translate>Username</span>
<input type="text" class="form-control"
placeholder="{{importLegacy.fromCloud ? ('Email'|translate): ('Username'|translate)}}"
name="username" ng-model="importLegacy.username" autocapitalize="off" required>
</label>

5
public/views/preferencesInformation.html
View File

@ -55,8 +55,7 @@
<h4 class="title m0" translate>Extended Public Keys</h4>
<li class="line-b p10" ng-repeat="pk in pubKeys">
<div class="row">
<div class="small-3 columns" translate>Copayer</span> {{$index}}
</div>
<div class="small-3 columns">Copayer {{$index}}</div>
<div class="small-9 columns oh enable_text_select text-gray" style="text-overflow:ellipsis">
{{pk}}
@ -64,8 +63,6 @@
</div>
</li>
</ul>
<ul class="no-bullet m0 size-14" ng-show="addrs">
<h4 class="title m0" translate>Last Wallet Addresses</h4>

1
src/js/controllers/preferencesLanguage.js
View File

@ -5,7 +5,6 @@ angular.module('copayApp.controllers').controller('preferencesLanguageController
this.availableLanguages = uxLanguage.getLanguages();
console.log('[preferencesLanguage.js.7]', this.availableLanguages); //TODO
this.save = function(newLang) {
var opts = {

6
src/js/services/profileService.js
View File

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.services')
.factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, nodeWebkit, bwsError, uxLanguage, ledger, bitcore) {
.factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, gettextCatalog, nodeWebkit, bwsError, uxLanguage, ledger, bitcore) {
var root = {};
@ -218,7 +218,9 @@ angular.module('copayApp.services')
root._seedWallet({}, function(err, walletClient) {
if (err) return cb(err);
walletClient.createWallet('Personal Wallet', 'me', 1, 1, {
var walletName = gettextCatalog.getString('Personal Wallet');
var me = gettextCatalog.getString('me');
walletClient.createWallet(walletName, me, 1, 1, {
network: 'livenet'
}, function(err) {
if (err) return bwsError.cb(err, gettext('Error creating wallet'), cb);