Add header Vary Accept-Language (#4588)

* nginx: add header Vary Accept-Language

solves #3647

* Revert "nginx: add header Vary Accept-Language"

This reverts commit 90dccf53247882ad30904e4c950b745c4e859e01.

* add resp header Vary Accept-Language

solves #3647

* don't add vary header to embed page

diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index 703166c0107107004cb7e783eee322389c622182..2157ae533d74961a4b897e297125042b2bf455b6 100644 (file)
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -138,31 +138,31 @@ async function generateEmbedHtmlPage (req: express.Request, res: express.Respons
 async function generateWatchHtmlPage (req: express.Request, res: express.Response) {
   const html = await ClientHtml.getWatchHTMLPage(req.params.id + '', req, res)
 
-  return sendHTML(html, res)
+  return sendHTML(html, res, true)
 }
 
 async function generateWatchPlaylistHtmlPage (req: express.Request, res: express.Response) {
   const html = await ClientHtml.getWatchPlaylistHTMLPage(req.params.id + '', req, res)
 
-  return sendHTML(html, res)
+  return sendHTML(html, res, true)
 }
 
 async function generateAccountHtmlPage (req: express.Request, res: express.Response) {
   const html = await ClientHtml.getAccountHTMLPage(req.params.nameWithHost, req, res)
 
-  return sendHTML(html, res)
+  return sendHTML(html, res, true)
 }
 
 async function generateVideoChannelHtmlPage (req: express.Request, res: express.Response) {
   const html = await ClientHtml.getVideoChannelHTMLPage(req.params.nameWithHost, req, res)
 
-  return sendHTML(html, res)
+  return sendHTML(html, res, true)
 }
 
 async function generateActorHtmlPage (req: express.Request, res: express.Response) {
   const html = await ClientHtml.getActorHTMLPage(req.params.nameWithHost, req, res)
 
-  return sendHTML(html, res)
+  return sendHTML(html, res, true)
 }
 
 async function generateManifest (req: express.Request, res: express.Response) {

diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts
index b2948254ba44792b612edec6afb2b3c81697a92b..360b4667f586bf36e9955ec184da60788b0199ca 100644 (file)
--- a/server/lib/client-html.ts
+++ b/server/lib/client-html.ts
@@ -555,9 +555,13 @@ class ClientHtml {
   }
 }
 
-function sendHTML (html: string, res: express.Response) {
+function sendHTML (html: string, res: express.Response, localizedHTML: boolean = false) {
   res.set('Content-Type', 'text/html; charset=UTF-8')
 
+  if (localizedHTML) {
+    res.set('Vary', 'Accept-Language')
+  }
+
   return res.send(html)
 }
 
@@ -586,5 +590,5 @@ export {
 async function generateHTMLPage (req: express.Request, res: express.Response, paramLang?: string) {
   const html = await ClientHtml.getDefaultHTMLPage(req, res, paramLang)
 
-  return sendHTML(html, res)
+  return sendHTML(html, res, true)
 }