IT4Change/ohmyform
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added updating of translation when user changes profile language

Browse Source
This commit is contained in:
David Baldwynn 2017-11-19 15:23:38 -08:00
parent 6a992d74ad
commit ff509f2b5c
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/modules/core/config/i18n/french.js
View File

@ -6,7 +6,7 @@ angular.module('core').config(['$translateProvider', function ($translateProvide
MENU: 'MENU',
SIGNUP_TAB: 'Créer un Compte',
SIGNIN_TAB: 'Connexion',
SIGNOUT_TAB: 'Créer un compte',
SIGNOUT_TAB: 'Déconnexion',
EDIT_PROFILE: 'Modifier Mon Profil',
MY_SETTINGS: 'Mes Paramètres',
CHANGE_PASSWORD: 'Changer mon Mot de Pass',

7
public/modules/users/controllers/settings.client.controller.js
View File

@ -1,7 +1,7 @@
'use strict';
angular.module('users').controller('SettingsController', ['$scope', '$rootScope', '$http', '$state', 'Users', 'Auth', 'currentUser', 'USERS_URL',
function($scope, $rootScope, $http, $state, Users, Auth, currentUser, USERS_URL) {
angular.module('users').controller('SettingsController', ['$scope', '$rootScope', '$http', '$state', 'Users', 'Auth', 'currentUser', 'USERS_URL', '$translate',
function($scope, $rootScope, $http, $state, Users, Auth, currentUser, USERS_URL, $translate) {
$scope.user = currentUser;
@ -18,6 +18,9 @@ angular.module('users').controller('SettingsController', ['$scope', '$rootScope'
$scope.success = true;
$scope.error = null;
$scope.user = response.data;
$translate.use($scope.user.language);
Auth.update($scope.user);
}, function(error) {
$scope.success = null;
$scope.error = 'Could not update your profile due to an error with the server. Sorry about this!'

4
public/modules/users/services/auth.client.service.js
View File

@ -56,6 +56,10 @@ angular.module('users').factory('Auth', ['$window', '$q', 'User',
this._currentUser = new_user;
},
update: function(new_user) {
this._currentUser = new_user;
},
logout: function() {
$window.user = null;
userState.isLoggedIn = false;

8
public/modules/users/views/settings/edit-profile.client.view.html
View File

@ -19,7 +19,7 @@
<h4>{{ 'FIRST_NAME_LABEL' | translate }}</h4>
</div>
<div class="col-xs-12 field-input">
<input type="text" id="firstName" name="firstName" class="form-control" data-ng-model="user.firstName" ng-pattern="/^[\w0-9 \-.]*$/">
<input type="text" id="firstName" name="firstName" class="form-control" ng-model="user.firstName" ng-pattern="/^[\w0-9 \-.]*$/">
</div>
</div>
<div class="form-group row">
@ -27,7 +27,7 @@
<h4>{{ 'LAST_NAME_LABEL' | translate }}</h4>
</div>
<div class="col-xs-12 field-input">
<input type="text" id="lastName" name="lastName" class="form-control" data-ng-model="user.lastName" ng-pattern="/^[\w0-9 \-.]*$/">
<input type="text" id="lastName" name="lastName" class="form-control" ng-model="user.lastName" ng-pattern="/^[\w0-9 \-.]*$/">
</div>
</div>
<div class="row">
@ -56,7 +56,7 @@
<h4>{{ 'USERNAME_LABEL' | translate }}</h4>
</div>
<div class="col-xs-12 field-input">
<input type="text" id="username" name="username" class="form-control" data-ng-model="user.username">
<input type="text" id="username" name="username" class="form-control" ng-model="user.username">
</div>
</div>
@ -65,7 +65,7 @@
<h4>{{ 'EMAIL_LABEL' | translate }}</h4>
</div>
<div class="col-xs-12 field-input">
<input type="email" id="email" name="email" class="form-control" data-ng-model="user.email">
<input type="email" id="email" name="email" class="form-control" ng-model="user.email">
</div>
</div>