From 690db2fe73db871bfc33946728f108d73278f446 Mon Sep 17 00:00:00 2001 From: juewuy Date: Wed, 14 Jan 2026 20:20:25 +0800 Subject: [PATCH] ~Add i18n support for 1_start.sh --- scripts/lang/chs/1_start.lang | 11 +++++++ scripts/lang/en/1_start.lang | 11 +++++++ scripts/menus/1_start.sh | 62 ++++++++++++++++++++++------------- 3 files changed, 61 insertions(+), 23 deletions(-) create mode 100644 scripts/lang/chs/1_start.lang create mode 100644 scripts/lang/en/1_start.lang diff --git a/scripts/lang/chs/1_start.lang b/scripts/lang/chs/1_start.lang new file mode 100644 index 00000000..275f0996 --- /dev/null +++ b/scripts/lang/chs/1_start.lang @@ -0,0 +1,11 @@ +# ===== 启动完成 ===== +START_SERVICE_OK="服务已启动!" +START_WEB_HINT="请使用" +START_WEB_HINT2="管理内置规则" +START_PAC_HINT="其他设备可使用 PAC 配置:" +START_PROXY_HINT="或使用 HTTP / SOCKS5 方式连接:" + +# ===== 启动流程 ===== +START_NO_CORE_CFG_TRY_GEN="没有找到核心配置文件,尝试生成 providers 配置文件!" +START_NO_CORE_CFG_IMPORT_FIRST="没有找到核心配置文件,请先导入配置文件!" +START_FIREWALL_DONE="已完成防火墙设置!" diff --git a/scripts/lang/en/1_start.lang b/scripts/lang/en/1_start.lang new file mode 100644 index 00000000..c45276af --- /dev/null +++ b/scripts/lang/en/1_start.lang @@ -0,0 +1,11 @@ +# ===== Startup ===== +START_SERVICE_OK="Service started successfully!" +START_WEB_HINT="Please use" +START_WEB_HINT2="manage built-in rules" +START_PAC_HINT="Other devices can connect using PAC configuration:" +START_PROXY_HINT="Or connect using HTTP / SOCKS5:" + +# ===== Startup Flow ===== +START_NO_CORE_CFG_TRY_GEN="Core configuration not found. Attempting to generate providers configuration!" +START_NO_CORE_CFG_IMPORT_FIRST="Core configuration not found. Please import a configuration first!" +START_FIREWALL_DONE="Firewall configuration completed!" diff --git a/scripts/menus/1_start.sh b/scripts/menus/1_start.sh index c3c39249..6f0cc258 100644 --- a/scripts/menus/1_start.sh +++ b/scripts/menus/1_start.sh @@ -3,49 +3,65 @@ [ -n "$__IS_MODULE_1_START_LOADED" ] && return __IS_MODULE_1_START_LOADED=1 +load_lang 1_start -#启动相关 +# ===== 启动完成提示 ===== startover() { echo -ne " \r" - echo -e "\033[32m服务已启动!\033[0m" - echo -e "请使用 \033[4;36mhttp://$host$hostdir\033[0m 管理内置规则" + echo -e "\033[32m$START_SERVICE_OK\033[0m" + echo -e "$START_WEB_HINT \033[4;36mhttp://$host$hostdir\033[0m $START_WEB_HINT2" + if [ "$redir_mod" = "纯净模式" ]; then echo "-----------------------------------------------" - echo -e "其他设备可以使用PAC配置连接:\033[4;32mhttp://$host:$db_port/ui/pac\033[0m" - echo -e "或者使用HTTP/SOCK5方式连接:IP{\033[36m$host\033[0m}Port{\033[36m$mix_port\033[0m}" + echo -e "$START_PAC_HINT \033[4;32mhttp://$host:$db_port/ui/pac\033[0m" + echo -e "$START_PROXY_HINT IP{\033[36m$host\033[0m} Port{\033[36m$mix_port\033[0m}" fi return 0 } + +# ===== 启动核心 ===== start_core() { if echo "$crashcore" | grep -q 'singbox'; then - core_config="$CRASHDIR"/jsons/config.json + core_config="$CRASHDIR/jsons/config.json" else - core_config="$CRASHDIR"/yamls/config.yaml + core_config="$CRASHDIR/yamls/config.yaml" fi + echo "-----------------------------------------------" - if [ ! -s $core_config -a -s "$CRASHDIR"/configs/providers.cfg ]; then - echo -e "\033[33m没有找到${crashcore}配置文件,尝试生成providers配置文件!\033[0m" + + if [ ! -s "$core_config" ] && [ -s "$CRASHDIR/configs/providers.cfg" ]; then + echo -e "\033[33m$START_NO_CORE_CFG_TRY_GEN\033[0m" + [ "$crashcore" = singboxr ] && coretype=singbox [ "$crashcore" = meta -o "$crashcore" = clashpre ] && coretype=clash - . "$CRASHDIR"/menus/6_core_config.sh && gen_${coretype}_providers - elif [ -s $core_config -o -n "$Url" -o -n "$Https" ]; then - "$CRASHDIR"/start.sh start - #设置循环检测以判定服务启动是否成功 - . "$CRASHDIR"/libs/start_wait.sh - [ -n "$test" -o -n "$(pidof CrashCore)" ] && { - #启动TG机器人 - [ "$bot_tg_service" = ON ] && . "$CRASHDIR"/menus/bot_tg_service.sh && bot_tg_start - startover - } + + . "$CRASHDIR/menus/6_core_config.sh" && gen_${coretype}_providers + + elif [ -s "$core_config" ] || [ -n "$Url" ] || [ -n "$Https" ]; then + "$CRASHDIR/start.sh" start + + # 循环检测服务启动状态 + . "$CRASHDIR/libs/start_wait.sh" + + [ -n "$test" ] || pidof CrashCore >/dev/null && { + # 启动 TG 机器人 + if [ "$bot_tg_service" = ON ]; then + . "$CRASHDIR/menus/bot_tg_service.sh" && bot_tg_start + fi + startover + } + else - echo -e "\033[31m没有找到${crashcore}配置文件,请先导入配置文件!\033[0m" - . "$CRASHDIR"/menus/6_core_config.sh && set_core_config + echo -e "\033[31m$START_NO_CORE_CFG_IMPORT_FIRST\033[0m" + . "$CRASHDIR/menus/6_core_config.sh" && set_core_config fi } + +# ===== 启动服务入口 ===== start_service() { if [ "$firewall_area" = 5 ]; then - "$CRASHDIR"/start.sh start - echo -e "\033[32m已完成防火墙设置!\033[0m" + "$CRASHDIR/start.sh" start + echo -e "\033[32m$START_FIREWALL_DONE\033[0m" else start_core fi