Skip to content

Commit 84e41b4

Browse files
17151733291715173329
committed
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2 parents c5e5406 + 2eb0501 commit 84e41b4

File tree

319 files changed

+9259
-3886
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

319 files changed

+9259
-3886
lines changed

‎applications/luci-app-acme/po/ko/acme.po‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
msgid ""
22
msgstr ""
3-
"PO-Revision-Date: 2025-12-31 00:52+0000\n"
3+
"PO-Revision-Date: 2026-01-09 02:04+0000\n"
44
"Last-Translator: Hyeonjeong Lee <h9101654@gmail.com>\n"
55
"Language-Team: Korean <https://hosted.weblate.org/projects/openwrt/"
66
"luciapplicationsacme/ko/>\n"
@@ -12,7 +12,7 @@ msgstr ""
1212

1313
#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme/logread.js:4
1414
msgid "ACME Log"
15-
msgstr ""
15+
msgstr "ACME 로그"
1616

1717
#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme/acme.js:40
1818
#: applications/luci-app-acme/root/usr/share/luci/menu.d/luci-app-acme.json:3
@@ -128,7 +128,7 @@ msgstr "계정 키에 연결할 이메일 주소입니다."
128128

129129
#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme/acme.js:62
130130
msgid "Enable debug logging"
131-
msgstr "디버그 로깅 사용"
131+
msgstr "디버그 로그 기록 사용"
132132

133133
#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme/acme.js:86
134134
msgid "Enabled"

‎applications/luci-app-acme/po/nl/acme.po‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
4-
"PO-Revision-Date: 2025-12-28 09:02+0000\n"
5-
"Last-Translator: Mijzelf <Mijzelf@live.com>\n"
4+
"PO-Revision-Date: 2026-01-10 04:39+0000\n"
5+
"Last-Translator: Marco Otto <marco.otto@tuta.com>\n"
66
"Language-Team: Dutch <https://hosted.weblate.org/projects/openwrt/"
77
"luciapplicationsacme/nl/>\n"
88
"Language: nl\n"
@@ -14,7 +14,7 @@ msgstr ""
1414

1515
#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme/logread.js:4
1616
msgid "ACME Log"
17-
msgstr ""
17+
msgstr "ACME Log"
1818

1919
#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme/acme.js:40
2020
#: applications/luci-app-acme/root/usr/share/luci/menu.d/luci-app-acme.json:3

‎applications/luci-app-adblock-fast/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PKG_NAME:=luci-app-adblock-fast
77
PKG_LICENSE:=AGPL-3.0-or-later
88
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
99
PKG_VERSION:=1.2.0
10-
PKG_RELEASE:=20
10+
PKG_RELEASE:=26
1111

1212
LUCI_TITLE:=AdBlock-Fast Web UI
1313
LUCI_URL:=https://github.com/stangri/luci-app-adblock-fast/

‎applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js‎

Lines changed: 55 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var pkg = {
1212
return "adblock-fast";
1313
},
1414
get LuciCompat() {
15-
return 8;
15+
return 9;
1616
},
1717
get ReadmeCompat() {
1818
return "";
@@ -213,10 +213,56 @@ var RPC = {
213213
function (result) {
214214
this.emit("setInitAction", result);
215215
}.bind(this)
216+
).catch(
217+
function (error) {
218+
// Even if RPC call fails/times out, emit event to start polling
219+
// This handles cases where the backend task starts but RPC times out
220+
this.emit("setInitAction", { timeout: true });
221+
}.bind(this)
216222
);
217223
},
218224
};
219225

