Fix language selection broken after po file merges

diff --git a/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua b/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
index 75c42c0..e3d7d41 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
@@ -28,7 +28,7 @@ c = m:section(NamedSection, "main", "core", translate("General"))
 l = c:option(ListValue, "lang", translate("Language"))
 l:value("auto")
 
 l = c:option(ListValue, "lang", translate("Language"))
 l:value("auto")
 

-local i18ndir = luci.i18n.i18ndir .. "default."
+local i18ndir = luci.i18n.i18ndir .. "base."

 for k, v in luci.util.kspairs(luci.config.languages) do
        local file = i18ndir .. k:gsub("_", "-")
        if k:sub(1, 1) ~= "." and fs.access(file .. ".lmo") then
 for k, v in luci.util.kspairs(luci.config.languages) do
        local file = i18ndir .. k:gsub("_", "-")
        if k:sub(1, 1) ~= "." and fs.access(file .. ".lmo") then

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/luci.lua b/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
index 58755fd..78255c1 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
@@ -30,7 +30,7 @@ c = m:section(NamedSection, "main", "core", translate("General"))
 l = c:option(ListValue, "lang", translate("Language"))
 l:value("auto")
 
 l = c:option(ListValue, "lang", translate("Language"))
 l:value("auto")
 

-local i18ndir = luci.i18n.i18ndir .. "default."
+local i18ndir = luci.i18n.i18ndir .. "base."

 for k, v in luci.util.kspairs(luci.config.languages) do
        local file = i18ndir .. k:gsub("_", "-")
        if k:sub(1, 1) ~= "." and fs.access(file .. ".lmo") then
 for k, v in luci.util.kspairs(luci.config.languages) do
        local file = i18ndir .. k:gsub("_", "-")
        if k:sub(1, 1) ~= "." and fs.access(file .. ".lmo") then