From 74b7c6d48e9ca377fe938c8134ed74b612e62ba0 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 6 Jun 2018 17:37:13 +0200
Subject: Little i18n refractoring

---
 server/controllers/client.ts | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'server')

diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index ec78a4bbc..385757fa6 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -3,18 +3,12 @@ import * as express from 'express'
 import { join } from 'path'
 import * as validator from 'validator'
 import { escapeHTML, readFileBufferPromise, root } from '../helpers/core-utils'
-import {
-  ACCEPT_HEADERS,
-  CONFIG,
-  EMBED_SIZE,
-  OPENGRAPH_AND_OEMBED_COMMENT,
-  STATIC_MAX_AGE,
-  STATIC_PATHS
-} from '../initializers'
+import { ACCEPT_HEADERS, CONFIG, EMBED_SIZE, OPENGRAPH_AND_OEMBED_COMMENT, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers'
 import { asyncMiddleware } from '../middlewares'
 import { VideoModel } from '../models/video/video'
 import { VideoPrivacy } from '../../shared/models/videos'
-import { I18N_LOCALES, is18nLocale, getDefaultLocale } from '../../shared/models'
+import { buildFileLocale, getCompleteLocale, getDefaultLocale, is18nLocale } from '../../shared/models'
+import { LOCALE_FILES } from '../../shared/models/i18n/i18n'
 
 const clientsRouter = express.Router()
 
@@ -51,8 +45,10 @@ clientsRouter.use('/client/locales/:locale/:file.json', function (req, res) {
   const locale = req.params.locale
   const file = req.params.file
 
-  if (is18nLocale(locale) && [ 'player', 'server' ].indexOf(file) !== -1) {
-    return res.sendFile(join(__dirname, `../../../client/dist/locale/${file}_${locale}.json`))
+  if (is18nLocale(locale) && LOCALE_FILES.indexOf(file) !== -1) {
+    const completeLocale = getCompleteLocale(locale)
+    const completeFileLocale = buildFileLocale(completeLocale)
+    return res.sendFile(join(__dirname, `../../../client/dist/locale/${file}_${completeFileLocale}.json`))
   }
 
   return res.sendStatus(404)
@@ -88,12 +84,12 @@ function getIndexPath (req: express.Request, paramLang?: string) {
   if (paramLang && is18nLocale(paramLang)) {
     lang = paramLang
   } else {
-    // lang = req.acceptsLanguages(Object.keys(I18N_LOCALES)) || getDefaultLocale()
+    // lang = req.acceptsLanguages(POSSIBLE_LOCALES) || getDefaultLocale()
     // Disable auto language for now
     lang = getDefaultLocale()
   }
 
-  return join(__dirname, '../../../client/dist/' + lang + '/index.html')
+  return join(__dirname, '../../../client/dist/' + buildFileLocale(lang) + '/index.html')
 }
 
 function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoModel) {
-- 
cgit v1.2.3