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

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

Browse source
This commit is contained in:
Tom Hughes 2021-08-12 17:57:51 +01:00
commit 678b63acb3
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/users/show.html.erb
View file

@ -191,7 +191,7 @@
<div class="col-md order-md-last"> <div class="col-md order-md-last">
<% if @user.home_lat.nil? or @user.home_lon.nil? %> <% if @user.home_lat.nil? or @user.home_lon.nil? %>
<div id="map" class="content_map"> <div id="map" class="content_map">
<p id="no_home_location"><%= t(".set_location_html", :edit_profile_url => edit_profile_path) %></p> <p id="no_home_location"><%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %></p>
</div> </div>
<% else %> <% else %>
<% content_for :head do %> <% content_for :head do %>

3
config/locales/en.yml
View file

@ -2505,7 +2505,8 @@ en:
spam score: "Spam Score:" spam score: "Spam Score:"
description: Description description: Description
user location: User location user location: User location
set_location_html: "<a href=\"%{edit_profile_url}\">Edit your profile</a> and set your home location to see nearby users." no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users."
edit_your_profile: Edit your profile
my friends: My 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"