Implement the OWG credit policy for hosting partners.

See https://operations.osmfoundation.org/policies/hosting/

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 6607bf7a5879eba6d026edbe809fc42835947516..3f11edf59cfd275a0323bb9b20031a63653e0919 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -49,6 +49,12 @@
         <h2><%= t 'layouts.intro_header' %></h2>
         <div class="close-wrap"><span class="icon close"></span></div>
         <p><%= t 'layouts.intro_text' %></p>
         <h2><%= t 'layouts.intro_header' %></h2>
         <div class="close-wrap"><span class="icon close"></span></div>
         <p><%= t 'layouts.intro_text' %></p>

+        <p><%= t 'layouts.partners_html',
+               :ucl => link_to(t('layouts.partners_ucl'), "http://www.bartlett.ucl.ac.uk"),
+               :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
+               :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),
+               :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>
+        </p>

         <a class="button learn-more" href="<%= about_path %>"><%= t('layouts.learn_more') %></a>
         <a class="button sign-up" href="<%= user_new_path %>"><%= t('layouts.start_mapping') %></a>
       </div>
         <a class="button learn-more" href="<%= about_path %>"><%= t('layouts.learn_more') %></a>
         <a class="button sign-up" href="<%= user_new_path %>"><%= t('layouts.start_mapping') %></a>
       </div>

diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb
index 07b2f9e52170d18f923847cf168119813649c9da..9847cf5aa9a9ea7745a130e629583510df5e979c 100644 (file)
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -36,7 +36,7 @@
              :ucl => link_to(t('layouts.partners_ucl'), "http://www.bartlett.ucl.ac.uk"),
              :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
              :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),
              :ucl => link_to(t('layouts.partners_ucl'), "http://www.bartlett.ucl.ac.uk"),
              :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
              :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),

-             :partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url')) %>
+             :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>

     </p>
   </div>
 </div>
     </p>
   </div>
 </div>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2414fcd1f0ef3c6a2c789f5e03110bc224a3f29b..15a1912df6f5b9e3ac55689485c0ccf1ded102cf 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -933,12 +933,11 @@ en:
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"

-    partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
+    partners_html: "Hosting is supported by %{ucl}, %{bytemark} and %{ic}, and other %{partners}."

     partners_ucl: "the UCL VR Centre"
     partners_ic: "Imperial College London"
     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     partners_ucl: "the UCL VR Centre"
     partners_ic: "Imperial College London"
     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"

-    partners_url: "http://wiki.openstreetmap.org/wiki/Partners"

     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."