nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add account search condition (instance domain) (#5577)

This commit is contained in:
MitarashiDango 2017-11-01 22:46:05 +09:00 committed by Eugen Rochko
parent 8ae9bd0eea
commit 38d072446b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/accounts/index.html.haml
View File

@ -42,7 +42,7 @@
- if params[key].present? - if params[key].present?
= hidden_field_tag key, params[key] = hidden_field_tag key, params[key]
- %i(username display_name email ip).each do |key| - %i(username by_domain display_name email ip).each do |key|
.input.string.optional .input.string.optional
= text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}") = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}")

1
config/locales/en.yml
View File

@ -59,6 +59,7 @@ en:
destroyed_msg: Moderation note successfully destroyed! destroyed_msg: Moderation note successfully destroyed!
accounts: accounts:
are_you_sure: Are you sure? are_you_sure: Are you sure?
by_domain: Domain
confirm: Confirm confirm: Confirm
confirmed: Confirmed confirmed: Confirmed
disable_two_factor_authentication: Disable 2FA disable_two_factor_authentication: Disable 2FA