Fix hotkey translations

diff --git a/client/src/app/+video-channels/video-channels.component.ts b/client/src/app/+video-channels/video-channels.component.ts
index 82b4a345ee065dd774e0b5748c0165bde3c8dd5a..0c5c814c74d9dbd6065e93b924c1d056bca5ca2f 100644 (file)
--- 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 29b02032f8fdbf3c43b5d0a86f31d4fdfb9284fb..7cd0fff1baf041c4246913ea279b691366c22cb8 100644 (file)
--- 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 8ff5713a11805370047335b1024786c42a7afcf5..9c36b946e3d6bc406894b2565054357082e7d231 100644 (file)
--- 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 7a61e355a6a72d400ca2a50276c9345e7bfc70f2..ea10b22ad021f73e8fa172e16a3e5209bbe2b1fd 100644 (file)
--- 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)
   }