diff --git a/app/assets/javascripts/.index.js.swp b/app/assets/javascripts/.index.js.swp new file mode 100644 index 0000000000..a6373f76ae Binary files /dev/null and b/app/assets/javascripts/.index.js.swp differ diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb index 702a0243d1..ebc0f58077 100644 --- a/app/views/site/about.html.erb +++ b/app/views/site/about.html.erb @@ -34,7 +34,6 @@

<%= 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/"), :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"), :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>

diff --git a/app/views/site/android_apps.html.erb b/app/views/site/android_apps.html.erb new file mode 100644 index 0000000000..92220039a0 --- /dev/null +++ b/app/views/site/android_apps.html.erb @@ -0,0 +1,73 @@ +<% content_for :head do %> + <%= javascript_include_tag "welcome" %> +<% end %> + +<% content_for :heading do %> +

<%= t "welcome_page.title" %>

+<% end %> + +

<%= t "welcome_page.introduction_html" %>

+ +

<%= t "welcome_page.whats_on_the_map.title" %>

+ +
+
+
+ +
+

<%= t "welcome_page.whats_on_the_map.on_html" %>

+
+
+
+ +
+

<%= t "welcome_page.whats_on_the_map.off_html" %>

+
+
+ +

<%= t "welcome_page.basic_terms.title" %>

+ +

<%= t "welcome_page.basic_terms.paragraph_1_html" %>

+ +
+
+ +

<%= t "welcome_page.basic_terms.editor_html" %>

+
+
+ +

<%= t "welcome_page.basic_terms.node_html" %>

+
+
+ +

<%= t "welcome_page.basic_terms.way_html" %>

+
+
+ +

<%= t "welcome_page.basic_terms.tag_html" %>

+
+
+ +
+

<%= t "welcome_page.rules.title" %>

+ +

<%= t "welcome_page.rules.paragraph_1_html" %>

+
+ +
+

<%= t "welcome_page.questions.title" %>

+ +

<%= t "welcome_page.questions.paragraph_1_html", :help_url => help_path %>

+
+ +
+ <%= t "welcome_page.start_mapping" %> +
+ +
+
+

<%= t "welcome_page.add_a_note.title" %>

+

<%= t "welcome_page.add_a_note.paragraph_1_html" %>

+

<%= t "welcome_page.add_a_note.paragraph_2_html", :map_url => root_path %>

+
+
diff --git a/config/locales/en.yml b/config/locales/en.yml index 7636bad034..62f557e4e8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1055,9 +1055,8 @@ en: intro_header: Welcome to OpenStreetMap! intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license. intro_2_create_account: "Create a user account" - partners_html: "Hosting is supported by %{ucl}, %{bytemark}, %{ic}, and other %{partners}." + partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}." partners_ucl: "UCL" - partners_ic: "Imperial College London" partners_bytemark: "Bytemark Hosting" partners_partners: "partners" osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out." @@ -1270,9 +1269,11 @@ en: 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 -
+ to our Terms of Use, + + Acceptable Use Policies and our + Privacy Policy +

Please contact the OSMF if you have licensing, copyright or other legal questions.