From 67671e2fcbd17dda38678a73fe34f56de0073b30 Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Tue, 17 May 2011 01:05:06 +0100
Subject: [PATCH] controller: FormatMessage: don't return null on events like
 merge commits

---
 SparkleShare/SparkleController.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs
index 64662182..f4ee99c5 100644
--- a/SparkleShare/SparkleController.cs
+++ b/SparkleShare/SparkleController.cs
@@ -652,9 +652,12 @@ namespace SparkleShare {
                                  change_set.Edited.Count +
                                  change_set.Deleted.Count) - 1;
 
-            if (changes_count > 0)
-                message += " " + String.Format (Catalog.GetPluralString ("and {0} more", "and {0} more", changes_count),
-                    changes_count);
+            if (changes_count > 0) {
+                string msg = Catalog.GetPluralString ("and {0} more", "and {0} more", changes_count);
+                message += " " + String.Format (msg, changes_count);
+            } else {
+                message += _("did something magical");
+            }
 
             return message;
         }