diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-25 13:08:57 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-25 13:08:57 -0700 |
| commit | ca489631db840e33757a71a7e4cb56b187c182d3 (patch) | |
| tree | 92c71b81b6870a8fd2d9c94bed8571b653d95413 /actions/apidirectmessagenew.php | |
| parent | 90c87553ee7566593529199374215ae80bb3e209 (diff) | |
| parent | 01637bcd32921d6857fb7f5c0bbd40fba6bdb830 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
Diffstat (limited to 'actions/apidirectmessagenew.php')
| -rw-r--r-- | actions/apidirectmessagenew.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php index c126cd312..ccef57b3f 100644 --- a/actions/apidirectmessagenew.php +++ b/actions/apidirectmessagenew.php @@ -121,9 +121,9 @@ class ApiDirectMessageNewAction extends ApiAuthAction } else { $content_shortened = common_shorten_links($this->content); if (Message::contentTooLong($content_shortened)) { - // TRANS: Client error displayed when message content is too long. - // TRANS: %d is the maximum number of characters for a message. $this->clientError( + // TRANS: Client error displayed when message content is too long. + // TRANS: %d is the maximum number of characters for a message. sprintf(_m('That\'s too long. Maximum message size is %d character.', 'That\'s too long. Maximum message size is %d characters.', Message::maxContent()), Message::maxContent() ), |