From fa11477ed1f31df8e4ecf7f945ef01074bc2de2f Mon Sep 17 00:00:00 2001
From: Thibaut Broggi <tbr@laquadrature.net>
Date: Tue, 7 Nov 2017 16:03:02 +0100
Subject: [PATCH] Fix language choice for server-side generation

---
 srv.js          | 2 +-
 views/index.pug | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srv.js b/srv.js
index 4207f71..6719c8a 100755
--- a/srv.js
+++ b/srv.js
@@ -14,7 +14,7 @@ app.set('view engine', 'pug');
 app.use(express.static('./static'));
 
 app.use(function(req, res, next) {
-  let locale = req.query.lang || req.headers['accept-language'] || '';
+  let locale = req.query.changeLang || req.query.lang || req.headers['accept-language'] || '';
   req.i18n = new i18n();
   if (locale.indexOf('en') !== -1
       && locale.indexOf('fr') !== -1)
diff --git a/views/index.pug b/views/index.pug
index 09b5acd..2d97f7c 100644
--- a/views/index.pug
+++ b/views/index.pug
@@ -22,6 +22,7 @@ html(lang=locale)
       =_('Soutenez La Quadrature du Net !')
   body
     form(action="./generate.png" target="_blank")
+      input(type="hidden" name="lang" value=locale)
       nav
         a
           img(src="./imgs/logo_lqdn.svg" alt="LQDN")
@@ -106,9 +107,9 @@ html(lang=locale)
               =_('GÉNÉRER')
       main
         div#langPicker
-          button(type="submit" name="lang" value="fr" formaction="" formtarget="_self")#frButton
+          button(type="submit" name="changeLang" value="fr" formaction="" formtarget="_self")#frButton
             =_('Français')
-          button(type="submit" name="lang" value="en" formaction="" formtarget="_self")#enButton
+          button(type="submit" name="changeLang" value="en" formaction="" formtarget="_self")#enButton
             =_('Anglais')
         div
           noscript
-- 
GitLab