X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bsignup%2F%2Bregister%2Fregister.component.ts;h=153a6d2b580ea57f0fd7811783038729b9b6810e;hb=66357162f8e1227495f09bd4f68446aad7071c6d;hp=acec56f04293439a3255f9f88ec63800689ba51a;hpb=0912f1b4caaa7394516567044f896132ad991131;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/+signup/+register/register.component.ts b/client/src/app/+signup/+register/register.component.ts
index acec56f04..153a6d2b5 100644
--- a/client/src/app/+signup/+register/register.component.ts
+++ b/client/src/app/+signup/+register/register.component.ts
@@ -1,13 +1,12 @@
 import { Component, OnInit, ViewChild } from '@angular/core'
-import { AuthService, Notifier, RedirectService, ServerService } from '@app/core'
-import { UserService, UserValidatorsService } from '@app/shared'
-import { I18n } from '@ngx-translate/i18n-polyfill'
-import { UserRegister } from '@shared/models/users/user-register.model'
 import { FormGroup } from '@angular/forms'
-import { About } from '@shared/models/server'
-import { InstanceService } from '@app/shared/instance/instance.service'
+import { ActivatedRoute } from '@angular/router'
+import { AuthService, Notifier, UserService } from '@app/core'
 import { HooksService } from '@app/core/plugins/hooks.service'
+import { InstanceService } from '@app/shared/shared-instance'
 import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap'
+import { UserRegister } from '@shared/models'
+import { About, ServerConfig } from '@shared/models/server'
 
 @Component({
   selector: 'my-register',
@@ -34,24 +33,25 @@ export class RegisterComponent implements OnInit {
   formStepUser: FormGroup
   formStepChannel: FormGroup
 
+  private serverConfig: ServerConfig
+
   constructor (
+    private route: ActivatedRoute,
     private authService: AuthService,
-    private userValidatorsService: UserValidatorsService,
     private notifier: Notifier,
     private userService: UserService,
-    private serverService: ServerService,
-    private redirectService: RedirectService,
     private instanceService: InstanceService,
-    private hooks: HooksService,
-    private i18n: I18n
-  ) {
+    private hooks: HooksService
+    ) {
   }
 
   get requiresEmailVerification () {
-    return this.serverService.getConfig().signup.requiresEmailVerification
+    return this.serverConfig.signup.requiresEmailVerification
   }
 
   ngOnInit (): void {
+    this.serverConfig = this.route.snapshot.data.serverConfig
+
     this.instanceService.getAbout()
       .subscribe(
         async about => {
@@ -112,7 +112,7 @@ export class RegisterComponent implements OnInit {
         this.signupDone = true
 
         if (this.requiresEmailVerification) {
-          this.info = this.i18n('Now please check your emails to verify your account and complete signup.')
+          this.info = $localize`Now please check your emails to verify your account and complete signup.`
           return
         }
 
@@ -120,7 +120,7 @@ export class RegisterComponent implements OnInit {
         this.authService.login(body.username, body.password)
             .subscribe(
               () => {
-                this.success = this.i18n('You are now logged in as {{username}}!', { username: body.username })
+                this.success = $localize`You are now logged in as ${body.username}!`
               },
 
               err => this.error = err.message