Fix for conversation check in @-reply notification email; i18n cleanup on mail messages: fixed some bad gettext usage, added trans doc comments.

1 files changed, 21 insertions, 0 deletions

diff --git a/classes/Notice.php b/classes/Notice.php
index b416e2ff2..998e9c92b 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -700,6 +700,27 @@ class Notice extends Memcached_DataObject
     }
 
     /**
+     * Is this notice part of an active conversation?
+     * 
+     * @return boolean true if other messages exist in the same
+     *                 conversation, false if this is the only one
+     */
+    function hasConversation()
+    {
+        if (!empty($this->conversation)) {
+            $conversation = Notice::conversationStream(
+                $this->conversation,
+                1,
+                1
+            );
+            if ($conversation->N > 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
      * @param $groups array of Group *objects*
      * @param $recipients array of profile *ids*
      */