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

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

Browse source
This commit is contained in:
Tom Hughes 2021-08-12 17:57:54 +01:00
commit 700bf13279
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/site/_potlatch.html.erb
View file

@ -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>

2
config/locales/en.yml
View file

@ -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