Remove Imperial from hosting credits

Fixes #1944

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 534ff13c019117aedb8a9e1c76e769247d25ba75..05f070914b2cd7e235fc9f0fd477eca235c749db 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -43,9 +43,8 @@
         <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',
+        <p><%= t 'layouts.hosting_partners_html',

                :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"),
                :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"),

-               :ic => link_to(t('layouts.partners_ic'), "https://www.imperial.ac.uk/"),

                :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"),
                :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>
         </p>
                :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"),
                :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>
         </p>

diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb
index 702a0243d19f7aaf06e4233b0657b60b21477219..111815c12598eb52de4e35855de19d25a4f2266a 100644 (file)
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -32,9 +32,8 @@
 
   <div class='section' id='partners'>
     <h2><div class='icon partners'></div><%= t ".partners_title" %></h2>
 
   <div class='section' id='partners'>
     <h2><div class='icon partners'></div><%= t ".partners_title" %></h2>

-    <p><%= t 'layouts.partners_html',
+    <p><%= t 'layouts.hosting_partners_html',

              :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"),
              :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"),

-             :ic => link_to(t('layouts.partners_ic'), "https://www.imperial.ac.uk/"),

              :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"),
              :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>
     </p>
              :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"),
              :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>
     </p>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7636bad034218db147949ba88fee78d2e075c985..5c96e819135fcb76082ee5bc0e9bd46bd8095886 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1055,9 +1055,8 @@ 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}, %{bytemark}, %{ic}, and other %{partners}."
+    hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}."

     partners_ucl: "UCL"
     partners_ucl: "UCL"

-    partners_ic: "Imperial College London"

     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."