mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2025-04-19 21:42:24 +00:00
fix lang + more geoip option
This commit is contained in:
parent
fb2b58110d
commit
6062031de4
4 changed files with 30 additions and 5 deletions
|
@ -138,7 +138,7 @@ gen_random_string() {
|
||||||
|
|
||||||
config_after_install() {
|
config_after_install() {
|
||||||
echo -e "${yellow}Install/update finished! For security, it's recommended to modify panel settings ${plain}"
|
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_webBasePath=$(gen_random_string 15)
|
||||||
local config_account=$(gen_random_string 10)
|
local config_account=$(gen_random_string 10)
|
||||||
|
|
|
@ -316,7 +316,7 @@
|
||||||
v-model="directDomains"
|
v-model="directDomains"
|
||||||
:dropdown-class-name="themeSwitcher.currentTheme">
|
:dropdown-class-name="themeSwitcher.currentTheme">
|
||||||
<a-select-option :value="p.value" :label="p.label"
|
<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-option>
|
||||||
</a-select>
|
</a-select>
|
||||||
</template>
|
</template>
|
||||||
|
@ -903,11 +903,16 @@
|
||||||
{ label: '🇨🇳 China', value: 'geoip:cn' },
|
{ label: '🇨🇳 China', value: 'geoip:cn' },
|
||||||
{ label: '🇷🇺 Russia', value: 'geoip:ru' },
|
{ label: '🇷🇺 Russia', value: 'geoip:ru' },
|
||||||
{ label: '🇻🇳 Vietnam', value: 'ext:geoip_VN.dat:vn' },
|
{ 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: [
|
DomainsOptions: [
|
||||||
{ label: 'Ads All', value: 'geosite:category-ads-all' },
|
{ label: 'Ads All', value: 'geosite:category-ads-all' },
|
||||||
{ label: 'Ads IR', value: 'ext:geosite_IR.dat: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 VN 🇻🇳', value: 'ext:geosite_VN.dat:ads' },
|
||||||
{ label: 'Sec-IR malware', value: 'geosite_IR.dat:malware' },
|
{ label: 'Sec-IR malware', value: 'geosite_IR.dat:malware' },
|
||||||
{ label: 'Sec-IR phishing', value: 'geosite_IR.dat:phishing' },
|
{ label: 'Sec-IR phishing', value: 'geosite_IR.dat:phishing' },
|
||||||
{ label: 'Sec-IR cryptominers', value: 'geosite_IR.dat:cryptominers' },
|
{ label: 'Sec-IR cryptominers', value: 'geosite_IR.dat:cryptominers' },
|
||||||
|
@ -916,7 +921,18 @@
|
||||||
{ label: '🇮🇷 .ایران', value: 'regexp:.*\\.xn--mgba3a4f16a$' },
|
{ label: '🇮🇷 .ایران', value: 'regexp:.*\\.xn--mgba3a4f16a$' },
|
||||||
{ label: '🇨🇳 China', value: 'geosite:cn' },
|
{ label: '🇨🇳 China', value: 'geosite:cn' },
|
||||||
{ label: '🇨🇳 .cn', value: 'regexp:.*\\.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: '🇷🇺 .ru', value: 'regexp:.*\\.ru' },
|
||||||
{ label: '🇻🇳 Vietnam', value: 'ext:geosite_VN.dat:vn' },
|
{ label: '🇻🇳 Vietnam', value: 'ext:geosite_VN.dat:vn' },
|
||||||
{ label: '🇻🇳 .vn', value: 'regexp:.*\\.vn$' },
|
{ label: '🇻🇳 .vn', value: 'regexp:.*\\.vn$' },
|
||||||
|
|
|
@ -351,6 +351,13 @@
|
||||||
"TorrentDesc" = "Blocks BitTorrent protocol."
|
"TorrentDesc" = "Blocks BitTorrent protocol."
|
||||||
"Family" = "Family Protection"
|
"Family" = "Family Protection"
|
||||||
"FamilyDesc" = "Blocks adult content, and malware websites."
|
"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"
|
"completeTemplate" = "All"
|
||||||
"logLevel" = "Log Level"
|
"logLevel" = "Log Level"
|
||||||
"logLevelDesc" = "The log level for error logs, indicating the information that needs to be recorded."
|
"logLevelDesc" = "The log level for error logs, indicating the information that needs to be recorded."
|
||||||
|
|
|
@ -424,6 +424,8 @@
|
||||||
[pages.xray.dns]
|
[pages.xray.dns]
|
||||||
"enable" = "Habilitar DNS"
|
"enable" = "Habilitar DNS"
|
||||||
"enableDesc" = "Habilitar servidor DNS incorporado"
|
"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"
|
"strategy" = "Estrategia de Consulta"
|
||||||
"strategyDesc" = "Estrategia general para resolver nombres de dominio"
|
"strategyDesc" = "Estrategia general para resolver nombres de dominio"
|
||||||
"add" = "Agregar Servidor"
|
"add" = "Agregar Servidor"
|
||||||
|
|
Loading…
Reference in a new issue