cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2021-09-12 18:41:05 +01:00
commit 22fbd05f1f
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/views/layouts/map.html.erb
View file

@ -45,6 +45,7 @@
<p><%= t "layouts.intro_text" %></p> <p><%= t "layouts.intro_text" %></p>
<p><%= t "layouts.hosting_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"),
:fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
:bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.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/") %> :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
</p> </p>

1
app/views/site/about.html.erb
View file

@ -40,6 +40,7 @@
<h2><div class='icon partners'></div><%= t ".partners_title", :locale => @locale %></h2> <h2><div class='icon partners'></div><%= t ".partners_title", :locale => @locale %></h2>
<p><%= t "layouts.hosting_partners_html", :locale => @locale, <p><%= t "layouts.hosting_partners_html", :locale => @locale,
:ucl => link_to(t("layouts.partners_ucl", :locale => @locale), "https://www.ucl.ac.uk"), :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"), :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/") %> :partners => link_to(t("layouts.partners_partners", :locale => @locale), "https://hardware.openstreetmap.org/thanks/") %>
</p> </p>

3
config/locales/en.yml
View file

@ -1420,8 +1420,9 @@ en:
intro_header: Welcome to OpenStreetMap! 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_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_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_ucl: "UCL"
partners_fastly: "Fastly"
partners_bytemark: "Bytemark Hosting" partners_bytemark: "Bytemark Hosting"
partners_partners: "partners" partners_partners: "partners"
tou: "Terms of Use" tou: "Terms of Use"