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

Merge pull request #4337 from JDonadio/bug/select-lang

Browse source 
Fix language selection - IOs
This commit is contained in:
Gustavo Maximiliano Cortez 2016-06-10 10:16:36 -03:00 • committed by GitHub
commit fc27b05d13
2 changed files with 13 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

21
public/views/preferencesLanguage.html
View file

@ -1,20 +1,11 @@
<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">
<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 availableLanguages" ng-value="lang.isoCode" ng-model="currentLanguage"
ng-click="save(lang.isoCode)">{{lang.name}}
</ion-radio>
</div>
<div class="extra-margin-bottom"></div>

21
src/js/controllers/preferencesLanguage.js
View file

@ -1,13 +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.availableLanguages = uxLanguage.getLanguages();
this.currentLanguage = uxLanguage.getCurrentLanguage();
this.save = function(newLang) {
$scope.availableLanguages = uxLanguage.getLanguages();
$scope.currentLanguage = uxLanguage.getCurrentLanguage();
$scope.save = function(newLang) {
var opts = {
wallet: {
settings: {
@ -20,16 +19,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');
});
});
});
};