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

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 1dd84edeaf4a581dd8a433a7616bab57675d2ce9..be25df1933d45cf28d026ad489479fa5931ddc10 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -191,7 +191,7 @@
     <div class="col-md order-md-last">
       <% if @user.home_lat.nil? or @user.home_lon.nil? %>
         <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>
       <% else %>
         <% content_for :head do %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 93d109fab51ffa1dc2308e4c940627750768ee17..5b1686c6b81b6eddf6c2f63304d00b9428bcde85 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2505,7 +2505,8 @@ en:
       spam score: "Spam Score:"
       description: Description
       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
       no friends: You have not added any friends yet.
       km away: "%{count}km away"