From: Andy Allan <git@gravitystorm.co.uk>
Date: Thu, 2 Jan 2020 10:14:54 +0000 (+0100)
Subject: Split the legal_html into two, so that we can use proper paragraphs instead of a... 
X-Git-Tag: live~2917^2~1
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/fc5260d71b764d4ebda340f073df5ab39ab1c2fa?ds=sidebyside;hp=-c

Split the legal_html into two, so that we can use proper paragraphs instead of a linebreak

Also add a missing full stop.
---

fc5260d71b764d4ebda340f073df5ab39ab1c2fa
diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb
index 15255d9e0..f5e90ff25 100644
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -28,7 +28,8 @@
 
     <div class='section' id='legal'>
       <h2><div class='icon legal'></div><%= t ".legal_title", :locale => @locale %></h2>
-      <p><%= t ".legal_html", :locale => @locale %></p>
+      <p><%= t ".legal_1_html", :locale => @locale %></p>
+      <p><%= t ".legal_2_html", :locale => @locale %></p>
     </div>
 
     <div class='section' id='partners'>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7c3aef4aa..5479c3db3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1358,13 +1358,13 @@ en:
         under the same licence. See the <a href='%{copyright_path}'>Copyright and
         License page</a> for details.
       legal_title: Legal
-      legal_html: |
+      legal_1_html: |
         This site and many other related services are formally operated by the
         <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
         on behalf of the community. Use of all OSMF operated services is subject
         to our <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">Terms of Use</a>, <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
-        Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
-        <br>
+        Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>.
+      legal_2_html: |
         Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a>
         if you have licensing, copyright or other legal questions.
         <br>