diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-08-23 22:37:23 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-27 14:02:57 -0600 |
| commit | 1213311562928551918495a69e4c6f87236f6a66 (patch) | |
| tree | dc1274de8877beee411b9a72efccc66cd11603ab /config/locales | |
| parent | 3681f7dcce8f82d2a4377a051952159cd03919c0 (diff) | |
port tootsuite#11639 to monsterfork: Add option to include reported statuses in warning e-mail
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/en.yml | 6 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index abf6da7b7..b592f5de5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1187,9 +1187,11 @@ en: disable: While your account is frozen, your account data remains intact, but you cannot perform any actions until it is unlocked. force_sensitive: Your account's media has been forced to sensitive visibility until this limit is removed by a moderator. force_unlisted: Your account's roars have been forced to unlisted visibility until this limit is removed by a moderator. - silence: While your account is limited, only monsters who are already following you will see your roars on this server, and you may be excluded from various public listings. However, others may still manually join your pack. - suspend: Your account has been suspended. All of your roars and your uploaded media files have been irreversibly removed from this server, and servers where you had packmates. + silence: While your account is limited, only those who are already following you will see your toots on this server, and you may be excluded from various public listings. However, others may still manually join your pack. + suspend: Your account has been suspended, and all of your content has been irreversibly removed from this server, and servers where you had followers. + get_in_touch: You can reply to this e-mail to get in touch with the staff of %{instance}. review_server_policies: Review server policies + statuses: 'Specifically, for:' subject: disable: "%{acct}, you account has been frozen." none: "%{acct}, you've been given a moderation warning." diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 6e2d956d6..7d57f82ec 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -7,6 +7,7 @@ en: admin_account_action: send_email_notification: The creature will receive an explanation of what happened with their account text_html: Optional. You can use roar syntax. You can <a href="%{path}">add warning presets</a> to save time + include_statuses: The creature will see which roars have caused the moderation action or warning type_html: Choose what to do with <strong>%{acct}</strong> warning_preset_id: Optional. You can still add custom text to end of the preset defaults: @@ -75,7 +76,12 @@ en: account_warning_preset: text: Preset text admin_account_action: +<<<<<<< HEAD send_email_notification: Notify the creature per e-mail +======= + include_statuses: Include reported toots in the e-mail + send_email_notification: Notify the user per e-mail +>>>>>>> 73ca0bb92... Add option to include reported statuses in warning e-mail (#11639) text: Custom warning type: Action types: |