Report reopened notes properly in the RSS feed
authorTom Hughes <tom@compton.nu>
Wed, 3 Jul 2013 16:42:04 +0000 (17:42 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 3 Jul 2013 16:42:04 +0000 (17:42 +0100)
app/views/notes/feed.rss.builder
config/locales/en.yml

index 06c5b98660cf140ed905b41b41813dfeb6deed7a..e663d94a60ff8d19c61cfb0cb4ccc4ddc84829f9 100644 (file)
@@ -13,15 +13,7 @@ xml.rss("version" => "2.0",
       location = describe_location(comment.note.lat, comment.note.lon, 14, locale)
 
       xml.item do
       location = describe_location(comment.note.lat, comment.note.lon, 14, locale)
 
       xml.item do
-        if comment.event == "closed"
-          xml.title t('note.rss.closed', :place => location)
-        elsif comment.event == "commented"
-          xml.title t('note.rss.comment', :place => location)
-        elsif comment.event == "opened"
-          xml.title t('note.rss.new', :place => location)
-        else
-          xml.title "unknown event"
-        end
+        xml.title t("note.rss.#{comment.event}", :place => location)
         
         xml.link url_for(:controller => "browse", :action => "note", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false)
         xml.guid url_for(:controller => "browse", :action => "note", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false)
         
         xml.link url_for(:controller => "browse", :action => "note", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false)
         xml.guid url_for(:controller => "browse", :action => "note", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false)
index 3949a0acd448fd2b955f8093bc7e00309f7ebfa1..8d30dbb059d198524c007e8f9f97f7e41acf1f3a 100644 (file)
@@ -2022,9 +2022,10 @@ en:
       title: "OpenStreetMap Notes"
       description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
       description_item: "An rss feed for note %{id}"
       title: "OpenStreetMap Notes"
       description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
       description_item: "An rss feed for note %{id}"
+      opened: "new note (near %{place})"
+      commented: "new comment (near %{place})"
       closed: "closed note (near %{place})"
       closed: "closed note (near %{place})"
-      new: "new note (near %{place})"
-      comment: "new comment (near %{place})"
+      reopened: "reactivated note (near %{place})"
     entry:
       comment: Comment
       full: Full note
     entry:
       comment: Comment
       full: Full note