summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2010-11-02 23:08:59 +0100
committerSiebrand Mazeland <s.mazeland@xs4all.nl>2010-11-02 23:08:59 +0100
commita65362f7fa2e1ea92414fce391ea0f9624f0d100 (patch)
treee105a2b7910f38f0c17267946eae47be4312770d
parent5bd6458f0097f8aaf4a60593c0f405e53bb1b6e9 (diff)
Add context for different uses of "%1$s (%2$s)"
-rw-r--r--actions/invite.php4
-rw-r--r--classes/Profile.php2
-rw-r--r--lib/command.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/actions/invite.php b/actions/invite.php
index 2779437e0..e9adb3b7f 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -142,7 +142,7 @@ class InviteAction extends CurrentUserDesignAction
$this->elementStart('ul');
foreach ($this->already as $other) {
// TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
- $this->element('li', null, sprintf(_('%1$s (%2$s)'), $other->nickname, $other->email));
+ $this->element('li', null, sprintf(_m('INVITE','%1$s (%2$s)'), $other->nickname, $other->email));
}
$this->elementEnd('ul');
}
@@ -156,7 +156,7 @@ class InviteAction extends CurrentUserDesignAction
$this->elementStart('ul');
foreach ($this->subbed as $other) {
// TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
- $this->element('li', null, sprintf(_('%1$s (%2$s)'), $other->nickname, $other->email));
+ $this->element('li', null, sprintf(_m('INVITE','%1$s (%2$s)'), $other->nickname, $other->email));
}
$this->elementEnd('ul');
}
diff --git a/classes/Profile.php b/classes/Profile.php
index 064ba551c..d580e1235 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -161,7 +161,7 @@ class Profile extends Memcached_DataObject
{
if ($this->fullname) {
// TRANS: Full name of a profile or group followed by nickname in parens
- return sprintf(_('%1$s (%2$s)'), $this->fullname, $this->nickname);
+ return sprintf(_m('FANCYNAME','%1$s (%2$s)'), $this->fullname, $this->nickname);
} else {
return $this->nickname;
}
diff --git a/lib/command.php b/lib/command.php
index 329617b3b..ae69f04a1 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -423,7 +423,7 @@ class WhoisCommand extends Command
// TRANS: Whois output.
// TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
- $whois = sprintf(_("%1\$s (%2\$s)"), $recipient->nickname,
+ $whois = sprintf(_m('WHOIS',"%1\$s (%2\$s)"), $recipient->nickname,
$recipient->profileurl);
if ($recipient->fullname) {
// TRANS: Whois output. %s is the full name of the queried user.