From d6d366ad2b5ed716c28948a84b13580ca0fd4114 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 3 Jul 2013 17:42:04 +0100 Subject: [PATCH] Report reopened notes properly in the RSS feed --- app/views/notes/feed.rss.builder | 10 +--------- config/locales/en.yml | 5 +++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/app/views/notes/feed.rss.builder b/app/views/notes/feed.rss.builder index 06c5b9866..e663d94a6 100644 --- a/app/views/notes/feed.rss.builder +++ b/app/views/notes/feed.rss.builder @@ -13,15 +13,7 @@ xml.rss("version" => "2.0", 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) diff --git a/config/locales/en.yml b/config/locales/en.yml index 3949a0acd..8d30dbb05 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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}" + opened: "new note (near %{place})" + commented: "new comment (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 -- 2.39.5