Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-statistics: minor bugfixes in IRQ and OpenVPN plugin config

Browse source 
- Fix cfgvalue loading in IRQ selection
 - Fix cfgbalue loading in OpenVPN status file selection
 - Fix typo in OpenVPN config translation string

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2020-03-29 14:17:55 +02:00
parent cfe6771846
commit 3d96519592
32 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/irq.js
View file

@ -36,6 +36,8 @@ return L.Class.extend({
this.value(m[1], '%s (%s)'.format(m[1], desc || '-')); this.value(m[1], '%s (%s)'.format(m[1], desc || '-'));
} }
return this.super('load', [section_id]);
}, this)); }, this));
}; };

6
applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js
View file

@ -29,7 +29,9 @@ return L.Class.extend({
return L.resolveDefault(fs.list('/var/run'), []).then(L.bind(function(entries) { return L.resolveDefault(fs.list('/var/run'), []).then(L.bind(function(entries) {
for (var i = 0; i < entries.length; i++) for (var i = 0; i < entries.length; i++)
if (entries[i].type == 'file' && entries[i].name.match(/^openvpn\..+\.status$/)) if (entries[i].type == 'file' && entries[i].name.match(/^openvpn\..+\.status$/))
o.value('/var/run/' + entries[i].name); this.value('/var/run/' + entries[i].name);
return this.super('load', [section_id]);
}, this)); }, this));
}; };
}, },
@ -38,6 +40,6 @@ return L.Class.extend({
var stats = L.toArray(section.StatusFile); var stats = L.toArray(section.StatusFile);
if (stats.length) if (stats.length)
return N_(stats.length, 'Monitoring one OpenVPN instance', 'Monitoring %d OpenVPN instancees').format(stats.length); return N_(stats.length, 'Monitoring one OpenVPN instance', 'Monitoring %d OpenVPN instances').format(stats.length);
} }
}); });

2
applications/luci-app-statistics/po/bg/statistics.po
View file

@ -671,7 +671,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""

2
applications/luci-app-statistics/po/ca/statistics.po
View file

@ -682,7 +682,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""

2
applications/luci-app-statistics/po/cs/statistics.po
View file

@ -686,7 +686,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
msgstr[2] "" msgstr[2] ""

2
applications/luci-app-statistics/po/de/statistics.po
View file

@ -682,7 +682,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""

2
applications/luci-app-statistics/po/el/statistics.po
View file

@ -673,7 +673,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""

2
applications/luci-app-statistics/po/en/statistics.po
View file

@ -677,7 +677,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""

2
applications/luci-app-statistics/po/es/statistics.po
View file

@ -681,7 +681,7 @@ msgstr "Monitoreo de puertos de escucha locales"
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "Monitoreo de una instancia de OpenVPN" msgstr[0] "Monitoreo de una instancia de OpenVPN"
msgstr[1] "Monitoreo de %d instancias OpenVPN" msgstr[1] "Monitoreo de %d instancias OpenVPN"

2
applications/luci-app-statistics/po/fr/statistics.po
View file

@ -679,7 +679,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""

2
applications/luci-app-statistics/po/he/statistics.po
View file

@ -670,7 +670,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""

2
applications/luci-app-statistics/po/hi/statistics.po
View file

@ -671,7 +671,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""

2
applications/luci-app-statistics/po/hu/statistics.po
View file

@ -682,7 +682,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""

2
applications/luci-app-statistics/po/it/statistics.po
View file

@ -678,7 +678,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""

2
applications/luci-app-statistics/po/ja/statistics.po
View file

@ -675,7 +675,7 @@ msgstr "ローカルの待ち受けポートを監視中"
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js:20 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js:20

2
applications/luci-app-statistics/po/ko/statistics.po
View file

@ -665,7 +665,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js:20 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js:20

2
applications/luci-app-statistics/po/mr/statistics.po
View file

@ -671,7 +671,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""

2
applications/luci-app-statistics/po/ms/statistics.po
View file

@ -665,7 +665,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js:20 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js:20

2
applications/luci-app-statistics/po/nb_NO/statistics.po
View file

@ -672,7 +672,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""

2
applications/luci-app-statistics/po/pl/statistics.po
View file

@ -690,7 +690,7 @@ msgstr "Monitorowanie lokalnych portów nasłuchiwania"
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "Monitorowanie jednej instancji OpenVPN" msgstr[0] "Monitorowanie jednej instancji OpenVPN"
msgstr[1] "Monitorowanie %d instancji OpenVPN" msgstr[1] "Monitorowanie %d instancji OpenVPN"
msgstr[2] "Monitorowanie innych instancji OpenVPN" msgstr[2] "Monitorowanie innych instancji OpenVPN"

2
applications/luci-app-statistics/po/pt/statistics.po
View file

@ -683,7 +683,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""

2
applications/luci-app-statistics/po/pt_BR/statistics.po
View file

@ -684,7 +684,7 @@ msgstr "Monitorando portas locais de escuta"
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "Monitorando uma instância openVPN" msgstr[0] "Monitorando uma instância openVPN"
msgstr[1] "Monitorando %d instâncias openVPN" msgstr[1] "Monitorando %d instâncias openVPN"

2
applications/luci-app-statistics/po/ro/statistics.po
View file

@ -678,7 +678,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
msgstr[2] "" msgstr[2] ""

2
applications/luci-app-statistics/po/ru/statistics.po
View file

@ -692,7 +692,7 @@ msgstr "Мониторинг локальных прослушиваемых п
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "Мониторинг одного экземпляра OpenVPN" msgstr[0] "Мониторинг одного экземпляра OpenVPN"
msgstr[1] "Мониторинг %d экземпляров OpenVPN" msgstr[1] "Мониторинг %d экземпляров OpenVPN"
msgstr[2] "Мониторинг %d экземпляров OpenVPN" msgstr[2] "Мониторинг %d экземпляров OpenVPN"

2
applications/luci-app-statistics/po/sk/statistics.po
View file

@ -675,7 +675,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
msgstr[2] "" msgstr[2] ""

2
applications/luci-app-statistics/po/sv/statistics.po
View file

@ -669,7 +669,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""

2
applications/luci-app-statistics/po/templates/statistics.pot
View file

@ -658,7 +658,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""

2
applications/luci-app-statistics/po/tr/statistics.po
View file

@ -663,7 +663,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js:20 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js:20

2
applications/luci-app-statistics/po/uk/statistics.po
View file

@ -678,7 +678,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
msgstr[2] "" msgstr[2] ""

2
applications/luci-app-statistics/po/vi/statistics.po
View file

@ -674,7 +674,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js:20 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js:20

2
applications/luci-app-statistics/po/zh_Hans/statistics.po
View file

@ -673,7 +673,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js:20 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js:20

2
applications/luci-app-statistics/po/zh_Hant/statistics.po
View file

@ -672,7 +672,7 @@ msgstr ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/openvpn.js:41
msgid "Monitoring one OpenVPN instance" msgid "Monitoring one OpenVPN instance"
msgid_plural "Monitoring %d OpenVPN instancees" msgid_plural "Monitoring %d OpenVPN instances"
msgstr[0] "" msgstr[0] ""
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js:20 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/nut.js:20