From ce426bbd71ef26889bf0bc61afef90c85dce096e Mon Sep 17 00:00:00 2001
From: emanuele-f <faranda@ntop.org>
Date: Tue, 19 Feb 2019 11:01:21 +0100
Subject: [PATCH] Fix language selection issues during first start

Fix #2405
---
 scripts/lua/change_password.lua       | 4 ++--
 scripts/lua/modules/locales_utils.lua | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/lua/change_password.lua b/scripts/lua/change_password.lua
index 292e79084e..acd23b8070 100644
--- a/scripts/lua/change_password.lua
+++ b/scripts/lua/change_password.lua
@@ -108,8 +108,8 @@ print[[
         <span class="input-group-addon"><i class="fa fa-language" aria-hidden="true"></i></span>
         <select name="user_language" id="user_language" class="form-control">]]
 
-for _, lang in pairs(locales_utils.getAvailableLocales()) do
-   print('<option value="'..lang["code"]..'">'..i18n("locales." .. lang["code"])..'</option>')
+for _, lang in ipairs(locales_utils.getAvailableLocales()) do
+   print('<option value="'..lang["code"]..'" ' .. ternary(lang["code"] == "en", "selected", "") .. '>'..i18n("locales." .. lang["code"])..'</option>')
 end
 
 print[[
diff --git a/scripts/lua/modules/locales_utils.lua b/scripts/lua/modules/locales_utils.lua
index f46dd52865..4525516e6f 100644
--- a/scripts/lua/modules/locales_utils.lua
+++ b/scripts/lua/modules/locales_utils.lua
@@ -65,7 +65,8 @@ end
 
 local available_locales = {}
 
-for localename, locale in pairs(supported_locales) do
+-- use pairsByKeys to impose an order
+for localename, locale in pairsByKeys(supported_locales) do
    if lookupLocale(localename) then
       available_locales[#available_locales + 1] = locale
    end