diff --git a/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/ruleset.js b/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/ruleset.js index 6c89cdca4..87108b6ec 100644 --- a/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/ruleset.js +++ b/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/ruleset.js @@ -206,10 +206,24 @@ return view.extend({ o.value('inline', _('Inline')); o.default = 'http'; + o = s.option(form.ListValue, 'behavior', _('Behavior')); + o.value('classical'); + o.value('domain'); + o.value('ipcidr'); + o.default = 'classical'; + o.validate = function(section_id, value) { + const format = this.section.getUIElement(section_id, 'format').getValue(); + + if (value === 'classical' && format === 'mrs') + return _('Expecting: %s').format(_('Binary format only supports domain / ipcidr')); + + return true; + } + o = s.option(form.ListValue, 'format', _('Format')); o.value('text', _('Plain text')); o.value('yaml', _('Yaml text')); - o.value('mrs', _('Binary file')); + o.value('mrs', _('Binary mrs')); o.default = 'yaml'; o.validate = function(section_id, value) { const behavior = this.section.getUIElement(section_id, 'behavior').getValue(); @@ -229,20 +243,6 @@ return view.extend({ }; o.depends({'type': 'inline', '!reverse': true}); - o = s.option(form.ListValue, 'behavior', _('Behavior')); - o.value('classical'); - o.value('domain'); - o.value('ipcidr'); - o.default = 'classical'; - o.validate = function(section_id, value) { - const format = this.section.getUIElement(section_id, 'format').getValue(); - - if (value === 'classical' && format === 'mrs') - return _('Expecting: %s').format(_('Binary format only supports domain / ipcidr')); - - return true; - } - o = s.option(form.DummyValue, '_value', _('Value')); o.load = function(section_id) { const option = uci.get(data[0], section_id, 'type'); diff --git a/luci-app-fchomo/po/templates/fchomo.pot b/luci-app-fchomo/po/templates/fchomo.pot index 164ad1ecf..0f67d2f40 100644 --- a/luci-app-fchomo/po/templates/fchomo.pot +++ b/luci-app-fchomo/po/templates/fchomo.pot @@ -209,7 +209,7 @@ msgid "Behavior" msgstr "" #: htdocs/luci-static/resources/view/fchomo/ruleset.js:212 -msgid "Binary file" +msgid "Binary mrs" msgstr "" #: htdocs/luci-static/resources/view/fchomo/ruleset.js:218 diff --git a/luci-app-fchomo/po/zh_Hans/fchomo.po b/luci-app-fchomo/po/zh_Hans/fchomo.po index aaf9a6c6a..75be657ab 100644 --- a/luci-app-fchomo/po/zh_Hans/fchomo.po +++ b/luci-app-fchomo/po/zh_Hans/fchomo.po @@ -217,8 +217,8 @@ msgid "Behavior" msgstr "行为" #: htdocs/luci-static/resources/view/fchomo/ruleset.js:212 -msgid "Binary file" -msgstr "二进制文件" +msgid "Binary mrs" +msgstr "二进制 mrs" #: htdocs/luci-static/resources/view/fchomo/ruleset.js:218 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:241 @@ -1569,7 +1569,7 @@ msgstr "性能可能会略有下降,建议仅在需要时开启。" #: htdocs/luci-static/resources/view/fchomo/ruleset.js:210 msgid "Plain text" -msgstr "纯文本" +msgstr "纯文本 text" #: htdocs/luci-static/resources/view/fchomo/global.js:781 msgid "" diff --git a/luci-app-fchomo/po/zh_Hant/fchomo.po b/luci-app-fchomo/po/zh_Hant/fchomo.po index 91a7ec11d..23b953b81 100644 --- a/luci-app-fchomo/po/zh_Hant/fchomo.po +++ b/luci-app-fchomo/po/zh_Hant/fchomo.po @@ -217,8 +217,8 @@ msgid "Behavior" msgstr "行為" #: htdocs/luci-static/resources/view/fchomo/ruleset.js:212 -msgid "Binary file" -msgstr "二進位檔案" +msgid "Binary mrs" +msgstr "二進位 mrs" #: htdocs/luci-static/resources/view/fchomo/ruleset.js:218 #: htdocs/luci-static/resources/view/fchomo/ruleset.js:241 @@ -1569,7 +1569,7 @@ msgstr "效能可能會略有下降,建議僅在需要時開啟。" #: htdocs/luci-static/resources/view/fchomo/ruleset.js:210 msgid "Plain text" -msgstr "純文本" +msgstr "純文本 text" #: htdocs/luci-static/resources/view/fchomo/global.js:781 msgid ""