Merge pull request #10 from danstowell/jsrouting-credits

[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..d782656688887d639bce75cb98a6449fcc948880 100644 (file)
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -1,45 +1,72 @@
-<p style="float: right">
-  <%= link_to(
-          image_tag("cc_button.png",
-              :alt => t('layouts.license.alt'),
-              :border => 0,
-              :width => 88,
-              :height => 31,
-              :title => t('layouts.license.title')),
-          "http://creativecommons.org/licenses/by-sa/2.0/",
-          { :rel => "license" }) %>
-</p>
-
-<% if I18n.locale.to_s == "en" or params['locale'] == 'en' %>
+<% content_for :heading do %>
+<% if @locale == 'en' %>
   <!-- Maybe ease foreigners back to their native page -->
-  <% if params['orig_locale'] and params['orig_locale'] != params['locale'] %>
-    <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') %>
-    </p>
-    <hr />
-  <% end %>
 
-  <%= 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') %>
-    <h2><%= t 'license_page.foreign.title' %></h2>
-    <p>
-      <%= t 'license_page.foreign.text',
-              :english_original_link => link_to(t('license_page.foreign.english_link'),
+    <% if t('license_page.legal_babble', :locale => I18n.locale) != t('license_page.legal_babble', :locale => :en) %>
+      <h1><%= t 'license_page.native.title' %></h1>
+      <p>
+        <%= raw t 'license_page.native.text',
+                    :native_link => link_to(t('license_page.native.native_link'),
                                                 :controller => 'site',
                                                 :action => 'copyright',
-                                                :locale => 'en',
-                                                :orig_locale => I18n.locale.to_s) %>
-    </p>
-    <hr />
+                                                :copyright_locale => nil),
+                    :mapping_link => link_to(t('license_page.native.mapping_link'),
+                                                :controller => 'site',
+                                                :action => 'index') %>
+      </p>
+      <hr />
+    <% end %>
+  <% else %>
+    <!-- Maybe note that this page has been translated -->
+    <% if t('license_page.legal_babble', :locale => @locale) != t('license_page.legal_babble', :locale => :en) %>
+      <h1><%= t 'license_page.foreign.title' %></h1>
+      <p>
+        <%= 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 %>
   <% end %>
-  <%= t('license_page.legal_babble') %>
+
+  <h1><%= t "license_page.legal_babble.title_html", :locale => @locale %></h1>
+
 <% end %>
+
+<p><%= t "license_page.legal_babble.intro_1_html", :locale => @locale %></p>
+<p><%= t "license_page.legal_babble.intro_2_html", :locale => @locale %></p>
+<p><%= t "license_page.legal_babble.intro_3_html", :locale => @locale %></p>
+
+<h3><%= t "license_page.legal_babble.credit_title_html", :locale => @locale %></h3>
+<p><%= t "license_page.legal_babble.credit_1_html", :locale => @locale %></p>
+<p><%= t "license_page.legal_babble.credit_2_html", :locale => @locale %></p>
+<p><%= t "license_page.legal_babble.credit_3_html", :locale => @locale %></p>
+<p><%= image_tag("attribution_example.png",
+              :alt => t('license_page.legal_babble.attribution_example.alt'),
+              :border => 0,
+              :title => t('license_page.legal_babble.attribution_example.title')) %>
+
+<h3><%= t "license_page.legal_babble.more_title_html", :locale => @locale %></h3>
+<p><%= t "license_page.legal_babble.more_1_html", :locale => @locale %></p>
+<p><%= t "license_page.legal_babble.more_2_html", :locale => @locale %></p>
+
+<h3><%= t "license_page.legal_babble.contributors_title_html", :locale => @locale %></h3>
+<p><%= t "license_page.legal_babble.contributors_intro_html", :locale => @locale %></p>
+<ul id="contributors">
+  <li><%= t "license_page.legal_babble.contributors_at_html", :locale => @locale %></li>
+  <li><%= t "license_page.legal_babble.contributors_ca_html", :locale => @locale %></li>
+  <li><%= t "license_page.legal_babble.contributors_fi_html", :locale => @locale %></li>
+  <li><%= t "license_page.legal_babble.contributors_fr_html", :locale => @locale %></li>
+  <li><%= t "license_page.legal_babble.contributors_nl_html", :locale => @locale %></li>
+  <li><%= t "license_page.legal_babble.contributors_nz_html", :locale => @locale %></li>
+  <li><%= t "license_page.legal_babble.contributors_za_html", :locale => @locale %></li>
+  <li><%= t "license_page.legal_babble.contributors_gb_html", :locale => @locale %></li>
+</ul>
+<p><%= t "license_page.legal_babble.contributors_footer_1_html", :locale => @locale %></p>
+<p><%= t "license_page.legal_babble.contributors_footer_2_html", :locale => @locale %></p>
+
+<h3><%= t "license_page.legal_babble.infringement_title_html", :locale => @locale %></h3>
+<p><%= t "license_page.legal_babble.infringement_1_html", :locale => @locale %></p>
+<p><%= t "license_page.legal_babble.infringement_2_html", :locale => @locale %></p>