This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit e67c2d1f57c2e43693e57b1812836cc8dca84221 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon May 19 17:34:44 2014 +0200 use header for locale --- pollen-ui-angular/src/main/webapp/js/app.js | 10 ++++++++-- pollen-ui-angular/src/main/webapp/js/services.js | 8 +------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 70ff3cb..47c75aa 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,11 +18,17 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'ui.bootstrap', 'ngCookies'], function($httpProvider) { +angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'ui.bootstrap', 'ngCookies']) +.config(['$httpProvider', '$cookiesProvider', function($httpProvider, $cookies) { $httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; //$httpProvider.defaults.headers.put['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; -}) + if (!angular.isDefined($cookies.locale)) { + var locale = navigator.language || navigator.userLanguage || 'en'; + $cookies.locale = locale.substring(0,2); + } + $httpProvider.defaults.headers.common['Accept-Language'] = $cookies.locale; +}]) .config(['$routeProvider', function($routeProvider) { $routeProvider.when('/', {templateUrl: './partials/home.html', controller: "HomeCtrl"}) diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 4a5306c..41be424 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -20,19 +20,13 @@ */ angular.module('pollenServices', ['ngResource']) -.factory('RestInfo', ['$cookies', '$locale', function ($cookies, $locale) { +.factory('RestInfo', ['$cookies', function ($cookies) { var query = ''; - if (!angular.isDefined($cookies.locale)) { - $cookies.locale = $locale.id; - } - if (angular.isDefined($cookies.token)) { query += '&permission='+$cookies.token; } - query += '&locale='+$cookies.locale; - return query; }]) -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm@chorem.org>.