From a70914cd579c9f600545cd5166ffbd36619aa856 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 11 Mar 2011 18:33:19 +0100 Subject: [PATCH] i18n fixes: plugins should use _m(), not _(). --- plugins/Poll/newpoll.php | 10 +++++----- plugins/Poll/showpoll.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/Poll/newpoll.php b/plugins/Poll/newpoll.php index 585af1a7b5..0386f3e3b8 100644 --- a/plugins/Poll/newpoll.php +++ b/plugins/Poll/newpoll.php @@ -59,7 +59,7 @@ class NewPollAction extends Action */ function title() { - return _('New poll'); + return _m('New poll'); } /** @@ -76,7 +76,7 @@ class NewPollAction extends Action $this->user = common_current_user(); if (empty($this->user)) { - throw new ClientException(_("You must be logged in to post a poll."), + throw new ClientException(_m('You must be logged in to post a poll.'), 403); } @@ -127,11 +127,11 @@ class NewPollAction extends Action } try { if (empty($this->question)) { - throw new ClientException(_('Poll must have a question.')); + throw new ClientException(_m('Poll must have a question.')); } if (count($this->options) < 2) { - throw new ClientException(_('Poll must have at least two options.')); + throw new ClientException(_m('Poll must have at least two options.')); } @@ -150,7 +150,7 @@ class NewPollAction extends Action $this->elementStart('html'); $this->elementStart('head'); // TRANS: Page title after sending a notice. - $this->element('title', null, _('Notice posted')); + $this->element('title', null, _m('Notice posted')); $this->elementEnd('head'); $this->elementStart('body'); $this->showNotice($saved); diff --git a/plugins/Poll/showpoll.php b/plugins/Poll/showpoll.php index 5b22c06805..60669f96ff 100644 --- a/plugins/Poll/showpoll.php +++ b/plugins/Poll/showpoll.php @@ -100,7 +100,7 @@ class ShowPollAction extends ShownoticeAction */ function title() { - return sprintf(_('%s\'s poll: %s'), + return sprintf(_m('%s\'s poll: %s'), $this->user->nickname, $this->poll->question); } -- 2.39.5