From b1d40cff89f7cff565a98cdbcea9a624196a169a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 4 Jun 2018 16:21:17 +0200 Subject: Add i18n attributes --- client/src/app/core/auth/auth.service.ts | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'client/src/app/core/auth/auth.service.ts') diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts index 614d38d08..363f58155 100644 --- a/client/src/app/core/auth/auth.service.ts +++ b/client/src/app/core/auth/auth.service.ts @@ -1,5 +1,5 @@ import { Observable, ReplaySubject, Subject, throwError as observableThrowError } from 'rxjs' -import { catchError, map, mergeMap, tap, share } from 'rxjs/operators' +import { catchError, map, mergeMap, share, tap } from 'rxjs/operators' import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' import { Router } from '@angular/router' @@ -13,6 +13,7 @@ import { AuthStatus } from './auth-status.model' import { AuthUser } from './auth-user.model' import { objectToUrlEncoded } from '@app/shared/misc/utils' import { peertubeLocalStorage } from '@app/shared/misc/peertube-local-storage' +import { I18n } from '@ngx-translate/i18n-polyfill' interface UserLoginWithUsername extends UserLogin { access_token: string @@ -46,7 +47,8 @@ export class AuthService { private http: HttpClient, private notificationsService: NotificationsService, private restExtractor: RestExtractor, - private router: Router + private router: Router, + private i18n: I18n ) { this.loginChanged = new Subject() this.loginChangedSource = this.loginChanged.asObservable() @@ -74,14 +76,15 @@ export class AuthService { let errorMessage = error.message if (error.status === 403) { - errorMessage = `Cannot retrieve OAuth Client credentials: ${error.text}. \n` - errorMessage += 'Ensure you have correctly configured PeerTube (config/ directory), ' + - 'in particular the "webserver" section.' + errorMessage = this.i18n('Cannot retrieve OAuth Client credentials: {{ errorText }}.\n', { errorText: error.text }) + errorMessage += this.i18n( + 'Ensure you have correctly configured PeerTube (config/ directory), in particular the "webserver" section.' + ) } // We put a bigger timeout // This is an important message - this.notificationsService.error('Error', errorMessage, { timeOut: 7000 }) + this.notificationsService.error(this.i18n('Error'), errorMessage, { timeOut: 7000 }) } ) } @@ -180,7 +183,7 @@ export class AuthService { this.router.navigate([ '/login' ]) return observableThrowError({ - error: 'You need to reconnect.' + error: this.i18n('You need to reconnect.') }) }), share() -- cgit v1.2.3