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 /actions/bookmarklet.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 'actions/bookmarklet.php')
-rw-r--r-- | actions/bookmarklet.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actions/bookmarklet.php b/actions/bookmarklet.php index 041c2e894..9cf4e58f8 100644 --- a/actions/bookmarklet.php +++ b/actions/bookmarklet.php @@ -34,7 +34,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { require_once INSTALLDIR . '/actions/newnotice.php'; /** - * Action for posting a notice + * Action for posting a notice * * @category Bookmarklet * @package StatusNet @@ -42,12 +42,12 @@ require_once INSTALLDIR . '/actions/newnotice.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class BookmarkletAction extends NewnoticeAction { function showTitle() { // TRANS: Title for mini-posting window loaded from bookmarklet. + // TRANS: %s is the StatusNet site name. $this->element('title', null, sprintf(_('Post to %s'), common_config('site', 'name'))); } @@ -73,4 +73,3 @@ class BookmarkletAction extends NewnoticeAction { } } - |