Allow the copyright page to be requested in any locale

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 36f57d6c27d26a5003f95e4b66aa0584e6654d4e..f0c686c9f4716433a7d60ba09b91626c5bc6d9b8 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -80,4 +80,8 @@ class SiteController < ApplicationController
       @zoom = '17' if @zoom.nil?
     end
   end
       @zoom = '17' if @zoom.nil?
     end
   end

+
+  def copyright
+    @locale = params[:copyright_locale] || I18n.locale
+  end

 end
 end

diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index c83cef99c255a76229f2dfe3b85b0920fa51021c..03dee8716a2bf7379c11b852f9cadc4c2e43db56 100644 (file)
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -10,9 +10,9 @@
           { :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>
       <%= raw t 'license_page.native.text',
     <h2><%= t 'license_page.native.title' %></h2>
     <p>
       <%= raw t 'license_page.native.text',


@@ -25,11 +25,9 @@
     </p>
     <hr />
   <% end %>
     </p>
     <hr />
   <% end %>

-
-  <%= raw 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>
       <%= raw t 'license_page.foreign.text',
     <h2><%= t 'license_page.foreign.title' %></h2>
     <p>
       <%= raw t 'license_page.foreign.text',


@@ -40,6 +38,6 @@
     </p>
     <hr />
   <% end %>
     </p>
     <hr />
   <% end %>

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

 <% end %>
 <% end %>

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