diff --git a/gui/app/pods/auth/login/template.hbs b/gui/app/pods/auth/login/template.hbs index 890e9cd2..5751f7f9 100644 --- a/gui/app/pods/auth/login/template.hbs +++ b/gui/app/pods/auth/login/template.hbs @@ -30,7 +30,7 @@
{{#if isAuthProviderDocumize}} - {{#link-to "auth.forgot"}}{{localize 'forgor_password'}}{{/link-to}} + {{#link-to "auth.forgot"}}{{localize 'forgot_password'}}{{/link-to}} {{/if}} diff --git a/gui/app/services/i18n.js b/gui/app/services/i18n.js index 1fac5375..a10d10f8 100644 --- a/gui/app/services/i18n.js +++ b/gui/app/services/i18n.js @@ -24,14 +24,15 @@ export default Service.extend({ let str = ""; switch(this.session.locale) { - case "fr-FR": - str = ""; + case "en-US": + str = this.langs.enUS[key]; break; default: str = this.langs.enUS[key]; } if (_.isUndefined(str)) { + // eslint-disable-next-line no-console console.log(">>>>>>>>>>>> i18n missed key", key); return `!${key}!`; } @@ -42,6 +43,8 @@ export default Service.extend({ } } + console.log(this.session.locale); + return str; }, }); diff --git a/gui/app/services/session.js b/gui/app/services/session.js index d4d54e8c..45b07bec 100644 --- a/gui/app/services/session.js +++ b/gui/app/services/session.js @@ -100,8 +100,15 @@ export default SimpleAuthSession.extend({ }), locale: computed('session.content.authenticated.user', function () { + if (this.get('session.authenticator') === 'authenticator:anonymous' || + this.get('session.content.authenticated.user.id') === '0' ) { + return this.appMeta.locale; + } + let locale = this.get('session.content.authenticated.user.locale'); if (_.isUndefined(locale) || locale === "") return this.appMeta.locale; + + return locale; }), init() {