Merge remote-tracking branch 'upstream/pull/4135'

[rails.git] / app / views / api / notes / _note.gpx.builder

diff --git a/app/views/api/notes/_note.gpx.builder b/app/views/api/notes/_note.gpx.builder
index 74961b2e058649d0ad1fea32e0a95f2e721960a8..bb5cac1c9f21c157065099e5d79ff44bee876c57 100644 (file)
--- a/app/views/api/notes/_note.gpx.builder
+++ b/app/views/api/notes/_note.gpx.builder
@@ -1,22 +1,22 @@
 xml.wpt("lon" => note.lon, "lat" => note.lat) do
-  xml.time note.created_at.to_formatted_s(:iso8601)
-  xml.name t("browse.note.title", :id => note.id)
+  xml.time note.created_at.to_fs(:iso8601)
+  xml.name t("notes.show.title", :id => note.id)
 
   xml.desc do
     xml.cdata! render(:partial => "description", :object => note, :formats => [:html])
   end
 
-  xml.link("href" => browse_note_url(note, :only_path => false))
+  xml.link("href" => note_url(note, :only_path => false))
 
   xml.extensions do
     xml.id note.id
-    xml.url note_url(note, :format => params[:format])
+    xml.url api_note_url(note, :format => params[:format])
 
     if note.closed?
-      xml.reopen_url reopen_note_url(note, :format => params[:format])
+      xml.reopen_url reopen_api_note_url(note, :format => params[:format])
     else
-      xml.comment_url comment_note_url(note, :format => params[:format])
-      xml.close_url close_note_url(note, :format => params[:format])
+      xml.comment_url comment_api_note_url(note, :format => params[:format])
+      xml.close_url close_api_note_url(note, :format => params[:format])
     end
 
     xml.date_created note.created_at