From: Andy Allan Date: Wed, 25 Apr 2018 08:20:17 +0000 (+0800) Subject: Use lazy lookups and rename keys for the welcome page. X-Git-Tag: live~3039^2~4 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ab79d8c520226284a1c6cbee2b613d26e4626f3c?ds=sidebyside Use lazy lookups and rename keys for the welcome page. --- diff --git a/app/views/site/fixthemap.html.erb b/app/views/site/fixthemap.html.erb index fc5fecc9a..f47068252 100644 --- a/app/views/site/fixthemap.html.erb +++ b/app/views/site/fixthemap.html.erb @@ -21,8 +21,8 @@
-

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

-

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

+

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

+

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

<%= t "fixthemap.how_to_help.add_a_note.instructions_html", :map_url => root_path %>

@@ -31,7 +31,7 @@

<%= t "fixthemap.other_concerns.explanation_html" %>

-

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

+

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

-

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

+

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

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb index 92220039a..dc6a519df 100644 --- a/app/views/site/welcome.html.erb +++ b/app/views/site/welcome.html.erb @@ -3,71 +3,71 @@ <% end %> <% content_for :heading do %> -

<%= t "welcome_page.title" %>

+

<%= t ".title" %>

<% end %> -

<%= t "welcome_page.introduction_html" %>

+

<%= t ".introduction_html" %>

-

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

+

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

-

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

+

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

-

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

+

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

-

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

+

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

-

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

+

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

-

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

+

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

-

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

+

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

-

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

+

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

-

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

+

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

-

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

+

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

- <%= t "welcome_page.start_mapping" %> + <%= t ".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 %>

+

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

+

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

+

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

diff --git a/config/locales/en.yml b/config/locales/en.yml index 01f49a9b7..2270c9d33 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1135,59 +1135,6 @@ en: trademarks_title_html: Trademarks trademarks_1_html: | OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please see our Trademark Policy. - welcome_page: - title: Welcome! - introduction_html: | - Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed - up, you're all set to get started mapping. Here's a quick guide with the most important - things you need to know. - whats_on_the_map: - title: What's on the Map - on_html: | - OpenStreetMap is a place for mapping things that are both real and current - - it includes millions of buildings, roads, and other details about places. You can map - whatever real-world features are interesting to you. - off_html: | - What it doesn't include is opinionated data like ratings, historical or - hypothetical features, and data from copyrighted sources. Unless you have special - permission, don't copy from online or paper maps. - basic_terms: - title: Basic Terms For Mapping - paragraph_1_html: | - OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy. - editor_html: | - An editor is a program or website you can use to edit the map. - node_html: | - A node is a point on the map, like a single restaurant or a tree. - way_html: | - A way is a line or area, like a road, stream, lake or building. - tag_html: | - A tag is a bit of data about a node or way, like a - restaurant's name or a road's speed limit. - rules: - title: Rules! - paragraph_1_html: | - OpenStreetMap has few formal rules but we expect all participants to collaborate - with, and communicate with, the community. If you are considering - any activities other than editing by hand, please read and follow the guidelines on - Imports and - Automated Edits. - questions: - title: Any questions? - paragraph_1_html: | - OpenStreetMap has several resources for learning about the project, asking and answering - questions, and collaboratively discussing and documenting mapping topics. - Get help here. - start_mapping: Start Mapping - add_a_note: - title: No Time To Edit? Add a Note! - paragraph_1_html: | - If you just want something small fixed and don't have the time to sign up and learn how to edit, it's - easy to add a note. - paragraph_2_html: | - Just go to the map and click the note icon: - . This will add a marker to the map, which you can move - by dragging. Add your message, then click save, and other mappers will investigate. fixthemap: title: Report a problem / Fix the map how_to_help: @@ -1570,6 +1517,59 @@ en: image: Image alt: Alt text url: URL + welcome: + title: Welcome! + introduction_html: | + Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed + up, you're all set to get started mapping. Here's a quick guide with the most important + things you need to know. + whats_on_the_map: + title: What's on the Map + on_html: | + OpenStreetMap is a place for mapping things that are both real and current - + it includes millions of buildings, roads, and other details about places. You can map + whatever real-world features are interesting to you. + off_html: | + What it doesn't include is opinionated data like ratings, historical or + hypothetical features, and data from copyrighted sources. Unless you have special + permission, don't copy from online or paper maps. + basic_terms: + title: Basic Terms For Mapping + paragraph_1_html: | + OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy. + editor_html: | + An editor is a program or website you can use to edit the map. + node_html: | + A node is a point on the map, like a single restaurant or a tree. + way_html: | + A way is a line or area, like a road, stream, lake or building. + tag_html: | + A tag is a bit of data about a node or way, like a + restaurant's name or a road's speed limit. + rules: + title: Rules! + paragraph_1_html: | + OpenStreetMap has few formal rules but we expect all participants to collaborate + with, and communicate with, the community. If you are considering + any activities other than editing by hand, please read and follow the guidelines on + Imports and + Automated Edits. + questions: + title: Any questions? + paragraph_1_html: | + OpenStreetMap has several resources for learning about the project, asking and answering + questions, and collaboratively discussing and documenting mapping topics. + Get help here. + start_mapping: Start Mapping + add_a_note: + title: No Time To Edit? Add a Note! + paragraph_1_html: | + If you just want something small fixed and don't have the time to sign up and learn how to edit, it's + easy to add a note. + paragraph_2_html: | + Just go to the map and click the note icon: + . This will add a marker to the map, which you can move + by dragging. Add your message, then click save, and other mappers will investigate. trace: visibility: private: "Private (only shared as anonymous, unordered points)"