Merge branch 'your' into 'master'

Update views to single form of address. Change "my" to "your"

Part of user experience. Every software (twitter, facebook etc) talks to you like "change your password" but not "change my password".

cc @sytse @job

See merge request !1736

14 files changed, 17 insertions, 19 deletions

diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 7d3fcfa7037..c31a556ff7b 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -23,9 +23,9 @@ module SearchHelper
   # Autocomplete results for various settings pages
   def default_autocomplete
     [
-      { label: "My Profile settings", url: profile_path },
-      { label: "My SSH Keys",         url: profile_keys_path },
-      { label: "My Dashboard",        url: root_path },
+      { label: "Profile settings", url: profile_path },
+      { label: "SSH Keys",         url: profile_keys_path },
+      { label: "Dashboard",        url: root_path },
       { label: "Admin Section",       url: admin_root_path },
     ]
   end
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
index cb1291cf3bf..c6fa8f0ee36 100644
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -6,4 +6,4 @@
   <p>You can confirm your account through the link below:</p>
 <% end %>
 
-<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>
+<p><%= link_to 'Confirm your account', confirmation_url(@resource, confirmation_token: @token) %></p>
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
index 7913e88beb6..23b31da92d8 100644
--- a/app/views/devise/mailer/reset_password_instructions.html.erb
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -2,7 +2,7 @@
 
 <p>Someone has requested a link to change your password, and you can do this through the link below.</p>
 
-<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
+<p><%= link_to 'Change your password', edit_password_url(@resource, reset_password_token: @token) %></p>
 
 <p>If you didn't request this, please ignore this email.</p>
 <p>Your password won't change until you access the link above and create a new one.</p>
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
index 8c2a4f0c2d9..79d6c761d8f 100644
--- a/app/views/devise/mailer/unlock_instructions.html.erb
+++ b/app/views/devise/mailer/unlock_instructions.html.erb
@@ -4,4 +4,4 @@
 
 <p>Click the link below to unlock your account:</p>
 
-<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>
+<p><%= link_to 'Unlock your account', unlock_url(@resource, unlock_token: @token) %></p>
diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml
index 0640739b5d7..56048e99c17 100644
--- a/app/views/devise/passwords/edit.html.haml
+++ b/app/views/devise/passwords/edit.html.haml
@@ -11,7 +11,7 @@
       %div
         = f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true
       .clearfix
-        = f.submit "Change my password", class: "btn btn-primary"
+        = f.submit "Change your password", class: "btn btn-primary"
 
 .clearfix.prepend-top-20
   %p
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index b11817af95d..f379e71ae5b 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -21,8 +21,8 @@
 <div><%= f.submit "Update", class: "input_button" %></div>
 <% end %>
 
-<h3>Cancel my account</h3>
+<h3>Cancel your account</h3>
 
-<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>.</p>
+<p>Unhappy? <%= link_to "Cancel your account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>.</p>
 
 <%= link_to "Back", :back %>
diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml
index ed03f885dcd..246a6c1bdfd 100644
--- a/app/views/help/ui.html.haml
+++ b/app/views/help/ui.html.haml
@@ -53,7 +53,7 @@
     %code .panel .well-list
 
   .panel.panel-default
-    .panel-heading My list
+    .panel-heading Your list
     %ul.well-list
       %li
         One item
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index fc8a487ece7..b1c2e1a7b19 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -25,7 +25,7 @@
             = link_to explore_root_path, title: "Explore", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
               %i.fa.fa-globe
           %li
-            = link_to user_snippets_path(current_user), title: "My snippets", class: 'has_bottom_tooltip', 'data-original-title' => 'My snippets' do
+            = link_to user_snippets_path(current_user), title: "Your snippets", class: 'has_bottom_tooltip', 'data-original-title' => 'Your snippets' do
               %i.fa.fa-clipboard
           - if current_user.is_admin?
             %li
diff --git a/app/views/profiles/history.html.haml b/app/views/profiles/history.html.haml
index 9cafe03b8b3..b1ab433f48f 100644
--- a/app/views/profiles/history.html.haml
+++ b/app/views/profiles/history.html.haml
@@ -1,5 +1,5 @@
 %h3.page-title
-  My Account History
+  Your Account History
 %p.light
   All events created by your account are listed below.
 %hr
diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml
index 965d5e032f9..0904c50c88b 100644
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@@ -3,8 +3,6 @@
   .pull-right
     = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-new"
 %p.light
-  My SSH keys: #{@keys.count}
-  %br
   Before you can add an SSH key you need to
   = link_to "generate it.", help_page_path("ssh", "README")
 %hr
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index c0e13e67be3..a295a0d6cdc 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -19,7 +19,7 @@
         .fork-buttons
           - if current_user && can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace
             - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
-              = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to my fork' do
+              = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork' do
                 = link_to_toggle_fork
             - else
               = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project" do
diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml
index b2b7ea4df0e..0df5ade500d 100644
--- a/app/views/snippets/current_user_index.html.haml
+++ b/app/views/snippets/current_user_index.html.haml
@@ -1,5 +1,5 @@
 %h3.page-title
-  My Snippets
+  Your Snippets
   .pull-right
     = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do
       Add new snippet
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 0d71c41e2e7..5cd8ae26cf9 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -2,12 +2,12 @@
   Public snippets
 
   .pull-right
-    
+
     - if current_user
       = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do
         Add new snippet
       = link_to user_snippets_path(current_user), class: "btn btn-grouped"  do
-        My snippets
+        Your snippets
 
 %p.light
   Public snippets created by you and other users are listed here
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index edfa2092df9..55a990c94ed 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -23,7 +23,7 @@
   .back-link
     - if @snippet.author == current_user
       = link_to user_snippets_path(current_user) do
-        &larr; my snippets
+        &larr; your snippets
     - else
       = link_to snippets_path do
         &larr; discover snippets