Prefer using _html locale keys to the raw function

[rails.git] / app / views / site / copyright.html.erb

diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index eaaf3f3661f4ff9ba8b4e068753f1ad382164ec6..03dee8716a2bf7379c11b852f9cadc4c2e43db56 100644 (file)
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -1,4 +1,4 @@
-<p style="float: right">
+<p id="cc_logo">

   <%= link_to(
           image_tag("cc_button.png",
               :alt => t('layouts.license.alt'),
   <%= link_to(
           image_tag("cc_button.png",
               :alt => t('layouts.license.alt'),


@@ -10,36 +10,34 @@
           { :rel => "license" }) %>
 </p>
 
           { :rel => "license" }) %>
 </p>
 

-<% if I18n.locale == 'en' or params[:copyright_locale] == 'en' %>
+<% if @locale == 'en' %>

   <!-- Maybe ease foreigners back to their native page -->
   <!-- Maybe ease foreigners back to their native page -->

-  <% 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) %>

     <h2><%= t 'license_page.native.title' %></h2>
     <p>
     <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 %>
     </p>
     <hr />
   <% end %>

-
-  <%= t('license_page.legal_babble', :locale => :en) %>

 <% else %>
   <!-- Maybe note that this page has been translated -->
 <% else %>
   <!-- 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', :locale => @locale) != t('license_page.legal_babble', :locale => :en) %>

     <h2><%= t 'license_page.foreign.title' %></h2>
     <p>
     <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 %>
     </p>
     <hr />
   <% end %>

-
-  <%= t('license_page.legal_babble') %>

 <% end %>
 <% end %>

+
+<%= raw t('license_page.legal_babble', :locale => @locale) %>