From ad3ca54e286d8bb733afb96b64d421c07faa358b Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 22 Sep 2018 16:57:53 +0100 Subject: [PATCH 1/1] Remove Imperial from hosting credits Fixes #1944 --- app/views/layouts/map.html.erb | 3 +-- app/views/site/about.html.erb | 3 +-- config/locales/en.yml | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb index 534ff13c0..05f070914 100644 --- a/app/views/layouts/map.html.erb +++ b/app/views/layouts/map.html.erb @@ -43,9 +43,8 @@

<%= t 'layouts.intro_header' %>

<%= t 'layouts.intro_text' %>

-

<%= t 'layouts.partners_html', +

<%= t 'layouts.hosting_partners_html', :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/") %>

diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb index 702a0243d..111815c12 100644 --- a/app/views/site/about.html.erb +++ b/app/views/site/about.html.erb @@ -32,9 +32,8 @@

<%= t ".partners_title" %>

-

<%= t 'layouts.partners_html', +

<%= t 'layouts.hosting_partners_html', :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/") %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 7636bad03..5c96e8191 100644 --- 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" - 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_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." -- 2.43.2