From: Andy Allan <git@gravitystorm.co.uk>
Date: Sat, 15 Feb 2025 14:57:16 +0000 (+0000)
Subject: Use 'My Account' for account pages
X-Git-Tag: live~184^2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/487bba4088e544a351b4ac0c9cb7bed2d6247e89?ds=sidebyside

Use 'My Account' for account pages

It's hard to make a distinction between 'Preferences' and 'Settings' in some languages,
and many other sites use the term 'Account' for things like changing email.
---

diff --git a/app/views/accounts/edit.html.erb b/app/views/accounts/edit.html.erb
index ce7dd97a8..5c626fc9f 100644
--- a/app/views/accounts/edit.html.erb
+++ b/app/views/accounts/edit.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :heading do %>
-  <h1><%= t ".my settings" %></h1>
+  <h1><%= t ".my_account" %></h1>
 <% end %>
 
 <%= render :partial => "settings_menu" %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 45e23fc2b..2e5af50b4 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -101,7 +101,7 @@
             <span class='badge count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
           <% end %>
           <%= link_to t("users.show.my profile"), current_user, :class => "dropdown-item" %>
-          <%= link_to t("users.show.my settings"), edit_account_path, :class => "dropdown-item" %>
+          <%= link_to t("users.show.my_account"), edit_account_path, :class => "dropdown-item" %>
           <%= link_to t("users.show.my_preferences"), preferences_path, :class => "dropdown-item" %>
           <div class="dropdown-divider"></div>
           <%= yield :greeting %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 8ef7b5644..a32f5fae1 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -30,7 +30,7 @@
               <span class='badge count-number'><%= number_with_delimiter(current_user.diary_comments.size) %></span>
             </li>
             <li>
-              <%= link_to t(".my settings"), edit_account_path %>
+              <%= link_to t(".my_account"), edit_account_path %>
             </li>
 
             <% if current_user.blocks.exists? %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index eaf0fdf15..eb87f790a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -246,7 +246,7 @@ en:
   accounts:
     edit:
       title: "Edit account"
-      my settings: My Settings
+      my_account: My Account
       current email address: "Current Email Address"
       external auth: "External Authentication"
       openid:
@@ -2809,7 +2809,7 @@ en:
       my notes: My Notes
       my messages: My Messages
       my profile: My Profile
-      my settings: My Settings
+      my_account: My Account
       my comments: My Comments
       my_preferences: My Preferences
       my_dashboard: My Dashboard
diff --git a/test/system/user_suspension_test.rb b/test/system/user_suspension_test.rb
index a72512357..d6368b68b 100644
--- a/test/system/user_suspension_test.rb
+++ b/test/system/user_suspension_test.rb
@@ -5,7 +5,7 @@ class UserSuspensionTest < ApplicationSystemTestCase
     user = create(:user)
     sign_in_as(user)
     visit edit_account_path
-    assert_content "My Settings"
+    assert_content "My Account"
 
     user.suspend!