From f30235373ae7fa07015f569f886f6243a2c69f31 Mon Sep 17 00:00:00 2001 From: Alireza Ahmadi Date: Sat, 11 Feb 2023 09:48:20 +0100 Subject: [PATCH] translations fix --- install.sh | 48 +++++++++++++------------- web/service/setting.go | 4 +-- web/translation/translate.en_US.toml | 6 +++- web/translation/translate.fa_IR.toml | 6 +++- web/translation/translate.zh_Hans.toml | 4 ++- 5 files changed, 39 insertions(+), 29 deletions(-) diff --git a/install.sh b/install.sh index 922f319e..40714ff0 100755 --- a/install.sh +++ b/install.sh @@ -26,7 +26,7 @@ elif cat /proc/version | grep -Eqi "ubuntu"; then elif cat /proc/version | grep -Eqi "centos|red hat|redhat"; then release="centos" else - echo -e "${red} check system OS failed,please contact with author! ${plain}\n" && exit 1 + echo -e "${red} Check system OS failed, please contact the author! ${plain}\n" && exit 1 fi arch=$(arch) @@ -39,13 +39,13 @@ elif [[ $arch == "s390x" ]]; then arch="s390x" else arch="amd64" - echo -e "${red} Fail to check system arch,will use default arch here: ${arch}${plain}" + echo -e "${red} Fail to check system arch, will use default arch: ${arch}${plain}" fi echo "arch: ${arch}" if [ $(getconf WORD_BIT) != '32' ] && [ $(getconf LONG_BIT) != '64' ]; then - echo "x-ui dosen't support 32bit(x86) system,please use 64 bit operating system(x86_64) instead,if there is something wrong,plz let me know" + echo "x-ui dosen't support 32-bit(x86) system, please use 64 bit operating system(x86_64) instead,if there is something wrong, plz let me know" exit -1 fi @@ -61,15 +61,15 @@ fi if [[ x"${release}" == x"centos" ]]; then if [[ ${os_version} -le 6 ]]; then - echo -e "${red} please use CentOS 7 or higher version ${plain}\n" && exit 1 + echo -e "${red} Please use CentOS 7 or higher version ${plain}\n" && exit 1 fi elif [[ x"${release}" == x"ubuntu" ]]; then if [[ ${os_version} -lt 16 ]]; then - echo -e "${red} please use Ubuntu 16 or higher version ${plain}\n" && exit 1 + echo -e "${red} Please use Ubuntu 16 or higher version ${plain}\n" && exit 1 fi elif [[ x"${release}" == x"debian" ]]; then if [[ ${os_version} -lt 8 ]]; then - echo -e "${red} please use Debian 8 or higher version ${plain}\n" && exit 1 + echo -e "${red} Please use Debian 8 or higher version ${plain}\n" && exit 1 fi fi @@ -83,22 +83,22 @@ install_base() { #This function will be called when user installed x-ui out of sercurity config_after_install() { - echo -e "${yellow} Install/update finished need to modify panel settings out of security ${plain}" - read -p "are you continue,if you type n will skip this at this time[y/n]": config_confirm + echo -e "${yellow}Install/update finished! For security it's recommended to modify panel settings ${plain}" + read -p "Do you want to continue with the modification [y/n]? ": config_confirm if [[ x"${config_confirm}" == x"y" || x"${config_confirm}" == x"Y" ]]; then - read -p "please set up your username:" config_account - echo -e "${yellow}your username will be:${config_account}${plain}" - read -p "please set up your password:" config_password - echo -e "${yellow}your password will be:${config_password}${plain}" - read -p "please set up the panel port:" config_port - echo -e "${yellow}your panel port is:${config_port}${plain}" - echo -e "${yellow}initializing,wait some time here...${plain}" + read -p "Please set up your username:" config_account + echo -e "${yellow}Your username will be:${config_account}${plain}" + read -p "Please set up your password:" config_password + echo -e "${yellow}Your password will be:${config_password}${plain}" + read -p "Please set up the panel port:" config_port + echo -e "${yellow}Your panel port is:${config_port}${plain}" + echo -e "${yellow}Initializing, please wait...${plain}" /usr/local/x-ui/x-ui setting -username ${config_account} -password ${config_password} - echo -e "${yellow}account name and password set down!${plain}" + echo -e "${yellow}Account name and password set successfully!${plain}" /usr/local/x-ui/x-ui setting -port ${config_port} - echo -e "${yellow}panel port set down!${plain}" + echo -e "${yellow}Panel port set successfully!${plain}" else - echo -e "${red}Canceled, all setting items are default settings${plain}" + echo -e "${red}Canceled, will use the default settings.${plain}" fi } @@ -109,19 +109,19 @@ install_x-ui() { if [ $# == 0 ]; then last_version=$(curl -Ls "https://api.github.com/repos/alireza0/x-ui/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') if [[ ! -n "$last_version" ]]; then - echo -e "${red}refresh x-ui version failed,it may due to Github API restriction,please try it later${plain}" + echo -e "${red}Failed to fetch x-ui version, it maybe due to Github API restrictions, please try it later${plain}" exit 1 fi - echo -e "get x-ui latest version succeed: ${last_version}, begin to install..." + echo -e "Got x-ui latest version: ${last_version}, beginning the installation..." wget -N --no-check-certificate -O /usr/local/x-ui-linux-${arch}.tar.gz https://github.com/alireza0/x-ui/releases/download/${last_version}/x-ui-linux-${arch}.tar.gz if [[ $? -ne 0 ]]; then - echo -e "${red}dowanload x-ui failed,please be sure that your server can access Github ${plain}" + echo -e "${red}Dowanloading x-ui failed, please be sure that your server can access Github ${plain}" exit 1 fi else last_version=$1 url="https://github.com/alireza0/x-ui/releases/download/${last_version}/x-ui-linux-${arch}.tar.gz" - echo -e "begin to install x-ui v$1" + echo -e "Begining to install x-ui v$1" wget -N --no-check-certificate -O /usr/local/x-ui-linux-${arch}.tar.gz ${url} if [[ $? -ne 0 ]]; then echo -e "${red}dowanload x-ui v$1 failed,please check the verison exists${plain}" @@ -151,7 +151,7 @@ install_x-ui() { systemctl daemon-reload systemctl enable x-ui systemctl start x-ui - echo -e "${green}x-ui v${last_version}${plain} install finished,it is working now..." + echo -e "${green}x-ui v${last_version}${plain} installation finished, it is up and running now..." echo -e "" echo -e "x-ui control menu usages: " echo -e "----------------------------------------------" @@ -170,6 +170,6 @@ install_x-ui() { echo -e "----------------------------------------------" } -echo -e "${green}excuting...${plain}" +echo -e "${green}Excuting...${plain}" install_base install_x-ui $1 diff --git a/web/service/setting.go b/web/service/setting.go index bedc8333..4302af34 100644 --- a/web/service/setting.go +++ b/web/service/setting.go @@ -28,7 +28,7 @@ var defaultValueMap = map[string]string{ "webKeyFile": "", "secret": random.Seq(32), "webBasePath": "/", - "timeLocation": "Asia/Shanghai", + "timeLocation": "Asia/Tehran", "tgBotEnable": "false", "tgBotToken": "", "tgBotChatId": "0", @@ -69,7 +69,7 @@ func (s *SettingService) GetAllSetting() (*entity.AllSetting, error) { } if !found { - // 有些设置自动生成，不需要返回到前端给用户修改 + // Some settings are automatically generated, no need to return to the front end to modify the user return nil } diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml index 741a72bd..8206ff81 100644 --- a/web/translation/translate.en_US.toml +++ b/web/translation/translate.en_US.toml @@ -10,6 +10,7 @@ "remark" = "remark" "enable" = "enable" "protocol" = "protocol" +"search" = "search" "loading" = "Loading" "second" = "second" @@ -17,10 +18,11 @@ "hour" = "hour" "day" = "day" "check" = "check" -"indefinitely" = "indefinitely" +"indefinite" = "indefinite" "unlimited" = "unlimited" "none" = "none" "qrCode" = "QR Code" +"info" = "More information" "edit" = "edit" "delete" = "delete" "reset" = "reset" @@ -42,6 +44,7 @@ "getVersion" = "get version" "install" = "install" "clients" = "Clients" +"usage" = "Usage" [menu] "dashboard" = "System Status" @@ -124,6 +127,7 @@ "keyPath" = "key file path" "keyContent" = "key content" "clickOnQRcode" = "click on QR Code to Copy" +"client" = "Client" [pages.inbounds.toasts] "obtain" = "Obtain" diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml index 9b72d80c..d1184ba7 100644 --- a/web/translation/translate.fa_IR.toml +++ b/web/translation/translate.fa_IR.toml @@ -10,6 +10,7 @@ "remark" = "نام" "enable" = "فعال" "protocol" = "پروتکل" +"search" = "جستجو" "loading" = "در حال بروزرسانی..." "second" = "ثانیه" @@ -17,10 +18,11 @@ "hour" = "ساعت" "day" = "روز" "check" = "چک کردن" -"indefinitely" = "نامحدود" +"indefinite" = "نامحدود" "unlimited" = "نامحدود" "none" = "هیچ" "qrCode" = "QR کد" +"info" = "اطلاعات بیشتر" "edit" = "ویرایش" "delete" = "حذف" "reset" = "ریست" @@ -42,6 +44,7 @@ "getVersion" = "دریافت ورژن" "install" = "نصب" "clients" = "کاربران" +"usage" = "استفاده" [menu] "dashboard" = "وضعیت سیستم" @@ -124,6 +127,7 @@ "keyPath" = "مسیر فایل Private.key" "keyContent" = "محتوای Private.key" "clickOnQRcode" = "برای کپی بر روی کد تصویری کلیک کنید" +"client" = "کاربر" [pages.inbounds.toasts] "obtain" = "Obtain" diff --git a/web/translation/translate.zh_Hans.toml b/web/translation/translate.zh_Hans.toml index b219c8b6..566d9238 100644 --- a/web/translation/translate.zh_Hans.toml +++ b/web/translation/translate.zh_Hans.toml @@ -10,6 +10,7 @@ "remark" = "备注" "enable" = "启用" "protocol" = "协议" +"search" = "搜尋" "loading" = "加载中" "second" = "秒" @@ -17,10 +18,11 @@ "hour" = "小时" "day" = "天" "check" = "查看" -"indefinitely" = "无限期" +"indefinite" = "无限期" "unlimited" = "无限制" "none" = "无" "qrCode" = "二维码" +"info" = "更多信息" "edit" = "编辑" "delete" = "删除" "reset" = "重置"