X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fassets%2Fplayer%2Fpeertube-player.ts;h=7e53d2142f9fb639c7148d821745b461ec1a86f4;hb=5d128505dca854cb7225624936d1053f06473260;hp=1fca6a7d2c38e0039d23aa1795eb435ac565cbca;hpb=1f6824c958440ace14f7c7f83c890b848a71f5d9;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/assets/player/peertube-player.ts b/client/src/assets/player/peertube-player.ts
index 1fca6a7d2..7e53d2142 100644
--- a/client/src/assets/player/peertube-player.ts
+++ b/client/src/assets/player/peertube-player.ts
@@ -35,6 +35,7 @@ function getVideojsOptions (options: {
   startTime: number | string
   theaterMode: boolean,
   videoCaptions: VideoJSCaption[],
+  language?: string,
   controls?: boolean,
   muted?: boolean,
   loop?: boolean
@@ -74,6 +75,10 @@ function getVideojsOptions (options: {
     })
   }
 
+  if (options.language && !isDefaultLocale(options.language)) {
+    Object.assign(videojsOptions, { language: options.language })
+  }
+
   return videojsOptions
 }
 
@@ -174,18 +179,55 @@ function addContextMenu (player: any, videoEmbedUrl: string) {
   })
 }
 
-function loadLocale (serverUrl: string, videojs: any, locale: string) {
+function loadLocaleInVideoJS (serverUrl: string, videojs: any, locale: string) {
+  const path = getLocalePath(serverUrl, locale)
+  // It is the default locale, nothing to translate
+  if (!path) return Promise.resolve(undefined)
+
+  let p: Promise<any>
+
+  if (loadLocaleInVideoJS.cache[path]) {
+    p = Promise.resolve(loadLocaleInVideoJS.cache[path])
+  } else {
+    p = fetch(path + '/player.json')
+      .then(res => res.json())
+      .then(json => {
+        loadLocaleInVideoJS.cache[path] = json
+        return json
+      })
+  }
+
   const completeLocale = getCompleteLocale(locale)
+  return p.then(json => videojs.addLanguage(getShortLocale(completeLocale), json))
+}
+namespace loadLocaleInVideoJS {
+  export const cache: { [ path: string ]: any } = {}
+}
 
-  if (!is18nLocale(completeLocale) || isDefaultLocale(completeLocale)) return Promise.resolve(undefined)
+function getServerTranslations (serverUrl: string, locale: string) {
+  const path = getLocalePath(serverUrl, locale)
+  // It is the default locale, nothing to translate
+  if (!path) return Promise.resolve(undefined)
 
-  return fetch(serverUrl + '/client/locales/' + completeLocale + '/player.json')
+  return fetch(path + '/server.json')
     .then(res => res.json())
-    .then(json => videojs.addLanguage(getShortLocale(completeLocale), json))
 }
 
+// ############################################################################
+
 export {
-  loadLocale,
+  getServerTranslations,
+  loadLocaleInVideoJS,
   getVideojsOptions,
   addContextMenu
 }
+
+// ############################################################################
+
+function getLocalePath (serverUrl: string, locale: string) {
+  const completeLocale = getCompleteLocale(locale)
+
+  if (!is18nLocale(completeLocale) || isDefaultLocale(completeLocale)) return undefined
+
+  return serverUrl + '/client/locales/' + completeLocale
+}