Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ghostery Plus & Insights Promo Modals #464

Merged
merged 13 commits into from Oct 28, 2019
Merged
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

GH-1814/promo toggle (#453)

* Add language and toggle for notify_promotions

* Change label name
  • Loading branch information
benstrumeyer authored and wlycdgr committed Oct 18, 2019
commit e47a0c37f5e1deb845ed748e801b5bebf8c978c7
@@ -880,6 +880,9 @@
"settings_new_features": {
"message": "Releases new features"
},
"settings_new_promotions": {
"message": "Has product promotions"
},
"settings_new_trackers": {
"message": "Adds new trackers to its tracker library"
},
@@ -41,6 +41,12 @@ const Notifications = (props) => {
<label id="settings-new-features-label" htmlFor="settings-new-features">{ t('settings_new_features') }</label>
</div>
</div>
<div className="s-option-group">
<div className="s-square-checkbox">
<input type="checkbox" id="settings-new-promotions" name="notify_promotions" defaultChecked={settingsData.notify_promotions} onClick={props.toggleCheckbox} />
<label id="settings-new-promotions-label" htmlFor="settings-new-promotions">{ t('settings_new_promotions') }</label>
</div>
</div>
<div className="s-option-group">
<div className="s-square-checkbox">
<input type="checkbox" id="settings-new-trackers" name="notify_library_updates" defaultChecked={settingsData.notify_library_updates} onClick={props.toggleCheckbox} />
@@ -121,6 +121,7 @@ class ConfData {
_initProperty('is_expert', false);
_initProperty('last_cmp_date', 0);
_initProperty('notify_library_updates', false);
_initProperty('notify_promotions', true);
_initProperty('notify_upgrade_updates', true);
_initProperty('paid_subscription', false);
_initProperty('plus_promo_modal_last_seen', null);
@@ -114,6 +114,7 @@ class Globals {
'is_expanded',
'is_expert',
'notify_library_updates',
'notify_promotions',
'notify_upgrade_updates',
'reload_banner_status',
'selected_app_ids',
@@ -510,7 +510,7 @@ class PanelData {
alert_bubble_pos, alert_bubble_timeout, block_by_default, enable_autoupdate,
enable_click2play, enable_click2play_social, enable_human_web, enable_offers,
enable_metrics, hide_alert_trusted, ignore_first_party, notify_library_updates,
notify_upgrade_updates, selected_app_ids, show_alert, show_badge,
notify_promotions, notify_upgrade_updates, selected_app_ids, show_alert, show_badge,
show_cmp, show_tracker_urls, toggle_individual_trackers
} = userSettingsSource;

@@ -527,6 +527,7 @@ class PanelData {
hide_alert_trusted,
ignore_first_party,
notify_library_updates,
notify_promotions,
notify_upgrade_updates,
selected_app_ids,
show_alert,
ProTip! Use n and p to navigate between commits in a pull request.