From: Jo-Philipp Wich Date: Tue, 26 May 2015 15:14:24 +0000 (+0200) Subject: Merge pull request #388 from oneru/fwknop-qr X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=d6d0926aee1205b9ade0cb5b7462603a98b938af;hp=30b8097f65b13b45b17ffebc0b10dd9fe2855d9b;p=project%2Fluci.git Merge pull request #388 from oneru/fwknop-qr Luci-app-fwknopd: Update uci-defaults as key-gen is now exposed in th… --- diff --git a/applications/luci-app-ddns/Makefile b/applications/luci-app-ddns/Makefile index 1bffcaa4b3..0e1e5df4c1 100644 --- a/applications/luci-app-ddns/Makefile +++ b/applications/luci-app-ddns/Makefile @@ -10,7 +10,7 @@ PKG_NAME:=luci-app-ddns # Version == major.minor.patch # increase on new functionality (minor) or patches (patch) -PKG_VERSION:=2.2.2 +PKG_VERSION:=2.2.4 # Release == build # increase on changes of translation files diff --git a/applications/luci-app-ddns/luasrc/controller/ddns.lua b/applications/luci-app-ddns/luasrc/controller/ddns.lua index 0b82021e2a..946dfefbc8 100644 --- a/applications/luci-app-ddns/luasrc/controller/ddns.lua +++ b/applications/luci-app-ddns/luasrc/controller/ddns.lua @@ -15,7 +15,7 @@ local SYS = require "luci.sys" local DDNS = require "luci.tools.ddns" -- ddns multiused functions local UTIL = require "luci.util" -DDNS_MIN = "2.2.0-1" -- minimum version of service required +DDNS_MIN = "2.4.2-1" -- minimum version of service required function index() local nxfs = require "nixio.fs" -- global definitions not available diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua index 40a66ef152..27f9a9f264 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua @@ -1156,11 +1156,13 @@ function fu.write(self, section, value) end -- retry_count (NEW) -- ######################################################## -rc = ns:taboption("timer", Value, "retry_count", - translate("Error Retry Counter"), - translate("On Error the script will stop execution after given number of retrys") ) -rc.default = 5 -rc.rmempty = false -- validate ourselves for translatable error messages +rc = ns:taboption("timer", Value, "retry_count") +rc.title = translate("Error Retry Counter") +rc.description = translate("On Error the script will stop execution after given number of retrys") + .. "
" + .. translate("The default setting of '0' will retry infinite.") +rc.default = 0 +rc.rmempty = false -- validate ourselves for translatable error messages function rc.validate(self, value) if not DTYP.uinteger(value) then return nil, err_tab_timer(self) .. translate("minimum value '0'") diff --git a/applications/luci-app-ddns/luasrc/tools/ddns.lua b/applications/luci-app-ddns/luasrc/tools/ddns.lua index 6d53931469..4466063cb3 100644 --- a/applications/luci-app-ddns/luasrc/tools/ddns.lua +++ b/applications/luci-app-ddns/luasrc/tools/ddns.lua @@ -98,8 +98,7 @@ end -- compare versions using "<=" "<" ">" ">=" "=" "<<" ">>" function ipkg_ver_compare(ver1, comp, ver2) - if not ver1 or not (#ver1 > 0) - or not ver2 or not (#ver2 > 0) + if not ver1 or not ver2 or not comp or not (#comp > 0) then return nil end -- correct compare string if comp == "<>" or comp == "><" or comp == "!=" or comp == "~=" then comp = "~=" @@ -116,33 +115,19 @@ function ipkg_ver_compare(ver1, comp, ver2) for i = 1, math.max(table.getn(av1),table.getn(av2)), 1 do local s1 = av1[i] or "" local s2 = av2[i] or "" - local n1 = tonumber(s1) - local n2 = tonumber(s2) - -- one numeric and other empty string then set other to 0 - if n1 and not n2 and (not s2 or #s2 == 0) then n2 = 0 end - if n2 and not n1 and (not s1 or #s1 == 0) then n1 = 0 end - - local nc = (n1 and n2) -- numeric compare - - if nc then - -- first "not equal" found return true - if comp == "~=" and (n1 ~= n2) then return true end - -- first "lower" found return true - if (comp == "<" or comp == "<=") and (n1 < n2) then return true end - -- first "greater" found return true - if (comp == ">" or comp == ">=") and (n1 > n2) then return true end - -- not equal then return false - if (n1 ~= n2) then return false end - else - if comp == "~=" and (s1 ~= s2) then return true end - if (comp == "<" or comp == "<=") and (s1 < s2) then return true end - if (comp == ">" or comp == ">=") and (s1 > s2) then return true end - if (s1 ~= s2) then return false end - end + -- first "not equal" found return true + if comp == "~=" and (s1 ~= s2) then return true end + -- first "lower" found return true + if (comp == "<" or comp == "<=") and (s1 < s2) then return true end + -- first "greater" found return true + if (comp == ">" or comp == ">=") and (s1 > s2) then return true end + -- not equal then return false + if (s1 ~= s2) then return false end end - -- all equal then true - return true + + -- all equal and not compare greater or lower then true + return not (comp == "<" or comp == ">") end -- read version information for given package if installed diff --git a/applications/luci-app-ddns/po/de/ddns.po b/applications/luci-app-ddns/po/de/ddns.po index f6e0d5e393..6ffde5d547 100644 --- a/applications/luci-app-ddns/po/de/ddns.po +++ b/applications/luci-app-ddns/po/de/ddns.po @@ -1,15 +1,15 @@ msgid "" msgstr "" "Project-Id-Version: luci-app-ddns\n" -"POT-Creation-Date: 2015-02-08 18:30+0100\n" -"PO-Revision-Date: 2015-02-08 18:36+0100\n" +"POT-Creation-Date: 2015-05-08 21:29+0100\n" +"PO-Revision-Date: 2015-05-08 21:47+0100\n" "Last-Translator: Christian Schoenebeck \n" "Language-Team: \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.7.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-Basepath: .\n" @@ -452,7 +452,7 @@ msgstr "" "wiederholen" msgid "On Error the script will stop execution after given number of retrys" -msgstr "Das Skript wird nach der gegebener Anzahlt von Fehlversuchen beendet" +msgstr "Das Skript wird nach der gegebenen Anzahl von Fehlversuchen beendet." msgid "Overview" msgstr "Übersicht" @@ -527,6 +527,9 @@ msgstr "" "Die installierte Software 'ddns-scripts' unterstützt nicht alle verfügbaren " "Optionen." +msgid "The default setting of '0' will retry infinite." +msgstr "Der Standard-Wert von '0' wird es endlosen erneut versuchen." + msgid "There is no service configured." msgstr "Kein Dienst konfiguriert" diff --git a/applications/luci-app-ddns/po/templates/ddns.pot b/applications/luci-app-ddns/po/templates/ddns.pot index 6e4f2fe08a..35386802bf 100644 --- a/applications/luci-app-ddns/po/templates/ddns.pot +++ b/applications/luci-app-ddns/po/templates/ddns.pot @@ -444,6 +444,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" diff --git a/modules/luci-base/luasrc/cbi.lua b/modules/luci-base/luasrc/cbi.lua index 34de44a5f0..7c5944bf27 100644 --- a/modules/luci-base/luasrc/cbi.lua +++ b/modules/luci-base/luasrc/cbi.lua @@ -12,6 +12,7 @@ require("luci.http") local fs = require("nixio.fs") local uci = require("luci.model.uci") local datatypes = require("luci.cbi.datatypes") +local dispatcher = require("luci.dispatcher") local class = util.class local instanceof = util.instanceof @@ -307,8 +308,29 @@ function Map.__init__(self, config, ...) self.changed = false - if not self.uci:load(self.config) then - error("Unable to read UCI data: " .. self.config) + local path = "%s/%s" %{ self.uci:get_confdir(), self.config } + if fs.stat(path, "type") ~= "reg" then + fs.writefile(path, "") + end + + local ok, err = self.uci:load(self.config) + if not ok then + local url = dispatcher.build_url(unpack(dispatcher.context.request)) + local source = self:formvalue("cbi.source") + if type(source) == "string" then + fs.writefile(path, source:gsub("\r\n", "\n")) + ok, err = self.uci:load(self.config) + if ok then + luci.http.redirect(url) + end + end + end + + if not ok then + self.template = "cbi/error" + self.error = err + self.source = fs.readfile(path) or "" + self.pageaction = false end end diff --git a/modules/luci-base/luasrc/view/cbi/error.htm b/modules/luci-base/luasrc/view/cbi/error.htm new file mode 100644 index 0000000000..2acb96924e --- /dev/null +++ b/modules/luci-base/luasrc/view/cbi/error.htm @@ -0,0 +1,19 @@ +
+ <% if self.title and #self.title > 0 then %>

