From: Tom Hughes <tom@compton.nu>
Date: Thu, 4 Jul 2024 17:26:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4941'
X-Git-Tag: live~904
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e1de19ef9375b5e4bd9c42572a28fab7814e634a?hp=bd7748fc64778e5e4954db13938d6ea86a26ac39

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 14df2ae4f..4c743b033 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2588,22 +2588,22 @@ en:
       openid_login_button: "Continue"
       openid:
         title: Log in with OpenID
-        alt: Log in with an OpenID URL
+        alt: OpenID logo
       google:
         title: Log in with Google
-        alt: Log in with a Google OpenID
+        alt: Google logo
       facebook:
         title: Log in with Facebook
-        alt: Log in with a Facebook Account
+        alt: Facebook logo
       microsoft:
         title: Log in with Microsoft
-        alt: Log in with a Microsoft Account
+        alt: Microsoft logo
       github:
         title: Log in with GitHub
-        alt: Log in with a GitHub Account
+        alt: GitHub logo
       wikipedia:
         title: Log in with Wikipedia
-        alt: Log in with a Wikipedia Account
+        alt: Wikipedia logo
   oauth:
     authorize:
       title: "Authorize access to your account"
diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb
index c7c63d62a..09adfc14b 100644
--- a/test/helpers/user_helper_test.rb
+++ b/test/helpers/user_helper_test.rb
@@ -116,7 +116,7 @@ class UserHelperTest < ActionView::TestCase
 
   def test_auth_button
     button = auth_button("google", "google")
-    img_tag = "<img alt=\"Log in with a Google OpenID\" class=\"rounded-1\" src=\"/images/google.svg\" width=\"36\" height=\"36\" />"
+    img_tag = "<img alt=\"Google logo\" class=\"rounded-1\" src=\"/images/google.svg\" width=\"36\" height=\"36\" />"
     assert_equal("<a class=\"auth_button btn btn-light mx-1 p-2 d-block\" title=\"Log in with Google\" rel=\"nofollow\" data-method=\"post\" href=\"/auth/google\">#{img_tag}</a>", button)
   end