X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Fserver%2Fserver.service.ts;h=6323a7edf9b65e552a69e6b34b369048ea1655a8;hb=bbe0f0645ca958d33a3f409b15166609733b663f;hp=a8beb242dc48dcb6fc819c3a0d4068763926e704;hpb=0db1a226507a39b0a663e3e63f04851836a44d5a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index a8beb242d..6323a7edf 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -1,16 +1,20 @@
+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 'rxjs/add/operator/do'
-import { ReplaySubject } from 'rxjs/ReplaySubject'
-import { ServerConfig } from '../../../../../shared'
+import { Observable, ReplaySubject, of } from 'rxjs'
+import { getCompleteLocale, ServerConfig } from '../../../../../shared'
 import { About } from '../../../../../shared/models/server/about.model'
 import { environment } from '../../../environments/environment'
+import { VideoConstant, VideoPrivacy } from '../../../../../shared/models/videos'
+import { isDefaultLocale } from '../../../../../shared/models/i18n'
+import { getDevLocale, isOnDevLocale, 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)
@@ -18,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: {
@@ -33,7 +38,8 @@ export class ServerService {
     },
     serverVersion: 'Unknown',
     signup: {
-      allowed: false
+      allowed: false,
+      allowedForCurrentIP: false
     },
     transcoding: {
       enabledResolutions: []
@@ -57,23 +63,27 @@ export class ServerService {
       videoQuota: -1
     }
   }
-  private videoCategories: Array<{ id: number, label: string }> = []
-  private videoLicences: Array<{ id: number, label: string }> = []
-  private videoLanguages: Array<{ id: number, label: string }> = []
-  private videoPrivacies: Array<{ id: number, label: string }> = []
+  private videoCategories: Array<VideoConstant<number>> = []
+  private videoLicences: Array<VideoConstant<number>> = []
+  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.loadServerLocale()
     this.loadConfigLocally()
   }
 
   loadConfig () {
     this.http.get<ServerConfig>(ServerService.BASE_CONFIG_URL)
-      .do(this.saveConfigLocally)
-      .subscribe(data => {
-        this.config = data
+        .pipe(tap(this.saveConfigLocally))
+        .subscribe(data => {
+          this.config = data
 
-        this.configLoaded.next(true)
-      })
+          this.configLoaded.next(true)
+        })
   }
 
   loadVideoCategories () {
@@ -118,30 +128,53 @@ export class ServerService {
 
   private loadVideoAttributeEnum (
     attributeName: 'categories' | 'licences' | 'languages' | 'privacies',
-    hashToPopulate: { id: number, label: string }[],
+    hashToPopulate: VideoConstant<number | string>[],
     notifier: ReplaySubject<boolean>,
     sort = false
   ) {
-    return this.http.get(ServerService.BASE_VIDEO_URL + attributeName)
-       .subscribe(data => {
-         Object.keys(data)
-               .forEach(dataKey => {
-                 hashToPopulate.push({
-                   id: parseInt(dataKey, 10),
-                   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)
+                .map(dataKey => parseInt(dataKey, 10))
+                .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 completeLocale = isOnDevLocale() ? getDevLocale() : getCompleteLocale(this.localeId)
+
+    // Default locale, nothing to translate
+    if (isDefaultLocale(completeLocale)) {
+      this.localeObservable = of({}).pipe(share())
+      return
+    }
+
+    this.localeObservable = this.http
+                                  .get(ServerService.BASE_LOCALE_URL + completeLocale + '/server.json')
+                                  .pipe(share())
   }
 
   private saveConfigLocally (config: ServerConfig) {