<%= 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/app/views/site/communities.html.erb b/app/views/site/communities.html.erb
index c214066837..21b5c235c5 100644
--- a/app/views/site/communities.html.erb
+++ b/app/views/site/communities.html.erb
@@ -20,4 +20,5 @@
<%= t ".other_groups.other_groups_html", :communities_wiki_link => link_to(t(".other_groups.communities_wiki"),
+ t(".other_groups.communities_wiki_url")) %>
diff --git a/app/views/site/fixthemap.html.erb b/app/views/site/fixthemap.html.erb
index fe6cf22c59..ab8684116b 100644
--- a/app/views/site/fixthemap.html.erb
+++ b/app/views/site/fixthemap.html.erb
@@ -27,6 +27,9 @@
+ <%= t ".other_concerns.concerns_html", :copyright_link => link_to(t(".other_concerns.copyright"), copyright_path),
+ :working_group_link => link_to(t(".other_concerns.working_group"), t(".other_concerns.working_group_url")) %>
+
<%= render "any_questions" %>
diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb
index f161667029..e2ece8f1a9 100644
--- a/app/views/users/terms.html.erb
+++ b/app/views/users/terms.html.erb
@@ -36,9 +36,11 @@
- <%= t ".guidance_html",
- :summary => "https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary",
- :translations => "https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations" %>
+ <%= t ".guidance_info_html",
+ :readable_summary_link => link_to(t(".readable_summary"),
+ "https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary"),
+ :informal_translations_link => link_to(t(".informal_translations"),
+ "https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations") %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5045542ab3..ca1d313c8d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1627,7 +1627,8 @@ en:
success: "Confirmed your account, thanks for signing up!"
already active: "This account has already been confirmed."
unknown token: "That confirmation code has expired or does not exist."
- reconfirm_html: "If you need us to resend the confirmation email,
click here."
+ resend_html: "If you need us to resend the confirmation email, %{reconfirm_link}."
+ click_here: click here
confirm_resend:
failure: "User %{name} not found."
confirm_email:
@@ -1803,7 +1804,9 @@ en:
support: support
shared:
markdown_help:
- title_html: Parsed with
kramdown
+ heading_html: Parsed with %{kramdown_link}
+ kramdown_url: https://kramdown.gettalong.org/quickref.html
+ kramdown: kramdown
headings: Headings
heading: Heading
subheading: Subheading
@@ -2084,10 +2087,12 @@ en:
by dragging. Add your message, then click save, and other mappers will investigate.
other_concerns:
title: Other concerns
- explanation_html: |
+ concerns_html: |
If you have concerns about how our data is being used or about the contents please consult our
-
copyright page for more legal information, or contact the appropriate
-
OSMF working group.
+ %{copyright_link} for more legal information, or contact the appropriate %{working_group_link}.
+ copyright: copyright page
+ working_group: OSMF working group
+ working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups
help:
title: Getting Help
introduction: |
@@ -2135,8 +2140,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: |
@@ -2301,11 +2309,12 @@ en:
The following communities are formally established as Local Chapters:
other_groups:
title: Other Groups
- about_html: |
+ other_groups_html: |
There is no need to formally establish a group to the same extent as the Local Chapters.
Indeed many groups exist very sucessfully as an informal gathering of people or as a
- community group. Anyone can set up or join these. Read more on the
-
Communities wiki page.
+ community group. Anyone can set up or join these. Read more on the %{communities_wiki_link}.
+ communities_wiki: Communities wiki page
+ communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group
traces:
visibility:
private: "Private (only shared as anonymous, unordered points)"
@@ -2570,7 +2579,9 @@ en:
consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain"
consider_pd_why: "what's this?"
consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
- guidance_html: 'Information to help understand these terms: a
human readable summary and some
informal translations'
+ guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}"
+ readable_summary: human readable summary
+ informal_translations: informal translations
continue: Continue
declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
decline: "Decline"