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

[rails.git] / config / i18n-tasks.yml

diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 01e70529d6af8409f9300075aa3c6c9424781bf0..2b0420224e5206ed0c21ccd65ef0d23356151e67 100644 (file)
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -123,6 +123,7 @@ ignore_unused:
   - 'geocoder.search_osm_nominatim.prefix.*'
   - 'javascripts.*'
   - 'doorkeeper.*'
   - 'geocoder.search_osm_nominatim.prefix.*'
   - 'javascripts.*'
   - 'doorkeeper.*'

+  - 'users.auth_failure.*'   # OmniAuth provider callback error messages

   - 'activerecord.attributes.*'
   - 'activerecord.models.*'
   - 'activerecord.help.*'
   - 'activerecord.attributes.*'
   - 'activerecord.models.*'
   - 'activerecord.help.*'


@@ -130,6 +131,11 @@ ignore_unused:
   - 'datetime.distance_in_words_ago.*'
   - 'reports.new.categories.*' # double interpolation in reports_helper
   - 'shared.pagination.*'
   - 'datetime.distance_in_words_ago.*'
   - 'reports.new.categories.*' # double interpolation in reports_helper
   - 'shared.pagination.*'

+  - '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}.*'
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'
 # - 'simple_form.{placeholders,hints,labels}.*'