From 71401659b812b8768fe70aa27221e3319ee1c434 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 25 Nov 2016 13:13:16 +0100 Subject: Fix #65 - Options to block notifications from people you don't follow/who don't follow you --- config/i18n-tasks.yml | 3 --- config/locales/simple_form.de.yml | 3 +++ config/locales/simple_form.en.yml | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index d345ce6c0..4dc6985b7 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -30,9 +30,6 @@ search: - app/assets/fonts - app/assets/videos -ignore_missing: - - '{devise,simple_form}.*' - ignore_unused: - 'activerecord.attributes.*' - '{devise,will_paginate,doorkeeper}.*' diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index 36c5141a2..90aeb1e5c 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -21,6 +21,9 @@ de: follow: E-mail senden, wenn mir jemand folgt mention: E-mail senden, wenn mich jemand erwähnt reblog: E-mail senden, wenn jemand meinen Beitrag teilt + interactions: + must_be_follower: Benachrichtigungen von nicht-Folgern blockieren + must_be_following: Benachrichtigungen von Nutzern blockieren, denen ich nicht folge 'no': Nein required: mark: "*" diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index a7d958c06..1ba7c91e2 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -21,6 +21,9 @@ en: follow: Send e-mail when someone follows you mention: Send e-mail when someone mentions you reblog: Send e-mail when someone reblogs your status + interactions: + must_be_follower: Block notifications from non-followers + must_be_following: Block notifications from people you don't follow 'no': 'No' required: mark: "*" -- cgit From 1ff0d5aea60363e65e749d3c44e4acd4cc9b5e36 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 25 Nov 2016 13:15:07 +0100 Subject: Normalized locale files --- config/locales/simple_form.de.yml | 6 +++--- config/locales/simple_form.en.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'config') diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index 90aeb1e5c..47e30ccb4 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -16,14 +16,14 @@ de: password: Passwort silenced: Öffentliche Beiträge nicht auflisten username: Nutzername + interactions: + must_be_follower: Benachrichtigungen von nicht-Folgern blockieren + must_be_following: Benachrichtigungen von Nutzern blockieren, denen ich nicht folge notification_emails: favourite: E-mail senden, wenn jemand meinen Beitrag favorisiert follow: E-mail senden, wenn mir jemand folgt mention: E-mail senden, wenn mich jemand erwähnt reblog: E-mail senden, wenn jemand meinen Beitrag teilt - interactions: - must_be_follower: Benachrichtigungen von nicht-Folgern blockieren - must_be_following: Benachrichtigungen von Nutzern blockieren, denen ich nicht folge 'no': Nein required: mark: "*" diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 1ba7c91e2..1e975af14 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -16,14 +16,14 @@ en: password: Password silenced: Unlisted mode username: Username + interactions: + must_be_follower: Block notifications from non-followers + must_be_following: Block notifications from people you don't follow notification_emails: favourite: Send e-mail when someone favourites your status follow: Send e-mail when someone follows you mention: Send e-mail when someone mentions you reblog: Send e-mail when someone reblogs your status - interactions: - must_be_follower: Block notifications from non-followers - must_be_following: Block notifications from people you don't follow 'no': 'No' required: mark: "*" -- cgit