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

diff --cc app/views/oauth_clients/index.html.erb
index 54bb4f9f6f4133d17341adc6f0751f7810fe30ab,738e01a743143ddff1b6388f5a5cdfda85f1a071..0ce09d57c9014a34df87a33f4e9b81d850d9a59f
--- 1/app/views/oauth_clients/index.html.erb
--- 2/app/views/oauth_clients/index.html.erb
+++ b/app/views/oauth_clients/index.html.erb
@@@ -29,7 -29,7 +29,7 @@@
  <% end %>
  <h3><%= t ".my_apps" %></h3>
  <% if @client_applications.empty? %>
- <p><%= raw(t(".no_apps", :oauth => "<a href=\"https://oauth.net\">OAuth</a>")) %></p>
 -<p><%= t(".no_apps_html", :oauth => link_to(t(".oauth"), "https://oauth.net" )) %></p>
++<p><%= t(".no_apps_html", :oauth => link_to(t(".oauth"), "https://oauth.net")) %></p>
  <% else %>
  <p><%= t ".registered_apps" %></p>
  <% @client_applications.each do |client| %>

diff --cc app/views/site/about.html.erb
index 15255d9e0d57e1fc73e799a00a87dc431b2ad45c,3f310be5baff0156f545df5eaab684efdf34c9c8..e62af1659cbaa8fce56c2e8aeb5c296bda9f3b72
--- 1/app/views/site/about.html.erb
--- 2/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@@ -1,43 -1,41 +1,43 @@@
 -<div class='attr'>
 -  <div class='byosm'>
 -    <%= t ".copyright_html" %>
 -  </div>
 -
 -  <div class='user-image'></div>
 +<%= tag.div :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>
 +  <div class='attr'>
 +    <div class='byosm'>
 +      <%= t ".copyright_html", :locale => @locale %>
 +    </div>
  
 -  <h1><%= t ".used_by_html", :name => content_tag(:span, "OpenStreetMap", :class => "user-name") %></h1>
 -</div>
 +    <div class='user-image'></div>
  
-     <h1><%= raw t ".used_by", :name => "<span class='user-name'>OpenStreetMap</span>", :locale => @locale %></h1>
 -<div class='text'>
 -  <div class='section'>
 -    <p><strong><%= t ".lede_text" %></strong></p>
 -    <h2><div class='icon local'></div><%= t ".local_knowledge_title" %></h2>
 -    <p><%= t ".local_knowledge_html" %></p>
++    <h1><%= t ".used_by_html", :name => content_tag(:span, "OpenStreetMap", :class => "user-name"), :locale => @locale %></h1>
    </div>
  
 -  <div class='section'>
 -    <h2><div class='icon community'></div><%= t ".community_driven_title" %></h2>
 -    <p><%= t ".community_driven_html", :diary_path => diary_entries_path %></p>
 -  </div>
 +  <div class='text'>
 +    <div class='section'>
 +      <p><strong><%= t ".lede_text", :locale => @locale %></strong></p>
 +      <h2><div class='icon local'></div><%= t ".local_knowledge_title", :locale => @locale %></h2>
 +      <p><%= t ".local_knowledge_html", :locale => @locale %></p>
 +    </div>
  
 -  <div class='section' id='open-data'>
 -    <h2><div class='icon open'></div><%= t ".open_data_title" %></h2>
 -    <p><%= t ".open_data_html", :copyright_path => copyright_path %></p>
 -  </div>
 +    <div class='section'>
 +      <h2><div class='icon community'></div><%= t ".community_driven_title", :locale => @locale %></h2>
 +      <p><%= t ".community_driven_html", :locale => @locale, :diary_path => diary_entries_path %></p>
 +    </div>
  
 -  <div class='section' id='legal'>
 -    <h2><div class='icon legal'></div><%= t ".legal_title" %></h2>
 -    <p><%= t ".legal_html" %></p>
 -  </div>
 +    <div class='section' id='open-data'>
 +      <h2><div class='icon open'></div><%= t ".open_data_title", :locale => @locale %></h2>
 +      <p><%= t ".open_data_html", :locale => @locale, :copyright_path => copyright_path %></p>
 +    </div>
 +
 +    <div class='section' id='legal'>
 +      <h2><div class='icon legal'></div><%= t ".legal_title", :locale => @locale %></h2>
 +      <p><%= t ".legal_html", :locale => @locale %></p>
 +    </div>
  
 -  <div class='section' id='partners'>
 -    <h2><div class='icon partners'></div><%= t ".partners_title" %></h2>
 -    <p><%= t "layouts.hosting_partners_html",
 -             :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
 -             :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
 -             :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
 -    </p>
 +    <div class='section' id='partners'>
 +      <h2><div class='icon partners'></div><%= t ".partners_title", :locale => @locale %></h2>
 +      <p><%= t "layouts.hosting_partners_html", :locale => @locale,
 +                                                :ucl => link_to(t("layouts.partners_ucl", :locale => @locale), "https://www.ucl.ac.uk"),
 +                                                :bytemark => link_to(t("layouts.partners_bytemark", :locale => @locale), "https://www.bytemark.co.uk"),
 +                                                :partners => link_to(t("layouts.partners_partners", :locale => @locale), "https://hardware.openstreetmap.org/thanks/") %>
 +      </p>
 +    </div>
    </div>
 -</div>
 +<% end %>

