Merge remote-tracking branch 'upstream/pull/5242'

diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index f5fec583269785a528972fa7e82c84e97f803866..2b0420224e5206ed0c21ccd65ef0d23356151e67 100644 (file)
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -134,6 +134,8 @@ ignore_unused:
   - 'auth.providers.*'
   - 'time.formats.blog' # used for formatting blog dates
   - 'time.formats.friendly' # used for formatting dates / times in a friendly way
+  - 'activerecord.errors.models.user_mute.attributes.subject.format' # used for formatting error message during validation in user_mute.rb
+  - 'activerecord.errors.models.user_mute.is_already_muted' # used as part of error message during validation in user_mute.rb
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'
 # - 'simple_form.{placeholders,hints,labels}.*'