From: Tom Hughes <tom@compton.nu>
Date: Tue, 14 Feb 2012 11:54:22 +0000 (+0000)
Subject: Allow the copyright page to be requested in any locale
X-Git-Tag: live~5813
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2b326acc32d5d89119038b21f390eccf8029c305

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 36f57d6c2..f0c686c9f 100644
--- 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
+
+  def copyright
+    @locale = params[:copyright_locale] || I18n.locale
+  end
 end
diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index c83cef99c..03dee8716 100644
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -10,9 +10,9 @@
           { :rel => "license" }) %>
 </p>
 
-<% if I18n.locale == 'en' or params[:copyright_locale] == 'en' %>
+<% if @locale == 'en' %>
   <!-- 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',
@@ -25,11 +25,9 @@
     </p>
     <hr />
   <% end %>
-
-  <%= raw 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', :locale => @locale) != t('license_page.legal_babble', :locale => :en) %>
     <h2><%= t 'license_page.foreign.title' %></h2>
     <p>
       <%= raw t 'license_page.foreign.text',
@@ -40,6 +38,6 @@
     </p>
     <hr />
   <% end %>
-
-  <%= raw t('license_page.legal_babble') %>
 <% end %>
+
+<%= raw t('license_page.legal_babble', :locale => @locale) %>