• R/O
  • HTTP
  • SSH
  • HTTPS

luci: Commit

LuCI - OpenWrt Configuration Interface


Commit MetaInfo

Revision918a02b5716660e3053a365fe32cf624939769c9 (tree)
Time2022-01-21 16:52:49
AuthorTianling Shen <cnsztl@immo...>
CommiterTianling Shen

Log Message

Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

Change Summary

Incremental Difference

--- a/modules/luci-base/luasrc/sys.lua
+++ b/modules/luci-base/luasrc/sys.lua
@@ -566,6 +566,7 @@ function init.names()
566566 end
567567
568568 function init.index(name)
569+ name = fs.basename(name)
569570 if fs.access(init.dir..name) then
570571 return call("env -i sh -c 'source %s%s enabled; exit ${START:-255}' >/dev/null"
571572 %{ init.dir, name })
@@ -573,6 +574,7 @@ function init.index(name)
573574 end
574575
575576 local function init_action(action, name)
577+ name = fs.basename(name)
576578 if fs.access(init.dir..name) then
577579 return call("env -i %s%s %s >/dev/null" %{ init.dir, name, action })
578580 end
--- a/modules/luci-base/po/ar/base.po
+++ b/modules/luci-base/po/ar/base.po
@@ -7071,7 +7071,7 @@ msgstr "تم بالفعل إضافة مفتاح SSH العمومي المحدد.
70717071
70727072 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
70737073 msgid ""
7074-"The given SSH public key is invalid. Please supply proper public RSA or "
7074+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
70757075 "ECDSA keys."
70767076 msgstr ""
70777077 "مفتاح SSH العمومي المحدد غير صالح. يرجى تقديم مفاتيح RSA أو ECDSA العامة "
--- a/modules/luci-base/po/bg/base.po
+++ b/modules/luci-base/po/bg/base.po
@@ -6919,7 +6919,7 @@ msgstr ""
69196919
69206920 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
69216921 msgid ""
6922-"The given SSH public key is invalid. Please supply proper public RSA or "
6922+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
69236923 "ECDSA keys."
69246924 msgstr ""
69256925
--- a/modules/luci-base/po/bn_BD/base.po
+++ b/modules/luci-base/po/bn_BD/base.po
@@ -6857,7 +6857,7 @@ msgstr ""
68576857
68586858 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
68596859 msgid ""
6860-"The given SSH public key is invalid. Please supply proper public RSA or "
6860+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
68616861 "ECDSA keys."
68626862 msgstr ""
68636863
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -6937,7 +6937,7 @@ msgstr ""
69376937
69386938 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
69396939 msgid ""
6940-"The given SSH public key is invalid. Please supply proper public RSA or "
6940+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
69416941 "ECDSA keys."
69426942 msgstr ""
69436943
--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
@@ -7094,7 +7094,7 @@ msgstr "Zadaný veřejný SSH klíč byl již přídán."
70947094
70957095 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
70967096 msgid ""
7097-"The given SSH public key is invalid. Please supply proper public RSA or "
7097+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
70987098 "ECDSA keys."
70997099 msgstr ""
71007100 "Zadaný veřejný SSH klíč je neplatný. Použijte řádné veřejné RSA nebo ECDSA "
--- a/modules/luci-base/po/da/base.po
+++ b/modules/luci-base/po/da/base.po
@@ -7214,7 +7214,7 @@ msgstr "Den angivne offentlige SSH-nøgle er allerede blevet tilføjet."
72147214
72157215 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
72167216 msgid ""
7217-"The given SSH public key is invalid. Please supply proper public RSA or "
7217+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
72187218 "ECDSA keys."
72197219 msgstr ""
72207220 "Den givne offentlige SSH-nøgle er ugyldig. Angiv venligst korrekte "
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -7343,7 +7343,7 @@ msgstr "Der angegebene öffentliche SSH-Schlüssel wurde bereits hinzugefügt."
73437343
73447344 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
73457345 msgid ""
7346-"The given SSH public key is invalid. Please supply proper public RSA or "
7346+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
73477347 "ECDSA keys."
73487348 msgstr ""
73497349 "Der angegebene öffentliche SSH Schlüssel ist ungültig, bitte OpenSSH-"
--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@@ -6950,7 +6950,7 @@ msgstr ""
69506950
69516951 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
69526952 msgid ""
6953-"The given SSH public key is invalid. Please supply proper public RSA or "
6953+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
69546954 "ECDSA keys."
69556955 msgstr ""
69566956
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -6922,7 +6922,7 @@ msgstr ""
69226922
69236923 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
69246924 msgid ""
6925-"The given SSH public key is invalid. Please supply proper public RSA or "
6925+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
69266926 "ECDSA keys."
69276927 msgstr ""
69286928
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -7320,7 +7320,7 @@ msgstr "La clave pública SSH dada ya se ha agregado."
73207320
73217321 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
73227322 msgid ""
7323-"The given SSH public key is invalid. Please supply proper public RSA or "
7323+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
73247324 "ECDSA keys."
73257325 msgstr ""
73267326 "La clave pública SSH dada no es válida. Por favor, suministre las claves "
--- a/modules/luci-base/po/fi/base.po
+++ b/modules/luci-base/po/fi/base.po
@@ -7139,7 +7139,7 @@ msgstr "Annettu SSH julkinen avain on jo lisätty."
71397139
71407140 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
71417141 msgid ""
7142-"The given SSH public key is invalid. Please supply proper public RSA or "
7142+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
71437143 "ECDSA keys."
71447144 msgstr ""
71457145 "Annettu julkinen SSH-avain ei kelpaa. Anna kelvollinen julkinen RSA- tai "
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -7199,7 +7199,7 @@ msgstr "La clé publique SSH donnée a déjà été ajoutée."
71997199
72007200 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
72017201 msgid ""
7202-"The given SSH public key is invalid. Please supply proper public RSA or "
7202+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
72037203 "ECDSA keys."
72047204 msgstr ""
72057205 "La clé publique SSH donnée n'est pas valide. Veuillez fournir les clés "
--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@@ -6887,7 +6887,7 @@ msgstr ""
68876887
68886888 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
68896889 msgid ""
6890-"The given SSH public key is invalid. Please supply proper public RSA or "
6890+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
68916891 "ECDSA keys."
68926892 msgstr ""
68936893
--- a/modules/luci-base/po/hi/base.po
+++ b/modules/luci-base/po/hi/base.po
@@ -6859,7 +6859,7 @@ msgstr ""
68596859
68606860 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
68616861 msgid ""
6862-"The given SSH public key is invalid. Please supply proper public RSA or "
6862+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
68636863 "ECDSA keys."
68646864 msgstr ""
68656865
--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@@ -7127,7 +7127,7 @@ msgstr "A megadott SSH nyilvános kulcs már hozzá lett adva."
71277127
71287128 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
71297129 msgid ""
7130-"The given SSH public key is invalid. Please supply proper public RSA or "
7130+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
71317131 "ECDSA keys."
71327132 msgstr ""
71337133 "A megadott SSH nyilvános kulcs érvénytelen. Adjon meg megfelelő nyilvános "
--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@@ -7101,7 +7101,7 @@ msgstr "La chiave pubblica SSH fornita è già stata aggiunta."
71017101
71027102 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
71037103 msgid ""
7104-"The given SSH public key is invalid. Please supply proper public RSA or "
7104+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
71057105 "ECDSA keys."
71067106 msgstr ""
71077107 "La chiave pubblica SSH fornita non è valida. Fornire chiavi pubbliche RSA o "
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -7172,7 +7172,7 @@ msgstr "入力されたSSH公開鍵はすでに追加されています。"
71727172
71737173 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
71747174 msgid ""
7175-"The given SSH public key is invalid. Please supply proper public RSA or "
7175+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
71767176 "ECDSA keys."
71777177 msgstr ""
71787178 "指定されたSSH公開鍵は無効です。正しいRSAまたはECDSA鍵を指定してください。"
--- a/modules/luci-base/po/ko/base.po
+++ b/modules/luci-base/po/ko/base.po
@@ -6945,7 +6945,7 @@ msgstr "제출하신 SSH 공개키는 이미 추가되어 있습니다."
69456945
69466946 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
69476947 msgid ""
6948-"The given SSH public key is invalid. Please supply proper public RSA or "
6948+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
69496949 "ECDSA keys."
69506950 msgstr ""
69516951 "제출하신 SSH 키는 올바르지 않습니다. 올바른 RSA 또는 ECDSA 키를 제출해주세요."
--- a/modules/luci-base/po/mr/base.po
+++ b/modules/luci-base/po/mr/base.po
@@ -6857,7 +6857,7 @@ msgstr ""
68576857
68586858 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
68596859 msgid ""
6860-"The given SSH public key is invalid. Please supply proper public RSA or "
6860+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
68616861 "ECDSA keys."
68626862 msgstr ""
68636863
--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@@ -6886,7 +6886,7 @@ msgstr ""
68866886
68876887 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
68886888 msgid ""
6889-"The given SSH public key is invalid. Please supply proper public RSA or "
6889+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
68906890 "ECDSA keys."
68916891 msgstr ""
68926892
--- a/modules/luci-base/po/nb_NO/base.po
+++ b/modules/luci-base/po/nb_NO/base.po
@@ -6968,7 +6968,7 @@ msgstr ""
69686968
69696969 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
69706970 msgid ""
6971-"The given SSH public key is invalid. Please supply proper public RSA or "
6971+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
69726972 "ECDSA keys."
69736973 msgstr ""
69746974
--- a/modules/luci-base/po/nl/base.po
+++ b/modules/luci-base/po/nl/base.po
@@ -6878,7 +6878,7 @@ msgstr ""
68786878
68796879 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
68806880 msgid ""
6881-"The given SSH public key is invalid. Please supply proper public RSA or "
6881+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
68826882 "ECDSA keys."
68836883 msgstr ""
68846884
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -7277,7 +7277,7 @@ msgstr "Podany klucz publiczny SSH został już dodany."
72777277
72787278 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
72797279 msgid ""
7280-"The given SSH public key is invalid. Please supply proper public RSA or "
7280+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
72817281 "ECDSA keys."
72827282 msgstr ""
72837283 "Podany klucz publiczny SSH jest nieprawidłowy. Podaj odpowiedni publiczny "
--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@@ -7326,7 +7326,7 @@ msgstr "A chave pública SSH dada já foi adicionada."
73267326
73277327 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
73287328 msgid ""
7329-"The given SSH public key is invalid. Please supply proper public RSA or "
7329+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
73307330 "ECDSA keys."
73317331 msgstr ""
73327332 "A chave pública SSH dada é inválida. Por favor, forneça chaves RSA ou ECDSA "
--- a/modules/luci-base/po/pt_BR/base.po
+++ b/modules/luci-base/po/pt_BR/base.po
@@ -7365,7 +7365,7 @@ msgstr "A chave pública SSH fornecida já foi adicionada."
73657365
73667366 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
73677367 msgid ""
7368-"The given SSH public key is invalid. Please supply proper public RSA or "
7368+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
73697369 "ECDSA keys."
73707370 msgstr ""
73717371 "A chave pública SSH fornecida é inválida. Por favor, forneça as chaves "
--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@ -7266,7 +7266,7 @@ msgstr "Cheia publică SSH dată a fost deja adăugată."
72667266
72677267 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
72687268 msgid ""
7269-"The given SSH public key is invalid. Please supply proper public RSA or "
7269+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
72707270 "ECDSA keys."
72717271 msgstr ""
72727272 "Cheia publică SSH furnizată nu este valabilă. Vă rugăm să furnizați chei "
--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@@ -7294,7 +7294,7 @@ msgstr "Указанный публичный SSH ключ уже добавле
72947294
72957295 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
72967296 msgid ""
7297-"The given SSH public key is invalid. Please supply proper public RSA or "
7297+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
72987298 "ECDSA keys."
72997299 msgstr ""
73007300 "Указанный публичный SSH ключ неверный. Укажите правильный RSA или ECDSA ключ."
--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@ -6914,7 +6914,7 @@ msgstr "Poskytnutý verejný kľúč SSH bol už pridaný."
69146914
69156915 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
69166916 msgid ""
6917-"The given SSH public key is invalid. Please supply proper public RSA or "
6917+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
69186918 "ECDSA keys."
69196919 msgstr ""
69206920 "Poskytnutý verejný kľúč SSH nie je platný. Prosím, poskytnite správne "
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -6884,7 +6884,7 @@ msgstr ""
68846884
68856885 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
68866886 msgid ""
6887-"The given SSH public key is invalid. Please supply proper public RSA or "
6887+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
68886888 "ECDSA keys."
68896889 msgstr ""
68906890
--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@@ -6848,8 +6848,8 @@ msgstr ""
68486848
68496849 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
68506850 msgid ""
6851-"The given SSH public key is invalid. Please supply proper public RSA or "
6852-"ECDSA keys."
6851+"The given SSH public key is invalid. Please supply proper public RSA, "
6852+"ED25519 or ECDSA keys."
68536853 msgstr ""
68546854
68556855 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:1098
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@ -7240,7 +7240,7 @@ msgstr "Verilen SSH genel anahtarı zaten eklenmiştir."
72407240
72417241 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
72427242 msgid ""
7243-"The given SSH public key is invalid. Please supply proper public RSA or "
7243+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
72447244 "ECDSA keys."
72457245 msgstr ""
72467246 "Verilen SSH genel anahtarı geçersiz. Lütfen uygun genel RSA veya ECDSA "
--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@@ -7178,7 +7178,7 @@ msgstr "Наданий відкритий SSH-ключ вже було дода
71787178
71797179 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
71807180 msgid ""
7181-"The given SSH public key is invalid. Please supply proper public RSA or "
7181+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
71827182 "ECDSA keys."
71837183 msgstr ""
71847184 "Наданий відкритий SSH-ключ є недійсним. Надавайте належні відкриті ключі RSA "
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -7037,7 +7037,7 @@ msgstr "Khóa công khai SSH đã cho đã được thêm"
70377037
70387038 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
70397039 msgid ""
7040-"The given SSH public key is invalid. Please supply proper public RSA or "
7040+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
70417041 "ECDSA keys."
70427042 msgstr ""
70437043 "Khóa công khai SSH đã cho không hợp lệ. Vui lòng cung cấp khóa RSA hoặc "
--- a/modules/luci-base/po/zh_Hans/base.po
+++ b/modules/luci-base/po/zh_Hans/base.po
@@ -7029,7 +7029,7 @@ msgstr "已添加给定的 SSH 公钥。"
70297029
70307030 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
70317031 msgid ""
7032-"The given SSH public key is invalid. Please supply proper public RSA or "
7032+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
70337033 "ECDSA keys."
70347034 msgstr "给定的 SSH 公钥无效。请提供适当的公共 RSA 或 ECDSA 密钥。"
70357035
--- a/modules/luci-base/po/zh_Hant/base.po
+++ b/modules/luci-base/po/zh_Hant/base.po
@@ -7017,7 +7017,7 @@ msgstr "輸入的 SSH 公鑰早已存在。"
70177017
70187018 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
70197019 msgid ""
7020-"The given SSH public key is invalid. Please supply proper public RSA or "
7020+"The given SSH public key is invalid. Please supply proper public RSA, ED25519 or "
70217021 "ECDSA keys."
70227022 msgstr "輸入的 SSH 公鑰無效。請提供正確的 RSA 公鑰或 ECDSA Keys。"
70237023
--- a/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js
@@ -627,8 +627,8 @@ return baseclass.extend({
627627 o.value('', _('disabled'));
628628 o.value('loose', _('Loose filtering'));
629629 o.value('strict', _('Strict filtering'));
630- o.cfgvalue = function(section_id) {
631- var val = form.ListValue.prototype.cfgvalue.apply(this, [section_id]);
630+ o.cfgvalue = function(/* ... */) {
631+ var val = form.ListValue.prototype.cfgvalue.apply(this, arguments);
632632
633633 switch (val || '') {
634634 case 'loose':
--- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js
@@ -169,7 +169,7 @@ function addKey(ev) {
169169 }
170170 else if (!pubkey) {
171171 ui.showModal(_('Add key'), [
172- E('div', { class: 'alert-message warning' }, _('The given SSH public key is invalid. Please supply proper public RSA or ECDSA keys.')),
172+ E('div', { class: 'alert-message warning' }, _('The given SSH public key is invalid. Please supply proper public RSA, ED25519 or ECDSA keys.')),
173173 E('div', { class: 'right' }, E('div', { class: 'btn', click: L.hideModal }, _('Close')))
174174 ]);
175175 }
Show on old repository browser