Use correct link for users with no location

Fixes #3290

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index ac6938af76066e1fc7a11fed8eb73a28895571dc..1dd84edeaf4a581dd8a433a7616bab57675d2ce9 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">
     <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(".if_set_location_html", :settings_link => (link_to t(".settings_link_text"), :controller => "users", :action => "account", :display_name => current_user.display_name)) %></p>
+          <p id="no_home_location"><%= t(".set_location_html", :edit_profile_url => edit_profile_path) %></p>

         </div>
       <% else %>
         <% content_for :head do %>
         </div>
       <% else %>
         <% content_for :head do %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7dce96dd681caba5df412f03319a29114325e17d..1b411a229dddf8f758dd913301c7f23506707d93 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2505,8 +2505,7 @@ en:
       spam score: "Spam Score:"
       description: Description
       user location: User location
       spam score: "Spam Score:"
       description: Description
       user location: User location

-      if_set_location_html: "Set your home location on the %{settings_link} page to see nearby users."
-      settings_link_text: settings
+      set_location_html: "<a href=\"%{edit_profile_url}\">Edit your profile</a> and set your home location to see nearby users."

       my friends: My friends
       no friends: You have not added any friends yet.
       km away: "%{count}km away"
       my friends: My friends
       no friends: You have not added any friends yet.
       km away: "%{count}km away"