diff options
| author | mayaeh <mayaeh@marimo-net.org> | 2019-09-16 21:27:29 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-16 14:27:29 +0200 |
| commit | ef0d22f232723be035e95bde13310d02bf1c127b (patch) | |
| tree | 114a12ef4c032dda781ba112b44a0c8ab6de8afc /config | |
| parent | b7420b8643b4028796d1bbd9443241f997957eb4 (diff) | |
Add search and sort functions to hashtag admin UI (#11829)
* Add search and sort functions to hashtag admin UI * Move scope processing from tags_controller to tag_filter * Fix based on method naming conventions * Fixed not to get 500 errors for invalid requests
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 4 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 8c9fe89f8..f05fdd48b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -521,6 +521,10 @@ en: context: Context directory: In directory in_directory: "%{count} in directory" + last_active: Last active + most_popular: Most popular + most_recent: Most recent + name: Hashtag review: Review status reviewed: Reviewed title: Hashtags diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 2e5982de9..c542377a9 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -131,6 +131,8 @@ en: must_be_follower: Block notifications from non-followers must_be_following: Block notifications from people you don't follow must_be_following_dm: Block direct messages from people you don't follow + invite: + comment: Comment invite_request: text: Why do you want to join? notification_emails: |