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

Add ability to choose the language

Browse source
This commit is contained in:
Chocobozzz 2018-06-28 13:59:48 +02:00
parent 3ea9a1c311
commit 8afc19a612
No known key found for this signature in database
GPG key ID: 583A612D890159BE
17 changed files with 239 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

37
server/controllers/client.ts
View file

@ -7,8 +7,14 @@ import { ACCEPT_HEADERS, CONFIG, EMBED_SIZE, OPENGRAPH_AND_OEMBED_COMMENT, STATI
import { asyncMiddleware } from '../middlewares'
import { VideoModel } from '../models/video/video'
import { VideoPrivacy } from '../../shared/models/videos'
import { buildFileLocale, getCompleteLocale, getDefaultLocale, is18nLocale } from '../../shared/models'
import { LOCALE_FILES } from '../../shared/models/i18n/i18n'
import {
buildFileLocale,
getCompleteLocale,
getDefaultLocale,
is18nLocale,
LOCALE_FILES,
POSSIBLE_LOCALES
} from '../../shared/models/i18n/i18n'
const clientsRouter = express.Router()
@ -22,7 +28,8 @@ clientsRouter.use('/videos/watch/:id',
asyncMiddleware(generateWatchHtmlPage)
)
clientsRouter.use('/videos/embed', (req: express.Request, res: express.Response, next: express.NextFunction) => {
clientsRouter.use('' +
'/videos/embed', (req: express.Request, res: express.Response, next: express.NextFunction) => {
res.sendFile(embedPath)
})
@ -63,7 +70,7 @@ clientsRouter.use('/client/*', (req: express.Request, res: express.Response, nex
// Try to provide the right language index.html
clientsRouter.use('/(:language)?', function (req, res) {
if (req.accepts(ACCEPT_HEADERS) === 'html') {
return res.sendFile(getIndexPath(req, req.params.language))
return res.sendFile(getIndexPath(req, res, req.params.language))
}
return res.status(404).end()
@ -77,16 +84,24 @@ export {
// ---------------------------------------------------------------------------
function getIndexPath (req: express.Request, paramLang?: string) {
function getIndexPath (req: express.Request, res: express.Response, paramLang?: string) {
let lang: string
// Check param lang validity
if (paramLang && is18nLocale(paramLang)) {
lang = paramLang
// Save locale in cookies
res.cookie('clientLanguage', lang, {
secure: CONFIG.WEBSERVER.SCHEME === 'https',
sameSite: true,
maxAge: 1000 * 3600 * 24 * 90 // 3 months
})
} else if (req.cookies.clientLanguage && is18nLocale(req.cookies.clientLanguage)) {
lang = req.cookies.clientLanguage
} else {
// lang = req.acceptsLanguages(POSSIBLE_LOCALES) || getDefaultLocale()
// Disable auto language for now
lang = getDefaultLocale()
lang = req.acceptsLanguages(POSSIBLE_LOCALES) || getDefaultLocale()
}
return join(__dirname, '../../../client/dist/' + buildFileLocale(lang) + '/index.html')
@ -181,18 +196,18 @@ async function generateWatchHtmlPage (req: express.Request, res: express.Respons
} else if (validator.isInt(videoId)) {
videoPromise = VideoModel.loadAndPopulateAccountAndServerAndTags(+videoId)
} else {
return res.sendFile(getIndexPath(req))
return res.sendFile(getIndexPath(req, res))
}
let [ file, video ] = await Promise.all([
readFileBufferPromise(getIndexPath(req)),
readFileBufferPromise(getIndexPath(req, res)),
videoPromise
])
const html = file.toString()
// Let Angular application handle errors
if (!video || video.privacy === VideoPrivacy.PRIVATE) return res.sendFile(getIndexPath(req))
if (!video || video.privacy === VideoPrivacy.PRIVATE) return res.sendFile(getIndexPath(req, res))
const htmlStringPageWithTags = addOpenGraphAndOEmbedTags(html, video)
res.set('Content-Type', 'text/html; charset=UTF-8').send(htmlStringPageWithTags)