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

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/config/locales/en.yml b/config/locales/en.yml
index 430836bce456d4db6cf53329f959ea75ffa26aa2..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