X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef880621a40a6065699ee69e3ba69c7a64a2afde..86912a61df67582b37d0ae5cb6542bc41aa5a41f:/app/views/site/welcome.html.erb?ds=sidebyside diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb index 4377da670..4617935e7 100644 --- a/app/views/site/welcome.html.erb +++ b/app/views/site/welcome.html.erb @@ -3,98 +3,69 @@ <% end %> <% content_for :heading do %> -

<%= t "welcome_page.title" %>

-

<%= t "welcome_page.subtitle" %>

+

<%= t ".title" %>

<% end %> -
-

<%= t "welcome_page.introduction_html" %>

-
+

<%= t ".introduction_html" %>

-
-

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

-
-
- <%= t "layouts.project_name.title" %> - <% t("welcome_page.one_map_many_uses.names").sample(6).each_with_index do |name, i| %> - <%= name %> - <% end %> -
-
-

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

-
+

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

-
-

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

-
-
+
+
+
-

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

+

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

-
-
+
+
-

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

+

<%= t ".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.changeset_html" %> -

+

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

+ +

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

+ +
+
+ +

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

+
+
+ +

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

+
+
+ +

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

+
+
+ +

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

-
-

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

-
- -
-

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

+
+

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

+ +

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

-
-

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

- <% if @user %> -

- <%= t "welcome_page.contributing.paragraph_1_html" %> - <%= t "welcome_page.contributing.paragraph_located" %> - <%= t "welcome_page.contributing.paragraph_geocoded_html" %> - <%= t "welcome_page.contributing.paragraph_geolocated" %> -

- - <% else %> -

<%= t "welcome_page.contributing.paragraph_1_no_user_html" %>

- - <% end %> +
+

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

+ +

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

-
-
-

<%= 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" %>

-
+ + +
+

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

+

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

+

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