Better naming of activity feed if only one kind of event is displayed (#1323).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1642 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 87a93c8153dbac6ded77c41cef05ee38c012cca0..3af77d1ac8c860b59356a9b122f5ba6839f08271 100644 (file)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -311,7 +311,10 @@ class ProjectsController < ApplicationController
     
     respond_to do |format|
       format.html { render :layout => false if request.xhr? }
-      format.atom { render_feed(@events, :title => "#{@project || Setting.app_title}: #{l(:label_activity)}") }
+      format.atom {
+        title = (@scope.size == 1) ? l("label_#{@scope.first.singularize}_plural") : l(:label_activity)
+        render_feed(@events, :title => "#{@project || Setting.app_title}: #{title}")
+      }
     end
   end