This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 050ad68591ee485b8231e8e8f415a41af7d76591 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 3 11:45:48 2017 +0200 fixes #130 sauvegarde de la langue de l'UI --- pollen-ui-riot-js/src/main/web/i18n/en.json | 2 +- pollen-ui-riot-js/src/main/web/js/Session.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/i18n/en.json b/pollen-ui-riot-js/src/main/web/i18n/en.json index 30336511..864b4f6e 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -203,7 +203,7 @@ "signcheck_validating": "Your account is validating...", "signcheck_validating_error": "Your account could not be validated, try to send a new invitation.", "signcheck_validating_success": "Your account was validated! You can now sign in. Enjoy!", - "signin_title": "Connexion", + "signin_title": "Connection", "signin_login": "Email", "signin_login_placeholder": "Enter your email", "signin_password": "Password", diff --git a/pollen-ui-riot-js/src/main/web/js/Session.js b/pollen-ui-riot-js/src/main/web/js/Session.js index 949e046b..e1c16257 100644 --- a/pollen-ui-riot-js/src/main/web/js/Session.js +++ b/pollen-ui-riot-js/src/main/web/js/Session.js @@ -59,7 +59,7 @@ class Session { // pour contenir l"utillisateur connecté this.user = null; - let lang = navigator.language || navigator.userLanguage; + let lang = localStorage && localStorage.userLanguage || navigator.language || navigator.userLanguage; if (lang.indexOf("en") === 0) { this.locale = "en"; } else { @@ -123,6 +123,7 @@ class Session { changeLocale(locale) { this.locale = locale; + localStorage.userLanguage = locale; bus.trigger("locale", this.locale); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.