diff options
| author | Brion Vibber <brion@pobox.com> | 2010-11-02 15:02:10 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-11-02 15:02:10 -0700 |
| commit | 04ca706601a2a3b556cc52fa21b61fcd842c4e87 (patch) | |
| tree | df79bc06e080623c4d2107ae8ce212160c7669b1 /lib/mailhandler.php | |
| parent | b26eccf33cf69c04a96d5d6d3eddc0ef68ffd4b1 (diff) | |
| parent | 81e06530800bce5eb60eca362d4c21453632183a (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/confirmaddress.php
actions/othersettings.php
Diffstat (limited to 'lib/mailhandler.php')
| -rw-r--r-- | lib/mailhandler.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/mailhandler.php b/lib/mailhandler.php index e9ba41839..69eb26bdd 100644 --- a/lib/mailhandler.php +++ b/lib/mailhandler.php @@ -57,8 +57,9 @@ class MailHandler $msg = $this->cleanup_msg($msg); $msg = common_shorten_links($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())); } |