summaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/luci-base/Makefile7
-rw-r--r--modules/luci-base/po/ca/base.po2
-rw-r--r--modules/luci-base/po/cs/base.po2
-rw-r--r--modules/luci-base/po/de/base.po2
-rw-r--r--modules/luci-base/po/el/base.po2
-rw-r--r--modules/luci-base/po/en/base.po2
-rw-r--r--modules/luci-base/po/es/base.po2
-rw-r--r--modules/luci-base/po/fr/base.po2
-rw-r--r--modules/luci-base/po/he/base.po2
-rw-r--r--modules/luci-base/po/hu/base.po2
-rw-r--r--modules/luci-base/po/it/base.po2
-rw-r--r--modules/luci-base/po/ja/base.po2
-rw-r--r--modules/luci-base/po/ms/base.po2
-rw-r--r--modules/luci-base/po/no/base.po2
-rw-r--r--modules/luci-base/po/pl/base.po2
-rw-r--r--modules/luci-base/po/pt-br/base.po2
-rw-r--r--modules/luci-base/po/pt/base.po2
-rw-r--r--modules/luci-base/po/ro/base.po2
-rw-r--r--modules/luci-base/po/ru/base.po2
-rw-r--r--modules/luci-base/po/sk/base.po2
-rw-r--r--modules/luci-base/po/sv/base.po2
-rw-r--r--modules/luci-base/po/templates/base.pot2
-rw-r--r--modules/luci-base/po/tr/base.po2
-rw-r--r--modules/luci-base/po/uk/base.po2
-rw-r--r--modules/luci-base/po/vi/base.po2
-rw-r--r--modules/luci-base/po/zh-cn/base.po2
-rw-r--r--modules/luci-base/po/zh-tw/base.po2
-rw-r--r--modules/luci-base/root/etc/config/luci5
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua2
-rwxr-xr-xmodules/luci-mod-admin-full/root/etc/uci-defaults/50_luci-mod-admin-full22
30 files changed, 52 insertions, 36 deletions
diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile
index f0763cb1d..972a451c6 100644
--- a/modules/luci-base/Makefile
+++ b/modules/luci-base/Makefile
@@ -37,10 +37,9 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR)/host/bin
- $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
- $(INSTALL_BIN) src/po2lmo $(STAGING_DIR_HOST)/bin/po2lmo
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/LuaSrcDiet.lua $(STAGING_DIR)/host/bin/LuaSrcDiet
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) src/po2lmo $(1)/bin/po2lmo
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/LuaSrcDiet.lua $(1)/bin/LuaSrcDiet
endef
$(eval $(call HostBuild))
diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po
index 1e4414775..efce3d3bf 100644
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -2271,7 +2271,7 @@ msgid ""
"ignore failures"
msgstr ""
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po
index b0ab326d0..97ec0d586 100644
--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
@@ -2296,7 +2296,7 @@ msgstr ""
"Po takovém množství LCP echo selhání předpokládám, že peer je mrtvý. "
"Použijte 0 pro ignorování chyb"
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po
index 8d7261213..c008af443 100644
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -2302,7 +2302,7 @@ msgstr ""
"Deklariere den Client als tot nach der angegebenen Anzahl von LCP Echo "
"Fehlschlägen, nutze den Wert 0 um Fehler zu ignorieren"
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po
index 7b716ada3..9bd69f39a 100644
--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@@ -2301,7 +2301,7 @@ msgid ""
"ignore failures"
msgstr ""
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
#, fuzzy
diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po
index 82a4e7254..55b34f34a 100644
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -2268,7 +2268,7 @@ msgid ""
"ignore failures"
msgstr ""
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po
index de9a64532..55c95aef0 100644
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -2310,7 +2310,7 @@ msgstr ""
"Asumir que el otro estará muerto tras estos fallos de echo LCP, use 0 para "
"ignorar fallos"
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po
index fcde931c7..6dc79ebf1 100644
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -2323,7 +2323,7 @@ msgstr ""
"Suppose que le distant a disparu une fois le nombre donné d'erreurs d'échos "
"LCP ; utiliser 0 pour ignorer ces erreurs"
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po
index 3c2d78470..17db4cee0 100644
--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@@ -2236,7 +2236,7 @@ msgid ""
"ignore failures"
msgstr ""
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po
index d71bd6907..bee834ead 100644
--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@@ -2313,7 +2313,7 @@ msgstr ""
"A peer halottnak tekintése a megadott számú LCP echo hibák után. Használjon "
"0-t a hibák figyelmen kívül hagyásához."
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po
index 2bc5ddabf..10ff31302 100644
--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@@ -2307,7 +2307,7 @@ msgid ""
"ignore failures"
msgstr ""
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index 740c676a8..b4c448afc 100644
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -2290,7 +2290,7 @@ msgstr ""
"設定回数のLCP echo 確認失敗後、ピアノードがダウンしているものと見なします。0"
"を設定した場合、失敗しても無視します"
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po
index 5e348d69f..f249d07b0 100644
--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@@ -2240,7 +2240,7 @@ msgid ""
"ignore failures"
msgstr ""
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po
index 793d381c2..10e70bd2b 100644
--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@@ -2288,7 +2288,7 @@ msgstr ""
"Annta at peer er uten forbindelse om angitt LCP ekko feiler, bruk verdi 0 "
"for å overse feil"
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po
index 4e6152c03..78d32c4f8 100644
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -2336,7 +2336,7 @@ msgstr ""
"Zakładaj że klient jest martwy po danej ilości błedów odpowiedzi echa LCP, "
"wpisz 0 aby zignorować błędy"
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po
index fda160503..1b3157c12 100644
--- a/modules/luci-base/po/pt-br/base.po
+++ b/modules/luci-base/po/pt-br/base.po
@@ -2341,7 +2341,7 @@ msgstr ""
"Assumir que o parceiro está morto depois de uma data quantidade de falhas de "
"echo do LCP. Use 0 para ignorar as falhas"
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po
index 05bdb76ff..1988a6977 100644
--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@@ -2308,7 +2308,7 @@ msgid ""
"ignore failures"
msgstr ""
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po
index 73f9fb19f..891628204 100644
--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@ -2233,7 +2233,7 @@ msgid ""
"ignore failures"
msgstr ""
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po
index 34dde6bb1..5e0084292 100644
--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@@ -2318,7 +2318,7 @@ msgstr ""
"Предполагать, что узел недоступен после указанного количества ошибок "
"получения эхо-пакета LCP, введите 0 для игнорирования ошибок"
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po
index 0d8705124..7d7899390 100644
--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@ -2207,7 +2207,7 @@ msgid ""
"ignore failures"
msgstr ""
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po
index 73a88b861..244902dd5 100644
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -2213,7 +2213,7 @@ msgid ""
"ignore failures"
msgstr ""
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot
index df2892b88..3041c6a17 100644
--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@@ -2200,7 +2200,7 @@ msgid ""
"ignore failures"
msgstr ""
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po
index a5a533897..44430963f 100644
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@ -2220,7 +2220,7 @@ msgid ""
"ignore failures"
msgstr ""
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po
index 95c686e28..5bf6068e3 100644
--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@@ -2329,7 +2329,7 @@ msgstr ""
"Вважати вузол недоступним після визначеної кількості невдач отримання ехо-"
"пакета LCP, використовуйте 0, щоб ігнорувати невдачі"
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po
index 0e378565a..485fbd983 100644
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -2243,7 +2243,7 @@ msgid ""
"ignore failures"
msgstr ""
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po
index dbc4df809..2852c154c 100644
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@ -2233,7 +2233,7 @@ msgid ""
"ignore failures"
msgstr "在指定数量的LCP响应故障后假定链路已断开,0为忽略故障"
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po
index d1d17ad91..8b4db5fe8 100644
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -2248,7 +2248,7 @@ msgid ""
"ignore failures"
msgstr "假若在給于多次的 LCP 呼叫失敗後終點將死, 使用0忽略失敗"
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
msgstr ""
msgid "Prevents client-to-client communication"
diff --git a/modules/luci-base/root/etc/config/luci b/modules/luci-base/root/etc/config/luci
index a443742f9..baa3ac5d1 100644
--- a/modules/luci-base/root/etc/config/luci
+++ b/modules/luci-base/root/etc/config/luci
@@ -22,8 +22,3 @@ config internal ccache
option enable 1
config internal themes
-
-config internal 'diag'
- option ping 'dev.openwrt.org'
- option route 'dev.openwrt.org'
- option dns 'dev.openwrt.org'
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
index aaf045ca2..10636a491 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
@@ -251,7 +251,7 @@ o:depends("nonwildcard", true)
o = s:taboption("general", DynamicList, "notinterface",
translate("Exclude interfaces"),
- translate("Prevent listening on thise interfaces."))
+ translate("Prevent listening on these interfaces."))
o.optional = true
o:depends("nonwildcard", true)
diff --git a/modules/luci-mod-admin-full/root/etc/uci-defaults/50_luci-mod-admin-full b/modules/luci-mod-admin-full/root/etc/uci-defaults/50_luci-mod-admin-full
new file mode 100755
index 000000000..372eb1512
--- /dev/null
+++ b/modules/luci-mod-admin-full/root/etc/uci-defaults/50_luci-mod-admin-full
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+if [ "$(uci -q get luci.diag)" != "internal" ]; then
+ host=""
+
+ if [ -s /etc/os-release ]; then
+ . /etc/os-release
+ host="${HOME_URL:-${BUG_URL:-$LEDE_DEVICE_MANUFACTURER_URL}}"
+ host="${host#*://}"
+ host="${host%%/*}"
+ fi
+
+ uci -q batch <<-EOF >/dev/null
+ set luci.diag=internal
+ set luci.diag.dns='${host:-openwrt.org}'
+ set luci.diag.ping='${host:-openwrt.org}'
+ set luci.diag.route='${host:-openwrt.org}'
+ commit luci
+ EOF
+fi
+
+exit 0