Merge remote-tracking branch 'upstream/pull/5341'

[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 100b485aa5d1ae38d75088450600e310e7fa2026..6940dc2f860f95f09a911d56f5cb7e7ba8817455 100644 (file)
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -32,7 +32,7 @@
 
   <% I18n.with_locale @locale do %>
     <%= tag.h1 :lang => @locale, :dir => t("html.dir") do %>
 
   <% I18n.with_locale @locale do %>
     <%= tag.h1 :lang => @locale, :dir => t("html.dir") do %>

-      <%= t ".legal_babble.title_html" %>
+      <%= t ".title" %>

     <% end %>
   <% end %>
 <% end %>
     <% end %>
   <% end %>
 <% end %>


@@ -78,7 +78,7 @@
     </p>
     <p><%= image_tag("attribution_example.png",
                      :alt => t(".legal_babble.attribution_example.alt"),
     </p>
     <p><%= image_tag("attribution_example.png",
                      :alt => t(".legal_babble.attribution_example.alt"),

-                     :border => 0,
+                     :class => "img-fluid",

                      :title => t(".legal_babble.attribution_example.title")) %></p>
 
     <h3><%= t ".legal_babble.more_title_html" %></h3>
                      :title => t(".legal_babble.attribution_example.title")) %></p>
 
     <h3><%= t ".legal_babble.more_title_html" %></h3>


@@ -100,17 +100,104 @@
     <h3><%= t ".legal_babble.contributors_title_html" %></h3>
     <p><%= t ".legal_babble.contributors_intro_html" %></p>
     <ul id="contributors">
     <h3><%= t ".legal_babble.contributors_title_html" %></h3>
     <p><%= t ".legal_babble.contributors_intro_html" %></p>
     <ul id="contributors">

-      <li><%= t ".legal_babble.contributors_at_html" %></li>
-      <li><%= t ".legal_babble.contributors_au_html" %></li>
-      <li><%= t ".legal_babble.contributors_ca_html" %></li>
-      <li><%= t ".legal_babble.contributors_fi_html" %></li>
-      <li><%= t ".legal_babble.contributors_fr_html" %></li>
-      <li><%= t ".legal_babble.contributors_nl_html" %></li>
-      <li><%= t ".legal_babble.contributors_nz_html" %></li>
-      <li><%= t ".legal_babble.contributors_si_html" %></li>
-      <li><%= t ".legal_babble.contributors_es_html" %></li>
-      <li><%= t ".legal_babble.contributors_za_html" %></li>
-      <li><%= t ".legal_babble.contributors_gb_html" %></li>
+      <li>
+        <%= t ".legal_babble.contributors_at_credit_html",
+              :austria => tag.strong(t(".legal_babble.contributors_at_austria")),
+              :stadt_wien_link => link_to(t(".legal_babble.contributors_at_stadt_wien"),
+                                          t(".legal_babble.contributors_at_stadt_wien_url")),
+              :cc_by_link => link_to(t(".legal_babble.contributors_at_cc_by"),
+                                     t(".legal_babble.contributors_at_cc_by_url")),
+              :land_vorarlberg_link => link_to(t(".legal_babble.contributors_at_land_vorarlberg"),
+                                               t(".legal_babble.contributors_at_land_vorarlberg_url")),
+              :cc_by_at_with_amendments_link => link_to(t(".legal_babble.contributors_at_cc_by_at_with_amendments"),
+                                                        t(".legal_babble.contributors_at_cc_by_at_with_amendments_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_au_credit_html",
+              :australia => tag.strong(t(".legal_babble.contributors_au_australia")),
+              :geoscape_australia_link => link_to(t(".legal_babble.contributors_au_geoscape_australia"),
+                                                  t(".legal_babble.contributors_au_geoscape_australia_url")),
+              :cc_licence_link => link_to(t(".legal_babble.contributors_au_cc_licence"),
+                                          t(".legal_babble.contributors_au_cc_licence_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_ca_credit_html",
+              :canada => tag.strong(t(".legal_babble.contributors_ca_canada")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_cz_credit_html",
+              :czechia => tag.strong(t(".legal_babble.contributors_cz_czechia")),
+              :cc_licence_link => link_to(t(".legal_babble.contributors_cz_cc_licence"),
+                                          t(".legal_babble.contributors_cz_cc_licence_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_fi_credit_html",
+              :finland => tag.strong(t(".legal_babble.contributors_fi_finland")),
+              :nlsfi_license_link => link_to(t(".legal_babble.contributors_fi_nlsfi_license"),
+                                             t(".legal_babble.contributors_fi_nlsfi_license_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_fr_credit_html",
+              :france => tag.strong(t(".legal_babble.contributors_fr_france")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_hr_credit_html",
+              :croatia => tag.strong(t(".legal_babble.contributors_hr_croatia")),
+              :dgu_link => link_to(t(".legal_babble.contributors_hr_dgu"),
+                                   t(".legal_babble.contributors_hr_dgu_url")),
+              :open_data_portal => link_to(t(".legal_babble.contributors_hr_open_data_portal"),
+                                           t(".legal_babble.contributors_hr_open_data_portal_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_nl_credit_html",
+              :netherlands => tag.strong(t(".legal_babble.contributors_nl_netherlands")),
+              :and_link => link_to(t(".legal_babble.contributors_nl_and"),
+                                   t(".legal_babble.contributors_nl_and_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_nz_credit_html",
+              :new_zealand => tag.strong(t(".legal_babble.contributors_nz_new_zealand")),
+              :linz_data_service_link => link_to(t(".legal_babble.contributors_nz_linz_data_service"),
+                                                 t(".legal_babble.contributors_nz_linz_data_service_url")),
+              :cc_by_link => link_to(t(".legal_babble.contributors_nz_cc_by"),
+                                     t(".legal_babble.contributors_nz_cc_by_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_rs_credit_html",
+              :serbia => tag.strong(t(".legal_babble.contributors_rs_serbia")),
+              :rgz_link => link_to(t(".legal_babble.contributors_rs_rgz"),
+                                   t(".legal_babble.contributors_rs_rgz_url")),
+              :open_data_portal => link_to(t(".legal_babble.contributors_rs_open_data_portal"),
+                                           t(".legal_babble.contributors_rs_open_data_portal_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_si_credit_html",
+              :slovenia => tag.strong(t(".legal_babble.contributors_si_slovenia")),
+              :gu_link => link_to(t(".legal_babble.contributors_si_gu"),
+                                  t(".legal_babble.contributors_si_gu_url")),
+              :mkgp_link => link_to(t(".legal_babble.contributors_si_mkgp"),
+                                    t(".legal_babble.contributors_si_mkgp_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_es_credit_html",
+              :spain => tag.strong(t(".legal_babble.contributors_es_spain")),
+              :ign_link => link_to(t(".legal_babble.contributors_es_ign"),
+                                   t(".legal_babble.contributors_es_ign_url")),
+              :scne_link => link_to(t(".legal_babble.contributors_es_scne"),
+                                    t(".legal_babble.contributors_es_scne_url")),
+              :cc_by_link => link_to(t(".legal_babble.contributors_es_cc_by"),
+                                     t(".legal_babble.contributors_es_cc_by_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_za_credit_html",
+              :south_africa => tag.strong(t(".legal_babble.contributors_za_south_africa")),
+              :ngi_link => link_to(t(".legal_babble.contributors_za_ngi"),
+                                   t(".legal_babble.contributors_za_ngi_url")) %>
+      </li>
+      <li>
+        <%= t ".legal_babble.contributors_gb_credit_html",
+              :united_kingdom => tag.strong(t(".legal_babble.contributors_gb_united_kingdom")) %>
+      </li>

     </ul>
     <p>
       <%= t ".legal_babble.contributors_2_html",
     </ul>
     <p>
       <%= t ".legal_babble.contributors_2_html",