<%=self.title%>

<% end %> + <% if self.description and #self.description > 0 then %>
<%=self.description%>
<% end %> + +

+ <%: The configuration file could not be loaded due to the following error: %>
+ <%=pcdata(self.error)%> +

+ + + +

+ <%: Edit the raw configuration data above to fix any error and hit "Save" to reload the page. %> +

+ +
+ +
+
diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index 4aa454e7bb..2252e7c951 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -775,6 +775,11 @@ msgstr "Mètode EAP" msgid "Edit" msgstr "Edita" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "Edita aquesta interfície" @@ -2474,6 +2479,9 @@ msgstr "" "Els caràcters permets són: A-Z, a-z, 0-9 i _" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index 0d89b28aa1..373602070c 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -785,6 +785,11 @@ msgstr "Metoda EAP" msgid "Edit" msgstr "Upravit" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "Upravit toto rozhraní" @@ -2529,6 +2534,9 @@ msgstr "" "Povolené znaky jsou: A-Z, a-z, 0-9 a " "_" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index 3ac0c52e2f..361abdead9 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -781,6 +781,11 @@ msgstr "EAP-Methode" msgid "Edit" msgstr "Bearbeiten" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "Diese Schnittstelle bearbeiten" @@ -2544,6 +2549,9 @@ msgstr "" "Erlaubte Buchstaben sind: A-Z, a-z, 0-9 and _" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index 5451adb479..ed3a20737c 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -797,6 +797,11 @@ msgstr "Μέθοδος EAP" msgid "Edit" msgstr "Επεξεργασία" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "Επεξεργασία αυτής της διεπαφής" @@ -2506,6 +2511,9 @@ msgstr "" "Οι επιτρεπόμενοι χαρακτήρες είναι: A-Z, a-z, " "0-9 και _" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index c75b4cab3f..3ad4b140bb 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -776,6 +776,11 @@ msgstr "EAP-Method" msgid "Edit" msgstr "Edit" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "" @@ -2466,6 +2471,9 @@ msgid "" "code> and _" msgstr "" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index d187fe7bdc..2c3ce94ad5 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -791,6 +791,11 @@ msgstr "Método EAP" msgid "Edit" msgstr "Editar" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "Editar esta interfaz" @@ -2549,6 +2554,9 @@ msgstr "" "Los caracteres permitidos son: A-Z, a-z, " "0-9 y _" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index 3b209b349b..1d8d224754 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -801,6 +801,11 @@ msgstr "Méthode EAP" msgid "Edit" msgstr "Éditer" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "Éditer cette interface" @@ -2561,6 +2566,9 @@ msgstr "" "Les caractères autorisés sont : A-Z, a-z, " "0-9 et _" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index cbc27d3160..237e8689ae 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -762,6 +762,11 @@ msgstr "" msgid "Edit" msgstr "ערוך" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "ערוך ממשק זה" @@ -2440,6 +2445,9 @@ msgid "" "code> and _" msgstr "" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index 47f0dfedb0..975bf2dfce 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -794,6 +794,11 @@ msgstr "EAP metódus" msgid "Edit" msgstr "Szerkesztés" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "Interfész szerkesztése" @@ -2550,6 +2555,9 @@ msgstr "" "A következő karakterek használhatók: A-Z, a-z, " "0-9 and _" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index b6f94443e2..771025e270 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -795,6 +795,11 @@ msgstr "Metodo EAP" msgid "Edit" msgstr "Modifica" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "Modifica questa interfaccia" @@ -2532,6 +2537,9 @@ msgid "" "code> and _" msgstr "" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index 69c384c508..8bea7644ea 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -783,6 +783,11 @@ msgstr "EAPメソッド" msgid "Edit" msgstr "編集" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "インターフェースを編集" @@ -2523,6 +2528,9 @@ msgstr "" "使用可能な文字は右記の通りです: A-Z, a-z, " "0-9, _" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index aaa1bc4ca0..d2a34dfbe1 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -746,6 +746,11 @@ msgstr "EAP-Kaedah" msgid "Edit" msgstr "Sunting" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "" @@ -2441,6 +2446,9 @@ msgstr "" "Karakter yang diizinkan adalah: A-Z, a-z, " "0-9 dan _" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index f7429201f0..21176ed3f4 100644 --- a/modules/luci-base/po/no/base.po +++ b/modules/luci-base/po/no/base.po @@ -781,6 +781,11 @@ msgstr "EAP-metode" msgid "Edit" msgstr "Endre" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "Endre dette grensesnittet" @@ -2521,6 +2526,9 @@ msgstr "" "Gyldige tegn er: A-Z, a-z, 0-9 og " "_" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index 908b6e601f..baa7ab8534 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -808,6 +808,11 @@ msgstr "Metoda EAP" msgid "Edit" msgstr "Edycja" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "Edytuj ten interfejs" @@ -2577,6 +2582,9 @@ msgstr "" "Dozwolone znaki to: A-Z, a-z, 0-9 " "oraz _" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index e9c68b225b..ec4401bde9 100644 --- a/modules/luci-base/po/pt-br/base.po +++ b/modules/luci-base/po/pt-br/base.po @@ -804,6 +804,11 @@ msgstr "Método EAP" msgid "Edit" msgstr "Editar" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "Editar esta interface" @@ -2581,6 +2586,9 @@ msgstr "" "Os caracteres permitidos são: A-Z, a-z, 0-9 e _" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index 2ba5ed7b4c..1acc852bbf 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -797,6 +797,11 @@ msgstr "Metodo-EAP" msgid "Edit" msgstr "Editar" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "Editar esta interface" @@ -2525,6 +2530,9 @@ msgstr "" "Os caracteres permitidos são: A-Z, a-z, 0-9 e _" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index efc0bb450d..3692b7de55 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -753,6 +753,11 @@ msgstr "" msgid "Edit" msgstr "Editeaza" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "Editeaza aceasta interfata" @@ -2430,6 +2435,9 @@ msgid "" "code> and _" msgstr "" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index ea5ccf163d..94fa6fb8ee 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -797,6 +797,11 @@ msgstr "Метод EAP" msgid "Edit" msgstr "Редактировать" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + #, fuzzy msgid "Edit this interface" msgstr "Редактировать этот интерфейс" @@ -2553,6 +2558,9 @@ msgstr "" "Допустимые символы: A-Z, a-z, 0-9 и " "_" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index ff5b6dde06..d943ccb891 100644 --- a/modules/luci-base/po/sk/base.po +++ b/modules/luci-base/po/sk/base.po @@ -733,6 +733,11 @@ msgstr "" msgid "Edit" msgstr "" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "" @@ -2401,6 +2406,9 @@ msgid "" "code> and _" msgstr "" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index 9e10acda3a..86fa224e79 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -739,6 +739,11 @@ msgstr "" msgid "Edit" msgstr "" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "" @@ -2407,6 +2412,9 @@ msgid "" "code> and _" msgstr "" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index fa7d6d8006..1bf53aa576 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -746,6 +746,11 @@ msgstr "" msgid "Edit" msgstr "" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "" @@ -2414,6 +2419,9 @@ msgid "" "code> and _" msgstr "" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index de1e461ab6..c5483221c2 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -807,6 +807,11 @@ msgstr "EAP-Метод" msgid "Edit" msgstr "Редагувати" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "Редагувати цей інтерфейс" @@ -2568,6 +2573,9 @@ msgstr "" "Дозволені символи: A-Z, a-z, 0-9 та " "_" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index cdbabd4cf3..d81be16eb5 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -751,6 +751,11 @@ msgstr "EAP-Method" msgid "Edit" msgstr "Chỉnh sửa" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "" @@ -2441,6 +2446,9 @@ msgid "" "code> and _" msgstr "" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index 47aa60f667..72bf937952 100644 --- a/modules/luci-base/po/zh-cn/base.po +++ b/modules/luci-base/po/zh-cn/base.po @@ -410,9 +410,6 @@ msgstr "CA证书.如果留空的话证书将在第一次连接时被保存." msgid "CPU" msgstr "CPU" -msgid "CPU frequency" -msgstr "CPU 频率" - msgid "CPU usage (%)" msgstr "CPU使用率(%)" @@ -443,9 +440,6 @@ msgstr "检查" msgid "Checksum" msgstr "校验值" -msgid "Chip Model" -msgstr "芯片型号" - msgid "" "Choose the firewall zone you want to assign to this interface. Select " "unspecified to remove the interface from the associated zone or " @@ -758,6 +752,11 @@ msgstr "EAP-Method" msgid "Edit" msgstr "修改" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "修改此接口" @@ -2453,6 +2452,9 @@ msgstr "" "合法字符：A-Z, a-z, 0-9 和 _" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3116,6 +3118,12 @@ msgstr "是" msgid "« Back" msgstr "« 后退" +#~ msgid "CPU frequency" +#~ msgstr "CPU 频率" + +#~ msgid "Chip Model" +#~ msgstr "芯片型号" + #~ msgid "" #~ "Always use 40MHz channels even if the secondary channel overlaps. Using " #~ "this option does not comply with IEEE 802.11n-2009!" diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index a2ec282dd8..ec901b8af2 100644 --- a/modules/luci-base/po/zh-tw/base.po +++ b/modules/luci-base/po/zh-tw/base.po @@ -763,6 +763,11 @@ msgstr "EAP協定驗證方式" msgid "Edit" msgstr "編輯" +msgid "" +"Edit the raw configuration data above to fix any error and hit \"Save\" to " +"reload the page." +msgstr "" + msgid "Edit this interface" msgstr "修改這個介面" @@ -2468,6 +2473,9 @@ msgstr "" "所允許的字元是: A-Z, a-z, 0-9 and " "_" +msgid "The configuration file could not be loaded due to the following error:" +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" diff --git a/modules/luci-base/root/lib/uci/upload/.gitignore b/modules/luci-base/root/lib/uci/upload/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/modules/luci-base/root/lib/uci/upload/.placeholder b/modules/luci-base/root/lib/uci/upload/.placeholder new file mode 100644 index 0000000000..e69de29bb2 diff --git a/modules/luci-base/root/www/index.html b/modules/luci-base/root/www/index.html index 0a7238b556..0b5fa1d87e 100644 --- a/modules/luci-base/root/www/index.html +++ b/modules/luci-base/root/www/index.html @@ -2,6 +2,7 @@ + diff --git a/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua b/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua index 59bf2f646c..1b2e23cc42 100644 --- a/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua +++ b/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua @@ -47,10 +47,11 @@ dialnumber.placeholder = "*99***1#" if luci.model.network:has_ipv6() then - ipv6 = section:taboption("advanced", Flag, "ipv6", - translate("Enable IPv6 negotiation on the PPP link")) - - ipv6.default = ipv6.disabled + ipv6 = section:taboption("advanced", ListValue, "ipv6") + ipv6:value("auto", translate("Automatic")) + ipv6:value("0", translate("Disabled")) + ipv6:value("1", translate("Manual")) + ipv6.default = "auto" end diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua new file mode 100644 index 0000000000..5a37582faf --- /dev/null +++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua @@ -0,0 +1,33 @@ +-- Copyright 2011 Jo-Philipp Wich +-- Copyright 2013 Steven Barth +-- Licensed to the public under the Apache License 2.0. + +local map, section, net = ... +local tunlink, defaultroute, metric, mtu + +section:taboption("general", Value, "ip6prefix", + translate("NAT64 Prefix"), translate("Leave empty to autodetect")) + +tunlink = section:taboption("advanced", DynamicList, "tunlink", translate("Tunnel Link")) +tunlink.template = "cbi/network_netlist" +tunlink.nocreate = true + + +defaultroute = section:taboption("advanced", Flag, "defaultroute", + translate("Default gateway"), + translate("If unchecked, no default route is configured")) + +defaultroute.default = defaultroute.enabled + + +metric = section:taboption("advanced", Value, "metric", + translate("Use gateway metric")) + +metric.placeholder = "0" +metric.datatype = "uinteger" +metric:depends("defaultroute", defaultroute.enabled) + + +mtu = section:taboption("advanced", Value, "mtu", translate("Use MTU on tunnel interface")) +mtu.placeholder = "1280" +mtu.datatype = "max(9200)" diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua new file mode 100644 index 0000000000..2f8108ef1c --- /dev/null +++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua @@ -0,0 +1,88 @@ +-- Copyright 2011 Jo-Philipp Wich +-- Copyright 2013 Steven Barth +-- Licensed to the public under the Apache License 2.0. + +local map, section, net = ... + +local peeraddr, ip6addr +local tunlink, defaultroute, metric, ttl, mtu + + +maptype = section:taboption("general", ListValue, "type", translate("Type")) +maptype:value("map-e", "MAP-E") +maptype:value("map-t", "MAP-T") +maptype:value("lw4o6", "LW4over6") + + +peeraddr = section:taboption("general", Value, "peeraddr", + translate("BR / DMR / AFTR")) + +peeraddr.rmempty = false +peeraddr.datatype = "ip6addr" + + +ipaddr = section:taboption("general", Value, "ipaddr", + translate("IPv4 prefix")) +ipaddr.datatype = "ip4addr" + + +ip4prefixlen = s:taboption("general", Value, "ip4prefixlen", + translate("IPv4 prefix length"), + translate("The length of the IPv4 prefix in bits, the remainder is used in the IPv6 addresses.")) + +ip4prefixlen.placeholder = "32" +ip4prefixlen.datatype = "range(0,32)" + +ip6addr = s:taboption("general", Value, "ip6prefix", + translate("IPv6 prefix"), + translate("The IPv6 prefix assigned to the provider, usually ends with ::")) + +ip6addr.rmempty = false +ip6addr.datatype = "ip6addr" + + +ip6prefixlen = s:taboption("general", Value, "ip6prefixlen", + translate("IPv6 prefix length"), + translate("The length of the IPv6 prefix in bits")) + +ip6prefixlen.placeholder = "16" +ip6prefixlen.datatype = "range(0,64)" + + +s:taboption("general", Value, "ealen", + translate("EA-bits length")).datatype = "range(0,16)" + +s:taboption("general", Value, "psidlen", + translate("PSID-bits length")).datatype = "range(0,16)" + +s:taboption("general", Value, "offset", + translate("PSID offset")).datatype = "range(0,16)" + +tunlink = section:taboption("advanced", DynamicList, "tunlink", translate("Tunnel Link")) +tunlink.template = "cbi/network_netlist" +tunlink.nocreate = true + + +defaultroute = section:taboption("advanced", Flag, "defaultroute", + translate("Default gateway"), + translate("If unchecked, no default route is configured")) + +defaultroute.default = defaultroute.enabled + + +metric = section:taboption("advanced", Value, "metric", + translate("Use gateway metric")) + +metric.placeholder = "0" +metric.datatype = "uinteger" +metric:depends("defaultroute", defaultroute.enabled) + + +ttl = section:taboption("advanced", Value, "ttl", translate("Use TTL on tunnel interface")) +ttl.placeholder = "64" +ttl.datatype = "range(1,255)" + + +mtu = section:taboption("advanced", Value, "mtu", translate("Use MTU on tunnel interface")) +mtu.placeholder = "1280" +mtu.datatype = "max(9200)" diff --git a/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua index daebc2f5d8..d876d69ba8 100644 --- a/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua +++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua @@ -5,13 +5,17 @@ local netmod = luci.model.network local _, p -for _, p in ipairs({"dslite"}) do +for _, p in ipairs({"dslite", "map", "464xlat"}) do local proto = netmod:register_protocol(p) function proto.get_i18n(self) if p == "dslite" then return luci.i18n.translate("Dual-Stack Lite (RFC6333)") + elseif p == "map" then + return luci.i18n.translate("MAP / LW4over6") + elseif p == "464xlat" then + return luci.i18n.translate("464XLAT (CLAT)") end end @@ -22,6 +26,10 @@ for _, p in ipairs({"dslite"}) do function proto.opkg_package(self) if p == "dslite" then return "ds-lite" + elseif p == "map" then + return "map-t" + elseif p == "464xlat" then + return "464xlat" end end @@ -45,5 +53,11 @@ for _, p in ipairs({"dslite"}) do return (netmod:ifnameof(ifc) == self:ifname()) end - netmod:register_pattern_virtual("^%s-%%w" % p) + if p == "dslite" then + netmod:register_pattern_virtual("^ds-%w") + elseif p == "map" then + netmod:register_pattern_virtual("^map-%w") + elseif p == "464xlat" then + netmod:register_pattern_virtual("^464-%w") + end end diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua index 023cc029bf..523ef1bc6f 100644 --- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua +++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua @@ -19,10 +19,11 @@ password.password = true if luci.model.network:has_ipv6() then - ipv6 = section:taboption("advanced", Flag, "ipv6", - translate("Enable IPv6 negotiation on the PPP link")) - - ipv6.default = ipv6.disabled + ipv6 = section:taboption("advanced", ListValue, "ipv6") + ipv6:value("auto", translate("Automatic")) + ipv6:value("0", translate("Disabled")) + ipv6:value("1", translate("Manual")) + ipv6.default = "auto" end diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua index 0fce97a6bd..b14db5966d 100644 --- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua +++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua @@ -31,10 +31,11 @@ password.password = true if luci.model.network:has_ipv6() then - ipv6 = section:taboption("advanced", Flag, "ipv6", - translate("Enable IPv6 negotiation on the PPP link")) - - ipv6.default = ipv6.disabled + ipv6 = section:taboption("advanced", ListValue, "ipv6") + ipv6:value("auto", translate("Automatic")) + ipv6:value("0", translate("Disabled")) + ipv6:value("1", translate("Manual")) + ipv6.default = "auto" end diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua index 7df1004fc5..8f463e5d76 100644 --- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua +++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua @@ -37,10 +37,11 @@ password.password = true if luci.model.network:has_ipv6() then - ipv6 = section:taboption("advanced", Flag, "ipv6", - translate("Enable IPv6 negotiation on the PPP link")) - - ipv6.default = ipv6.disabled + ipv6 = section:taboption("advanced", ListValue, "ipv6") + ipv6:value("auto", translate("Automatic")) + ipv6:value("0", translate("Disabled")) + ipv6:value("1", translate("Manual")) + ipv6.default = "auto" end diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua index 0e5bbaf513..5a05cd2065 100644 --- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua +++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua @@ -31,10 +31,11 @@ service.placeholder = translate("auto") if luci.model.network:has_ipv6() then - ipv6 = section:taboption("advanced", Flag, "ipv6", - translate("Enable IPv6 negotiation on the PPP link")) - - ipv6.default = ipv6.disabled + ipv6 = section:taboption("advanced", ListValue, "ipv6") + ipv6:value("auto", translate("Automatic")) + ipv6:value("0", translate("Disabled")) + ipv6:value("1", translate("Manual")) + ipv6.default = "auto" end