mastofe

commit: 38d072446be2321c82f42b6e1cf90891f935725c
parent: 8ae9bd0eea75a0a22c08e1e45b2136674aa88cf5
Author: MitarashiDango <MitarashiDango@users.noreply.github.com>
Date:   Wed,  1 Nov 2017 22:46:05 +0900

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


Diffstat:
M
app/views/admin/accounts/index.html.haml
2
+-
M
config/locales/en.yml
1
+

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
@@ -42,7 +42,7 @@
       - if params[key].present?
         = 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
         = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}")
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -59,6 +59,7 @@ en:
       destroyed_msg: Moderation note successfully destroyed!
     accounts:
       are_you_sure: Are you sure?
+      by_domain: Domain
       confirm: Confirm
       confirmed: Confirmed
       disable_two_factor_authentication: Disable 2FA