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

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 3bf4cde5f83e59d4323f6b9334ea1a88603639b9..f15430efa554627f3b9a9dcf708818a40b6ee656 100644 (file)
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -40,7 +40,7 @@
         <div id='login_openid_url' class="mb-3">
           <label for='openid_url' class="form-label"><%= t ".openid_html", :logo => openid_logo %></label>
           <%= hidden_field_tag("referer", params[:referer], :autocomplete => "off") %>
-          <%= text_field_tag("openid_url", "", :tabindex => 3, :autocomplete => "on", :class => "openid_url form-control") %>
+          <%= text_field_tag("openid_url", "", :tabindex => 5, :autocomplete => "on", :class => "openid_url form-control") %>
           <span class="form-text text-muted">(<a href="<%= t "accounts.edit.openid.link" %>" target="_new"><%= t "accounts.edit.openid.link text" %></a>)</span>
         </div>
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 069efb4a4f8cf3a5ee70e5db22110dcc62239f5e..dcb877f7b4a5803611eba9326fbd6c5ec77490ee 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1822,7 +1822,7 @@ en:
       heading: "Login"
       email or username: "Email Address or Username"
       password: "Password"
-      openid_html: "%{logo} OpenID:"
+      openid_html: "%{logo} OpenID"
       remember: "Remember me"
       lost password link: "Lost your password?"
       login_button: "Login"