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

Fix HTML escaping issues on the copyright page

Browse source
This commit is contained in:
Tom Hughes 2011-12-02 16:59:30 +00:00
parent 3255495520
commit e484b6894c
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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