This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit e03e94f29404854287c0e8475c5f5fc0ec0537d2 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 26 17:02:24 2014 +0200 add default fall back language, remove debug language --- pollen-ui-angular/src/main/webapp/index.html | 1 - pollen-ui-angular/src/main/webapp/js/app.js | 4 ++-- pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 99c24d4..a7c4811 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -51,7 +51,6 @@ <ul class="dropdown-menu"> <li><a ng-click="switchLocale('fr')"><img src="img/fr.png" /> Français </a></li> <li><a ng-click="switchLocale('en')"><img src="img/en.png" /> English </a> </li> - <li ng-if="debug"><a ng-click="switchLocale('no')"> No Translate </a> </li> </ul> </li> </ul> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index ee8b99f..75b50e0 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -136,11 +136,11 @@ angular.module('pollen', ['pollenDirective', 'pollenServices', 'ngRoute', 'Polle if (angular.isDefined(conf.defaultLanguage)) { $translateProvider.preferredLanguage(conf.defaultLanguage); - // $translateProvider.fallbackLanguage(conf.defaultLanguage); + $translateProvider.fallbackLanguage(conf.defaultLanguage); } else { $translateProvider.preferredLanguage('en'); - // $translateProvider.fallbackLanguage('en'); + $translateProvider.fallbackLanguage('en'); } }]); diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js index a6ba707..291b975 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js @@ -22,7 +22,6 @@ angular.module('localeControllers', []) .controller('LocaleCtrl', ['$scope', '$rootScope', '$translate', 'SessionStorage', '$locale', function ($scope, $rootScope, $translate, SessionStorage, $locale) { - $scope.debug = conf.debug; $scope.locale = SessionStorage.get().locale; var locales = []; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.