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

diff --git a/app/views/accounts/edit.html.erb b/app/views/accounts/edit.html.erb
index ce7dd97a83d4dd7597810559c4d2fa8452f2b56b..5c626fc9f985645120e6cda69ce6f4ab1db46bc6 100644 (file)
--- 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 1f5856908abed577e1a18c580b94a7c679dfeb51..f09812972ef31ff234233072891f20a0bb1d4300 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -85,7 +85,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>
           <% if current_user.home_location? %>

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 8ef7b56447d4fd891cdcb60daa0a8ef67c7543f9..a32f5fae1e071337716f945fbd5b531093cd3e92 100644 (file)
--- 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 6c0a780384a59549c043c78b90fb7079c0940d62..2f7cae65e83b4e55036d8ceca56e2809a1c95763 100644 (file)
--- 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:
@@ -2810,7 +2810,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 a7251235770971ff33b49f2bcb3cc912f604b3f5..d6368b68b28edfb4a8aa825428341d93b660dcea 100644 (file)
--- 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!