From 764caffd74ff4543a2ec3043bfdd659dad428b55 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 22 Apr 2015 15:47:14 -0300
Subject: [PATCH] Fix preferencesLanguage

---
 public/views/preferences.html             | 2 +-
 public/views/preferencesLanguage.html     | 2 +-
 src/js/controllers/index.js               | 3 ---
 src/js/controllers/preferences.js         | 9 +++++++--
 src/js/controllers/preferencesLanguage.js | 1 +
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/public/views/preferences.html b/public/views/preferences.html
index 5c746f40c..27bc643d6 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -31,7 +31,7 @@
       <span translate>Language</span>
       <span class="right text-gray">
         <i class="icon-arrow-right3 size-24 right"></i>
-        {{index.defaultLanguageName}}
+        {{preferences.getDefaultLanguageName(index.availableLanguages)}}
       </span>
     </li>
 
diff --git a/public/views/preferencesLanguage.html b/public/views/preferencesLanguage.html
index 6cd2eabbd..8e6f5dc74 100644
--- a/public/views/preferencesLanguage.html
+++ b/public/views/preferencesLanguage.html
@@ -4,7 +4,7 @@
     ng-repeat="lang in index.availableLanguages" 
     ng-click="prefLang.save(lang.isoCode)" class="line-b p20 size-14">
     <span>{{lang.name}}</span>
-    <i class="fi-check size-16 right" ng-show="index.defaultLanguage == lang.isoCode"></i>
+    <i class="fi-check size-16 right" ng-show="prefLang.defaultLanguage == lang.isoCode"></i>
   </div>
 </div>
 <div class="extra-margin-bottom"></div>
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index d24b42bee..e034a3988 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -42,9 +42,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     isoCode: 'ja',
   }];
 
-  self.defaultLanguage = configService.getSync().wallet.settings.defaultLanguage || 'en';
-  self.defaultLanguageName = lodash.result(lodash.find(this.availableLanguages, { 'isoCode': self.defaultLanguage }), 'name');
-
   self.setOngoingProcess = function(processName, isOn) {
     $log.debug('onGoingProcess', processName, isOn);
     self[processName] = isOn;
diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js
index 636f3659d..95c3462be 100644
--- a/src/js/controllers/preferences.js
+++ b/src/js/controllers/preferences.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesController',
-  function($scope, $rootScope, $filter, $timeout, $modal, $log, configService, profileService) {
+  function($scope, $rootScope, $filter, $timeout, $modal, $log, lodash, configService, profileService) {
     this.error = null;
     this.success = null;
 
@@ -12,7 +12,7 @@ angular.module('copayApp.controllers').controller('preferencesController',
     this.selectedAlternative = {
       name: config.wallet.settings.alternativeName,
       isoCode: config.wallet.settings.alternativeIsoCode
-    };
+    }; 
     var fc = profileService.focusedClient;
     $scope.encrypt = fc.hasPrivKeyEncrypted();
 
@@ -48,6 +48,11 @@ angular.module('copayApp.controllers').controller('preferencesController',
       }
     });
 
+    this.getDefaultLanguageName = function(availableLanguages) {
+      var defaultLanguage = config.wallet.settings.defaultLanguage || 'en';
+      return lodash.result(lodash.find(availableLanguages, { 'isoCode': defaultLanguage }), 'name');
+    };
+
     $scope.$on('$destroy', function() {
       unwatch();
     });
diff --git a/src/js/controllers/preferencesLanguage.js b/src/js/controllers/preferencesLanguage.js
index 2714ec74a..4eaf736d3 100644
--- a/src/js/controllers/preferencesLanguage.js
+++ b/src/js/controllers/preferencesLanguage.js
@@ -2,6 +2,7 @@
 
 angular.module('copayApp.controllers').controller('preferencesLanguageController',
   function($scope, $timeout, configService, applicationService) {
+    this.defaultLanguage = configService.getSync().wallet.settings.defaultLanguage || 'en';
 
     this.save = function(newLang) {
       var opts = {