From 66357162f8e1227495f09bd4f68446aad7071c6d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 12 Aug 2020 10:40:04 +0200 Subject: Migrate to $localize * Remove i18n polyfill to translate things in components * Reduce bundle sizes * Improve runtime perf * Reduce a lot the time to make a full client build * Reduce client build complexity * We don't need a service to translate things anymore (so we will be able to translate title pages etc) Unfortunately we may loose some translations in the migration process. I'll put a message on weblate to notify translators --- client/src/app/+login/login.component.ts | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'client/src/app/+login') diff --git a/client/src/app/+login/login.component.ts b/client/src/app/+login/login.component.ts index e5a382218..e9336172e 100644 --- a/client/src/app/+login/login.component.ts +++ b/client/src/app/+login/login.component.ts @@ -5,7 +5,6 @@ import { AuthService, Notifier, RedirectService, UserService } from '@app/core' import { HooksService } from '@app/core/plugins/hooks.service' import { FormReactive, FormValidatorService, LoginValidatorsService } from '@app/shared/shared-forms' import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap' -import { I18n } from '@ngx-translate/i18n-polyfill' import { RegisteredExternalAuthConfig, ServerConfig } from '@shared/models' @Component({ @@ -37,9 +36,8 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni private userService: UserService, private redirectService: RedirectService, private notifier: Notifier, - private hooks: HooksService, - private i18n: I18n - ) { + private hooks: HooksService + ) { super() } @@ -105,10 +103,9 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni this.userService.askResetPassword(this.forgotPasswordEmail) .subscribe( () => { - const message = this.i18n( - 'An email with the reset password instructions will be sent to {{email}}. The link will expire within 1 hour.', - { email: this.forgotPasswordEmail } - ) + const message = $localize`An email with the reset password instructions will be sent to ${this.forgotPasswordEmail}. +The link will expire within 1 hour.` + this.notifier.success(message) this.hideForgotPasswordModal() }, @@ -140,8 +137,8 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni } private handleError (err: any) { - if (err.message.indexOf('credentials are invalid') !== -1) this.error = this.i18n('Incorrect username or password.') - else if (err.message.indexOf('blocked') !== -1) this.error = this.i18n('Your account is blocked.') + if (err.message.indexOf('credentials are invalid') !== -1) this.error = $localize`Incorrect username or password.` + else if (err.message.indexOf('blocked') !== -1) this.error = $localize`Your account is blocked.` else this.error = err.message } } -- cgit v1.2.3