Move note paging locale strings to notes scope

diff --git a/app/views/notes/_notes_paging_nav.html.erb b/app/views/notes/_notes_paging_nav.html.erb
index 207f8877918bbaedf6af21f503f8b26c72efff8e..9e52b721eb3b164fe7c0646714ae981074aaae94 100644 (file)
--- a/app/views/notes/_notes_paging_nav.html.erb
+++ b/app/views/notes/_notes_paging_nav.html.erb
@@ -1,17 +1,17 @@
 <p>
 
 <% if @page > 1 %>
 <p>
 
 <% if @page > 1 %>

-<%= link_to t("changesets.changeset_paging_nav.previous"), @params.merge(:page => @page - 1) %>
+<%= link_to t(".previous"), @params.merge(:page => @page - 1) %>

 <% else %>
 <% else %>

-<%= t("changesets.changeset_paging_nav.previous") %>
+<%= t(".previous") %>

 <% end %>
 
 <% end %>
 

-| <%= t("changesets.changeset_paging_nav.showing_page", :page => @page) %> |
+| <%= t(".showing_page", :page => @page) %> |

 
 <% if @notes.size < @page_size %>
 
 <% if @notes.size < @page_size %>

-<%= t("changesets.changeset_paging_nav.next") %>
+<%= t(".next") %>

 <% else %>
 <% else %>

-<%= link_to t("changesets.changeset_paging_nav.next"), @params.merge(:page => @page + 1) %>
+<%= link_to t(".next"), @params.merge(:page => @page + 1) %>

 <% end %>
 
 </p>
 <% end %>
 
 </p>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a3bb71b1283e2a853ccbf4f50a7d86a6c061c48b..d9bb56fbf6eb5a00684bdc15f9ed9a9491f691fe 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -427,10 +427,6 @@ en:
       timeout:
         sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
   changesets:
       timeout:
         sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
   changesets:

-    changeset_paging_nav:
-      showing_page: "Page %{page}"
-      next: "Next »"
-      previous: "« Previous"

     changeset:
       anonymous: "Anonymous"
       no_edits: "(no edits)"
     changeset:
       anonymous: "Anonymous"
       no_edits: "(no edits)"


@@ -3029,6 +3025,10 @@ en:
       anonymous_warning_sign_up: "sign up"
       advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
       add: Add Note
       anonymous_warning_sign_up: "sign up"
       advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
       add: Add Note

+    notes_paging_nav:
+      showing_page: "Page %{page}"
+      next: "Next »"
+      previous: "« Previous"

   javascripts:
     close: Close
     share:
   javascripts:
     close: Close
     share: