From: Tom Hughes <tom@compton.nu>
Date: Sun, 12 Sep 2021 17:41:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3317'
X-Git-Tag: live~2488
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/22fbd05f1f982cabc8fab60e63c545112c6e0006?hp=93144b5d299a890392fb64b6d0bf8b8fe3024312

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

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 7a0ca0ed7..816f90c70 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -45,6 +45,7 @@
           <p><%= t "layouts.intro_text" %></p>
           <p><%= t "layouts.hosting_partners_html",
                    :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
+                   :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
                    :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 f495193a6..e127cc5b5 100644
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -40,6 +40,7 @@
       <h2><div class='icon partners'></div><%= t ".partners_title", :locale => @locale %></h2>
       <p><%= t "layouts.hosting_partners_html", :locale => @locale,
                                                 :ucl => link_to(t("layouts.partners_ucl", :locale => @locale), "https://www.ucl.ac.uk"),
+                                                :fastly => link_to(t("layouts.partners_fastly", :locale => @locale), "https://www.fastly.com/"),
                                                 :bytemark => link_to(t("layouts.partners_bytemark", :locale => @locale), "https://www.bytemark.co.uk"),
                                                 :partners => link_to(t("layouts.partners_partners", :locale => @locale), "https://hardware.openstreetmap.org/thanks/") %>
       </p>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0b745aa7c..030fab696 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1420,8 +1420,9 @@ 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"
-    hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}."
+    hosting_partners_html: "Hosting is supported by %{ucl}, %{fastly}, %{bytemark}, and other %{partners}."
     partners_ucl: "UCL"
+    partners_fastly: "Fastly"
     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     tou: "Terms of Use"