garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

i18n implementation (#55)

Browse Source
This commit is contained in:
Athou
2013-05-12 12:38:56 +02:00
parent ca47270db1
commit 98aeccbb66
23 changed files with 353 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/webapp/js/controllers.js
View File

@@ -793,19 +793,12 @@ function($scope, $state, $stateParams, $dialog, AdminUsersService) {
};
}]);
module.controller('SettingsCtrl', ['$scope', '$location', 'SettingsService', 'AnalyticsService',
function($scope, $location, SettingsService, AnalyticsService) {
module.controller('SettingsCtrl', ['$scope', '$location', 'SettingsService', 'AnalyticsService', 'ServerService',
function($scope, $location, SettingsService, AnalyticsService, ServerService) {
AnalyticsService.track();
$scope.languages = [ {
id : 'en',
label : 'English'
}, {
id : 'fr',
label : 'Français'
} ];
$scope.ServerService = ServerService.get();
$scope.settingsService = SettingsService;
$scope.$watch('settingsService.settings', function(value) {

1
src/main/webapp/js/services.js
View File

@@ -34,6 +34,7 @@ module.factory('SettingsService', ['$resource', function($resource) {
s.init = function(callback) {
res.get(function(data) {
s.settings = data;
moment.lang(s.settings.language || 'en');
if (callback) {
callback(data);
}