krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'translations' into develop

Browse Source 
Conflicts:
	locales/bg/app.json
	locales/nl/app.json
This commit is contained in:
Tyler Renelle
2013-11-13 23:37:29 -08:00
parent 95c886eee8 6512e17454
commit 10e9c205e6
31 changed files with 7062 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/controllers/rootCtrl.js
View File

@@ -11,6 +11,8 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
$rootScope.user = User.user;
$rootScope.settings = User.settings;
$rootScope.translations = window.env.translations;
// Angular UI Router
$rootScope.$state = $state;
$rootScope.$stateParams = $stateParams;

10
public/js/controllers/settingsCtrl.js
View File

@@ -33,6 +33,16 @@ habitrpg.controller('SettingsCtrl',
User.log({'op':'set', data:{'preferences.dayStart': dayStart}});
}
$scope.language = window.env.language;
$scope.avalaibleLanguages = window.env.avalaibleLanguages;
$scope.changeLanguage = function(){
$rootScope.$on('userSynced', function(){
location.reload();
});
User.set('preferences.language', $scope.language);
}
$scope.reroll = function(){
$http.post(API_URL + '/api/v1/user/reroll')