From 9c8bb75b9de199dac93da671de00bc5d478fac8a Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Sat, 25 Feb 2023 12:15:09 +0100 Subject: [PATCH 1/1] Refactor potlatch page to avoid html in translations --- app/views/site/_potlatch.html.erb | 4 ++-- config/locales/en.yml | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb index 790a3bf5d..909a4cb41 100644 --- a/app/views/site/_potlatch.html.erb +++ b/app/views/site/_potlatch.html.erb @@ -1,5 +1,5 @@

<%= t ".removed" %>

-

<%= t ".desktop_html" %>

-

<%= t ".id_html", :settings_url => preferences_path %>

+

<%= t ".desktop_application_html", :download_link => link_to(t(".download"), t(".download_url")) %>

+

<%= t ".id_editor_html", :change_preferences_link => link_to(t(".change_preferences"), preferences_path) %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index fc01c22ae..0a64eaccd 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2158,8 +2158,11 @@ en: description: Browse the wiki for in-depth OpenStreetMap documentation. 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 downloading the desktop application for Mac and Windows. - id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. Change your preferences here. + desktop_application_html: You can still use Potlatch by %{download_link}. + download: downloading the desktop application for Mac and Windows + download_url: https://www.systemed.net/potlatch/ + id_editor_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. %{change_preferences_link}. + change_preferences: Change your preferences here any_questions: title: Any questions? paragraph_1_html: | -- 2.45.2