GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Add context for different uses of "%1$s (%2$s)"

Browse Source
This commit is contained in:
Siebrand Mazeland 2010-11-02 23:08:59 +01:00
parent 5bd6458f00
commit a65362f7fa
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/invite.php
View File

@ -142,7 +142,7 @@ class InviteAction extends CurrentUserDesignAction
$this->elementStart('ul'); $this->elementStart('ul');
foreach ($this->already as $other) { foreach ($this->already as $other) {
// TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address). // 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'); $this->elementEnd('ul');
} }
@ -156,7 +156,7 @@ class InviteAction extends CurrentUserDesignAction
$this->elementStart('ul'); $this->elementStart('ul');
foreach ($this->subbed as $other) { foreach ($this->subbed as $other) {
// TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address). // 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'); $this->elementEnd('ul');
} }

2
classes/Profile.php
View File

@ -161,7 +161,7 @@ class Profile extends Memcached_DataObject
{ {
if ($this->fullname) { if ($this->fullname) {
// TRANS: Full name of a profile or group followed by nickname in parens // 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 { } else {
return $this->nickname; return $this->nickname;
} }

2
lib/command.php
View File

@ -423,7 +423,7 @@ class WhoisCommand extends Command
// TRANS: Whois output. // TRANS: Whois output.
// TRANS: %1$s nickname of the queried user, %2$s is their profile URL. // 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); $recipient->profileurl);
if ($recipient->fullname) { if ($recipient->fullname) {
// TRANS: Whois output. %s is the full name of the queried user. // TRANS: Whois output. %s is the full name of the queried user.