X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9619e699e1daf2ec1127cdf0bba7ffe2aa3bbb0c..bc70cae711fb6947233d6a750cb33f115aa7a01b:/app/views/site/about.html.erb?ds=sidebyside diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb index f6f6ba137..56e82f8f8 100644 --- a/app/views/site/about.html.erb +++ b/app/views/site/about.html.erb @@ -1,3 +1,4 @@ +<% content_for(:content_class) { "bg-body-secondary" } %> <% I18n.with_locale @locale do %> <%= tag.div :lang => @locale, :dir => t("html.dir") do %>
<%= t ".lede_text" %>
- <%= render :layout => "about_section", :locals => { :icon => "local", :title => "local_knowledge" } do %> -<%= t "site.about.local_knowledge_html" %>
- <% end %> +<%= t ".local_knowledge_html" %>
+- <%= t "site.about.community_driven_1_html", :osm_blog_link => link_to(t("site.about.community_driven_osm_blog"), - t("site.about.community_driven_osm_blog_url")), - :user_diaries_link => link_to(t("site.about.community_driven_user_diaries"), - diary_entries_path), - :community_blogs_link => link_to(t("site.about.community_driven_community_blogs"), - t("site.about.community_driven_community_blogs_url")), - :osm_foundation_link => link_to(t("site.about.community_driven_osm_foundation"), - t("site.about.community_driven_osm_foundation_url")) %> + <%= t ".community_driven_1_html", :osm_blog_link => link_to(t(".community_driven_osm_blog"), + t(".community_driven_osm_blog_url")), + :user_diaries_link => link_to(t(".community_driven_user_diaries"), + diary_entries_path), + :community_blogs_link => link_to(t(".community_driven_community_blogs"), + t(".community_driven_community_blogs_url")), + :osm_foundation_link => link_to(t(".community_driven_osm_foundation"), + t(".community_driven_osm_foundation_url")) %>
- <% end %> +- <%= t "site.about.open_data_1_html", :open_data => tag.i(t("site.about.open_data_open_data")), - :copyright_license_link => link_to(t("site.about.open_data_copyright_license"), - copyright_path) %>
- <% end %> + <%= t ".open_data_1_html", :open_data => tag.i(t(".open_data_open_data")), + :copyright_license_link => link_to(t(".open_data_copyright_license"), + copyright_path) %> +- <%= t "site.about.legal_1_1_html", :openstreetmap_foundation_link => link_to(t("site.about.legal_1_1_openstreetmap_foundation"), - t("site.about.legal_1_1_openstreetmap_foundation_url")), - :terms_of_use_link => link_to(t("site.about.legal_1_1_terms_of_use"), - t("site.about.legal_1_1_terms_of_use_url")), - :aup_link => link_to(t("site.about.legal_1_1_aup"), - t("site.about.legal_1_1_aup_url")), - :privacy_policy_link => link_to(t("site.about.legal_1_1_privacy_policy"), - t("site.about.legal_1_1_privacy_policy_url")) %> + <%= t ".legal_1_1_html", :openstreetmap_foundation_link => link_to(t(".legal_1_1_openstreetmap_foundation"), + t(".legal_1_1_openstreetmap_foundation_url")), + :terms_of_use_link => link_to(t(".legal_1_1_terms_of_use"), + t(".legal_1_1_terms_of_use_url")), + :aup_link => link_to(t(".legal_1_1_aup"), + t(".legal_1_1_aup_url")), + :privacy_policy_link => link_to(t(".legal_1_1_privacy_policy"), + t(".legal_1_1_privacy_policy_url")) %>
- <%= t "site.about.legal_2_1_html", :contact_the_osmf_link => link_to(t("site.about.legal_2_1_contact_the_osmf"), - t("site.about.legal_2_1_contact_the_osmf_url")) %> + <%= t ".legal_2_1_html", :contact_the_osmf_link => link_to(t(".legal_2_1_contact_the_osmf"), + t(".legal_2_1_contact_the_osmf_url")) %>
- <%= t "site.about.legal_2_2_html", :registered_trademarks_link => link_to(t("site.about.legal_2_2_registered_trademarks"), - t("site.about.legal_2_2_registered_trademarks_url")) %> + <%= t ".legal_2_2_html", :registered_trademarks_link => link_to(t(".legal_2_2_registered_trademarks"), + t(".legal_2_2_registered_trademarks_url")) %>
- <% end %> +<%= 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/") %>
+ <%= 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/") %>
<%= t ".partners_title" %>
+