1 files changed, 52 insertions, 24 deletions

diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index ccae5a151..56d33339e 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -1,17 +1,20 @@
-import { tap } from 'rxjs/operators'
+import { map, share, switchMap, tap } from 'rxjs/operators'
 import { HttpClient } from '@angular/common/http'
-import { Injectable } from '@angular/core'
+import { Inject, Injectable, LOCALE_ID } from '@angular/core'
 import { peertubeLocalStorage } from '@app/shared/misc/peertube-local-storage'
-import { ReplaySubject } from 'rxjs'
+import { Observable, ReplaySubject } from 'rxjs'
 import { ServerConfig } from '../../../../../shared'
 import { About } from '../../../../../shared/models/server/about.model'
 import { environment } from '../../../environments/environment'
 import { VideoConstant, VideoPrivacy } from '../../../../../shared/models/videos'
+import { buildFileLocale, getDefaultLocale } from '../../../../../shared/models/i18n'
+import { peertubeTranslate } from '@app/shared/i18n/i18n-utils'
 
 @Injectable()
 export class ServerService {
   private static BASE_CONFIG_URL = environment.apiUrl + '/api/v1/config/'
   private static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos/'
+  private static BASE_LOCALE_URL = environment.apiUrl + '/client/locales/'
   private static CONFIG_LOCAL_STORAGE_KEY = 'server-config'
 
   configLoaded = new ReplaySubject<boolean>(1)
@@ -19,6 +22,7 @@ export class ServerService {
   videoCategoriesLoaded = new ReplaySubject<boolean>(1)
   videoLicencesLoaded = new ReplaySubject<boolean>(1)
   videoLanguagesLoaded = new ReplaySubject<boolean>(1)
+  localeObservable: Observable<any>
 
   private config: ServerConfig = {
     instance: {
@@ -64,8 +68,12 @@ export class ServerService {
   private videoLanguages: Array<VideoConstant<string>> = []
   private videoPrivacies: Array<VideoConstant<VideoPrivacy>> = []
 
-  constructor (private http: HttpClient) {
+  constructor (
+    private http: HttpClient,
+    @Inject(LOCALE_ID) private localeId: string
+  ) {
     this.loadConfigLocally()
+    this.loadServerLocale()
   }
 
   loadConfig () {
@@ -124,26 +132,46 @@ export class ServerService {
     notifier: ReplaySubject<boolean>,
     sort = false
   ) {
-    return this.http.get(ServerService.BASE_VIDEO_URL + attributeName)
-       .subscribe(data => {
-         Object.keys(data)
-               .forEach(dataKey => {
-                 hashToPopulate.push({
-                   id: dataKey,
-                   label: data[dataKey]
-                 })
-               })
-
-         if (sort === true) {
-           hashToPopulate.sort((a, b) => {
-             if (a.label < b.label) return -1
-             if (a.label === b.label) return 0
-             return 1
-           })
-         }
-
-         notifier.next(true)
-       })
+    this.localeObservable
+        .pipe(
+          switchMap(translations => {
+            return this.http.get(ServerService.BASE_VIDEO_URL + attributeName)
+                       .pipe(map(data => ({ data, translations })))
+          })
+        )
+        .subscribe(({ data, translations }) => {
+          Object.keys(data)
+                .forEach(dataKey => {
+                  const label = data[ dataKey ]
+
+                  hashToPopulate.push({
+                    id: dataKey,
+                    label: peertubeTranslate(label, translations)
+                  })
+                })
+
+          if (sort === true) {
+            hashToPopulate.sort((a, b) => {
+              if (a.label < b.label) return -1
+              if (a.label === b.label) return 0
+              return 1
+            })
+          }
+
+          notifier.next(true)
+        })
+  }
+
+  private loadServerLocale () {
+    const fileLocale = buildFileLocale(environment.production === true ? this.localeId : 'fr')
+
+    // Default locale, nothing to translate
+    const defaultFileLocale = buildFileLocale(getDefaultLocale())
+    if (fileLocale === defaultFileLocale) return {}
+
+    this.localeObservable = this.http
+                                  .get(ServerService.BASE_LOCALE_URL + fileLocale + '/server.json')
+                                  .pipe(share())
   }
 
   private saveConfigLocally (config: ServerConfig) {