X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/feb9582b071d6eb44bcc6fbc027049dd1f5c2042..98445b2ab9d9d7b731ba128e7878a865d2409f37:/app/views/site/copyright.html.erb diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb index eaaf3f366..03dee8716 100644 --- a/app/views/site/copyright.html.erb +++ b/app/views/site/copyright.html.erb @@ -1,4 +1,4 @@ -
+
<%= link_to( image_tag("cc_button.png", :alt => t('layouts.license.alt'), @@ -10,36 +10,34 @@ { :rel => "license" }) %>
-<% if I18n.locale == 'en' or params[:copyright_locale] == 'en' %> +<% if @locale == 'en' %> - <% if t('license_page.legal_babble') != t('license_page.legal_babble', :locale => :en) %> + <% if t('license_page.legal_babble', :locale => I18n.locale) != t('license_page.legal_babble', :locale => :en) %>- <%= 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') %>
- <%= 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') %>