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

diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index c17f090af865b9e8338c7c610e23aaa5c836f8b6..f014eb037842e584928b6533c4d0c44cbcfbba15 100644 (file)
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -140,6 +140,14 @@
         <%= 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")),

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f9117ca1cc89add7669440805fbb59138644c7b0..77002268b0e6b3c2f04c9995d5c70b39af6ac75c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2098,6 +2098,14 @@ en:
           %{france}: Contains data sourced from
           Direction Générale des Impôts.
         contributors_fr_france: France
+        contributors_hr_credit_html: |
+          %{croatia}: Contains data from the %{dgu_link} and %{open_data_portal}
+          (public information of Croatia).
+        contributors_hr_croatia: Croatia
+        contributors_hr_dgu: State Geodetic Administration of Croatia
+        contributors_hr_dgu_url: https://dgu.gov.hr/
+        contributors_hr_open_data_portal: National Open Data Portal
+        contributors_hr_open_data_portal_url: https://data.gov.hr/
         contributors_nl_credit_html: |
           %{netherlands}: Contains © AND data, 2007 (%{and_link})
         contributors_nl_netherlands: Netherlands