yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 02:09:37 +02:00
Code Issues Releases Wiki Activity

Little i18n refractoring

Browse source
This commit is contained in:
Chocobozzz 2018-06-06 17:37:13 +02:00
parent 7ce44a74a3
commit 74b7c6d48e
No known key found for this signature in database
GPG key ID: 583A612D890159BE
10 changed files with 81 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

22
server/controllers/client.ts
View file

@ -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) {