From: Tom Hughes <tom@compton.nu>
Date: Fri, 2 Dec 2011 16:59:30 +0000 (+0000)
Subject: Fix HTML escaping issues on the copyright page
X-Git-Tag: live~6023
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e484b6894c533f5364b248df2d5beaad62f0e7f3?hp=32554955205b000f346e4c6915b571fc5af6a4ed

Fix HTML escaping issues on the copyright page
---

diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index 92c84c745..c83cef99c 100644
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -15,31 +15,31 @@
   <% if t('license_page.legal_babble') != t('license_page.legal_babble', :locale => :en) %>
     <h2><%= t 'license_page.native.title' %></h2>
     <p>
-      <%= t 'license_page.native.text',
-              :native_link => link_to(t('license_page.native.native_link'),
-                                          :controller => 'site',
-                                          :action => 'copyright'),
-              :mapping_link => link_to(t('license_page.native.mapping_link'),
-                                          :controller => 'site',
-                                          :action => 'index') %>
+      <%= raw t 'license_page.native.text',
+                  :native_link => link_to(t('license_page.native.native_link'),
+                                              :controller => 'site',
+                                              :action => 'copyright'),
+                  :mapping_link => link_to(t('license_page.native.mapping_link'),
+                                              :controller => 'site',
+                                              :action => 'index') %>
     </p>
     <hr />
   <% end %>
 
-  <%= t('license_page.legal_babble', :locale => :en) %>
+  <%= raw t('license_page.legal_babble', :locale => :en) %>
 <% else %>
   <!-- Maybe note that this page has been translated -->
   <% if t('license_page.legal_babble') != t('license_page.legal_babble', :locale => :en) %>
     <h2><%= t 'license_page.foreign.title' %></h2>
     <p>
-      <%= t 'license_page.foreign.text',
-              :english_original_link => link_to(t('license_page.foreign.english_link'),
-                                                :controller => 'site',
-                                                :action => 'copyright',
-                                                :copyright_locale => 'en') %>
+      <%= raw t 'license_page.foreign.text',
+                  :english_original_link => link_to(t('license_page.foreign.english_link'),
+                                                        :controller => 'site',
+                                                        :action => 'copyright',
+                                                        :copyright_locale => 'en') %>
     </p>
     <hr />
   <% end %>
 
-  <%= raw(t('license_page.legal_babble')) %>
+  <%= raw t('license_page.legal_babble') %>
 <% end %>