From 7ec3be640b1a53e5334ad91309a52b8c65fcb52f Mon Sep 17 00:00:00 2001 From: Luke Williams Date: Sun, 19 Apr 2020 19:56:16 +0200 Subject: [PATCH] specialpages: do not set a language cookie if the browser did not send one In this way, if the browser sends a list of preferred languages via Accept-Language HTTP header, Etherpad will honor that. Before this change, Etherpad always forced on the user the language from padOptions.lang in settings.json. This reverts a feature that was introduced in 295672f5987f. --- src/node/hooks/express/specialpages.js | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/node/hooks/express/specialpages.js b/src/node/hooks/express/specialpages.js index 035074e02..2ca1384bb 100644 --- a/src/node/hooks/express/specialpages.js +++ b/src/node/hooks/express/specialpages.js @@ -41,30 +41,6 @@ exports.expressCreateServer = function (hook_name, args, cb) { //serve pad.html under /p args.app.get('/p/:pad', function(req, res, next) { - // Set language for pad editor for the first time - // Or if language cookie doesn't exist - if (req.cookies.language === undefined) - { - cookieOptions = { - /* req.protocol may be 'https' because either: - * - * 1. we are directly serving the nodejs application over SSL, using - * the "ssl" options in settings.json - * - * 2. we are serving the nodejs application in plaintext, but we are - * using a reverse proxy that terminates SSL for us. In this case, - * the user has to set trustProxy = true in settings.json, and thus - * req.protocol will reflect the value of the X-Forwarded-Proto HTTP - * header - * - * Please note that this will not be compatible with applications being - * served over http and https at the same time. - */ - secure: (req.protocol === 'https'), - } - res.cookie('language', settings.padOptions.lang, cookieOptions); - } - // The below might break for pads being rewritten var isReadOnly = req.url.indexOf("/p/r.") === 0;