Merge pull request #267 from OpenHistoricalMap/961-osm-references-hav…

…e-reappeared

961 osm references have reappeared + partners (pr 264)

app/views/layouts/map.html.erb

@@ -44,7 +44,11 @@
       <div class="welcome p-3" hidden>
         <%= render "sidebar_header", :title => t("layouts.intro_header") %>
         <p class="fs-6 fw-light"><%= t "layouts.intro_text" %></p>
-        <p class="fs-6 fw-light"><%= t "layouts.hosting_partners_2024_html" %>
+        <p class="fs-6 fw-light"><%= t "layouts.hosting_partners_2024_html",
+                                       :devseed => link_to(t("layouts.partners_devseed"), "https://developmentseed.org/"),
+                                       :greeninfo => link_to(t("layouts.partners_greeninfo"), "https://greeninfo.org/"),
+                                       :osmf => link_to(t("layouts.partners_osmf"), "https://osmfoundation.org/"),
+                                       :osmus => link_to(t("layouts.partners_osmus"), "https://openstreetmap.us/") %>
         </p>
         <div class="d-flex gap-2">
           <a class="btn btn-primary w-100 d-flex align-items-center justify-content-center" href="<%= about_path %>"><%= t("layouts.learn_more") %></a>

app/views/site/about.html.erb

@@ -110,9 +110,10 @@
           </svg>
           <h2 class="flex-grow-1 mb-0"><%= t ".partners_title" %></h2>
         </div>
-        <p><%= t "layouts.hosting_partners_2024_html", :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
-                                                       :corpmembers => link_to(t("layouts.partners_corpmembers"), "https://osmfoundation.org/wiki/Corporate_Members"),
-                                                       :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
+        <p><%= t "layouts.hosting_partners_2024_html", :devseed => link_to(t("layouts.partners_devseed"), "https://developmentseed.org/"),
+                                                       :greeninfo => link_to(t("layouts.partners_greeninfo"), "https://greeninfo.org/"),
+                                                       :osmf => link_to(t("layouts.partners_osmf"), "https://osmfoundation.org/"),
+                                                       :osmus => link_to(t("layouts.partners_osmus"), "https://openstreetmap.us/") %>
         </p>
       </section>
     </div>

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: |
-      <p>
-      <a href='https://greeninfo.org'>GreenInfo Network</a> 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.
-      </p>
-      <p>
-      <a href='https://developmentseed.org/'>Development Seed</a> 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.
-      </p>
-    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."
@@ -1977,7 +1974,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
@@ -2022,7 +2019,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