X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/41d02225d2dc6446e4506e38aa93f3a8519bde5a..d593d3d2dd6986aa07f5d5268d3e0d7b808590db:/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 d78265668..1b85d201c 100644
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -2,15 +2,15 @@
 <% 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) %>
-      <h1><%= t 'license_page.native.title' %></h1>
+    <% if t('.legal_babble', :locale => I18n.locale) != t('.legal_babble', :locale => :en) %>
+      <h1><%= t '.native.title' %></h1>
       <p>
-        <%= raw t 'license_page.native.text',
-                    :native_link => link_to(t('license_page.native.native_link'),
+        <%= raw t '.native.text',
+                    :native_link => link_to(t('.native.native_link'),
                                                 :controller => 'site',
                                                 :action => 'copyright',
                                                 :copyright_locale => nil),
-                    :mapping_link => link_to(t('license_page.native.mapping_link'),
+                    :mapping_link => link_to(t('.native.mapping_link'),
                                                 :controller => 'site',
                                                 :action => 'index') %>
       </p>
@@ -18,11 +18,11 @@
     <% 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>
+    <% if t('.legal_babble', :locale => @locale) != t('.legal_babble', :locale => :en) %>
+      <h1><%= t '.foreign.title' %></h1>
       <p>
-        <%= raw t 'license_page.foreign.text',
-                    :english_original_link => link_to(t('license_page.foreign.english_link'),
+        <%= raw t '.foreign.text',
+                    :english_original_link => link_to(t('.foreign.english_link'),
                                                           :controller => 'site',
                                                           :action => 'copyright',
                                                           :copyright_locale => 'en') %>
@@ -31,42 +31,46 @@
     <% end %>
   <% end %>
 
-  <h1><%= t "license_page.legal_babble.title_html", :locale => @locale %></h1>
+  <h1><%= t ".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>
+<p><%= t ".legal_babble.intro_1_html", :locale => @locale %></p>
+<p><%= t ".legal_babble.intro_2_html", :locale => @locale %></p>
+<p><%= t ".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>
+<h3><%= t ".legal_babble.credit_title_html", :locale => @locale %></h3>
+<p><%= t ".legal_babble.credit_1_html", :locale => @locale %></p>
+<p><%= t ".legal_babble.credit_2_html", :locale => @locale %></p>
+<p><%= t ".legal_babble.credit_3_html", :locale => @locale %></p>
 <p><%= image_tag("attribution_example.png",
-              :alt => t('license_page.legal_babble.attribution_example.alt'),
+              :alt => t('.legal_babble.attribution_example.alt'),
               :border => 0,
-              :title => t('license_page.legal_babble.attribution_example.title')) %>
+              :title => t('.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 ".legal_babble.more_title_html", :locale => @locale %></h3>
+<p><%= t ".legal_babble.more_1_html", :locale => @locale %></p>
+<p><%= t ".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>
+<h3><%= t ".legal_babble.contributors_title_html", :locale => @locale %></h3>
+<p><%= t ".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>
+  <li><%= t ".legal_babble.contributors_at_html", :locale => @locale %></li>
+  <li><%= t ".legal_babble.contributors_ca_html", :locale => @locale %></li>
+  <li><%= t ".legal_babble.contributors_fi_html", :locale => @locale %></li>
+  <li><%= t ".legal_babble.contributors_fr_html", :locale => @locale %></li>
+  <li><%= t ".legal_babble.contributors_nl_html", :locale => @locale %></li>
+  <li><%= t ".legal_babble.contributors_nz_html", :locale => @locale %></li>
+  <li><%= t ".legal_babble.contributors_si_html", :locale => @locale %></li>
+  <li><%= t ".legal_babble.contributors_za_html", :locale => @locale %></li>
+  <li><%= t ".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>
+<p><%= t ".legal_babble.contributors_footer_1_html", :locale => @locale %></p>
+<p><%= t ".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>
+<h3><%= t ".legal_babble.infringement_title_html", :locale => @locale %></h3>
+<p><%= t ".legal_babble.infringement_1_html", :locale => @locale %></p>
+<p><%= t ".legal_babble.infringement_2_html", :locale => @locale %></p>
+
+<h3><%= t ".legal_babble.trademarks_title_html", :locale => @locale %></h3>
+<p><%= t ".legal_babble.trademarks_1_html", :locale => @locale %></p>