226+
// Poll service status until completion (for long-running operations like download)
227+
var pollServiceStatus = function (callback) {
228+
var maxAttempts = 120; // Max 2 minutes of polling
229+
var attempt = 0;
230+
231+
var checkStatus = function () {
232+
attempt++;
233+
234+
// Use the RPC function directly from the module scope
235+
L.resolveDefault(getInitStatus(pkg.Name), {}).then(function (statusData) {
236+
var currentStatus = statusData && statusData[pkg.Name] && statusData[pkg.Name].status;
237+
238+
// Check if completed or failed
239+
if (currentStatus === 'statusSuccess' ||
240+
currentStatus === 'statusFail' ||
241+
currentStatus === 'statusStopped') {
242+
callback(true, currentStatus);
243+
}
244+
// Check if timed out
245+
else if (attempt >= maxAttempts) {
246+
callback(false, 'timeout');
247+
}
248+
// Continue polling
249+
else {
250+
setTimeout(checkStatus, 1000); // Check again in 1 second
251+
}
252+
}).catch(function (err) {
253+
// Retry on error unless timed out
254+
if (attempt < maxAttempts) {
255+
setTimeout(checkStatus, 1000);
256+
} else {
257+
callback(false, 'error');
258+
}
259+
});
260+
};
261+
262+
// Start polling after 2 seconds delay (give backend time to start the task)
263+
setTimeout(checkStatus, 2000);
264+
};
265+
220266
var status = baseclass.extend({
221267
render: function () {
222268
return Promise.all([
@@ -266,8 +312,8 @@ var status = baseclass.extend({
266312
pkg.LuciCompat,
267313
reply.status.rpcdCompat,
268314
'<a href="' +
269-
pkg.URL +
270-
'#internal_version_mismatch" target="_blank">',
315+
pkg.URL +
316+
'#internal_version_mismatch" target="_blank">',
271317
"</a>",
272318
],
273319
});
@@ -599,8 +645,12 @@ var status = baseclass.extend({
599645
});
600646

601647
RPC.on("setInitAction", function (reply) {
602-
ui.hideModal();
603-
location.reload();
648+
// Don't immediately hide modal and reload
649+
// Instead, poll status until the operation actually completes
650+
pollServiceStatus(function () {
651+
ui.hideModal();
652+
location.reload();
653+
});
604654
});
605655

606656
return L.Class.extend({

‎applications/luci-app-adblock-fast/po/ko/adblock-fast.po‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
msgid ""
22
msgstr ""
3-
"PO-Revision-Date: 2025-12-29 16:35+0000\n"
3+
"PO-Revision-Date: 2026-01-09 19:56+0000\n"
44
"Last-Translator: Hyeonjeong Lee <h9101654@gmail.com>\n"
55
"Language-Team: Korean <https://hosted.weblate.org/projects/openwrt/"
66
"luciapplicationsadblock-fast/ko/>\n"
@@ -83,11 +83,11 @@ msgstr "고급 설정"
8383
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:508
8484
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:513
8585
msgid "Allow"
86-
msgstr ""
86+
msgstr "허용"
8787

8888
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:466
8989
msgid "Allowed Domains"
90-
msgstr ""
90+
msgstr "허용된 도메인"
9191

9292
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:421
9393
msgid ""
@@ -110,7 +110,7 @@ msgstr ""
110110
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:474
111111
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:62
112112
msgid "Blocked Domains"
113-
msgstr "차단된 도메인들"
113+
msgstr "차단된 도메인"
114114

115115
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:292
116116
msgid "Blocking %s domains (with %s)."
@@ -163,7 +163,7 @@ msgstr ""
163163
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:131
164164
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:61
165165
msgid "DNS Service"
166-
msgstr ""
166+
msgstr "DNS 서비스"
167167

168168
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:53
169169
msgid "DNS resolution option, see the %sREADME%s for details."
@@ -511,7 +511,7 @@ msgstr ""
511511

512512
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:62
513513
msgid "Restarting"
514-
msgstr "다시 시작 중"
514+
msgstr "재시작 중"
515515

516516
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:89
517517
msgid "Sanity check discovered TLDs in %s"
@@ -547,7 +547,7 @@ msgstr ""
547547

548548
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:500
549549
msgid "Size: %s"
550-
msgstr ""
550+
msgstr "크기: %s"
551551

552552
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:320
553553
msgid "Some output"

‎applications/luci-app-adblock-fast/po/lt/adblock-fast.po‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
4-
"PO-Revision-Date: 2025-12-30 17:01+0000\n"
4+
"PO-Revision-Date: 2026-01-05 19:04+0000\n"
55
"Last-Translator: Džiugas Januševičius <dziugas1959@hotmail.com>\n"
66
"Language-Team: Lithuanian <https://hosted.weblate.org/projects/openwrt/"
77
"luciapplicationsadblock-fast/lt/>\n"
@@ -809,7 +809,7 @@ msgstr "nepavyko atkurti atsarginės kopijos failo – %s"
809809

810810
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:334
811811
msgid "none"
812-
msgstr "joks (-ia/-ie)"
812+
msgstr "joks (-ia/-ie/-ios)"
813813

814814
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:146
815815
msgid "smartdns domain set"

‎applications/luci-app-adblock-fast/po/ru/adblock-fast.po‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: LuCI: simple-adblock\n"
44
"POT-Creation-Date: 2017-12-07 14:00+0300\n"
5-
"PO-Revision-Date: 2025-09-21 06:29+0000\n"
5+
"PO-Revision-Date: 2026-01-09 19:56+0000\n"
66
"Last-Translator: vanapro1 <law820314@gmail.com>\n"
77
"Language-Team: Russian <https://hosted.weblate.org/projects/openwrt/"
88
"luciapplicationsadblock-fast/ru/>\n"
@@ -12,7 +12,7 @@ msgstr ""
1212
"Content-Transfer-Encoding: 8bit\n"
1313
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1414
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
15-
"X-Generator: Weblate 5.14-dev\n"
15+
"X-Generator: Weblate 5.15.1\n"
1616
"Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
1717
"интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
1818

@@ -448,7 +448,7 @@ msgstr "Отсутствует рекомендуемый пакет: '%s'"
448448

449449
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:525
450450
msgid "Name"
451-
msgstr "Название"
451+
msgstr "Имя"
452452

453453
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:516
454454
msgid "Name/URL"

0 commit comments

Comments
 (0)