From feb9582b071d6eb44bcc6fbc027049dd1f5c2042 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 27 Apr 2010 16:00:10 +0100
Subject: [PATCH] Tweak the copyright page translation

---
 app/views/site/copyright.html.erb | 12 ++++++------
 config/routes.rb                  |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index 897f9cda3..eaaf3f366 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.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 %>
diff --git a/config/routes.rb b/config/routes.rb
index df6efef60..9a86f9200 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -89,6 +89,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/', :controller => 'site', :action => 'index'
   map.connect '/edit', :controller => 'site', :action => 'edit'
   map.connect '/copyright', :controller => 'site', :action => 'copyright'
+  map.connect '/copyright/:copyright_locale', :controller => 'site', :action => 'copyright'
   map.connect '/history', :controller => 'changeset', :action => 'list'
   map.connect '/history/feed', :controller => 'changeset', :action => 'list', :format => :atom
   map.connect '/export', :controller => 'site', :action => 'export'
-- 
2.39.5