X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b1b2b52477cc95f4cb9953e426e111f0b940cfc0..8a8c2517f2e594bcecba1fda751ffd34b39dbe9a:/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 e127cc5b5..56e82f8f8 100644 --- a/app/views/site/about.html.erb +++ b/app/views/site/about.html.erb @@ -1,49 +1,120 @@ -<%= tag.div :lang => @locale, :dir => t("html.dir", :locale => @locale) do %> -
+ <%= t ".heading_html", :copyright => tag.span(t(".copyright_symbol_html")), + :br => tag.br %> +
+<%= t ".lede_text", :locale => @locale %>
-<%= t ".local_knowledge_html", :locale => @locale %>
-<%= t ".lede_text" %>
-<%= t ".community_driven_html", :locale => @locale, :diary_path => diary_entries_path %>
-<%= t ".local_knowledge_html" %>
+<%= t ".open_data_html", :locale => @locale, :copyright_path => copyright_path %>
-+ <%= 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")) %> +
+<%= t ".legal_1_html", :locale => @locale %>
-<%= t ".legal_2_html", :locale => @locale %>
-+ <%= 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 ".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 ".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 ".legal_2_2_html", :registered_trademarks_link => link_to(t(".legal_2_2_registered_trademarks"), + t(".legal_2_2_registered_trademarks_url")) %> +
+<%= 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/") %> -
+<%= 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/") %> +
+