cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Be more consistent with 'my' vs 'your' for objects that belong to

Browse source 
the user
This commit is contained in:
Andy Allan 2018-03-28 17:07:50 +08:00
parent 1f2ac59d1d
commit 3b75e92415
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/trace_controller.rb
View file

@ -33,7 +33,7 @@ class TraceController < ApplicationController
@title = if target_user.nil? @title = if target_user.nil?
t "trace.list.public_traces" t "trace.list.public_traces"
elsif current_user && current_user == target_user elsif current_user && current_user == target_user
t "trace.list.your_traces" t "trace.list.my_traces"
else else
t "trace.list.public_traces_from", :user => target_user.display_name t "trace.list.public_traces_from", :user => target_user.display_name
end end

4
app/views/trace/list.html.erb
View file

@ -6,13 +6,13 @@
<li><%= link_to t('trace.trace_header.upload_trace'), :action => 'create' %></li> <li><%= link_to t('trace.trace_header.upload_trace'), :action => 'create' %></li>
<% if @tag %> <% 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_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 %> <% else %>
<% if @display_name %> <% 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> <li><%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>
<% end %> <% end %>
<%= unless_user(@target_user, :li) do %> <%= 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 %>
<% end %> <% end %>
</ul> </ul>

2
app/views/user/view.html.erb
View file

@ -195,7 +195,7 @@
<% nearby = @this_user.nearby - friends %> <% nearby = @this_user.nearby - friends %>
<div class="activity-block column-1"> <div class="activity-block column-1">
<h3><%= t 'user.view.your friends' %></h3> <h3><%= t 'user.view.my friends' %></h3>
<% if friends.empty? %> <% if friends.empty? %>
<%= t 'user.view.no friends' %> <%= t 'user.view.no friends' %>

10
config/locales/en.yml
View file

@ -230,7 +230,7 @@ en:
list: list:
title: "Changesets" title: "Changesets"
title_user: "Changesets by %{user}" title_user: "Changesets by %{user}"
title_friend: "Changesets by your friends" title_friend: "Changesets by my friends"
title_nearby: "Changesets by nearby users" title_nearby: "Changesets by nearby users"
empty: "No changesets found." empty: "No changesets found."
empty_area: "No changesets in this area." empty_area: "No changesets in this area."
@ -259,7 +259,7 @@ en:
user_title: "%{user}'s diary" user_title: "%{user}'s diary"
in_language_title: "Diary Entries in %{language}" in_language_title: "Diary Entries in %{language}"
new: New Diary Entry 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 no_entries: No diary entries
recent_entries: "Recent diary entries" recent_entries: "Recent diary entries"
older_entries: Older Entries older_entries: Older Entries
@ -1611,7 +1611,7 @@ en:
trace_header: trace_header:
upload_trace: "Upload a trace" upload_trace: "Upload a trace"
see_all_traces: "See all traces" see_all_traces: "See all traces"
see_your_traces: "See your traces" see_my_traces: "See my traces"
traces_waiting: 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." 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." 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" map: "map"
list: list:
public_traces: "Public GPS traces" public_traces: "Public GPS traces"
your_traces: "Your GPS traces" my_traces: "My GPS traces"
public_traces_from: "Public GPS traces from %{user}" public_traces_from: "Public GPS traces from %{user}"
description: "Browse recent GPS trace uploads" description: "Browse recent GPS trace uploads"
tagged_with: " tagged with %{tags}" tagged_with: " tagged with %{tags}"
@ -1923,7 +1923,7 @@ en:
user location: User location user location: User location
if set location: "Set your home location on the %{settings_link} page to see nearby users." if set location: "Set your home location on the %{settings_link} page to see nearby users."
settings_link_text: settings settings_link_text: settings
your friends: Your friends my friends: My friends
no friends: You have not added any friends yet. no friends: You have not added any friends yet.
km away: "%{count}km away" km away: "%{count}km away"
m away: "%{count}m away" m away: "%{count}m away"