diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-11-07 19:06:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-07 19:06:44 +0100 |
| commit | 1032f3994fdbd61c2f517057261ddc3559199b6b (patch) | |
| tree | d039701515efc050dbf91124e8d32da2014498fb /config | |
| parent | cbbeec05be5cd0930a7be73bf673acc8d8105c12 (diff) | |
Add ability to disable login and mark accounts as memorial (#5615)
Fix #5597
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 7 | ||||
| -rw-r--r-- | config/routes.rb | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index ce439029c..41a636760 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -62,11 +62,15 @@ en: by_domain: Domain confirm: Confirm confirmed: Confirmed + disable: Disable disable_two_factor_authentication: Disable 2FA + disabled: Disabled display_name: Display name domain: Domain edit: Edit email: E-mail + enable: Enable + enabled: Enabled feed_url: Feed URL followers: Followers followers_url: Followers URL @@ -78,7 +82,9 @@ en: local: Local remote: Remote title: Location + login_status: Login status media_attachments: Media attachments + memorialize: Turn into memoriam moderation: all: All silenced: Silenced @@ -379,6 +385,7 @@ en: following: Following list muting: Muting list upload: Upload + in_memoriam_html: In Memoriam. landing_strip_html: "<strong>%{name}</strong> is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse." landing_strip_signup_html: If you don't, you can <a href="%{sign_up_path}">sign up here</a>. media_attachments: diff --git a/config/routes.rb b/config/routes.rb index bdfcdaff6..e6d6b52f7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -126,7 +126,10 @@ Rails.application.routes.draw do member do post :subscribe post :unsubscribe + post :enable + post :disable post :redownload + post :memorialize end resource :reset, only: [:create] |