From 6062031de41b882153866e94e41d085846dd3aa4 Mon Sep 17 00:00:00 2001
From: MHSanaei <ho3ein.sanaei@gmail.com>
Date: Fri, 11 Oct 2024 09:15:36 +0200
Subject: [PATCH] fix lang + more geoip option

---
 install.sh                           |  2 +-
 web/html/xui/xray.html               | 24 ++++++++++++++++++++----
 web/translation/translate.en_US.toml |  7 +++++++
 web/translation/translate.es_ES.toml |  2 ++
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/install.sh b/install.sh
index c4cc6798f8..8f425118b1 100644
--- a/install.sh
+++ b/install.sh
@@ -138,7 +138,7 @@ gen_random_string() {
 
 config_after_install() {
     echo -e "${yellow}Install/update finished! For security, it's recommended to modify panel settings ${plain}"
-    read -p "Would you like to customize ${yellow}the Panel Port ${plain}settings? (If not, random settings will be applied) [y/n]: " config_confirm
+    read -p "Would you like to customize the Panel Port settings? (If not, random settings will be applied) [y/n]: " config_confirm
 
     local config_webBasePath=$(gen_random_string 15)
     local config_account=$(gen_random_string 10)
diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html
index ac97b1f1f2..a5a842c44b 100644
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@@ -316,7 +316,7 @@
                                     v-model="directDomains"
                                     :dropdown-class-name="themeSwitcher.currentTheme">
                                         <a-select-option :value="p.value" :label="p.label"
-                                            v-for="p in settingsData.DomainsOptions"> [[ p.label ]]
+                                            v-for="p in settingsData.DirectDomainsOptions"> [[ p.label ]]
                                         </a-select-option>
                                     </a-select>
                                 </template>
@@ -903,11 +903,16 @@
                     { label: '🇨🇳 China', value: 'geoip:cn' },
                     { label: '🇷🇺 Russia', value: 'geoip:ru' },
                     { label: '🇻🇳 Vietnam', value: 'ext:geoip_VN.dat:vn' },
+                    { label: '🇪🇸 Spain', value: 'geoip:es' },
+                    { label: '🇮🇩 Indonesia', value: 'geoip:id' },
+                    { label: '🇺🇦 Ukraine', value: 'geoip:ua' },
+                    { label: '🇹🇷 Türkiye', value: 'geoip:tr' },
+                    { label: '🇧🇷 Brazil', value: 'geoip:br' },
                 ],
                 DomainsOptions: [
                     { label: 'Ads All', value: 'geosite:category-ads-all' },
-                    { label: 'Ads IR', value: 'ext:geosite_IR.dat:category-ads-all' },
-                    { label: 'Ads VN', value: 'ext:geosite_VN.dat:ads' },
+                    { label: 'Ads IR 🇮🇷', value: 'ext:geosite_IR.dat:category-ads-all' },
+                    { label: 'Ads VN 🇻🇳', value: 'ext:geosite_VN.dat:ads' },
                     { label: 'Sec-IR malware', value: 'geosite_IR.dat:malware' },
                     { label: 'Sec-IR phishing', value: 'geosite_IR.dat:phishing' },
                     { label: 'Sec-IR cryptominers', value: 'geosite_IR.dat:cryptominers' },
@@ -916,7 +921,18 @@
                     { label: '🇮🇷 .ایران', value: 'regexp:.*\\.xn--mgba3a4f16a$' },
                     { label: '🇨🇳 China', value: 'geosite:cn' },
                     { label: '🇨🇳 .cn', value: 'regexp:.*\\.cn$' },
-                    { label: '🇷🇺 Russia', value: 'geosite:category-ru' },  //https://github.com/v2fly/domain-list-community/blob/master/data/category-ru
+                    { label: '🇷🇺 Russia', value: 'geosite:category-ru' },
+                    { label: '🇷🇺 .ru', value: 'regexp:.*\\.ru' },
+                    { label: '🇻🇳 Vietnam', value: 'ext:geosite_VN.dat:vn' },
+                    { label: '🇻🇳 .vn', value: 'regexp:.*\\.vn$' },
+                ],
+                DirectDomainsOptions: [
+                    { label: '🇮🇷 Iran', value: 'ext:geosite_IR.dat:ir' },
+                    { label: '🇮🇷 .ir', value: 'regexp:.*\\.ir$' },
+                    { label: '🇮🇷 .ایران', value: 'regexp:.*\\.xn--mgba3a4f16a$' },
+                    { label: '🇨🇳 China', value: 'geosite:cn' },
+                    { label: '🇨🇳 .cn', value: 'regexp:.*\\.cn$' },
+                    { label: '🇷🇺 Russia', value: 'geosite:category-ru' },
                     { label: '🇷🇺 .ru', value: 'regexp:.*\\.ru' },
                     { label: '🇻🇳 Vietnam', value: 'ext:geosite_VN.dat:vn' },
                     { label: '🇻🇳 .vn', value: 'regexp:.*\\.vn$' },
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
index 7b813357a0..7e2e5eef0c 100644
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -351,6 +351,13 @@
 "TorrentDesc" = "Blocks BitTorrent protocol."
 "Family" = "Family Protection"
 "FamilyDesc" = "Blocks adult content, and malware websites."
+"Inbounds" = "Inbounds"
+"InboundsDesc" = "Accepting the specific clients."
+"Outbounds" = "Outbounds"
+"Balancers" = "Balancers"
+"OutboundsDesc" = "Set the outgoing traffic pathway."
+"Routings" = "Routing Rules"
+"RoutingsDesc" = "The priority of each rule is important!"
 "completeTemplate" = "All"
 "logLevel" = "Log Level"
 "logLevelDesc" = "The log level for error logs, indicating the information that needs to be recorded."
diff --git a/web/translation/translate.es_ES.toml b/web/translation/translate.es_ES.toml
index 0c18e936d6..1ca7a50516 100644
--- a/web/translation/translate.es_ES.toml
+++ b/web/translation/translate.es_ES.toml
@@ -424,6 +424,8 @@
 [pages.xray.dns]
 "enable" = "Habilitar DNS"
 "enableDesc" = "Habilitar servidor DNS incorporado"
+"tag" = "Etiqueta de Entrada DNS"
+"tagDesc" = "Esta etiqueta estará disponible como una etiqueta de entrada en las reglas de enrutamiento."
 "strategy" = "Estrategia de Consulta"
 "strategyDesc" = "Estrategia general para resolver nombres de dominio"
 "add" = "Agregar Servidor"