Lazy translation lookup and key renames for fixthemap page.

diff --git a/app/views/site/fixthemap.html.erb b/app/views/site/fixthemap.html.erb
index f47068252590c673228f9c9d325bf8c161b2d58a..571a9b25fc0ed445ebf8a3d29e16e97da4f3c4ac 100644 (file)
--- a/app/views/site/fixthemap.html.erb
+++ b/app/views/site/fixthemap.html.erb
@@ -3,19 +3,19 @@
 <% end %>
 
 <% content_for :heading do %>
 <% end %>
 
 <% content_for :heading do %>

-  <h1><%= t "fixthemap.title" %></h1>
+  <h1><%= t ".title" %></h1>

 <% end %>
 
 <h3><%= t "layouts.intro_header" %></h3>
 
 <p><%= t "layouts.intro_text" %></p>
 
 <% end %>
 
 <h3><%= t "layouts.intro_header" %></h3>
 
 <p><%= t "layouts.intro_text" %></p>
 

-<h3><%= t "fixthemap.how_to_help.title" %></h3>
+<h3><%= t ".how_to_help.title" %></h3>

 
 <div class='clearfix'>
   <div class='col6 inner11'>
 
 <div class='clearfix'>
   <div class='col6 inner11'>

-    <h3><%= t "fixthemap.how_to_help.join_the_community.title" %></h3>
-    <%= t "fixthemap.how_to_help.join_the_community.explanation_html" %>
+    <h3><%= t ".how_to_help.join_the_community.title" %></h3>
+    <%= t ".how_to_help.join_the_community.explanation_html" %>

     <div class='clearfix center'>
       <a class="button sign-up" href="<%= user_new_path %>"><%= t('layouts.start_mapping') %></a>
     </div>
     <div class='clearfix center'>
       <a class="button sign-up" href="<%= user_new_path %>"><%= t('layouts.start_mapping') %></a>
     </div>


@@ -23,12 +23,12 @@
   <div class='col6 inner11'>
     <h3><%= t "site.welcome.add_a_note.title" %></h3>
     <p><%= t "site.welcome.add_a_note.paragraph_1_html" %></p>
   <div class='col6 inner11'>
     <h3><%= t "site.welcome.add_a_note.title" %></h3>
     <p><%= t "site.welcome.add_a_note.paragraph_1_html" %></p>

-    <p><%= t "fixthemap.how_to_help.add_a_note.instructions_html", :map_url => root_path %></p>
+    <p><%= t ".how_to_help.add_a_note.instructions_html", :map_url => root_path %></p>

   </div>
 </div>
 
   </div>
 </div>
 

-<h3><%= t "fixthemap.other_concerns.title" %></h3>
-<p><%= t "fixthemap.other_concerns.explanation_html" %></p>
+<h3><%= t ".other_concerns.title" %></h3>
+<p><%= t ".other_concerns.explanation_html" %></p>

 
 <div class='col12 clearfix icon-list'>
   <h3><%= t "site.welcome.questions.title" %></h3>
 
 <div class='col12 clearfix icon-list'>
   <h3><%= t "site.welcome.questions.title" %></h3>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e61af8d3b363f694f4c97c27b3bdd86ceabf1c1a..a56aa0a572c7e92fb5427473eab7e4f6cef9295d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -968,26 +968,6 @@ en:
       text: Make a Donation
     learn_more: "Learn More"
     more: More
       text: Make a Donation
     learn_more: "Learn More"
     more: More

-  fixthemap:
-    title: Report a problem / Fix the map
-    how_to_help:
-      title: How to Help
-      join_the_community:
-        title: Join the community
-        explanation_html: |
-          If you have noticed a problem with our map data, for example a road is missing or your address, the best way to
-          proceed is to join the OpenStreetMap community and add or repair the data yourself.
-      add_a_note:
-        instructions_html: |
-          Just click <a class='icon note'></a> or the same icon on the map display.
-          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.
-    other_concerns:
-      title: Other concerns
-      explanation_html: |
-        If you have concerns about how our data is being used or about the contents please consult our
-        <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate
-        <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.

   help_page:
     title: Getting Help
     introduction: |
   help_page:
     title: Getting Help
     introduction: |


@@ -1416,6 +1396,26 @@ en:
       output: "Output"
       paste_html: "Paste HTML to embed in website"
       export_button: "Export"
       output: "Output"
       paste_html: "Paste HTML to embed in website"
       export_button: "Export"

+    fixthemap:
+      title: Report a problem / Fix the map
+      how_to_help:
+        title: How to Help
+        join_the_community:
+          title: Join the community
+          explanation_html: |
+            If you have noticed a problem with our map data, for example a road is missing or your address, the best way to
+            proceed is to join the OpenStreetMap community and add or repair the data yourself.
+        add_a_note:
+          instructions_html: |
+            Just click <a class='icon note'></a> or the same icon on the map display.
+            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.
+      other_concerns:
+        title: Other concerns
+        explanation_html: |
+          If you have concerns about how our data is being used or about the contents please consult our
+          <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate
+          <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.

     sidebar:
       search_results: Search Results
       close: Close
     sidebar:
       search_results: Search Results
       close: Close