From 66fc3fe4169592233ea7111ea188353d89478924 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Thu, 9 Jun 2016 17:20:17 -0300
Subject: [PATCH 1/2] Fix language selection - IOs

---
 public/views/preferencesLanguage.html     | 20 ++++++--------------
 src/js/controllers/preferencesLanguage.js | 21 +++++++++------------
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/public/views/preferencesLanguage.html b/public/views/preferencesLanguage.html
index e3496b1e5..9c856a97a 100644
--- a/public/views/preferencesLanguage.html
+++ b/public/views/preferencesLanguage.html
@@ -1,20 +1,12 @@
-<div 
-  class="topbar-container" 
-  ng-include="'views/includes/topbar.html'"
+<div class="topbar-container" ng-include="'views/includes/topbar.html'"
   ng-init="titleSection='Language'; goBackToState = 'preferencesGlobal'; noColor = true">
 </div>
 
-
-
-<div class="content preferences" ng-controller="preferencesLanguageController as prefLang">
+<div class="content preferences" ng-controller="preferencesLanguageController as prefLang" ng-init="prefLang.init()">
   <h4></h4>
-  <ul class="no-bullet m0 ">
-  <li
-    ng-repeat="lang in prefLang.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="prefLang.currentLanguage == lang.isoCode"></i>
-  </li>
-  </ul>
+
+  <ion-radio class="line-b size-12" ng-repeat="lang in prefLang.availableLanguages" ng-value="lang.isoCode" ng-model="data.currentLanguage"
+    ng-click="prefLang.save(lang.isoCode)">{{lang.name}}
+  </ion-radio>
 </div>
 <div class="extra-margin-bottom"></div>
diff --git a/src/js/controllers/preferencesLanguage.js b/src/js/controllers/preferencesLanguage.js
index acce188b5..50fb7a2af 100644
--- a/src/js/controllers/preferencesLanguage.js
+++ b/src/js/controllers/preferencesLanguage.js
@@ -3,11 +3,14 @@
 angular.module('copayApp.controllers').controller('preferencesLanguageController',
   function($scope, $log, $timeout, configService, profileService, uxLanguage, walletService, go) {
 
-    this.availableLanguages = uxLanguage.getLanguages();
-    this.currentLanguage = uxLanguage.getCurrentLanguage();
+    this.init = function() {
+      this.availableLanguages = uxLanguage.getLanguages();
+      $scope.data = {
+        currentLanguage: uxLanguage.getCurrentLanguage()
+      };
+    };
 
     this.save = function(newLang) {
-
       var opts = {
         wallet: {
           settings: {
@@ -20,16 +23,10 @@ angular.module('copayApp.controllers').controller('preferencesLanguageController
         if (err) $log.warn(err);
         go.preferencesGlobal();
 
-
         uxLanguage.update(function() {
-          $timeout(function() {
-            $scope.$apply();
-          }, 100);
-
-          walletService.updateRemotePreferences(profileService.getClients(), {},
-            function() {
-              $log.debug('Remote preferences saved');
-            });
+          walletService.updateRemotePreferences(profileService.getClients(), {}, function() {
+            $log.debug('Remote preferences saved');
+          });
         });
       });
     };

From e58ac3bd5870fe091c1eae9a96908ee3b56348a4 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Fri, 10 Jun 2016 09:35:44 -0300
Subject: [PATCH 2/2] use scope only

---
 public/views/preferencesLanguage.html     |  7 +++----
 src/js/controllers/preferencesLanguage.js | 12 ++++--------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/public/views/preferencesLanguage.html b/public/views/preferencesLanguage.html
index 9c856a97a..b5c4c2315 100644
--- a/public/views/preferencesLanguage.html
+++ b/public/views/preferencesLanguage.html
@@ -2,11 +2,10 @@
   ng-init="titleSection='Language'; goBackToState = 'preferencesGlobal'; noColor = true">
 </div>
 
-<div class="content preferences" ng-controller="preferencesLanguageController as prefLang" ng-init="prefLang.init()">
+<div class="content preferences" ng-controller="preferencesLanguageController">
   <h4></h4>
 
-  <ion-radio class="line-b size-12" ng-repeat="lang in prefLang.availableLanguages" ng-value="lang.isoCode" ng-model="data.currentLanguage"
-    ng-click="prefLang.save(lang.isoCode)">{{lang.name}}
+  <ion-radio class="line-b size-12" ng-repeat="lang in availableLanguages" ng-value="lang.isoCode" ng-model="currentLanguage"
+    ng-click="save(lang.isoCode)">{{lang.name}}
   </ion-radio>
 </div>
-<div class="extra-margin-bottom"></div>
diff --git a/src/js/controllers/preferencesLanguage.js b/src/js/controllers/preferencesLanguage.js
index 50fb7a2af..0e44492d1 100644
--- a/src/js/controllers/preferencesLanguage.js
+++ b/src/js/controllers/preferencesLanguage.js
@@ -1,16 +1,12 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesLanguageController',
-  function($scope, $log, $timeout, configService, profileService, uxLanguage, walletService, go) {
+  function($scope, $log, configService, profileService, uxLanguage, walletService, go) {
 
-    this.init = function() {
-      this.availableLanguages = uxLanguage.getLanguages();
-      $scope.data = {
-        currentLanguage: uxLanguage.getCurrentLanguage()
-      };
-    };
+    $scope.availableLanguages = uxLanguage.getLanguages();
+    $scope.currentLanguage = uxLanguage.getCurrentLanguage();
 
-    this.save = function(newLang) {
+    $scope.save = function(newLang) {
       var opts = {
         wallet: {
           settings: {