diff options
| author | ThibG <thib@sitedethib.com> | 2019-11-30 18:13:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-30 18:13:53 +0100 |
| commit | 7f6315841c98a1eee6cb57171a91a88f5c5343df (patch) | |
| tree | 02bc3eae22390ba267410c3e134067669ad3c805 /app/views/settings | |
| parent | 93b8aec7b7cd6af1b6ef6385cfe138fb32dee6e9 (diff) | |
| parent | b509b8812a8f08f59f3b0303f7d8e98de86e3590 (diff) | |
Merge pull request #1249 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/settings')
| -rw-r--r-- | app/views/settings/preferences/notifications/show.html.haml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/settings/preferences/notifications/show.html.haml b/app/views/settings/preferences/notifications/show.html.haml index f666ae4ff..f71b930e7 100644 --- a/app/views/settings/preferences/notifications/show.html.haml +++ b/app/views/settings/preferences/notifications/show.html.haml @@ -4,6 +4,10 @@ = simple_form_for current_user, url: settings_preferences_notifications_path, html: { method: :put } do |f| = render 'shared/error_messages', object: current_user + %h4= t('notifications.email_events') + + %p.hint = t('notifications.email_events_hint') + .fields-group = f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff| = ff.input :follow, as: :boolean, wrapper: :with_label @@ -21,6 +25,8 @@ = f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff| = ff.input :digest, as: :boolean, wrapper: :with_label + %h4 = t('notifications.other_settings') + .fields-group = f.simple_fields_for :interactions, hash_to_object(current_user.settings.interactions) do |ff| = ff.input :must_be_follower, as: :boolean, wrapper: :with_label |