tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Feature: Allow staff to change user emails (#7074)

Browse Source 
* Admin: Show unconfirmed email address on account page

* Admin: Allow staff to change user email addresses

* ActionLog: On change_email, log current email address and new unconfirmed email address
This commit is contained in:
Emelia Smith
2018-04-10 09:16:06 +02:00
committed by Eugen Rochko
parent e6e93ecd8a
commit 219a4423d8
10 changed files with 131 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/locales/en.yml
View File

@ -63,6 +63,13 @@ en:
are_you_sure: Are you sure?
avatar: Avatar
by_domain: Domain
change_email:
changed_msg: Account email successfully changed!
current_email: Current Email
label: Change Email
new_email: New Email
submit: Change Email
title: Change Email for %{username}
confirm: Confirm
confirmed: Confirmed
demote: Demote
@ -131,6 +138,7 @@ en:
statuses: Statuses
subscribe: Subscribe
title: Accounts
unconfirmed_email: Unconfirmed E-mail
undo_silenced: Undo silence
undo_suspension: Undo suspension
unsubscribe: Unsubscribe
@ -139,6 +147,7 @@ en:
action_logs:
actions:
assigned_to_self_report: "%{name} assigned report %{target} to themselves"
change_email_user: "%{name} changed the e-mail address of user %{target}"
confirm_user: "%{name} confirmed e-mail address of user %{target}"
create_custom_emoji: "%{name} uploaded new emoji %{target}"
create_domain_block: "%{name} blocked domain %{target}"