You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2019/11/07 17:00:40 UTC
[syncope] branch 2_1_X updated: [SYNCOPE-1509] Using
.determinePreferredLanguage
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 5dcbd3e [SYNCOPE-1509] Using .determinePreferredLanguage
5dcbd3e is described below
commit 5dcbd3ec5c04bde9abfb25ff2e4d5f074d266371
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu Nov 7 18:00:05 2019 +0100
[SYNCOPE-1509] Using .determinePreferredLanguage
---
.../src/main/resources/META-INF/resources/app/js/app.js | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
index f9c5fe7..742cfe7 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
+++ b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
@@ -60,7 +60,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$translate
$translatePartialLoaderProvider.addPart('static');
$translateProvider.useLoader('$translatePartialLoader', {
urlTemplate: 'languages/{lang}/{part}.json'
- }).preferredLanguage('en');
+ }).registerAvailableLanguageKeys(['en', 'it', 'de', 'ja'], {
+ 'en_*': 'en',
+ 'de_*': 'de',
+ 'it_*': 'it',
+ 'ja_*': 'ja',
+ '*': 'en'
+ }).fallbackLanguage('en').
+ determinePreferredLanguage();
/*
* State provider
*/
@@ -386,9 +393,9 @@ app.run(['$rootScope', '$state', 'AuthService', '$transitions',
}
};
}]);
-app.controller('ApplicationController', ['$scope', '$rootScope', 'InfoService', 'SAML2IdPService',
+app.controller('ApplicationController', ['$scope', '$rootScope', '$translate', 'InfoService', 'SAML2IdPService',
'OIDCProviderService', 'DynamicTemplateService',
- function ($scope, $rootScope, InfoService, SAML2IdPService, OIDCProviderService, DynamicTemplateService) {
+ function ($scope, $rootScope, $translate, InfoService, SAML2IdPService, OIDCProviderService, DynamicTemplateService) {
$scope.initApplication = function () {
/*
* disable by default wizard buttons in self-registration
@@ -407,7 +414,9 @@ app.controller('ApplicationController', ['$scope', '$rootScope', 'InfoService',
{id: '4', name: '日本語', code: 'ja', format: 'yyyy/MM/dd HH:mm'}
]
};
- $rootScope.languages.selectedLanguage = $rootScope.languages.availableLanguages[1];
+ $rootScope.languages.selectedLanguage = $rootScope.languages.availableLanguages.filter(function(obj) {
+ return obj.code === $translate.preferredLanguage();
+ })[0];
/*
|--------------------------------------------------------------------------
| Syncope Enduser properties initialization