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

[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 d6f3b499e0043fe73cbf24c62edee3ae50da2ae0..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>


@@ -124,6 +124,12 @@
         <%= t ".legal_babble.contributors_ca_credit_html",
               :canada => tag.strong(t(".legal_babble.contributors_ca_canada")) %>
       </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")),
       <li>
         <%= t ".legal_babble.contributors_fi_credit_html",
               :finland => tag.strong(t(".legal_babble.contributors_fi_finland")),


@@ -134,6 +140,14 @@
         <%= t ".legal_babble.contributors_fr_credit_html",
               :france => tag.strong(t(".legal_babble.contributors_fr_france")) %>
       </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")),
       <li>
         <%= t ".legal_babble.contributors_nl_credit_html",
               :netherlands => tag.strong(t(".legal_babble.contributors_nl_netherlands")),