Tidy up the note controller

[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 897f9cda30c5223e769d4bb7901656ac1730adac..eaaf3f3661f4ff9ba8b4e068753f1ad382164ec6 100644 (file)
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -10,9 +10,9 @@
           { :rel => "license" }) %>
 </p>
 
-<% if I18n.locale.to_s == "en" or params['locale'] == 'en' %>
+<% if I18n.locale == 'en' or params[:copyright_locale] == 'en' %>
   <!-- Maybe ease foreigners back to their native page -->
-  <% if params['orig_locale'] and params['orig_locale'] != params['locale'] %>
+  <% 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',
@@ -26,20 +26,20 @@
     <hr />
   <% end %>
 
-  <%= t('license_page.legal_babble', :locale => 'en') %>
+  <%= 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') %>
+  <% 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',
-                                                :locale => 'en',
-                                                :orig_locale => I18n.locale.to_s) %>
+                                                :copyright_locale => 'en') %>
     </p>
     <hr />
   <% end %>
+
   <%= t('license_page.legal_babble') %>
 <% end %>