From 3b75e9241507c0672dabaec44ecb83148df979b6 Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 28 Mar 2018 17:07:50 +0800
Subject: [PATCH 1/1] Be more consistent with 'my' vs 'your' for objects that
 belong to the user

---
 app/controllers/trace_controller.rb |  2 +-
 app/views/trace/list.html.erb       |  4 ++--
 app/views/user/view.html.erb        |  2 +-
 config/locales/en.yml               | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index ce2494001..f97e5ecd2 100644
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -33,7 +33,7 @@ class TraceController < ApplicationController
     @title = if target_user.nil?
                t "trace.list.public_traces"
              elsif current_user && current_user == target_user
-               t "trace.list.your_traces"
+               t "trace.list.my_traces"
              else
                t "trace.list.public_traces_from", :user => target_user.display_name
              end
diff --git a/app/views/trace/list.html.erb b/app/views/trace/list.html.erb
index 1e89e963d..7dcfacb80 100644
--- a/app/views/trace/list.html.erb
+++ b/app/views/trace/list.html.erb
@@ -6,13 +6,13 @@
     <li><%= link_to t('trace.trace_header.upload_trace'), :action => 'create' %></li>
     <% if @tag %>
       <li><%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>
-      <li><%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %></li>
+      <li><%= link_to t('trace.trace_header.see_my_traces'), :action => 'mine', :tag => nil, :page => nil %></li>
     <% else %>
       <% if @display_name %>
         <li><%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>
       <% end %>
       <%= unless_user(@target_user, :li) do %>
-        <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %>
+        <%= link_to t('trace.trace_header.see_my_traces'), :action => 'mine', :tag => nil, :page => nil %>
       <% end %>
     <% end %>
   </ul>
diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index 137a390ba..119fe10a4 100644
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -195,7 +195,7 @@
     <% nearby = @this_user.nearby - friends %>
 
   <div class="activity-block column-1">
-    <h3><%= t 'user.view.your friends' %></h3>
+    <h3><%= t 'user.view.my friends' %></h3>
 
     <% if friends.empty? %>
       <%= t 'user.view.no friends' %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 54ec7a468..1a146701a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -230,7 +230,7 @@ en:
     list:
       title: "Changesets"
       title_user: "Changesets by %{user}"
-      title_friend: "Changesets by your friends"
+      title_friend: "Changesets by my friends"
       title_nearby: "Changesets by nearby users"
       empty: "No changesets found."
       empty_area: "No changesets in this area."
@@ -259,7 +259,7 @@ en:
       user_title: "%{user}'s diary"
       in_language_title: "Diary Entries in %{language}"
       new: New Diary Entry
-      new_title: Compose a new entry in your user diary
+      new_title: Compose a new entry in my user diary
       no_entries: No diary entries
       recent_entries: "Recent diary entries"
       older_entries: Older Entries
@@ -1611,7 +1611,7 @@ en:
     trace_header:
       upload_trace: "Upload a trace"
       see_all_traces: "See all traces"
-      see_your_traces: "See your traces"
+      see_my_traces: "See my traces"
       traces_waiting:
         one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
         other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
@@ -1658,7 +1658,7 @@ en:
       map: "map"
     list:
       public_traces: "Public GPS traces"
-      your_traces: "Your GPS traces"
+      my_traces: "My GPS traces"
       public_traces_from: "Public GPS traces from %{user}"
       description: "Browse recent GPS trace uploads"
       tagged_with: " tagged with %{tags}"
@@ -1923,7 +1923,7 @@ en:
       user location: User location
       if set location: "Set your home location on the %{settings_link} page to see nearby users."
       settings_link_text: settings
-      your friends: Your friends
+      my friends: My friends
       no friends: You have not added any friends yet.
       km away: "%{count}km away"
       m away: "%{count}m away"
-- 
2.39.5