summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-07-06 13:57:10 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-07-06 13:57:10 +0000
commitbfba84d526f80e14d7c1422ac51a40803f828f9e (patch)
tree1124eb0452ae82fdeae9fe551764f17cb30d51d9 /app
parentd4f55a86fdc5aaf58db6e9f9a942f7adad68d4f6 (diff)
downloadredmine-bfba84d526f80e14d7c1422ac51a40803f828f9e.tar.gz
redmine-bfba84d526f80e14d7c1422ac51a40803f828f9e.zip
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
Diffstat (limited to 'app')
-rw-r--r--app/controllers/projects_controller.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 87a93c815..3af77d1ac 100644
--- 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