From b38eb613ae1844fbcd68c62f469b25ee410405ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Tue, 14 Jan 2025 10:01:27 -0800 Subject: [PATCH 1/3] Updated partner acknowledgments --- app/views/layouts/map.html.erb | 6 +++++- app/views/site/about.html.erb | 7 ++++--- config/locales/en.yml | 17 +++++++---------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb index 9bdeb36845..5ee6ffcf15 100644 --- a/app/views/layouts/map.html.erb +++ b/app/views/layouts/map.html.erb @@ -44,7 +44,11 @@ diff --git a/config/locales/en.yml b/config/locales/en.yml index a9373dfcb6..a67e21954f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1578,16 +1578,13 @@ en: tag_line: The Free Wiki World Map intro_header: Welcome to OpenHistoricalMap! intro_text: OpenHistoricalMap is an interactive map of the world throughout history, created by people like you and dedicated to the public domain. - hosting_partners_2024_html: | -

- GreenInfo Network is a nonprofit social-good mapping and communications organization that helps nonprofits and government agencies achieve social, environmental, and other goals using a range of tools, including human-centered design practices, collaborative development, and open source web and geospatial tools. -

-

- Development Seed is an engineering and product company that is accelerating the application of earth data to our biggest global challenges. Development Seed leverages massive earth data, cloud computing, geospatial AI, and thoughtful product development. -

- partners_fastly: "Fastly" - partners_corpmembers: "OSMF corporate members" - partners_partners: "partners" + intro_2_create_account: "Create a user account" + partners_title: Partners + hosting_partners_2024_html: "OpenHistoricalMap is a charter project of %{osmus}, a 501(c)(3) nonprofit organization affiliated with the %{osmf}. Technical development is supported by %{greeninfo} and %{devseed}." + partners_devseed: Development Seed + partners_greeninfo: GreenInfo Network + partners_osmf: OpenStreetMap Foundation + partners_osmus: OpenStreetMap U.S. tou: "Terms of Use" osm_offline: "The OpenHistoricalMap database is currently offline while essential database maintenance work is carried out." osm_read_only: "The OpenHistoricalMap database is currently in read-only mode while essential database maintenance work is carried out." From eb1cd4404f493a749b3ca370a1496f63ca650149 Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Tue, 28 Jan 2025 10:12:22 -0600 Subject: [PATCH 2/3] re: #961, replaces occurence of "OpenStreetMap" with "OpenHistoricalMap" in en.yml --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index a9373dfcb6..772034627a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2022,7 +2022,7 @@ en: Creative Commons Attribution “No Rights Reserved” Public Domain license (CC0). introduction_3_creative_commons: Creative Commons Attribution-ShareAlike 2.0 introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/ - credit_title_html: How to credit OpenStreetMap + credit_title_html: How to credit OpenHistoricalMap credit_1_html: | We do not require any OHM-specific credit separate from those required by the underlying data. Citations, however, are appreciated From 20601273adeb29a03f13ae546f12b3ba4cb9265f Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Tue, 28 Jan 2025 10:32:25 -0600 Subject: [PATCH 3/3] re: #961, remove mention of "State of the Map" in en.yml --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 772034627a..7d159b87ef 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1977,7 +1977,7 @@ en: legal_2_1_contact_the_osmf: contact the OSMF legal_2_1_contact_the_osmf_url: https://osmfoundation.org/Contact legal_2_2_html: | - OpenStreetMap, the magnifying glass logo and State of the Map are %{registered_trademarks_link}. + OpenStreetMap and the magnifying glass logo are %{registered_trademarks_link}. legal_2_2_registered_trademarks: registered trademarks of the OSMF legal_2_2_registered_trademarks_url: https://osmfoundation.org/wiki/Trademark_Policy partners_title: Partners