tcjlj/ZeroOmega
1
0
Fork 0
mirror of https://github.com/zero-peak/ZeroOmega.git synced 2025-01-22 15:08:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add warning and disable adding new PAC Profiles in Firefox. Fix #1146.

Browse Source
This commit is contained in:
FelisCatus 2017-08-09 18:21:56 -04:00
parent a77efc90fb
commit a441085493
23 changed files with 71 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
omega-locales/ach/LC_MESSAGES/omega-web.po
View File

@ -1131,6 +1131,9 @@ msgstr "Configure Network Monitor"
msgid "options_resultProfileForSelectedDomains"
msgstr "Use this profile for all selected domains"
msgid "options_pac_profile_unsupported_moz"
msgstr "PAC Profiles WILL NOT work in Mozilla Firefox due to technical limitations!"
msgid "popup_issueTemplate"
msgstr ""
"\n"

3
omega-locales/cs/LC_MESSAGES/omega-web.po
View File

@ -1123,6 +1123,9 @@ msgstr "Konfigurovat monitor sítě"
msgid "options_resultProfileForSelectedDomains"
msgstr "Použít tento profil pro všechny vybrané domény"
msgid "options_pac_profile_unsupported_moz"
msgstr "PAC Profiles WILL NOT work in Mozilla Firefox due to technical limitations!"
msgid "popup_issueTemplate"
msgstr ""
"\n"

3
omega-locales/de/LC_MESSAGES/omega-web.po
View File

@ -1136,6 +1136,9 @@ msgstr "Configure Network Monitor"
msgid "options_resultProfileForSelectedDomains"
msgstr "Use this profile for all selected domains"
msgid "options_pac_profile_unsupported_moz"
msgstr "PAC Profiles WILL NOT work in Mozilla Firefox due to technical limitations!"
msgid "popup_issueTemplate"
msgstr ""
"\n"

3
omega-locales/en_US/LC_MESSAGES/omega-web.po
View File

@ -1114,6 +1114,9 @@ msgstr "Configure Network Monitor"
msgid "options_resultProfileForSelectedDomains"
msgstr "Use this profile for all selected domains"
msgid "options_pac_profile_unsupported_moz"
msgstr "PAC Profiles WILL NOT work in Mozilla Firefox due to technical limitations!"
msgid "popup_issueTemplate"
msgstr ""
"\n"

3
omega-locales/es/LC_MESSAGES/omega-web.po
View File

@ -931,6 +931,9 @@ msgstr ""
msgid "options_resultProfileForSelectedDomains"
msgstr ""
msgid "options_pac_profile_unsupported_moz"
msgstr "PAC Profiles WILL NOT work in Mozilla Firefox due to technical limitations!"
msgid "popup_issueTemplate"
msgstr ""

3
omega-locales/es_AR/LC_MESSAGES/omega-web.po
View File

@ -1136,6 +1136,9 @@ msgstr "Configure Network Monitor"
msgid "options_resultProfileForSelectedDomains"
msgstr "Use this profile for all selected domains"
msgid "options_pac_profile_unsupported_moz"
msgstr "PAC Profiles WILL NOT work in Mozilla Firefox due to technical limitations!"
msgid "popup_issueTemplate"
msgstr ""
"\n"

3
omega-locales/fa/LC_MESSAGES/omega-web.po
View File

@ -1136,6 +1136,9 @@ msgstr "تنظیم مانیتور شبکه"
msgid "options_resultProfileForSelectedDomains"
msgstr "از این پروفایل برای تمامی دامنه های منتخب استفاده کن"
msgid "options_pac_profile_unsupported_moz"
msgstr "PAC Profiles WILL NOT work in Mozilla Firefox due to technical limitations!"
msgid "popup_issueTemplate"
msgstr ""
"\n"

3
omega-locales/fr/LC_MESSAGES/omega-web.po
View File

