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

diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb
index 946519d7362e36732a6a326735eb753c88075237..790a3bf5d057497713a449e9eb930ca217ee5459 100644 (file)
--- a/app/views/site/_potlatch.html.erb
+++ b/app/views/site/_potlatch.html.erb
@@ -1,5 +1,5 @@
 <div class="container">
   <p><%= t ".removed" %></p>
   <p><%= t ".desktop_html" %></p>
-  <p><%= t ".id_html", :settings_url => user_account_path(current_user) %></p>
+  <p><%= t ".id_html", :settings_url => preferences_path %></p>
 </div>

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 0db30f5b5edd20d8e80061855f743665e30cc8c9..caa7730cb16fe4809b8452c3b461c659c5081430 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 1b411a229dddf8f758dd913301c7f23506707d93..5b1686c6b81b6eddf6c2f63304d00b9428bcde85 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2060,7 +2060,7 @@ en:
     potlatch:
       removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser.
       desktop_html: You can still use Potlatch by <a href="https://www.systemed.net/potlatch/">downloading the desktop application for Mac and Windows</a>.
-      id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your user settings here</a>.
+      id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your preferences here</a>.
     sidebar:
       search_results: Search Results
       close: Close
@@ -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"