# HG changeset patch
# User Chris Cannam
# Date 1358942352 0
# Node ID c63e31776f92efb3ef1f0400a8d9849270c1fa8a
# Parent  d24c22d420eba8944b7c60006eac0b3ddb085779# Parent  adb5f38f6ab75ce758c9b6488c419f2e0f39dfce
Merge from branch cannam

diff -r d24c22d420eb -r c63e31776f92 app/helpers/activities_helper.rb
--- a/app/helpers/activities_helper.rb	Wed Jan 23 11:46:22 2013 +0000
+++ b/app/helpers/activities_helper.rb	Wed Jan 23 11:59:12 2013 +0000
@@ -1,6 +1,20 @@
 
 module ActivitiesHelper
 
+  def date_of_event(e)
+    if e.respond_to? :updated_at
+      e.updated_at
+    elsif e.respond_to? :updated_on
+      e.updated_on
+    elsif e.respond_to? :created_on
+      e.created_on
+    elsif e.respond_to? :committed_on
+      e.committed_on
+    else
+      nil 
+    end
+  end
+
   def busy_projects(events, count)
 
     # Score each project for which there are any events, by giving
@@ -12,14 +26,16 @@
     events.each do |e|
       if e.respond_to?(:project)
         p = e.project
-        d = if e.respond_to? :updated_at then e.updated_at else e.updated_on end
-        dd = Date.parse d.to_s
-        age = Date.today - dd
-        score = (age < 14 ? 15-age : 1)
-        if projhash.key? p
-          projhash[p] += score
-        else
-          projhash[p] = score
+        d = date_of_event e
+        if !d.nil?
+          dd = Date.parse d.to_s
+          age = Date.today - dd
+          score = (age < 14 ? 15-age : 1)
+          if projhash.key? p
+            projhash[p] += score
+          else
+            projhash[p] = score
+          end
         end
       end
     end
diff -r d24c22d420eb -r c63e31776f92 config/locales/en.yml
--- a/config/locales/en.yml	Wed Jan 23 11:46:22 2013 +0000
+++ b/config/locales/en.yml	Wed Jan 23 11:59:12 2013 +0000
@@ -497,6 +497,7 @@
   label_projects_more: More projects
   label_project_tags_all: Popular tags
   label_projects_busy: Busy projects
+  label_projects_mature: Mature projects
   label_institutions_busy: Active institutions
   label_managers: Managed by
   label_issue: Issue