X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7561eacbf4d1e45ae3bf954a55093b4ff1be5ba4..3b43e4d53a736680bb41a14401244f3445d0c274:/app/views/site/copyright.html.erb?ds=sidebyside

diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index 897f9cda3..0ef9d7b2b 100644
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -1,4 +1,4 @@
-<p style="float: right">
+<p id="cc_logo">
   <%= link_to(
           image_tag("cc_button.png",
               :alt => t('layouts.license.alt'),
@@ -10,36 +10,63 @@
           { :rel => "license" }) %>
 </p>
 
-<% if I18n.locale.to_s == "en" or params['locale'] == 'en' %>
+<% if @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', :locale => I18n.locale) != t('license_page.legal_babble', :locale => :en) %>
     <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') %>
+      <%= raw t 'license_page.native.text',
+                  :native_link => link_to(t('license_page.native.native_link'),
+                                              :controller => 'site',
+                                              :action => 'copyright',
+                                              :copyright_locale => nil),
+                  :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') %>
+  <% if t('license_page.legal_babble', :locale => @locale) != 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) %>
+      <%= 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 %>
-  <%= t('license_page.legal_babble') %>
 <% end %>
+
+<h2><%= t "license_page.legal_babble.title_html", :locale => @locale %></h2>
+
+<p><%= t "license_page.legal_babble.intro_1_html", :locale => @locale %></p>
+<p><%= t "license_page.legal_babble.intro_2_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>
+
+<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>
+<p><%= t "license_page.legal_babble.more_3_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_au_html", :locale => @locale %></li>
+  <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_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_pl_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>