From 9b4e98753b8d64ffc39d9a1f13885fe6a363454f Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 19 May 2015 15:30:49 -0300
Subject: [PATCH] Fix strings for translation

---
 public/views/modals/confirmation.html  | 4 ++--
 public/views/preferencesAlias.html     | 6 ++----
 public/views/preferencesEmail.html     | 8 ++++----
 src/js/controllers/preferencesEmail.js | 8 ++------
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/public/views/modals/confirmation.html b/public/views/modals/confirmation.html
index a057c7a4e..1d56e2348 100644
--- a/public/views/modals/confirmation.html
+++ b/public/views/modals/confirmation.html
@@ -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>
diff --git a/public/views/preferencesAlias.html b/public/views/preferencesAlias.html
index 6b7af95d0..ca1e90657 100644
--- a/public/views/preferencesAlias.html
+++ b/public/views/preferencesAlias.html
@@ -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>
diff --git a/public/views/preferencesEmail.html b/public/views/preferencesEmail.html
index 43280ba5e..55cac6990 100644
--- a/public/views/preferencesEmail.html
+++ b/public/views/preferencesEmail.html
@@ -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>
diff --git a/src/js/controllers/preferencesEmail.js b/src/js/controllers/preferencesEmail.js
index 783ba82ee..241297501 100644
--- a/src/js/controllers/preferencesEmail.js
+++ b/src/js/controllers/preferencesEmail.js
@@ -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);