From a4410854938f99c70aff390a3e9954e26910e20b Mon Sep 17 00:00:00 2001 From: FelisCatus Date: Wed, 9 Aug 2017 18:21:56 -0400 Subject: [PATCH] Add warning and disable adding new PAC Profiles in Firefox. Fix #1146. --- omega-locales/ach/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/cs/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/de/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/en_US/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/es/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/es_AR/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/fa/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/fr/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/is/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/ja/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/nb_NO/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/nl/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/pt_BR/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/ru/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/sk/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/sl/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/tr/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/zh_CN/LC_MESSAGES/omega-web.po | 3 +++ omega-locales/zh_TW/LC_MESSAGES/omega-web.po | 3 +++ omega-web/src/omega/controllers/master.coffee | 2 ++ omega-web/src/partials/about.jade | 2 +- omega-web/src/partials/new_profile.jade | 9 +++++++-- omega-web/src/partials/profile_pac.jade | 4 ++++ 23 files changed, 71 insertions(+), 3 deletions(-) diff --git a/omega-locales/ach/LC_MESSAGES/omega-web.po b/omega-locales/ach/LC_MESSAGES/omega-web.po index f18247d..cabd691 100644 --- a/omega-locales/ach/LC_MESSAGES/omega-web.po +++ b/omega-locales/ach/LC_MESSAGES/omega-web.po @@ -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" diff --git a/omega-locales/cs/LC_MESSAGES/omega-web.po b/omega-locales/cs/LC_MESSAGES/omega-web.po index b5dee70..5eec28a 100644 --- a/omega-locales/cs/LC_MESSAGES/omega-web.po +++ b/omega-locales/cs/LC_MESSAGES/omega-web.po @@ -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" diff --git a/omega-locales/de/LC_MESSAGES/omega-web.po b/omega-locales/de/LC_MESSAGES/omega-web.po index f209f97..44aa924 100644 --- a/omega-locales/de/LC_MESSAGES/omega-web.po +++ b/omega-locales/de/LC_MESSAGES/omega-web.po @@ -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" diff --git a/omega-locales/en_US/LC_MESSAGES/omega-web.po b/omega-locales/en_US/LC_MESSAGES/omega-web.po index 72f285e..1b7a61a 100644 --- a/omega-locales/en_US/LC_MESSAGES/omega-web.po +++ b/omega-locales/en_US/LC_MESSAGES/omega-web.po @@ -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" diff --git a/omega-locales/es/LC_MESSAGES/omega-web.po b/omega-locales/es/LC_MESSAGES/omega-web.po index c562903..21d8f31 100644 --- a/omega-locales/es/LC_MESSAGES/omega-web.po +++ b/omega-locales/es/LC_MESSAGES/omega-web.po @@ -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 "" diff --git a/omega-locales/es_AR/LC_MESSAGES/omega-web.po b/omega-locales/es_AR/LC_MESSAGES/omega-web.po index cd2996e..6d9fb51 100644 --- a/omega-locales/es_AR/LC_MESSAGES/omega-web.po +++ b/omega-locales/es_AR/LC_MESSAGES/omega-web.po @@ -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" diff --git a/omega-locales/fa/LC_MESSAGES/omega-web.po b/omega-locales/fa/LC_MESSAGES/omega-web.po index ec8bf8e..89d789e 100644 --- a/omega-locales/fa/LC_MESSAGES/omega-web.po +++ b/omega-locales/fa/LC_MESSAGES/omega-web.po @@ -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" diff --git a/omega-locales/fr/LC_MESSAGES/omega-web.po b/omega-locales/fr/LC_MESSAGES/omega-web.po index 82cb228..fc7c2a8 100644 --- a/omega-locales/fr/LC_MESSAGES/omega-web.po +++ b/omega-locales/fr/LC_MESSAGES/omega-web.po @@ -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" diff --git a/omega-locales/is/LC_MESSAGES/omega-web.po b/omega-locales/is/LC_MESSAGES/omega-web.po index 5a687c9..d9f2927 100644 --- a/omega-locales/is/LC_MESSAGES/omega-web.po +++ b/omega-locales/is/LC_MESSAGES/omega-web.po @@ -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 "" diff --git a/omega-locales/ja/LC_MESSAGES/omega-web.po b/omega-locales/ja/LC_MESSAGES/omega-web.po index 025bcfc..b5b37ee 100644 --- a/omega-locales/ja/LC_MESSAGES/omega-web.po +++ b/omega-locales/ja/LC_MESSAGES/omega-web.po @@ -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" diff --git a/omega-locales/nb_NO/LC_MESSAGES/omega-web.po b/omega-locales/nb_NO/LC_MESSAGES/omega-web.po index 87bffb1..14bfa1b 100644 --- a/omega-locales/nb_NO/LC_MESSAGES/omega-web.po +++ b/omega-locales/nb_NO/LC_MESSAGES/omega-web.po @@ -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" diff --git a/omega-locales/nl/LC_MESSAGES/omega-web.po b/omega-locales/nl/LC_MESSAGES/omega-web.po index 57485fd..d3a1f58 100644 --- a/omega-locales/nl/LC_MESSAGES/omega-web.po +++ b/omega-locales/nl/LC_MESSAGES/omega-web.po @@ -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 "" diff --git a/omega-locales/pt_BR/LC_MESSAGES/omega-web.po b/omega-locales/pt_BR/LC_MESSAGES/omega-web.po index 064ef0b..51297f4 100644 --- a/omega-locales/pt_BR/LC_MESSAGES/omega-web.po +++ b/omega-locales/pt_BR/LC_MESSAGES/omega-web.po @@ -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" diff --git a/omega-locales/ru/LC_MESSAGES/omega-web.po b/omega-locales/ru/LC_MESSAGES/omega-web.po index c4a17c0..d78447b 100644 --- a/omega-locales/ru/LC_MESSAGES/omega-web.po +++ b/omega-locales/ru/LC_MESSAGES/omega-web.po @@ -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" diff --git a/omega-locales/sk/LC_MESSAGES/omega-web.po b/omega-locales/sk/LC_MESSAGES/omega-web.po index 407d026..251d30d 100644 --- a/omega-locales/sk/LC_MESSAGES/omega-web.po +++ b/omega-locales/sk/LC_MESSAGES/omega-web.po @@ -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 "" diff --git a/omega-locales/sl/LC_MESSAGES/omega-web.po b/omega-locales/sl/LC_MESSAGES/omega-web.po index 2dddab0..13bc621 100644 --- a/omega-locales/sl/LC_MESSAGES/omega-web.po +++ b/omega-locales/sl/LC_MESSAGES/omega-web.po @@ -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 "" diff --git a/omega-locales/tr/LC_MESSAGES/omega-web.po b/omega-locales/tr/LC_MESSAGES/omega-web.po index f8eb395..bcef138 100644 --- a/omega-locales/tr/LC_MESSAGES/omega-web.po +++ b/omega-locales/tr/LC_MESSAGES/omega-web.po @@ -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" diff --git a/omega-locales/zh_CN/LC_MESSAGES/omega-web.po b/omega-locales/zh_CN/LC_MESSAGES/omega-web.po index f91023c..92a56b2 100644 --- a/omega-locales/zh_CN/LC_MESSAGES/omega-web.po +++ b/omega-locales/zh_CN/LC_MESSAGES/omega-web.po @@ -990,6 +990,9 @@ msgstr "设置网络检测选项" msgid "options_resultProfileForSelectedDomains" msgstr "对所有选中域名使用此情景模式:" +msgid "options_pac_profile_unsupported_moz" +msgstr "由于技术限制,PAC 情景模式无法在 Mozilla Firefox 上工作!" + msgid "popup_issueTemplate" msgstr "" "\n" diff --git a/omega-locales/zh_TW/LC_MESSAGES/omega-web.po b/omega-locales/zh_TW/LC_MESSAGES/omega-web.po index 4823e43..47ce520 100644 --- a/omega-locales/zh_TW/LC_MESSAGES/omega-web.po +++ b/omega-locales/zh_TW/LC_MESSAGES/omega-web.po @@ -990,6 +990,9 @@ msgstr "設定網路檢測選項" msgid "options_resultProfileForSelectedDomains" msgstr "對所有選中域名使用此情景模式:" +msgid "options_pac_profile_unsupported_moz" +msgstr "由於技術限制,PAC 情景模式無法在 Mozilla Firefox 上工作!" + msgid "popup_issueTemplate" msgstr "" "\n" diff --git a/omega-web/src/omega/controllers/master.coffee b/omega-web/src/omega/controllers/master.coffee index f0f4874..cc33f06 100644 --- a/omega-web/src/omega/controllers/master.coffee +++ b/omega-web/src/omega/controllers/master.coffee @@ -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 diff --git a/omega-web/src/partials/about.jade b/omega-web/src/partials/about.jade index 3846608..5c8ea61 100644 --- a/omega-web/src/partials/about.jade +++ b/omega-web/src/partials/about.jade @@ -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}} diff --git a/omega-web/src/partials/new_profile.jade b/omega-web/src/partials/new_profile.jade index 27a3fb2..2e94289 100644 --- a/omega-web/src/partials/new_profile.jade +++ b/omega-web/src/partials/new_profile.jade @@ -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') diff --git a/omega-web/src/partials/profile_pac.jade b/omega-web/src/partials/profile_pac.jade index 5947a73..9367e24 100644 --- a/omega-web/src/partials/profile_pac.jade +++ b/omega-web/src/partials/profile_pac.jade @@ -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'