2 files changed, 24 insertions, 17 deletions

diff --git a/client/src/app/signup/signup.component.html b/client/src/app/signup/signup.component.html
index 5f48786e5..2fe9a4281 100644
--- a/client/src/app/signup/signup.component.html
+++ b/client/src/app/signup/signup.component.html
@@ -1,11 +1,11 @@
 <div class="margin-content">
 
-  <div class="title-page title-page-single">
+  <div i18n class="title-page title-page-single">
     Create an account
   </div>
 
   <div class="initial-user-quota">
-    <span class="initial-user-quota-label">Initial video quota:</span>
+    <span i18n class="initial-user-quota-label">Initial video quota:</span>
 
     <span *ngIf="initialUserVideoQuota !== -1">
       {{ initialUserVideoQuota | bytes: 0 }}
@@ -13,18 +13,18 @@
       <my-help helpType="custom" [customHtml]="quotaHelpIndication"></my-help>
     </span>
 
-    <ng-template [ngIf]="initialUserVideoQuota === -1">
+    <ng-container i18n *ngIf="initialUserVideoQuota === -1">
       Unlimited
-    </ng-template>
+    </ng-container>
   </div>
 
   <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
 
   <form role="form" (ngSubmit)="signup()" [formGroup]="form">
     <div class="form-group">
-      <label for="username">Username</label>
+      <label for="username" i18n>Username</label>
       <input
-        type="text" id="username" placeholder="Username"
+        type="text" id="username" i18n-placeholder placeholder="Username"
         formControlName="username" [ngClass]="{ 'input-error': formErrors['username'] }"
       >
       <div *ngIf="formErrors.username" class="form-error">
@@ -33,9 +33,9 @@
     </div>
 
     <div class="form-group">
-      <label for="email">Email</label>
+      <label for="email" i18n>Email</label>
       <input
-        type="text" id="email" placeholder="Email"
+        type="text" id="email" i18n-placeholder placeholder="Email"
         formControlName="email" [ngClass]="{ 'input-error': formErrors['email'] }"
       >
       <div *ngIf="formErrors.email" class="form-error">
@@ -44,9 +44,9 @@
     </div>
 
     <div class="form-group">
-      <label for="password">Password</label>
+      <label for="password" i18n>Password</label>
       <input
-        type="password" id="password" placeholder="Password"
+        type="password" id="password" i18n-placeholder placeholder="Password"
         formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }"
       >
       <div *ngIf="formErrors.password" class="form-error">
@@ -54,7 +54,7 @@
       </div>
     </div>
 
-    <input type="submit" value="Signup" [disabled]="!form.valid">
+    <input type="submit" i18n-value value="Signup" [disabled]="!form.valid">
   </form>
 
 </div>
diff --git a/client/src/app/signup/signup.component.ts b/client/src/app/signup/signup.component.ts
index 1f3e2e146..4a49ead50 100644
--- a/client/src/app/signup/signup.component.ts
+++ b/client/src/app/signup/signup.component.ts
@@ -6,6 +6,8 @@ import { ServerService } from '@app/core/server'
 import { NotificationsService } from 'angular2-notifications'
 import { UserCreate } from '../../../../shared'
 import { FormReactive, USER_EMAIL, USER_PASSWORD, USER_USERNAME, UserService } from '../shared'
+import { RedirectService } from '@app/core'
+import { I18n } from '@ngx-translate/i18n-polyfill'
 
 @Component({
   selector: 'my-signup',
@@ -45,7 +47,9 @@ export class SignupComponent extends FormReactive implements OnInit {
     private router: Router,
     private notificationsService: NotificationsService,
     private userService: UserService,
-    private serverService: ServerService
+    private redirectService: RedirectService,
+    private serverService: ServerService,
+    private i18n: I18n
   ) {
     super()
   }
@@ -78,8 +82,11 @@ export class SignupComponent extends FormReactive implements OnInit {
 
     this.userService.signup(userCreate).subscribe(
       () => {
-        this.notificationsService.success('Success', `Registration for ${userCreate.username} complete.`)
-        this.router.navigate([ '/videos/list' ])
+        this.notificationsService.success(
+          this.i18n('Success'),
+          this.i18n('Registration for {{ username }} complete.', { username: userCreate.username})
+        )
+        this.redirectService.redirectToHomepage()
       },
 
       err => this.error = err.message
@@ -99,9 +106,9 @@ export class SignupComponent extends FormReactive implements OnInit {
     const normalSeconds = initialUserVideoQuotaBit / (1.5 * 1000 * 1000)
 
     const lines = [
-      SignupComponent.getApproximateTime(fullHdSeconds) + ' of full HD videos',
-      SignupComponent.getApproximateTime(hdSeconds) + ' of HD videos',
-      SignupComponent.getApproximateTime(normalSeconds) + ' of average quality videos'
+      this.i18n('{{ seconds }} of full HD videos', { seconds: SignupComponent.getApproximateTime(fullHdSeconds) }),
+      this.i18n('{{ seconds }} of HD videos', { seconds: SignupComponent.getApproximateTime(hdSeconds) }),
+      this.i18n('{{ seconds }} of average quality videos', { seconds: SignupComponent.getApproximateTime(normalSeconds) })
     ]
 
     this.quotaHelpIndication = lines.join('<br />')