correct number of notices on a page

[quix0rs-gnu-social.git] / lib / mailhandler.php

diff --git a/lib/mailhandler.php b/lib/mailhandler.php
index e9ba418399dcad6709fbb2530c6360e609f03ffc..459657ffe0d3f01bec851789e017bc532a63eebc 100644 (file)
--- a/lib/mailhandler.php
+++ b/lib/mailhandler.php
@@ -55,10 +55,11 @@ class MailHandler
             return true;
         }
         $msg = $this->cleanup_msg($msg);
-        $msg = common_shorten_links($msg);
+        $msg = $user->shortenLinks($msg);
         if (Notice::contentTooLong($msg)) {
-            $this->error($from, sprintf(_('That\'s too long. '.
-                                          'Max notice size is %d chars.'),
+            $this->error($from, sprintf(_('That\'s too long. Maximum notice size is %d character.',
+                                          'That\'s too long. Maximum notice size is %d characters.',
+                                          Notice::maxContent()),
                                         Notice::maxContent()));
         }