diff options
Diffstat (limited to 'modules')
5 files changed, 17 insertions, 12 deletions
diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index baa7ab8534..e1ec57ffee 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -42,13 +42,13 @@ msgid "-- match by label --" msgstr "" msgid "1 Minute Load:" -msgstr "Obciążenie w ciągu 1 minuty:" +msgstr "Obciążenie 1 min.:" msgid "15 Minute Load:" -msgstr "Obciążenie w ciągu 15 minut:" +msgstr "Obciążenie 15 min.:" msgid "5 Minute Load:" -msgstr "Obciążenie w ciągu 5 minut:" +msgstr "Obciążenie 5 min.:" msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>" msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>" @@ -1838,7 +1838,7 @@ msgid "Out" msgstr "Wychodzące" msgid "Outbound:" -msgstr "Wychodzące:" +msgstr "Wychodzący:" msgid "Outdoor Channels" msgstr "Kanały zewnętrzne" diff --git a/modules/luci-base/root/etc/config/luci b/modules/luci-base/root/etc/config/luci index c503a8f1e0..baa3ac5d1e 100644 --- a/modules/luci-base/root/etc/config/luci +++ b/modules/luci-base/root/etc/config/luci @@ -1,6 +1,6 @@ config core main option lang auto - option mediaurlbase /luci-static/openwrt.org + option mediaurlbase /luci-static/bootstrap option resourcebase /luci-static/resources config extern flash_keep diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua index b01b5dbb3e..7c6d7e1c66 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua @@ -11,6 +11,7 @@ f = SimpleForm("ipkgconf", translate("OPKG-Configuration"), translate("General o f:append(Template("admin_system/ipkg")) t = f:field(TextValue, "lines") +t.wrap = "off" t.rows = 10 function t.cfgvalue() return nixio.fs.readfile(ipkgfile) or "" @@ -28,6 +29,7 @@ g = SimpleForm("distfeedconf", translate("Distribution feeds"), translate("Build/distribution specific feed definitions. This file will NOT be preserved in any sysupgrade.")) d = g:field(TextValue, "lines2") +d.wrap = "off" d.rows = 10 function d.cfgvalue() return nixio.fs.readfile(distfeeds) or "" @@ -45,6 +47,7 @@ h = SimpleForm("customfeedconf", translate("Custom feeds"), translate("Custom feed definitions, e.g. private feeds. This file can be preserved in a sysupgrade.")) c = h:field(TextValue, "lines3") +c.wrap = "off" c.rows = 10 function c.cfgvalue() return nixio.fs.readfile(customfeeds) or "" diff --git a/modules/luci-mod-failsafe/luasrc/controller/failsafe/failsafe.lua b/modules/luci-mod-failsafe/luasrc/controller/failsafe/failsafe.lua index 6f78643018..60caadb4b1 100644 --- a/modules/luci-mod-failsafe/luasrc/controller/failsafe/failsafe.lua +++ b/modules/luci-mod-failsafe/luasrc/controller/failsafe/failsafe.lua @@ -84,11 +84,13 @@ function action_flashops() fp = io.open(image_tmp, "w") end end - if chunk then - fp:write(chunk) - end - if eof then - fp:close() + if fp then + if chunk then + fp:write(chunk) + end + if eof then + fp:close() + end end end ) diff --git a/modules/luci-mod-rpc/luasrc/controller/rpc.lua b/modules/luci-mod-rpc/luasrc/controller/rpc.lua index 129ca43b51..759bb749cf 100644 --- a/modules/luci-mod-rpc/luasrc/controller/rpc.lua +++ b/modules/luci-mod-rpc/luasrc/controller/rpc.lua @@ -49,10 +49,10 @@ function rpc_auth() server.challenge = function(user, pass) local sid, token, secret - require "luci.config" + local config = require "luci.config" if sys.user.checkpasswd(user, pass) then - local sdat = util.ubus("session", "create", { timeout = luci.config.sauth.sessiontime }) + local sdat = util.ubus("session", "create", { timeout = config.sauth.sessiontime }) if sdat then sid = sdat.ubus_rpc_session token = sys.uniqueid(16) |