X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e484b6894c533f5364b248df2d5beaad62f0e7f3..012d5b69c6807ec59b8b6dfacd36a43778902a06:/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 c83cef99c..2f44386da 100644
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -1,35 +1,22 @@
-<p id="cc_logo">
-  <%= 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 == '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',
                   :native_link => link_to(t('license_page.native.native_link'),
                                               :controller => 'site',
-                                              :action => 'copyright'),
+                                              :action => 'copyright',
+                                              :copyright_locale => nil),
                   :mapping_link => link_to(t('license_page.native.mapping_link'),
                                               :controller => 'site',
                                               :action => 'index') %>
     </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 +27,43 @@
     </p>
     <hr />
   <% end %>
-
-  <%= raw 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>
+<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,
+              :width => 193,
+              :height => 69,
+              :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_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>