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

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

Browse source
This commit is contained in:
Tom Hughes 2023-03-08 17:00:48 +00:00
commit 9241d9810d
7 changed files with 42 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/confirmations/confirm.html.erb
View file

@ -27,6 +27,8 @@
</span>
</h1>
<p class='text-muted'><%= t ".reconfirm_html",
:reconfirm => url_for(:action => "confirm_resend") %></p>
<p class='text-muted'>
<%= t ".resend_html",
:reconfirm_link => link_to(t(".click_here"), url_for(:action => "confirm_resend")) %>
</p>
<% end %>

4
app/views/shared/_markdown_help.html.erb
View file

@ -1,4 +1,6 @@
<h5><%= t ".title_html" %></h5>
<h5>
<%= t ".heading_html", :kramdown_link => link_to(t(".kramdown"), t(".kramdown_url")) %>
</h5>
<dl>
<dt><%= t ".headings" %></dt>
<dd># <%= t ".heading" %><br>

4
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 => preferences_path %></p>
<p><%= t ".desktop_application_html", :download_link => link_to(t(".download"), t(".download_url")) %></p>
<p><%= t ".id_editor_html", :change_preferences_link => link_to(t(".change_preferences"), preferences_path) %></p>
</div>

3
app/views/site/communities.html.erb
View file

@ -20,4 +20,5 @@
</ul>
<h2><%= t ".other_groups.title" %></h2>
<p><%= t ".other_groups.about_html" %></p>
<p><%= t ".other_groups.other_groups_html", :communities_wiki_link => link_to(t(".other_groups.communities_wiki"),
t(".other_groups.communities_wiki_url")) %>

5
app/views/site/fixthemap.html.erb
View file

@ -27,6 +27,9 @@
</div>
<h2><%= t ".other_concerns.title" %></h2>
<p><%= t ".other_concerns.explanation_html" %></p>
<p>
<%= 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")) %>
</p>
<%= render "any_questions" %>

8
app/views/users/terms.html.erb
View file

@ -36,9 +36,11 @@
<div>
<p id="contributorGuidance" class="text-muted">
<%= 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") %>
</p>
</div>
<div class="mb-3">