tcjlj/ZeroOmega
1
0
Fork 0
mirror of https://github.com/zero-peak/ZeroOmega.git synced 2025-02-02 02:58:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disallow creating bare Rulelist profiles. Use SwitchProfile instead.

Browse Source
This commit is contained in:
FelisCatus 2014-10-04 19:18:07 +08:00
parent 9a628a3452
commit 6d679e92a1
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
omega-i18n/en/messages.json
View File

@ -461,7 +461,7 @@
"message": "Please select the type of the profile:" "message": "Please select the type of the profile:"
}, },
"options_profileTypeFixedProfile" : { "options_profileTypeFixedProfile" : {
"message": "Fixed Profile" "message": "Proxy Profile"
}, },
"options_profileDescFixedProfile" : { "options_profileDescFixedProfile" : {
"message": "Tunneling traffic through proxy servers." "message": "Tunneling traffic through proxy servers."
@ -472,11 +472,14 @@
"options_profileDescPacProfile" : { "options_profileDescPacProfile" : {
"message": "Choosing proxies using an online/local PAC script." "message": "Choosing proxies using an online/local PAC script."
}, },
"options_profileDescMorePacProfile" : {
"message": "You will only need this if you have a PAC script or a URL to it. Don't try to create one unless you have knowledge about PAC."
},
"options_profileTypeSwitchProfile" : { "options_profileTypeSwitchProfile" : {
"message": "Switch Profile" "message": "Switch Profile"
}, },
"options_profileDescSwitchProfile" : { "options_profileDescSwitchProfile" : {
"message": "Applying different profiles automatically on various conditions such as domains or patterns. (Replaces AutoSwitch mode.)" "message": "Applying different profiles automatically on various conditions such as domains or patterns.\n You can also import rules published online for easier switching. (Replaces AutoSwitch mode + Rule List.)"
}, },
"options_profileTypeRuleListProfile" : { "options_profileTypeRuleListProfile" : {
"message": "Rule List Profile" "message": "Rule List Profile"

5
omega-i18n/zh/messages.json
View File

@ -472,11 +472,14 @@
"options_profileDescPacProfile" : { "options_profileDescPacProfile" : {
"message": "根据在线或本地的PAC脚本选择代理。" "message": "根据在线或本地的PAC脚本选择代理。"
}, },
"options_profileDescMorePacProfile" : {
"message": "如果您没有任何PAC脚本，也没有脚本的网址，则不必使用此情景模式。不了解PAC的用户不建议自行尝试编写脚本。"
},
"options_profileTypeSwitchProfile" : { "options_profileTypeSwitchProfile" : {
"message": "自动切换模式" "message": "自动切换模式"
}, },
"options_profileDescSwitchProfile" : { "options_profileDescSwitchProfile" : {
"message": "根据多种条件，如域名或网址等自动选择情景模式。" "message": "根据多种条件，如域名或网址等自动选择情景模式。您也可以导入在线发布的切换规则（如 AutoProxy 列表）以简化设置。"
}, },
"options_profileTypeRuleListProfile" : { "options_profileTypeRuleListProfile" : {
"message": "规则列表" "message": "规则列表"

9
omega-web/src/partials/new_profile.jade
View File

@ -36,14 +36,7 @@ form(ng-submit='newProfile.$valid && $close(profile)' name='newProfile')
= ' ' = ' '
span {{'options_profileTypePacProfile' | tr}} span {{'options_profileTypePacProfile' | tr}}
.help-block {{'options_profileDescPacProfile' | tr}} .help-block {{'options_profileDescPacProfile' | tr}}
.radio .help-block {{'options_profileDescMorePacProfile' | tr}}
label
input(type='radio', name='profile-new-type', value='SwitchyRuleListProfile' ng-model='profile.profileType')
span.profile-type
span.glyphicon.glyphicon-list
= ' '
span {{'options_profileTypeRuleListProfile' | tr}}
.help-block {{'options_profileDescRuleListProfile' | tr}}
.modal-footer .modal-footer
button.btn.btn-default(type='button' ng-click='$dismiss()') {{'dialog_cancel' | tr}} button.btn.btn-default(type='button' ng-click='$dismiss()') {{'dialog_cancel' | tr}}
button.btn.btn-primary(type='submit' ng-disabled='!newProfile.$valid') {{'options_createProfile' | tr}} button.btn.btn-primary(type='submit' ng-disabled='!newProfile.$valid') {{'options_createProfile' | tr}}