Merge remote-tracking branch 'openstreetmap/pull/1030' into next

[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 4a7a57bea8962785bb1dd7a37edab2a27db8ffa8..887782be25b9d9f1333412b7bbcbcb96f838ff92 100644 (file)
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -1,35 +1,39 @@
+<% content_for :heading do %>
 <% if @locale == 'en' %>
   <!-- Maybe ease foreigners back to their native page -->
-  <% 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',
-                                              :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) %>
-    <h2><%= t 'license_page.foreign.title' %></h2>
-    <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 />
+
+    <% 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',
+                                                :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 %>
-<% end %>
 
-<h2><%= t "license_page.legal_babble.title_html", :locale => @locale %></h2>
+  <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>
@@ -38,6 +42,11 @@
 <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>
@@ -48,9 +57,11 @@
 <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_si_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>
@@ -60,3 +71,6 @@
 <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>
+
+<h3><%= t "license_page.legal_babble.trademarks_title_html", :locale => @locale %></h3>
+<p><%= t "license_page.legal_babble.trademarks_1_html", :locale => @locale %></p>