@ -1133,6 +1133,9 @@ msgstr "Configure Network Monitor"
msgid "options_resultProfileForSelectedDomains"
msgstr "Use this profile for all selected domains"
msgid "options_pac_profile_unsupported_moz"
msgstr "PAC Profiles WILL NOT work in Mozilla Firefox due to technical limitations!"
msgid "popup_issueTemplate"
msgstr ""
"\n"

3
omega-locales/is/LC_MESSAGES/omega-web.po
View File

@ -945,6 +945,9 @@ msgstr ""
msgid "options_resultProfileForSelectedDomains"
msgstr ""
msgid "options_pac_profile_unsupported_moz"
msgstr "PAC Profiles WILL NOT work in Mozilla Firefox due to technical limitations!"
msgid "popup_issueTemplate"
msgstr ""

3
omega-locales/ja/LC_MESSAGES/omega-web.po
View File

@ -1121,6 +1121,9 @@ msgstr "Configure Network Monitor"
msgid "options_resultProfileForSelectedDomains"
msgstr "Use this profile for all selected domains"
msgid "options_pac_profile_unsupported_moz"
msgstr "PAC Profiles WILL NOT work in Mozilla Firefox due to technical limitations!"
msgid "popup_issueTemplate"
msgstr ""
"\n"

3
omega-locales/nb_NO/LC_MESSAGES/omega-web.po
View File

@ -973,6 +973,9 @@ msgstr "Sett opp nettverksoversikt"
msgid "options_resultProfileForSelectedDomains"
msgstr "Bruk denne profilen for alle valgte domener"
msgid "options_pac_profile_unsupported_moz"
msgstr "PAC Profiles WILL NOT work in Mozilla Firefox due to technical limitations!"
msgid "popup_issueTemplate"
msgstr ""
"\n"

3
omega-locales/nl/LC_MESSAGES/omega-web.po
View File

@ -934,6 +934,9 @@ msgstr ""
msgid "options_resultProfileForSelectedDomains"
msgstr ""
msgid "options_pac_profile_unsupported_moz"
msgstr "PAC Profiles WILL NOT work in Mozilla Firefox due to technical limitations!"
msgid "popup_issueTemplate"
msgstr ""

3
omega-locales/pt_BR/LC_MESSAGES/omega-web.po
View File

@ -1132,6 +1132,9 @@ msgstr "Configure Network Monitor"
msgid "options_resultProfileForSelectedDomains"
msgstr "Use this profile for all selected domains"
msgid "options_pac_profile_unsupported_moz"
msgstr "PAC Profiles WILL NOT work in Mozilla Firefox due to technical limitations!"
msgid "popup_issueTemplate"
msgstr ""
"\n"

3
omega-locales/ru/LC_MESSAGES/omega-web.po
View File

@ -1136,6 +1136,9 @@ msgstr "Configure Network Monitor"
msgid "options_resultProfileForSelectedDomains"
msgstr "Use this profile for all selected domains"
msgid "options_pac_profile_unsupported_moz"
msgstr "PAC Profiles WILL NOT work in Mozilla Firefox due to technical limitations!"
msgid "popup_issueTemplate"
msgstr ""
"\n"

3
omega-locales/sk/LC_MESSAGES/omega-web.po
View File

@ -944,6 +944,9 @@ msgstr ""
msgid "options_resultProfileForSelectedDomains"
msgstr ""
msgid "options_pac_profile_unsupported_moz"
msgstr "PAC Profiles WILL NOT work in Mozilla Firefox due to technical limitations!"
msgid "popup_issueTemplate"
msgstr ""

3
omega-locales/sl/LC_MESSAGES/omega-web.po
View File

@ -946,6 +946,9 @@ msgstr ""
msgid "options_resultProfileForSelectedDomains"
msgstr ""
msgid "options_pac_profile_unsupported_moz"
msgstr "PAC Profiles WILL NOT work in Mozilla Firefox due to technical limitations!"
msgid "popup_issueTemplate"
msgstr ""

3
omega-locales/tr/LC_MESSAGES/omega-web.po
View File

