From 675a6af89cdaf58b72f536b093b45fe98f84ba31 Mon Sep 17 00:00:00 2001 From: divocat Date: Mon, 27 Oct 2025 13:16:18 +0200 Subject: [PATCH] feat: simplify sb check displaying --- fe-app-podkop/locales/calls.json | 4 ++-- fe-app-podkop/locales/podkop.pot | 6 +++--- fe-app-podkop/locales/podkop.ru.po | 8 ++++---- .../src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts | 2 +- .../htdocs/luci-static/resources/view/podkop/main.js | 2 +- luci-app-podkop/po/ru/podkop.po | 8 ++++---- luci-app-podkop/po/templates/podkop.pot | 6 +++--- podkop/files/usr/bin/podkop | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/fe-app-podkop/locales/calls.json b/fe-app-podkop/locales/calls.json index b0a6200..fbaadad 100644 --- a/fe-app-podkop/locales/calls.json +++ b/fe-app-podkop/locales/calls.json @@ -1330,8 +1330,8 @@ ] }, { - "call": "Sing-box version >= 1.12.4", - "key": "Sing-box version >= 1.12.4", + "call": "Sing-box version is compatible (newer than 1.12.4)", + "key": "Sing-box version is compatible (newer than 1.12.4)", "places": [ "src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts:67" ] diff --git a/fe-app-podkop/locales/podkop.pot b/fe-app-podkop/locales/podkop.pot index b5e418a..f0f750a 100644 --- a/fe-app-podkop/locales/podkop.pot +++ b/fe-app-podkop/locales/podkop.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PODKOP\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-10-27 11:06+0200\n" -"PO-Revision-Date: 2025-10-27 11:06+0200\n" +"POT-Creation-Date: 2025-10-27 11:15+0200\n" +"PO-Revision-Date: 2025-10-27 11:15+0200\n" "Last-Translator: divocat \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -792,7 +792,7 @@ msgid "Sing-box service exist" msgstr "" #: src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts:67 -msgid "Sing-box version >= 1.12.4" +msgid "Sing-box version is compatible (newer than 1.12.4)" msgstr "" #: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:89 diff --git a/fe-app-podkop/locales/podkop.ru.po b/fe-app-podkop/locales/podkop.ru.po index 9d9c038..cf50c38 100644 --- a/fe-app-podkop/locales/podkop.ru.po +++ b/fe-app-podkop/locales/podkop.ru.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PODKOP\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-10-27 13:06+0200\n" -"PO-Revision-Date: 2025-10-27 13:06+0200\n" +"POT-Creation-Date: 2025-10-27 13:15+0200\n" +"PO-Revision-Date: 2025-10-27 13:15+0200\n" "Last-Translator: divocat\n" "Language-Team: none\n" "Language: ru\n" @@ -572,8 +572,8 @@ msgstr "Процесс sing-box запущен" msgid "Sing-box service exist" msgstr "Сервис sing-box существует" -msgid "Sing-box version >= 1.12.4" -msgstr "Версия sing-box >= 1.12.4" +msgid "Sing-box version is compatible (newer than 1.12.4)" +msgstr "Версия Sing-box совместима (новее 1.12.4)" msgid "Source Network Interface" msgstr "Сетевой интерфейс источника" diff --git a/fe-app-podkop/src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts b/fe-app-podkop/src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts index 28c7815..b13f0bc 100644 --- a/fe-app-podkop/src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts +++ b/fe-app-podkop/src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts @@ -64,7 +64,7 @@ export async function runSingBoxCheck() { }, { state: data.sing_box_version_ok ? 'success' : 'error', - key: _('Sing-box version >= 1.12.4'), + key: _('Sing-box version is compatible (newer than 1.12.4)'), value: '', }, { diff --git a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js index d7b7ef1..21ec692 100644 --- a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js +++ b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js @@ -2509,7 +2509,7 @@ async function runSingBoxCheck() { }, { state: data.sing_box_version_ok ? "success" : "error", - key: _("Sing-box version >= 1.12.4"), + key: _("Sing-box version is compatible (newer than 1.12.4)"), value: "" }, { diff --git a/luci-app-podkop/po/ru/podkop.po b/luci-app-podkop/po/ru/podkop.po index 9d9c038..cf50c38 100644 --- a/luci-app-podkop/po/ru/podkop.po +++ b/luci-app-podkop/po/ru/podkop.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PODKOP\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-10-27 13:06+0200\n" -"PO-Revision-Date: 2025-10-27 13:06+0200\n" +"POT-Creation-Date: 2025-10-27 13:15+0200\n" +"PO-Revision-Date: 2025-10-27 13:15+0200\n" "Last-Translator: divocat\n" "Language-Team: none\n" "Language: ru\n" @@ -572,8 +572,8 @@ msgstr "Процесс sing-box запущен" msgid "Sing-box service exist" msgstr "Сервис sing-box существует" -msgid "Sing-box version >= 1.12.4" -msgstr "Версия sing-box >= 1.12.4" +msgid "Sing-box version is compatible (newer than 1.12.4)" +msgstr "Версия Sing-box совместима (новее 1.12.4)" msgid "Source Network Interface" msgstr "Сетевой интерфейс источника" diff --git a/luci-app-podkop/po/templates/podkop.pot b/luci-app-podkop/po/templates/podkop.pot index b5e418a..f0f750a 100644 --- a/luci-app-podkop/po/templates/podkop.pot +++ b/luci-app-podkop/po/templates/podkop.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PODKOP\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-10-27 11:06+0200\n" -"PO-Revision-Date: 2025-10-27 11:06+0200\n" +"POT-Creation-Date: 2025-10-27 11:15+0200\n" +"PO-Revision-Date: 2025-10-27 11:15+0200\n" "Last-Translator: divocat \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -792,7 +792,7 @@ msgid "Sing-box service exist" msgstr "" #: src/podkop/tabs/diagnostic/checks/runSingBoxCheck.ts:67 -msgid "Sing-box version >= 1.12.4" +msgid "Sing-box version is compatible (newer than 1.12.4)" msgstr "" #: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:89 diff --git a/podkop/files/usr/bin/podkop b/podkop/files/usr/bin/podkop index 2ef9a9e..0f4f2a4 100755 --- a/podkop/files/usr/bin/podkop +++ b/podkop/files/usr/bin/podkop @@ -2277,9 +2277,9 @@ global_check() { fi if [ "$sing_box_version_ok" -eq 1 ]; then - print_global "✅ Sing-box version >= 1.12.4" + print_global "✅ Sing-box version is compatible (newer than 1.12.4)" else - print_global "❌ Sing-box version >= 1.12.4" + print_global "❌ Sing-box version is not compatible (older than 1.12.4)" fi if [ "$sing_box_service_exist" -eq 1 ]; then