From 27fd0a88f6bb0158db6984d05ee11d0b833702bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 4 Sep 2017 10:16:19 +0200
Subject: [PATCH] Include language parameter when loading js messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This forces reloading javscript messages when changing language.

Fixes #13633

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog            | 1 +
 libraries/Header.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 154c9a1777..ee58b11b30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog
 - issue #13612 Integrate tooltip into datetime pickers
 - issue #13628 Fixed javascript error in server monitor
 - issue #13444 Fixed server monitor on non Linux and Windows systems
+- issue #13633 Reload javscript messages when changing language
 
 4.7.4 (2017-08-23)
 - issue #13415 Remove shadow from the logo
diff --git a/libraries/Header.php b/libraries/Header.php
index 5fa9b3ec9e..d85b84606c 100644
--- a/libraries/Header.php
+++ b/libraries/Header.php
@@ -177,7 +177,7 @@ class Header
         // Here would not be a good place to add CodeMirror because
         // the user preferences have not been merged at this point
 
-        $this->_scripts->addFile('messages.php');
+        $this->_scripts->addFile('messages.php', false, array('l' => $GLOBALS['lang']));
         // Append the theme id to this url to invalidate
         // the cache on a theme change. Though this might be
         // unavailable for fatal errors.