@ -1128,6 +1128,9 @@ msgstr "Configure Network Monitor"
msgid "options_resultProfileForSelectedDomains"
msgstr "Use this profile for all selected domains"
msgid "options_pac_profile_unsupported_moz"
msgstr "PAC Profiles WILL NOT work in Mozilla Firefox due to technical limitations!"
msgid "popup_issueTemplate"
msgstr ""
"\n"

3
omega-locales/zh_CN/LC_MESSAGES/omega-web.po
View File

@ -990,6 +990,9 @@ msgstr "设置网络检测选项"
msgid "options_resultProfileForSelectedDomains"
msgstr "对所有选中域名使用此情景模式："
msgid "options_pac_profile_unsupported_moz"
msgstr "由于技术限制，PAC 情景模式无法在 Mozilla Firefox 上工作！"
msgid "popup_issueTemplate"
msgstr ""
"\n"

3
omega-locales/zh_TW/LC_MESSAGES/omega-web.po
View File

@ -990,6 +990,9 @@ msgstr "設定網路檢測選項"
msgid "options_resultProfileForSelectedDomains"
msgstr "對所有選中域名使用此情景模式："
msgid "options_pac_profile_unsupported_moz"
msgstr "由於技術限制，PAC 情景模式無法在 Mozilla Firefox 上工作！"
msgid "popup_issueTemplate"
msgstr ""
"\n"

2
omega-web/src/omega/controllers/master.coffee
View File

@ -5,6 +5,7 @@ angular.module('omega').controller 'MasterCtrl', ($scope, $rootScope, $window,
if not chrome?.proxy?.settings?
$scope.isExperimental = true
$scope.pacProfilesUnsupported = true
tr = $filter('tr')
@ -125,6 +126,7 @@ angular.module('omega').controller 'MasterCtrl', ($scope, $rootScope, $window,
scope.profileIcons = profileIcons
scope.dispNameFilter = dispNameFilter
scope.options = $scope.options
scope.pacProfilesUnsupported = $scope.pacProfilesUnsupported
$modal.open(
templateUrl: 'partials/new_profile.html'
scope: scope

2
omega-web/src/partials/about.jade
View File

@ -1,7 +1,7 @@
.page-header
h2 {{'about_title' | tr}}
section.omega-experimental(ng-show='isExperimental')
p.alert.alert-danger
p.alert.alert-warning
span.glyphicon.glyphicon-warning-sign
= ' '
span {{'about_experimental_warning_moz' | tr}}

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

@ -37,13 +37,18 @@ form(ng-submit='newProfile.$valid && $close(profile)' name='newProfile')
.help-block {{'options_profileDescSwitchProfile' | tr}}
.radio
label
input(type='radio', name='profile-new-type', value='PacProfile' ng-model='profile.profileType')
input(type='radio', name='profile-new-type', value='PacProfile' ng-model='profile.profileType' ng-disabled='pacProfilesUnsupported')
span.profile-type
span.glyphicon(ng-class='profileIcons["PacProfile"]')
= ' '
span {{'options_profileTypePacProfile' | tr}}
.help-block {{'options_profileDescPacProfile' | tr}}
.help-block {{'options_profileDescMorePacProfile' | tr}}
.help-block(ng-show='!pacProfilesUnsupported') {{'options_profileDescMorePacProfile' | tr}}
.has-error(ng-show='pacProfilesUnsupported')
.help-block
span.glyphicon.glyphicon-warning-sign
= ' '
{{'options_pac_profile_unsupported_moz' | tr}}
.radio
label
input(type='radio', name='profile-new-type', value='VirtualProfile' ng-model='profile.profileType')

4
omega-web/src/partials/profile_pac.jade
View File

@ -1,4 +1,8 @@
div(ng-controller='PacProfileCtrl')
p.alert.alert-danger.width-limit(ng-show='pacProfilesUnsupported')
span.glyphicon.glyphicon-remove
= ' '
| {{'options_pac_profile_unsupported_moz' | tr}}
section.settings-group
h3 {{'options_group_pacUrl' | tr}}
.width-limit(input-group-clear type='text' model='profile.pacUrl'