From: Tom Hughes <tom@compton.nu>
Date: Thu, 12 Sep 2024 21:25:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5208'
X-Git-Tag: live~712
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d7880031a1ab869ba5b4c2926eb43dd78701d48a?hp=4f2789c73c3ac9c3af3e4a4ae08f2f37cb78ddf1

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

diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 01e70529d..225078a51 100644
--- 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 e784df5dd..feacfcf12 100644
--- 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: