Fix tab-settings and preferences language

src/js/controllers/preferencesLanguage.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesLanguageController',
-  function($scope, $log, $ionicHistory, gettextCatalog, configService, profileService, uxLanguage, walletService, externalLinkService) {
+  function($scope, $log, $ionicHistory, $state, gettextCatalog, configService, profileService, uxLanguage, walletService, externalLinkService) {
 
     $scope.availableLanguages = uxLanguage.getLanguages();
 
@@ -18,19 +18,18 @@ angular.module('copayApp.controllers').controller('preferencesLanguageController
         }
       };
 
+      uxLanguage._set(newLang);
       configService.set(opts, function(err) {
         if (err) $log.warn(err);
-
+        walletService.updateRemotePreferences(profileService.getWallets(), {}, function() {
-        $ionicHistory.goBack();
+          $log.debug('Remote preferences saved');
-        uxLanguage.init(function() {
-          walletService.updateRemotePreferences(profileService.getWallets(), {}, function() {
-            $log.debug('Remote preferences saved');
-          });
         });
       });
+
+      $ionicHistory.goBack();
     };
 
-    $scope.$on("$ionicView.enter", function(event, data) {
+    $scope.$on("$ionicView.beforeEnter", function(event, data) {
       $scope.currentLanguage = uxLanguage.getCurrentLanguage();
     });
   });

src/js/controllers/tab-settings.js

@@ -3,8 +3,6 @@
 angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, $window, $ionicModal, $log, lodash, uxLanguage, platformInfo, profileService, feeService, configService, externalLinkService, bitpayCardService, storageService, glideraService) {
 
   var updateConfig = function() {
-
-    var config = configService.getSync();
     var isCordova = platformInfo.isCordova;
     var isWP = platformInfo.isWP;
     var isWindowsPhoneApp = platformInfo.isWP && isCordova;
@@ -13,21 +11,39 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
     $scope.isCordova = isCordova;
 
     $scope.appName = $window.appConfig.nameCase;
-
-    $scope.unitName = config.wallet.settings.unitName;
     $scope.currentLanguageName = uxLanguage.getCurrentLanguageName();
-    $scope.selectedAlternative = {
-      name: config.wallet.settings.alternativeName,
-      isoCode: config.wallet.settings.alternativeIsoCode
-    };
     $scope.feeOpts = feeService.feeOpts;
     $scope.currentFeeLevel = feeService.getCurrentFeeLevel();
-
+    
     $scope.wallets = profileService.getWallets();
+    
+    configService.whenAvailable(function(config) {
+      $scope.unitName = config.wallet.settings.unitName;
+      $scope.selectedAlternative = {
+        name: config.wallet.settings.alternativeName,
+        isoCode: config.wallet.settings.alternativeIsoCode
+      };
 
-    $scope.bitpayCardEnabled = config.bitpayCard.enabled;
+      $scope.bitpayCardEnabled = config.bitpayCard.enabled;
+      $scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp;
 
-    $scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp;
+      if ($scope.bitpayCardEnabled) {
+        bitpayCardService.getBitpayDebitCards(function(err, data) {
+          if (err) $log.error(err);
+          if (!lodash.isEmpty(data)) {
+            $scope.bitpayCards = true;
+          }
+        });  
+      }
+
+      if ($scope.glideraEnabled) {
+        storageService.getGlideraToken(glideraService.getEnvironment(), function(err, token) {
+          if (err) $log.error(err);
+          $scope.glideraToken = token;
+        });
+      }
+
+    });
   };
 
   $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) {
@@ -36,18 +52,6 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
 
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
     updateConfig();
-
-    bitpayCardService.getBitpayDebitCards(function(err, data) {
-      if (err) $log.error(err);
-      if (!lodash.isEmpty(data)) {
-        $scope.bitpayCards = true;
-      }
-    });
-
-    storageService.getGlideraToken(glideraService.getEnvironment(), function(err, token) {
-      if (err) $log.error(err);
-      $scope.glideraToken = token;
-    });
   });
 
 });

www/views/tab-settings.html

@@ -10,21 +10,21 @@
         <i class="icon big-icon-svg">
           <img src="img/icon-exchange.svg" class="bg"/>
         </i>
-        <span translate>Bitcoin Exchanges</span>
+        <span>{{'Bitcoin Exchanges' | translate}}</span>
         <i class="icon bp-arrow-right"></i>
       </a>
       <a class="item item-icon-left item-icon-right" ui-sref="tabs.addressbook">
         <i class="icon big-icon-svg">
           <img src="img/icon-address-book.svg" class="bg"/>
         </i>
-        <span translate>Address Book</span>
+        <span>{{'Address Book' | translate}}</span>
         <i class="icon bp-arrow-right"></i>
       </a>
       <a class="item item-icon-left item-icon-right" ng-click="openExternalLink('https://help.bitpay.com/bitpay-app', true, 'BitPay Help Center', 'Help and support information is available at the BitPay Help Center website. Would you like to go there now?', 'Open Help Center', 'Go Back')">
         <i class="icon big-icon-svg">
           <img src="img/icon-help-support.svg" class="bg"/>
         </i>
-        <span translate>Help &amp; Support</span>
+        <span>{{'Help & Support' | translate }}</span>
         <i class="icon big-icon-svg">
           <img src="img/icon-link.svg" class="bg just-a-hint"/>
         </i>
@@ -33,31 +33,31 @@
         <i class="icon big-icon-svg">
           <img src="img/icon-language.svg" class="bg"/>
         </i>
-        <span translate>Send Feedback</span>
+        <span>{{'Send Feedback' | translate}}</span>
         <i class="icon bp-arrow-right"></i>
       </a>
       <a ng-if="isCordova" class="item item-icon-left item-icon-right" ui-sref="tabs.shareApp({score: 4, skipped: true, fromSettings: true})">
         <i class="icon big-icon-svg">
           <img src="img/icon-send-feedback.svg" class="bg"/>
         </i>
-        <span translate>Share {{appName}}</span>
+        <span>{{'Share'|translate}} {{appName}}</span>
         <i class="icon bp-arrow-right"></i>
       </a>
 
-      <div class="item item-divider" translate>Preferences</div>
+      <div class="item item-divider">{{'Preferences' | translate}}</div>
 
       <a class="item item-icon-left item-icon-right" ui-sref="tabs.notifications">
         <i class="icon big-icon-svg">
           <img src="img/icon-notifications.svg" class="bg"/>
         </i>
-        <span translate>Notifications</span>
+        <span>{{'Notifications' | translate}}</span>
         <i class="icon bp-arrow-right"></i>
       </a>
       <a class="item item-icon-left item-icon-right" ui-sref="tabs.language">
        <i class="icon big-icon-svg">
          <img src="img/icon-language.svg" class="bg"/>
        </i>
-       <span translate>Language</span>
+       <span>{{'Language' | translate}}</span>
        <span class="item-note">
          {{currentLanguageName|translate}}
        </span>
@@ -67,7 +67,7 @@
         <i class="icon big-icon-svg">
           <img src="img/icon-unit.svg" class="bg"/>
         </i>
-        <span class="setting-title" translate>Bitcoin Unit</span>
+        <span class="setting-title">{{'Bitcoin Unit' | translate}}</span>
         <span class="setting-value">
           {{unitName}}
         </span>
@@ -78,7 +78,7 @@
         <i class="icon big-icon-svg">
           <img src="img/icon-alternative-currency.svg" class="bg"/>
         </i>
-        <span class="setting-title" translate>Alternative Currency</span>
+        <span class="setting-title">{{'Alternative Currency' | translate}}</span>
         <span class="setting-value">
           {{selectedAlternative.name}}
         </span>
@@ -89,14 +89,14 @@
         <i class="icon big-icon-svg">
           <img src="img/icon-network.svg" class="bg"/>
         </i>
-        <span class="setting-title" translate>Bitcoin Network Fee Policy</span>
+        <span class="setting-title">{{'Bitcoin Network Fee Policy' | translate}}</span>
         <span class="setting-value">
           {{feeOpts[currentFeeLevel]|translate}}
         </span>
         <i class="icon bp-arrow-right"></i>
       </a>
 
-      <div class="item item-divider" ng-show="wallets[0]" translate>Wallets &amp; Integrations</div>
+      <div class="item item-divider" ng-show="wallets[0]">{{'Wallets & Integrations' | translate}}</div>
 
       <a class="item item-icon-left item-icon-right" href
            ui-sref="tabs.preferences({'walletId': item.id})"
@@ -110,8 +110,8 @@
             {{item.m}}-of-{{item.n}}
           </span>
         </span>
-        <span class="right text-light assertive" ng-show="!item.isComplete()" translate>
+        <span class="right text-light assertive" ng-show="!item.isComplete()">
-          Incomplete
+          {{'Incomplete' | translate}}
         </span>
         <i class="icon bp-arrow-right"></i>
       </a>
@@ -139,7 +139,7 @@
         <i class="icon big-icon-svg">
           <img src="img/icon-heart.svg" class="bg"/>
         </i>
-        <span translate>Tell a friend</span>
+        <span>{{'Tell a friend' | translate}}</span>
         <i class="icon bp-arrow-right"></i>
       </a>
 
@@ -149,14 +149,14 @@
         <i class="icon big-icon-svg">
           <img src="img/icon-advanced.svg" class="bg"/>
         </i>
-        <span translate>Advanced</span>
+        <span>{{'Advanced' | translate}}</span>
         <i class="icon bp-arrow-right"></i>
       </a>
       <a class="item item-icon-left item-icon-right" href ui-sref="tabs.about">
         <i class="icon big-icon-svg">
           <img src="img/icon-about.svg" class="bg"/>
         </i>
-        <span translate>About</span> {{appName}}
+        <span>{{'About' | translate}}</span> {{appName}}
         <i class="icon bp-arrow-right"></i>
       </a>
       <div class="item item-divider"></div>