From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Feb 2019 18:21:50 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2135'
X-Git-Tag: live~3799
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/77dcaef44c19d43a3944affbfcf2d037dc11aba5?hp=43c09d8062fc4aef4f1e0e5d3598e526a02bb288

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a81172de2..577efd174 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -6,6 +6,10 @@ en:
       friendly: "%e %B %Y at %H:%M"
       blog: "%e %B %Y"
   activerecord:
+    errors:
+      messages:
+        invalid_email_address: does not appear to be a valid e-mail address
+        email_address_not_routable: is not routable
     # Translates all the model names, which is used in error handling on the web site
     models:
       acl: "Access Control List"