From e33f888b86734f7e050a5e3d6f73f852b6de955a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 3 Oct 2018 10:11:26 +0200 Subject: Fix hotkey translations --- .../app/+video-channels/video-channels.component.ts | 4 +++- client/src/app/app.component.ts | 18 ++++++++++-------- client/src/app/core/auth/auth.service.ts | 8 ++++---- .../app/videos/+video-watch/video-watch.component.ts | 6 +++--- 4 files changed, 20 insertions(+), 16 deletions(-) (limited to 'client') diff --git a/client/src/app/+video-channels/video-channels.component.ts b/client/src/app/+video-channels/video-channels.component.ts index 82b4a345e..0c5c814c7 100644 --- a/client/src/app/+video-channels/video-channels.component.ts +++ b/client/src/app/+video-channels/video-channels.component.ts @@ -8,6 +8,7 @@ import { Subscription } from 'rxjs' import { AuthService } from '@app/core' import { Hotkey, HotkeysService } from 'angular2-hotkeys' import { SubscribeButtonComponent } from '@app/shared/user-subscription/subscribe-button.component' +import { I18n } from '@ngx-translate/i18n-polyfill' @Component({ templateUrl: './video-channels.component.html', @@ -22,6 +23,7 @@ export class VideoChannelsComponent implements OnInit, OnDestroy { private routeSub: Subscription constructor ( + private i18n: I18n, private route: ActivatedRoute, private authService: AuthService, private videoChannelService: VideoChannelService, @@ -45,7 +47,7 @@ export class VideoChannelsComponent implements OnInit, OnDestroy { this.subscribeButton.unsubscribe() : this.subscribeButton.subscribe() return false - }, undefined, 'Subscribe to the account') + }, undefined, this.i18n('Subscribe to the account')) ] if (this.isUserLoggedIn()) this.hotkeysService.add(this.hotkeys) } diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts index 29b02032f..7cd0fff1b 100644 --- a/client/src/app/app.component.ts +++ b/client/src/app/app.component.ts @@ -6,6 +6,7 @@ import { is18nPath } from '../../../shared/models/i18n' import { ScreenService } from '@app/shared/misc/screen.service' import { skip } from 'rxjs/operators' import { HotkeysService, Hotkey } from 'angular2-hotkeys' +import { I18n } from '@ngx-translate/i18n-polyfill' @Component({ selector: 'my-app', @@ -31,6 +32,7 @@ export class AppComponent implements OnInit { customCSS: SafeHtml constructor ( + private i18n: I18n, private router: Router, private authService: AuthService, private serverService: ServerService, @@ -133,35 +135,35 @@ export class AppComponent implements OnInit { new Hotkey(['/', 's'], (event: KeyboardEvent): boolean => { document.getElementById('search-video').focus() return false - }, undefined, 'Focus the search bar'), + }, undefined, this.i18n('Focus the search bar')), new Hotkey('b', (event: KeyboardEvent): boolean => { this.toggleMenu() return false - }, undefined, 'Toggle the left menu'), + }, undefined, this.i18n('Toggle the left menu')), new Hotkey('g o', (event: KeyboardEvent): boolean => { this.router.navigate([ '/videos/overview' ]) return false - }, undefined, 'Go to the videos overview page'), + }, undefined, this.i18n('Go to the videos overview page')), new Hotkey('g t', (event: KeyboardEvent): boolean => { this.router.navigate([ '/videos/trending' ]) return false - }, undefined, 'Go to the trending videos page'), + }, undefined, this.i18n('Go to the trending videos page')), new Hotkey('g r', (event: KeyboardEvent): boolean => { this.router.navigate([ '/videos/recently-added' ]) return false - }, undefined, 'Go to the recently added videos page'), + }, undefined, this.i18n('Go to the recently added videos page')), new Hotkey('g l', (event: KeyboardEvent): boolean => { this.router.navigate([ '/videos/local' ]) return false - }, undefined, 'Go to the local videos page'), + }, undefined, this.i18n('Go to the local videos page')), new Hotkey('g u', (event: KeyboardEvent): boolean => { this.router.navigate([ '/videos/upload' ]) return false - }, undefined, 'Go to the videos upload page'), + }, undefined, this.i18n('Go to the videos upload page')), new Hotkey('shift+t', (event: KeyboardEvent): boolean => { this.themeService.toggleDarkTheme() return false - }, undefined, 'Toggle Dark theme') + }, undefined, this.i18n('Toggle Dark theme')) ]) } diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts index 8ff5713a1..9c36b946e 100644 --- a/client/src/app/core/auth/auth.service.ts +++ b/client/src/app/core/auth/auth.service.ts @@ -65,19 +65,19 @@ export class AuthService { new Hotkey('m s', (event: KeyboardEvent): boolean => { this.router.navigate([ '/videos/subscriptions' ]) return false - }, undefined, 'Go to my subscriptions'), + }, undefined, this.i18n('Go to my subscriptions')), new Hotkey('m v', (event: KeyboardEvent): boolean => { this.router.navigate([ '/my-account/videos' ]) return false - }, undefined, 'Go to my videos'), + }, undefined, this.i18n('Go to my videos')), new Hotkey('m i', (event: KeyboardEvent): boolean => { this.router.navigate([ '/my-account/video-imports' ]) return false - }, undefined, 'Go to my imports'), + }, undefined, this.i18n('Go to my imports')), new Hotkey('m c', (event: KeyboardEvent): boolean => { this.router.navigate([ '/my-account/video-channels' ]) return false - }, undefined, 'Go to my channels') + }, undefined, this.i18n('Go to my channels')) ] } diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts index 7a61e355a..ea10b22ad 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts @@ -125,17 +125,17 @@ export class VideoWatchComponent implements OnInit, OnDestroy { new Hotkey('shift+l', (event: KeyboardEvent): boolean => { this.setLike() return false - }, undefined, 'Like the video'), + }, undefined, this.i18n('Like the video')), new Hotkey('shift+d', (event: KeyboardEvent): boolean => { this.setDislike() return false - }, undefined, 'Dislike the video'), + }, undefined, this.i18n('Dislike the video')), new Hotkey('shift+s', (event: KeyboardEvent): boolean => { this.subscribeButton.subscribed ? this.subscribeButton.unsubscribe() : this.subscribeButton.subscribe() return false - }, undefined, 'Subscribe to the account') + }, undefined, this.i18n('Subscribe to the account')) ] if (this.isUserLoggedIn()) this.hotkeysService.add(this.hotkeys) } -- cgit v1.2.3