diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb index 0c8075c6e..702a0243d 100644 --- a/app/views/site/about.html.erb +++ b/app/views/site/about.html.erb @@ -1,37 +1,37 @@
- <%= t "about_page.copyright_html" %> + <%= t ".copyright_html" %>
-

<%= raw t "about_page.used_by", :name => "OpenStreetMap" %>

+

<%= raw t ".used_by", :name => "OpenStreetMap" %>

-

<%= t "about_page.lede_text" %>

-

<%= t "about_page.local_knowledge_title" %>

-

<%= t "about_page.local_knowledge_html" %>

+

<%= t ".lede_text" %>

+

<%= t ".local_knowledge_title" %>

+

<%= t ".local_knowledge_html" %>

-

<%= t "about_page.community_driven_title" %>

-

<%= t "about_page.community_driven_html", :diary_path => diary_path %>

+

<%= t ".community_driven_title" %>

+

<%= t ".community_driven_html", :diary_path => diary_path %>

-

<%= t "about_page.open_data_title" %>

-

<%= t "about_page.open_data_html", :copyright_path => copyright_path %>

+

<%= t ".open_data_title" %>

+

<%= t ".open_data_html", :copyright_path => copyright_path %>

-

<%= t "about_page.partners_title" %>

+

<%= t ".partners_title" %>

<%= t 'layouts.partners_html', :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"), :ic => link_to(t('layouts.partners_ic'), "https://www.imperial.ac.uk/"), diff --git a/config/locales/en.yml b/config/locales/en.yml index b31ce4d5d..01f49a9b7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1245,49 +1245,6 @@ en: url: https://wiki.openstreetmap.org/ title: wiki.openstreetmap.org description: Browse the wiki for in-depth OSM documentation. - about_page: - next: Next - copyright_html: ©OpenStreetMap
contributors - used_by: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices" - lede_text: | - OpenStreetMap is built by a community of mappers that contribute and maintain data - about roads, trails, cafés, railway stations, and much more, all over the world. - local_knowledge_title: Local Knowledge - local_knowledge_html: | - OpenStreetMap emphasizes local knowledge. Contributors use - aerial imagery, GPS devices, and low-tech field maps to verify that OSM - is accurate and up to date. - community_driven_title: Community Driven - community_driven_html: | - OpenStreetMap's community is diverse, passionate, and growing every day. - Our contributors include enthusiast mappers, GIS professionals, engineers - running the OSM servers, humanitarians mapping disaster-affected areas, - and many more. - To learn more about the community, see the - OpenStreetMap Blog, - user diaries, - community blogs, and - the OSM Foundation website. - open_data_title: Open Data - open_data_html: | - OpenStreetMap is open data: you are free to use it for any purpose - as long as you credit OpenStreetMap and its contributors. If you alter or - build upon the data in certain ways, you may distribute the result only - under the same licence. See the Copyright and - License page for details. - legal_title: Legal - legal_html: | - This site and many other related services are formally operated by the - OpenStreetMap Foundation (OSMF) - on behalf of the community. Use of all OSMF operated services is subject - to our - Acceptable Use Policies and our Privacy Policy -
- Please contact the OSMF - if you have licensing, copyright or other legal questions. -
- OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OSMF. - partners_title: Partners notifier: diary_comment_notification: subject: "[OpenStreetMap] %{user} commented on a diary entry" @@ -1446,6 +1403,49 @@ en: delete: deleted: "Message deleted" site: + about: + next: Next + copyright_html: ©OpenStreetMap
contributors + used_by: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices" + lede_text: | + OpenStreetMap is built by a community of mappers that contribute and maintain data + about roads, trails, cafés, railway stations, and much more, all over the world. + local_knowledge_title: Local Knowledge + local_knowledge_html: | + OpenStreetMap emphasizes local knowledge. Contributors use + aerial imagery, GPS devices, and low-tech field maps to verify that OSM + is accurate and up to date. + community_driven_title: Community Driven + community_driven_html: | + OpenStreetMap's community is diverse, passionate, and growing every day. + Our contributors include enthusiast mappers, GIS professionals, engineers + running the OSM servers, humanitarians mapping disaster-affected areas, + and many more. + To learn more about the community, see the + OpenStreetMap Blog, + user diaries, + community blogs, and + the OSM Foundation website. + open_data_title: Open Data + open_data_html: | + OpenStreetMap is open data: you are free to use it for any purpose + as long as you credit OpenStreetMap and its contributors. If you alter or + build upon the data in certain ways, you may distribute the result only + under the same licence. See the Copyright and + License page for details. + legal_title: Legal + legal_html: | + This site and many other related services are formally operated by the + OpenStreetMap Foundation (OSMF) + on behalf of the community. Use of all OSMF operated services is subject + to our + Acceptable Use Policies and our Privacy Policy +
+ Please contact the OSMF + if you have licensing, copyright or other legal questions. +
+ OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OSMF. + partners_title: Partners index: js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript." js_2: "OpenStreetMap uses JavaScript for its slippy map."