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

Merge pull request #174 from cmgustavo/matias/feat/email-01

Browse source 
Fix strings for translation
This commit is contained in:
Matias Alejo Garcia 2015-05-19 15:33:43 -03:00
commit 3a18c2d5fb
4 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/views/modals/confirmation.html
View file

@ -2,13 +2,13 @@
<div class="row">
<h1 class="text-center m20b">{{title|translate}}</h1>
<div class="large-6 medium-6 small-6 columns">
<button class="button light-gray expand outline radius" ng-disabled="loading"
<button class="button light-gray expand outline round" ng-disabled="loading"
ng-click="cancel()">
<i class="fi-x"></i> <span class="tu" translate>No</span>
</button>
</div>
<div class="large-6 medium-6 small-6 columns">
<button class="warning expand radius" ng-disabled="loading" ng-click="ok()">
<button class="button warning expand round" ng-disabled="loading" ng-click="ok()">
<i class="fi-trash"></i> <span translate>Yes</span>
</button>
</div>

6
public/views/preferencesAlias.html
View file

@ -4,15 +4,13 @@
ng-init="titleSection='Wallet Alias'; goBackToState = 'preferences'">
</div>
<div class="content preferences p20v" ng-controller="preferencesAliasController as prefAlias">
<form name="settingsAliasForm" ng-submit="prefAlias.save()" class="columns">
<label>Alias for <i>{{index.walletName}}</i></label>
<label><span translate>Alias for</span> <i>{{index.walletName}}</i></label>
<input type="text" id="alias2" type="text" name="alias2" ng-model="prefAlias.alias">
<input type="submit" class="button expand black round" value="{{'Save'|translate}}"
ng-style="{'background-color':index.backgroundColor}">
</form>
<p class="text-gray text-center columns size-14"> Changing wallet alias only afects the local wallet name.
<p class="text-gray text-center columns size-14" translate>Changing wallet alias only afects the local wallet name.</p>
</div>
<div class="extra-margin-bottom"></div>

8
public/views/preferencesEmail.html
View file

@ -17,7 +17,7 @@
<div class="rect4"></div>
<div class="rect5"></div>
</div>
<span translate> Saving preferences... </span>
<span translate>Saving preferences...</span>
</div>
</div>
@ -29,11 +29,11 @@
</span>
</div>
<label>email for wallet notifications:</i></label>
<label translate>email for wallet notifications</label>
<input type="email" id="email" name="email" ng-model="prefEmail.email" required>
<input type="submit" class="button expand black radius" value="{{'Save'|translate}}"
<input type="submit" class="button expand black round" value="{{'Save'|translate}}"
ng-style="{'background-color':index.backgroundColor}" ng-disabled="emailForm.$invalid && !index.preferences.email">
</form>
<p class="text-gray text-center columns size-14" translate> Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more.
<p class="text-gray text-center columns size-14" translate>Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more.</p>
</div>
<div class="extra-margin-bottom"></div>

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

@ -3,19 +3,15 @@
angular.module('copayApp.controllers').controller('preferencesEmailController',
function($scope, go, profileService, gettext, $log) {
this.save = function(form) {
var self = this;
this.error = null;
if (!form.$valid && this.email) {
this.error = gettext('Invalid email');
return;
}
var fc = profileService.focusedClient;
this.saving = true;
fc.savePreferences({
email: this.email
}, function(err) {
fc.saving = false;
self.saving = false;
if (err) {
$log.warn(err);
$scope.$emit('Local/ClientError', err);