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

Remove html from translations for the welcome page

Browse source 
This also refactors the "any questions" section, which is shared with the fixthemap page.
This commit is contained in:
Andy Allan 2023-02-15 16:47:02 +00:00
parent 10e035df93
commit 9101705656
4 changed files with 57 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/site/_any_questions.html.erb Normal file
View file

@ -0,0 +1,4 @@
<h2><%= t ".title" %></h2>
<span class='sprite small term question float-start'></span>
<p><%= t ".paragraph_1_html", :help_link => link_to(t(".get_help_here"), help_path),
:welcome_mat_link => link_to(t(".welcome_mat"), t(".welcome_mat_url")) %></p>

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

@ -21,7 +21,7 @@
</div>
<div class='col-sm'>
<h5><%= t "site.welcome.add_a_note.title" %></h5>
<p><%= t "site.welcome.add_a_note.paragraph_1_html" %></p>
<p><%= t "site.welcome.add_a_note.para_1" %></p>
<p><%= t ".how_to_help.add_a_note.instructions_html", :map_url => root_path %></p>
</div>
</div>
@ -29,6 +29,4 @@
<h2><%= t ".other_concerns.title" %></h2>
<p><%= t ".other_concerns.explanation_html" %></p>
<h2><%= t "site.welcome.questions.title" %></h2>
<span class='sprite small term question float-start'></span>
<p><%= t "site.welcome.questions.paragraph_1_html", :help_url => help_path %></p>
<%= render "any_questions" %>

28
app/views/site/welcome.html.erb
View file

@ -6,7 +6,7 @@
<h1><%= t ".title" %></h1>
<% end %>
<p class="lead"><%= t ".introduction_html" %></p>
<p class="lead"><%= t ".introduction" %></p>
<h2><%= t ".whats_on_the_map.title" %></h2>
@ -15,49 +15,48 @@
<div>
<span class='sprite small check mx-auto'></span>
</div>
<p><%= t ".whats_on_the_map.on_html" %></p>
<p><%= t ".whats_on_the_map.on_the_map_html", :real_and_current => tag.em(t(".whats_on_the_map.real_and_current")) %></p>
</div>
<div class='col'>
<div class='center'>
<span class='sprite small x mx-auto'></span>
</div>
<p><%= t ".whats_on_the_map.off_html" %></p>
<p><%= t ".whats_on_the_map.off_the_map_html", :doesnt => tag.em(t(".whats_on_the_map.doesnt")) %></p>
</div>
</div>
<h2><%= t ".basic_terms.title" %></h2>
<p><%= t ".basic_terms.paragraph_1_html" %></p>
<p><%= t ".basic_terms.paragraph_1" %></p>
<div class='clearfix'>
<div class='clearfix'>
<span class='sprite small term editor float-start'></span>
<p><%= t ".basic_terms.editor_html" %></p>
<p><%= t ".basic_terms.an_editor_html", :editor => tag.strong(t(".basic_terms.editor")) %></p>
</div>
<div class='clearfix'>
<span class='sprite small term node float-start'></span>
<p><%= t ".basic_terms.node_html" %></p>
<p><%= t ".basic_terms.a_node_html", :node => tag.strong(t(".basic_terms.node")) %></p>
</div>
<div class='clearfix'>
<span class='sprite small term way float-start'></span>
<p><%= t ".basic_terms.way_html" %></p>
<p><%= t ".basic_terms.a_way_html", :way => tag.strong(t(".basic_terms.way")) %></p>
</div>
<div class='clearfix'>
<span class='sprite small term tag float-start'></span>
<p><%= t ".basic_terms.tag_html" %></p>
<p><%= t ".basic_terms.a_tag_html", :tag => tag.strong(t(".basic_terms.tag")) %></p>
</div>
</div>
<div class='clearfix'>
<h2><%= t ".rules.title" %></h2>
<span class='sprite small term rules float-start'></span>
<p><%= t ".rules.paragraph_1_html" %></p>
<p><%= t ".rules.para_1_html", :imports_link => link_to(t(".rules.imports"), t(".rules.imports_url")),
:automated_edits_link => link_to(t(".rules.automated_edits"), t(".rules.automated_edits_url")) %></p>
</div>
<div class='clearfix'>
<h2><%= t ".questions.title" %></h2>
<span class='sprite small term question float-start'></span>
<p><%= t ".questions.paragraph_1_html", :help_url => help_path %></p>
<%= render "any_questions" %>
</div>
<div class='clearfix text-center'>
@ -66,6 +65,7 @@
<div class='alert alert-primary'>
<h2><%= t ".add_a_note.title" %></h2>
<p><%= t ".add_a_note.paragraph_1_html" %></p>
<p><%= t ".add_a_note.paragraph_2_html", :map_url => root_path %></p>
<p><%= t ".add_a_note.para_1" %></p>
<p><%= t ".add_a_note.para_2_html", :map_link => link_to(t(".add_a_note.the_map"), root_path),
:note_icon => tag.span(:class => "icon note") %></p>
</div>