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

diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 01e70529d6af8409f9300075aa3c6c9424781bf0..225078a515e380b5a7ddf48f2f14ef809277f015 100644 (file)
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -130,6 +130,7 @@ ignore_unused:
   - 'datetime.distance_in_words_ago.*'
   - 'reports.new.categories.*' # double interpolation in reports_helper
   - 'shared.pagination.*'
+  - 'auth.providers.*'
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'
 # - 'simple_form.{placeholders,hints,labels}.*'

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e784df5ddf6685576b83f2157f4dd647a90e2081..feacfcf12d613a24c1942652f631bbd77d57d910 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -38,8 +38,6 @@ en:
   activerecord:
     errors:
       messages:
-        invalid_email_address: does not appear to be a valid e-mail address
-        email_address_not_routable: is not routable
         display_name_is_user_n: can't be user_n unless n is your user id
       models:
         user_mute: