X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fclient.ts;h=e4643e1711dc68a92b9b2c9158e2ca74536ebf00;hb=a30a136c9896c656cab98d2c92cde32c534dc098;hp=51f610afaa001877511db0949a18c9e2f54a67ac;hpb=cd4cb177e6e35f69832304366c6f9df96600fb9e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/client.ts b/server/controllers/client.ts index 51f610afa..e4643e171 100644 --- a/server/controllers/client.ts +++ b/server/controllers/client.ts @@ -1,8 +1,8 @@ import * as express from 'express' import { join } from 'path' import { root } from '../helpers/core-utils' -import { ACCEPT_HEADERS, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers/constants' -import { asyncMiddleware, embedCSP } from '../middlewares' +import { ACCEPT_HEADERS, STATIC_MAX_AGE } from '../initializers/constants' +import { asyncMiddleware } from '../middlewares' import { buildFileLocale, getCompleteLocale, is18nLocale, LOCALE_FILES } from '../../shared/models/i18n/i18n' import { ClientHtml } from '../lib/client-html' import { logger } from '../helpers/logger' @@ -21,7 +21,6 @@ clientsRouter.use('/video-channels/:nameWithHost', asyncMiddleware(generateVideo clientsRouter.use( '/videos/embed', - embedCSP, (req: express.Request, res: express.Response) => { res.removeHeader('X-Frame-Options') res.sendFile(embedPath) @@ -67,7 +66,7 @@ export { // --------------------------------------------------------------------------- -async function serveServerTranslations (req: express.Request, res: express.Response) { +function serveServerTranslations (req: express.Request, res: express.Response) { const locale = req.params.locale const file = req.params.file @@ -75,7 +74,7 @@ async function serveServerTranslations (req: express.Request, res: express.Respo const completeLocale = getCompleteLocale(locale) const completeFileLocale = buildFileLocale(completeLocale) - const path = join(__dirname, `../../../client/dist/locale/${file}_${completeFileLocale}.json`) + const path = join(__dirname, `../../../client/dist/locale/${file}.${completeFileLocale}.json`) return res.sendFile(path, { maxAge: STATIC_MAX_AGE.SERVER }) }