diff --git a/app/controllers/filters_controller.rb b/app/controllers/filters_controller.rb index 03403a1ba104233a200cc9d36221158bfba9905c..175dbab072a728d7f0937cdf0b7f91fe4525b785 100644 --- a/app/controllers/filters_controller.rb +++ b/app/controllers/filters_controller.rb @@ -52,6 +52,6 @@ class FiltersController < ApplicationController end def resource_params - params.require(:custom_filter).permit(:phrase, :expires_in, :irreversible, context: []) + params.require(:custom_filter).permit(:phrase, :expires_in, :irreversible, :whole_word, context: []) end end diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 49d94bcde9e1d0cafd416021169043ac8d3e6fbf..7d9a5d617e580cf61cc0468e3dc2580d25ef310e 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -25,6 +25,7 @@ en: setting_hide_network: Who you follow and who follows you will not be shown on your profile setting_noindex: Affects your public profile and status pages setting_theme: Affects how Mastodon looks when you're logged in from any device. + whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word imports: data: CSV file exported from another Mastodon instance sessions: @@ -77,6 +78,7 @@ en: type: Import type username: Username username_or_email: Username or Email + whole_word: Whole word interactions: must_be_follower: Block notifications from non-followers must_be_following: Block notifications from people you don't follow diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index 7f7f3af19dd3ce06725aa341ff58ece4322a6955..af5d5d768768342c53d65795d21166c63cf34d91 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -21,6 +21,7 @@ ja: setting_hide_network: フォãƒãƒ¼ã¨ãƒ•ã‚©ãƒãƒ¯ãƒ¼ã®æƒ…å ±ãŒãƒ—ãƒãƒ•ィールページã§è¦‹ã‚‰ã‚Œãªã„よã†ã«ã—ã¾ã™ setting_noindex: 公開プãƒãƒ•ィールãŠã‚ˆã³å„投稿ページã«å½±éŸ¿ã—ã¾ã™ setting_theme: ãƒã‚°ã‚¤ãƒ³ã—ã¦ã„ã‚‹å…¨ã¦ã®ãƒ‡ãƒã‚¤ã‚¹ã§é©ç”¨ã•れるデザインã§ã™ã€‚ + whole_word: ã‚ーワードã¾ãŸã¯ãƒ•レーズãŒè‹±æ•°å—ã®ã¿ã®å ´åˆã€å˜èªžå…¨ä½“ã¨ä¸€è‡´ã™ã‚‹å ´åˆã®ã¿é©ç”¨ã•れるよã†ã«ãªã‚Šã¾ã™ imports: data: ä»–ã® Mastodon インスタンスã‹ã‚‰ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã—ãŸCSVãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžã—ã¦ä¸‹ã•ã„ sessions: @@ -73,6 +74,7 @@ ja: type: インãƒãƒ¼ãƒˆã™ã‚‹é …ç›® username: ユーザーå username_or_email: ユーザーåã¾ãŸã¯ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ + whole_word: å˜èªžå…¨ä½“ã«ãƒžãƒƒãƒ interactions: must_be_follower: フォãƒãƒ¯ãƒ¼ä»¥å¤–ã‹ã‚‰ã®é€šçŸ¥ã‚’ブãƒãƒƒã‚¯ must_be_following: フォãƒãƒ¼ã—ã¦ã„ãªã„ユーザーã‹ã‚‰ã®é€šçŸ¥ã‚’ブãƒãƒƒã‚¯