diff --cc app/views/site/copyright.html.erb
index feec81c82172053f7921bbd8d537772c58647d1d,c6a0348df001f658ab014e6d3c0d27fbda00a92d..75f4e878db94bc50a4ecedcc2ac02cb849e95a79
--- 1/app/views/site/copyright.html.erb
--- 2/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@@ -6,14 -6,14 +6,14 @@@
        <%= tag.h1 :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>
          <h1><%= t ".native.title" %></h1>
          <p>
-           <%= raw t ".native.text",
-                     :native_link => link_to(t(".native.native_link"),
-                                             :controller => "site",
-                                             :action => "copyright",
-                                             :copyright_locale => nil),
-                     :mapping_link => link_to(t(".native.mapping_link"),
-                                              :controller => "site",
-                                              :action => "index") %>
+           <%= t ".native.html",
 -              :native_link => link_to(t(".native.native_link"),
 -                                      :controller => "site",
 -                                      :action => "copyright",
 -                                      :copyright_locale => nil),
 -              :mapping_link => link_to(t(".native.mapping_link"),
 -                                       :controller => "site",
 -                                       :action => "index") %>
++                :native_link => link_to(t(".native.native_link"),
++                                        :controller => "site",
++                                        :action => "copyright",
++                                        :copyright_locale => nil),
++                :mapping_link => link_to(t(".native.mapping_link"),
++                                         :controller => "site",
++                                         :action => "index") %>
          </p>
        <% end %>
        <hr />
@@@ -24,11 -24,11 +24,11 @@@
        <% if t(".legal_babble", :locale => @locale) != t(".legal_babble", :locale => :en) %>
          <h1><%= t ".foreign.title" %></h1>
          <p>
-           <%= raw t ".foreign.text",
-                     :english_original_link => link_to(t(".foreign.english_link"),
-                                                       :controller => "site",
-                                                       :action => "copyright",
-                                                       :copyright_locale => "en") %>
+           <%= t ".foreign.html",
 -              :english_original_link => link_to(t(".foreign.english_link"),
 -                                                :controller => "site",
 -                                                :action => "copyright",
 -                                                :copyright_locale => "en") %>
++                :english_original_link => link_to(t(".foreign.english_link"),
++                                                  :controller => "site",
++                                                  :action => "copyright",
++                                                  :copyright_locale => "en") %>
          </p>
        <% end %>
        <hr />

diff --cc app/views/traces/_trace.html.erb
Simple merge

diff --cc app/views/traces/show.html.erb
Simple merge

diff --cc config/locales/en.yml
Simple merge