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

* L10n updates: consistent puctuation

Browse Source 
* i18n updates: number parameters if more than one are being used
This commit is contained in:
Siebrand Mazeland 2010-01-10 01:45:58 +01:00
parent 954335fa5e
commit b0aea3f9c1
33 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/all.php
View File

@ -81,7 +81,7 @@ class AllAction extends ProfileAction
function title() function title()
{ {
if ($this->page > 1) { if ($this->page > 1) {
return sprintf(_("%s and friends, page %d"), $this->user->nickname, $this->page); return sprintf(_("%1$s and friends, page %2$d"), $this->user->nickname, $this->page);
} else { } else {
return sprintf(_("%s and friends"), $this->user->nickname); return sprintf(_("%s and friends"), $this->user->nickname);
} }
@ -131,7 +131,7 @@ class AllAction extends ProfileAction
if ($this->user->id === $current_user->id) { if ($this->user->id === $current_user->id) {
$message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.'); $message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.');
} else { } else {
$message .= sprintf(_('You can try to [nudge %s](../%s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); $message .= sprintf(_('You can try to [nudge %1$s](../%2$s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
} }
} else { } else {
$message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to his or her attention.'), $this->user->nickname); $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to his or her attention.'), $this->user->nickname);

2
actions/apigroupjoin.php
View File

@ -135,7 +135,7 @@ class ApiGroupJoinAction extends ApiAuthAction
common_log_db_error($member, 'INSERT', __FILE__); common_log_db_error($member, 'INSERT', __FILE__);
$this->serverError( $this->serverError(
sprintf( sprintf(
_('Could not join user %s to group %s.'), _('Could not join user %1$s to group %2$s.'),
$this->user->nickname, $this->user->nickname,
$this->group->nickname $this->group->nickname
) )

2
actions/apigroupleave.php
View File

@ -121,7 +121,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
common_log_db_error($member, 'DELETE', __FILE__); common_log_db_error($member, 'DELETE', __FILE__);
$this->serverError( $this->serverError(
sprintf( sprintf(
_('Could not remove user %s from group %s.'), _('Could not remove user %1$s from group %2$s.'),
$this->user->nickname, $this->user->nickname,
$this->group->nickname $this->group->nickname
) )

2
actions/apigrouplist.php
View File

@ -100,7 +100,7 @@ class ApiGroupListAction extends ApiBareAuthAction
array('nickname' => $this->user->nickname) array('nickname' => $this->user->nickname)
); );
$subtitle = sprintf( $subtitle = sprintf(
_("Groups %s is a member of on %s."), _("Groups %1$s is a member of on %2$s."),
$this->user->nickname, $this->user->nickname,
$sitename $sitename
); );

4
actions/apitimelinefavorites.php
View File

@ -105,7 +105,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
$sitename = common_config('site', 'name'); $sitename = common_config('site', 'name');
$title = sprintf( $title = sprintf(
_('%s / Favorites from %s'), _('%1$s / Favorites from %2$s'),
$sitename, $sitename,
$this->user->nickname $this->user->nickname
); );
@ -117,7 +117,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
array('nickname' => $this->user->nickname) array('nickname' => $this->user->nickname)
); );
$subtitle = sprintf( $subtitle = sprintf(
_('%s updates favorited by %s / %s.'), _('%1$s updates favorited by %2$s / %2$s.'),
$sitename, $sitename,
$profile->getBestName(), $profile->getBestName(),
$this->user->nickname $this->user->nickname

2
actions/blockedfromgroup.php
View File

@ -90,7 +90,7 @@ class BlockedfromgroupAction extends GroupDesignAction
return sprintf(_('%s blocked profiles'), return sprintf(_('%s blocked profiles'),
$this->group->nickname); $this->group->nickname);
} else { } else {
return sprintf(_('%s blocked profiles, page %d'), return sprintf(_('%1$s blocked profiles, page %2$d'),
$this->group->nickname, $this->group->nickname,
$this->page); $this->page);
} }

2
actions/groupblock.php
View File

@ -159,7 +159,7 @@ class GroupblockAction extends Action
$this->hidden('token', common_session_token()); $this->hidden('token', common_session_token());
$this->element('legend', _('Block user')); $this->element('legend', _('Block user'));
$this->element('p', null, $this->element('p', null,
sprintf(_('Are you sure you want to block user "%s" from the group "%s"? '. sprintf(_('Are you sure you want to block user "%1$s" from the group "%2$s"? '.
'They will be removed from the group, unable to post, and '. 'They will be removed from the group, unable to post, and '.
'unable to subscribe to the group in the future.'), 'unable to subscribe to the group in the future.'),
$this->profile->getBestName(), $this->profile->getBestName(),

2
actions/groupmembers.php
View File

@ -93,7 +93,7 @@ class GroupmembersAction extends GroupDesignAction
return sprintf(_('%s group members'), return sprintf(_('%s group members'),
$this->group->nickname); $this->group->nickname);
} else { } else {
return sprintf(_('%s group members, page %d'), return sprintf(_('%1$s group members, page %2$d'),
$this->group->nickname, $this->group->nickname,
$this->page); $this->page);
} }

2
actions/inbox.php
View File

@ -56,7 +56,7 @@ class InboxAction extends MailboxAction
function title() function title()
{ {
if ($this->page > 1) { if ($this->page > 1) {
return sprintf(_("Inbox for %s - page %d"), $this->user->nickname, return sprintf(_("Inbox for %1$s - page %2$d"), $this->user->nickname,
$this->page); $this->page);
} else { } else {
return sprintf(_("Inbox for %s"), $this->user->nickname); return sprintf(_("Inbox for %s"), $this->user->nickname);

4
actions/invite.php
View File

@ -128,7 +128,7 @@ class InviteAction extends CurrentUserDesignAction
$this->element('p', null, _('You are already subscribed to these users:')); $this->element('p', null, _('You are already subscribed to these users:'));
$this->elementStart('ul'); $this->elementStart('ul');
foreach ($this->already as $other) { foreach ($this->already as $other) {
$this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email)); $this->element('li', null, sprintf(_('%1$s (%2$s)'), $other->nickname, $other->email));
} }
$this->elementEnd('ul'); $this->elementEnd('ul');
} }
@ -136,7 +136,7 @@ class InviteAction extends CurrentUserDesignAction
$this->element('p', null, _('These people are already users and you were automatically subscribed to them:')); $this->element('p', null, _('These people are already users and you were automatically subscribed to them:'));
$this->elementStart('ul'); $this->elementStart('ul');
foreach ($this->subbed as $other) { foreach ($this->subbed as $other) {
$this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email)); $this->element('li', null, sprintf(_('%1$s (%2$s)'), $other->nickname, $other->email));
} }
$this->elementEnd('ul'); $this->elementEnd('ul');
} }

4
actions/joingroup.php
View File

@ -125,14 +125,14 @@ class JoingroupAction extends Action
if (!$result) { if (!$result) {
common_log_db_error($member, 'INSERT', __FILE__); common_log_db_error($member, 'INSERT', __FILE__);
$this->serverError(sprintf(_('Could not join user %s to group %s'), $this->serverError(sprintf(_('Could not join user %1$s to group %2$s'),
$cur->nickname, $this->group->nickname)); $cur->nickname, $this->group->nickname));
} }
if ($this->boolean('ajax')) { if ($this->boolean('ajax')) {
$this->startHTML('text/xml;charset=utf-8'); $this->startHTML('text/xml;charset=utf-8');
$this->elementStart('head'); $this->elementStart('head');
$this->element('title', null, sprintf(_('%s joined group %s'), $this->element('title', null, sprintf(_('%1$s joined group %2$s'),
$cur->nickname, $cur->nickname,
$this->group->nickname)); $this->group->nickname));
$this->elementEnd('head'); $this->elementEnd('head');

4
actions/leavegroup.php
View File

@ -124,14 +124,14 @@ class LeavegroupAction extends Action
if (!$result) { if (!$result) {
common_log_db_error($member, 'DELETE', __FILE__); common_log_db_error($member, 'DELETE', __FILE__);
$this->serverError(sprintf(_('Could not remove user %s from group %s'), $this->serverError(sprintf(_('Could not remove user %1$s from group %2$s.'),
$cur->nickname, $this->group->nickname)); $cur->nickname, $this->group->nickname));
} }
if ($this->boolean('ajax')) { if ($this->boolean('ajax')) {
$this->startHTML('text/xml;charset=utf-8'); $this->startHTML('text/xml;charset=utf-8');
$this->elementStart('head'); $this->elementStart('head');
$this->element('title', null, sprintf(_('%s left group %s'), $this->element('title', null, sprintf(_('%1$s left group %2$s'),
$cur->nickname, $cur->nickname,
$this->group->nickname)); $this->group->nickname));
$this->elementEnd('head'); $this->elementEnd('head');

6
actions/makeadmin.php
View File

@ -92,7 +92,7 @@ class MakeadminAction extends Action
return false; return false;
} }
if ($this->profile->isAdmin($this->group)) { if ($this->profile->isAdmin($this->group)) {
$this->clientError(sprintf(_('%s is already an admin for group "%s".'), $this->clientError(sprintf(_('%1$s is already an admin for group "%2$s".'),
$this->profile->getBestName(), $this->profile->getBestName(),
$this->group->getBestName()), $this->group->getBestName()),
401); 401);
@ -129,7 +129,7 @@ class MakeadminAction extends Action
'profile_id' => $this->profile->id)); 'profile_id' => $this->profile->id));
if (empty($member)) { if (empty($member)) {
$this->serverError(_('Can\'t get membership record for %s in group %s'), $this->serverError(_('Can\'t get membership record for %1$s in group %2$s'),
$this->profile->getBestName(), $this->profile->getBestName(),
$this->group->getBestName()); $this->group->getBestName());
} }
@ -142,7 +142,7 @@ class MakeadminAction extends Action
if (!$result) { if (!$result) {
common_log_db_error($member, 'UPDATE', __FILE__); common_log_db_error($member, 'UPDATE', __FILE__);
$this->serverError(_('Can\'t make %s an admin for group %s'), $this->serverError(_('Can\'t make %1$s an admin for group %2$s'),
$this->profile->getBestName(), $this->profile->getBestName(),
$this->group->getBestName()); $this->group->getBestName());
} }

2
actions/noticesearch.php
View File

@ -88,7 +88,7 @@ class NoticesearchAction extends SearchAction
return array(new Feed(Feed::RSS1, common_local_url('noticesearchrss', return array(new Feed(Feed::RSS1, common_local_url('noticesearchrss',
array('q' => $q)), array('q' => $q)),
sprintf(_('Search results for "%s" on %s'), sprintf(_('Search results for "%1$s" on %2$s'),
$q, common_config('site', 'name')))); $q, common_config('site', 'name'))));
} }

2
actions/outbox.php
View File

@ -55,7 +55,7 @@ class OutboxAction extends MailboxAction
function title() function title()
{ {
if ($this->page > 1) { if ($this->page > 1) {
return sprintf(_("Outbox for %s - page %d"), return sprintf(_("Outbox for %1$s - page %2$d"),
$this->user->nickname, $page); $this->user->nickname, $page);
} else { } else {
return sprintf(_("Outbox for %s"), $this->user->nickname); return sprintf(_("Outbox for %s"), $this->user->nickname);

2
actions/peopletag.php
View File

@ -141,7 +141,7 @@ class PeopletagAction extends Action
*/ */
function title() function title()
{ {
return sprintf(_('Users self-tagged with %s - page %d'), return sprintf(_('Users self-tagged with %1$s - page %2$d'),
$this->tag, $this->page); $this->tag, $this->page);
} }

4
actions/postnotice.php
View File

@ -87,8 +87,8 @@ class PostnoticeAction extends Action
$license = $_POST['omb_notice_license']; $license = $_POST['omb_notice_license'];
$site_license = common_config('license', 'url'); $site_license = common_config('license', 'url');
if ($license && !common_compatible_license($license, $site_license)) { if ($license && !common_compatible_license($license, $site_license)) {
throw new Exception(sprintf(_('Notice license ‘%s’ is not ' . throw new Exception(sprintf(_('Notice license ‘%1$s’ is not ' .
'compatible with site license ‘%s’.'), 'compatible with site license ‘%2$s’.'),
$license, $site_license)); $license, $site_license));
} }
} }

4
actions/register.php
View File

@ -534,9 +534,9 @@ class RegisterAction extends Action
array('nickname' => $nickname)); array('nickname' => $nickname));
$this->elementStart('div', 'success'); $this->elementStart('div', 'success');
$instr = sprintf(_('Congratulations, %s! And welcome to %%%%site.name%%%%. '. $instr = sprintf(_('Congratulations, %1$s! And welcome to %%%%site.name%%%%. '.
'From here, you may want to...'. "\n\n" . 'From here, you may want to...'. "\n\n" .
'* Go to [your profile](%s) '. '* Go to [your profile](%2$s) '.
'and post your first message.' . "\n" . 'and post your first message.' . "\n" .
'* Add a [Jabber/GTalk address]'. '* Add a [Jabber/GTalk address]'.
'(%%%%action.imsettings%%%%) '. '(%%%%action.imsettings%%%%) '.

6
actions/replies.php
View File

@ -124,7 +124,7 @@ class RepliesAction extends OwnerDesignAction
if ($this->page == 1) { if ($this->page == 1) {
return sprintf(_("Replies to %s"), $this->user->nickname); return sprintf(_("Replies to %s"), $this->user->nickname);
} else { } else {
return sprintf(_("Replies to %s, page %d"), return sprintf(_("Replies to %1$s, page %2$d"),
$this->user->nickname, $this->user->nickname,
$this->page); $this->page);
} }
@ -195,14 +195,14 @@ class RepliesAction extends OwnerDesignAction
function showEmptyListMessage() function showEmptyListMessage()
{ {
$message = sprintf(_('This is the timeline showing replies to %s but %s hasn\'t received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' '; $message = sprintf(_('This is the timeline showing replies to %1$s but %2$s hasn\'t received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' ';
if (common_logged_in()) { if (common_logged_in()) {
$current_user = common_current_user(); $current_user = common_current_user();
if ($this->user->id === $current_user->id) { if ($this->user->id === $current_user->id) {
$message .= _('You can engage other users in a conversation, subscribe to more people or [join groups](%%action.groups%%).'); $message .= _('You can engage other users in a conversation, subscribe to more people or [join groups](%%action.groups%%).');
} else { } else {
$message .= sprintf(_('You can try to [nudge %s](../%s) or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); $message .= sprintf(_('You can try to [nudge %1$s](../%2$s) or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
} }
} }
else { else {

2
actions/showfavorites.php
View File

@ -76,7 +76,7 @@ class ShowfavoritesAction extends OwnerDesignAction
if ($this->page == 1) { if ($this->page == 1) {
return sprintf(_("%s's favorite notices"), $this->user->nickname); return sprintf(_("%s's favorite notices"), $this->user->nickname);
} else { } else {
return sprintf(_("%s's favorite notices, page %d"), return sprintf(_("%1$s's favorite notices, page %2$d"),
$this->user->nickname, $this->user->nickname,
$this->page); $this->page);
} }

2
actions/showgroup.php
View File

@ -81,7 +81,7 @@ class ShowgroupAction extends GroupDesignAction
if ($this->page == 1) { if ($this->page == 1) {
return sprintf(_("%s group"), $base); return sprintf(_("%s group"), $base);
} else { } else {
return sprintf(_("%s group, page %d"), return sprintf(_("%1$s group, page %2$d"),
$base, $base,
$this->page); $this->page);
} }

8
actions/showstream.php
View File

@ -76,7 +76,7 @@ class ShowstreamAction extends ProfileAction
if ($this->page == 1) { if ($this->page == 1) {
return $base; return $base;
} else { } else {
return sprintf(_("%s, page %d"), return sprintf(_("%1$s, page %2$d"),
$base, $base,
$this->page); $this->page);
} }
@ -119,7 +119,7 @@ class ShowstreamAction extends ProfileAction
common_local_url('userrss', common_local_url('userrss',
array('nickname' => $this->user->nickname, array('nickname' => $this->user->nickname,
'tag' => $this->tag)), 'tag' => $this->tag)),
sprintf(_('Notice feed for %s tagged %s (RSS 1.0)'), sprintf(_('Notice feed for %1$s tagged %2$s (RSS 1.0)'),
$this->user->nickname, $this->tag))); $this->user->nickname, $this->tag)));
} }
@ -188,14 +188,14 @@ class ShowstreamAction extends ProfileAction
function showEmptyListMessage() function showEmptyListMessage()
{ {
$message = sprintf(_('This is the timeline for %s but %s hasn\'t posted anything yet.'), $this->user->nickname, $this->user->nickname) . ' '; $message = sprintf(_('This is the timeline for %1$s but %2$s hasn\'t posted anything yet.'), $this->user->nickname, $this->user->nickname) . ' ';
if (common_logged_in()) { if (common_logged_in()) {
$current_user = common_current_user(); $current_user = common_current_user();
if ($this->user->id === $current_user->id) { if ($this->user->id === $current_user->id) {
$message .= _('Seen anything interesting recently? You haven\'t posted any notices yet, now would be a good time to start :)'); $message .= _('Seen anything interesting recently? You haven\'t posted any notices yet, now would be a good time to start :)');
} else { } else {
$message .= sprintf(_('You can try to nudge %s or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, '@' . $this->user->nickname); $message .= sprintf(_('You can try to nudge %1$s or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%2$s).'), $this->user->nickname, '@' . $this->user->nickname);
} }
} }
else { else {

2
actions/subscribers.php
View File

@ -49,7 +49,7 @@ class SubscribersAction extends GalleryAction
if ($this->page == 1) { if ($this->page == 1) {
return sprintf(_('%s subscribers'), $this->user->nickname); return sprintf(_('%s subscribers'), $this->user->nickname);
} else { } else {
return sprintf(_('%s subscribers, page %d'), return sprintf(_('%1$s subscribers, page %2$d'),
$this->user->nickname, $this->user->nickname,
$this->page); $this->page);
} }

2
actions/subscriptions.php
View File

@ -51,7 +51,7 @@ class SubscriptionsAction extends GalleryAction
if ($this->page == 1) { if ($this->page == 1) {
return sprintf(_('%s subscriptions'), $this->user->nickname); return sprintf(_('%s subscriptions'), $this->user->nickname);
} else { } else {
return sprintf(_('%s subscriptions, page %d'), return sprintf(_('%1$s subscriptions, page %2$d'),
$this->user->nickname, $this->user->nickname,
$this->page); $this->page);
} }

2
actions/tag.php
View File

@ -65,7 +65,7 @@ class TagAction extends Action
if ($this->page == 1) { if ($this->page == 1) {
return sprintf(_("Notices tagged with %s"), $this->tag); return sprintf(_("Notices tagged with %s"), $this->tag);
} else { } else {
return sprintf(_("Notices tagged with %s, page %d"), return sprintf(_("Notices tagged with %1$s, page %2$d"),
$this->tag, $this->tag,
$this->page); $this->page);
} }

4
actions/updateprofile.php
View File

@ -59,8 +59,8 @@ class UpdateprofileAction extends Action
$license = $_POST['omb_listenee_license']; $license = $_POST['omb_listenee_license'];
$site_license = common_config('license', 'url'); $site_license = common_config('license', 'url');
if (!common_compatible_license($license, $site_license)) { if (!common_compatible_license($license, $site_license)) {
$this->clientError(sprintf(_('Listenee stream license ‘%s’ is not '. $this->clientError(sprintf(_('Listenee stream license ‘%1$s’ is not '.
'compatible with site license ‘%s’.'), 'compatible with site license ‘%2$s’.'),
$license, $site_license)); $license, $site_license));
return false; return false;
} }

6
actions/userauthorization.php
View File

@ -293,7 +293,7 @@ class UserauthorizationAction extends Action
$user = User::staticGet('uri', $listener); $user = User::staticGet('uri', $listener);
if (!$user) { if (!$user) {
throw new Exception(sprintf(_('Listener URI ‘%s’ not found here'), throw new Exception(sprintf(_('Listener URI ‘%s’ not found here.'),
$listener)); $listener));
} }
@ -327,8 +327,8 @@ class UserauthorizationAction extends Action
$license = $_GET['omb_listenee_license']; $license = $_GET['omb_listenee_license'];
$site_license = common_config('license', 'url'); $site_license = common_config('license', 'url');
if (!common_compatible_license($license, $site_license)) { if (!common_compatible_license($license, $site_license)) {
throw new Exception(sprintf(_('Listenee stream license ‘%s’ is not ' . throw new Exception(sprintf(_('Listenee stream license ‘%1$s’ is not ' .
'compatible with site license ‘%s’.'), 'compatible with site license ‘%2$s’.'),
$license, $site_license)); $license, $site_license));
} }

2
actions/usergroups.php
View File

@ -61,7 +61,7 @@ class UsergroupsAction extends OwnerDesignAction
if ($this->page == 1) { if ($this->page == 1) {
return sprintf(_("%s groups"), $this->user->nickname); return sprintf(_("%s groups"), $this->user->nickname);
} else { } else {
return sprintf(_("%s groups, page %d"), return sprintf(_("%1$s groups, page %2$d"),
$this->user->nickname, $this->user->nickname,
$this->page); $this->page);
} }

2
actions/version.php
View File

@ -150,7 +150,7 @@ class VersionAction extends Action
{ {
$this->elementStart('p'); $this->elementStart('p');
$this->raw(sprintf(_('This site is powered by %s version %s, '. $this->raw(sprintf(_('This site is powered by %1$s version %2$s, '.
'Copyright 2008-2010 StatusNet, Inc. '. 'Copyright 2008-2010 StatusNet, Inc. '.
'and contributors.'), 'and contributors.'),
XMLStringer::estring('a', array('href' => 'http://status.net/'), XMLStringer::estring('a', array('href' => 'http://status.net/'),

2
lib/action.php
View File

@ -141,7 +141,7 @@ class Action extends HTMLOutputter // lawsuit
function showTitle() function showTitle()
{ {
$this->element('title', null, $this->element('title', null,
sprintf(_("%s - %s"), sprintf(_("%1$s - %2$s"),
$this->title(), $this->title(),
common_config('site', 'name'))); common_config('site', 'name')));
} }

2
lib/api.php
View File

@ -787,7 +787,7 @@ class ApiAction extends Action
$from = $message->getFrom(); $from = $message->getFrom();
$entry['title'] = sprintf('Message from %s to %s', $entry['title'] = sprintf('Message from %1$s to %2$s',
$from->nickname, $message->getTo()->nickname); $from->nickname, $message->getTo()->nickname);
$entry['content'] = common_xml_safe_str($message->rendered); $entry['content'] = common_xml_safe_str($message->rendered);

52
lib/command.php
View File

@ -85,7 +85,7 @@ class NudgeCommand extends Command
{ {
$recipient = User::staticGet('nickname', $this->other); $recipient = User::staticGet('nickname', $this->other);
if(! $recipient){ if(! $recipient){
$channel->error($this->user, sprintf(_('Could not find a user with nickname %s'), $channel->error($this->user, sprintf(_('Could not find a user with nickname %s.'),
$this->other)); $this->other));
}else{ }else{
if ($recipient->id == $this->user->id) { if ($recipient->id == $this->user->id) {
@ -96,7 +96,7 @@ class NudgeCommand extends Command
} }
// XXX: notify by IM // XXX: notify by IM
// XXX: notify by SMS // XXX: notify by SMS
$channel->output($this->user, sprintf(_('Nudge sent to %s'), $channel->output($this->user, sprintf(_('Nudge sent to %s.'),
$recipient->nickname)); $recipient->nickname));
} }
} }
@ -149,7 +149,7 @@ class FavCommand extends Command
$notice = Notice::staticGet(substr($this->other,1)); $notice = Notice::staticGet(substr($this->other,1));
if (!$notice) { if (!$notice) {
$channel->error($this->user, _('Notice with that id does not exist')); $channel->error($this->user, _('Notice with that id does not exist.'));
return; return;
} }
$recipient = $notice->getProfile(); $recipient = $notice->getProfile();
@ -165,7 +165,7 @@ class FavCommand extends Command
} }
$notice = $recipient->getCurrentNotice(); $notice = $recipient->getCurrentNotice();
if (!$notice) { if (!$notice) {
$channel->error($this->user, _('User has no last notice')); $channel->error($this->user, _('User has no last notice.'));
return; return;
} }
} }
@ -214,7 +214,7 @@ class JoinCommand extends Command
} }
if ($cur->isMember($group)) { if ($cur->isMember($group)) {
$channel->error($cur, _('You are already a member of that group')); $channel->error($cur, _('You are already a member of that group.'));
return; return;
} }
if (Group_block::isBlocked($group, $cur->getProfile())) { if (Group_block::isBlocked($group, $cur->getProfile())) {
@ -231,12 +231,12 @@ class JoinCommand extends Command
$result = $member->insert(); $result = $member->insert();
if (!$result) { if (!$result) {
common_log_db_error($member, 'INSERT', __FILE__); common_log_db_error($member, 'INSERT', __FILE__);
$channel->error($cur, sprintf(_('Could not join user %s to group %s'), $channel->error($cur, sprintf(_('Could not join user %1$s to group %2$s.'),
$cur->nickname, $group->nickname)); $cur->nickname, $group->nickname));
return; return;
} }
$channel->output($cur, sprintf(_('%s joined group %s'), $channel->output($cur, sprintf(_('%1$s joined group %2$s'),
$cur->nickname, $cur->nickname,
$group->nickname)); $group->nickname));
} }
@ -281,12 +281,12 @@ class DropCommand extends Command
$result = $member->delete(); $result = $member->delete();
if (!$result) { if (!$result) {
common_log_db_error($member, 'INSERT', __FILE__); common_log_db_error($member, 'INSERT', __FILE__);
$channel->error($cur, sprintf(_('Could not remove user %s to group %s'), $channel->error($cur, sprintf(_('Could not remove user %1$s to group %2$s.'),
$cur->nickname, $group->nickname)); $cur->nickname, $group->nickname));
return; return;
} }
$channel->output($cur, sprintf(_('%s left group %s'), $channel->output($cur, sprintf(_('%1$s left group %2$s'),
$cur->nickname, $cur->nickname,
$group->nickname)); $group->nickname));
} }
@ -355,7 +355,7 @@ class MessageCommand extends Command
$this->text = common_shorten_links($this->text); $this->text = common_shorten_links($this->text);
if (Message::contentTooLong($this->text)) { if (Message::contentTooLong($this->text)) {
$channel->error($this->user, sprintf(_('Message too long - maximum is %d characters, you sent %d'), $channel->error($this->user, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d.'),
Message::maxContent(), mb_strlen($this->text))); Message::maxContent(), mb_strlen($this->text)));
return; return;
} }
@ -373,7 +373,7 @@ class MessageCommand extends Command
$message = Message::saveNew($this->user->id, $other->id, $this->text, $channel->source()); $message = Message::saveNew($this->user->id, $other->id, $this->text, $channel->source());
if ($message) { if ($message) {
$message->notify(); $message->notify();
$channel->output($this->user, sprintf(_('Direct message to %s sent'), $this->other)); $channel->output($this->user, sprintf(_('Direct message to %s sent.'), $this->other));
} else { } else {
$channel->error($this->user, _('Error sending direct message.')); $channel->error($this->user, _('Error sending direct message.'));
} }
@ -396,7 +396,7 @@ class RepeatCommand extends Command
$notice = Notice::staticGet(substr($this->other,1)); $notice = Notice::staticGet(substr($this->other,1));
if (!$notice) { if (!$notice) {
$channel->error($this->user, _('Notice with that id does not exist')); $channel->error($this->user, _('Notice with that id does not exist.'));
return; return;
} }
$recipient = $notice->getProfile(); $recipient = $notice->getProfile();
@ -412,19 +412,19 @@ class RepeatCommand extends Command
} }
$notice = $recipient->getCurrentNotice(); $notice = $recipient->getCurrentNotice();
if (!$notice) { if (!$notice) {
$channel->error($this->user, _('User has no last notice')); $channel->error($this->user, _('User has no last notice.'));
return; return;
} }
} }
if($this->user->id == $notice->profile_id) if($this->user->id == $notice->profile_id)
{ {
$channel->error($this->user, _('Cannot repeat your own notice')); $channel->error($this->user, _('Cannot repeat your own notice.'));
return; return;
} }
if ($recipient->hasRepeated($notice->id)) { if ($recipient->hasRepeated($notice->id)) {
$channel->error($this->user, _('Already repeated that notice')); $channel->error($this->user, _('Already repeated that notice.'));
return; return;
} }
@ -432,7 +432,7 @@ class RepeatCommand extends Command
if ($repeat) { if ($repeat) {
common_broadcast_notice($repeat); common_broadcast_notice($repeat);
$channel->output($this->user, sprintf(_('Notice from %s repeated'), $recipient->nickname)); $channel->output($this->user, sprintf(_('Notice from %s repeated.'), $recipient->nickname));
} else { } else {
$channel->error($this->user, _('Error repeating notice.')); $channel->error($this->user, _('Error repeating notice.'));
} }
@ -457,7 +457,7 @@ class ReplyCommand extends Command
$notice = Notice::staticGet(substr($this->other,1)); $notice = Notice::staticGet(substr($this->other,1));
if (!$notice) { if (!$notice) {
$channel->error($this->user, _('Notice with that id does not exist')); $channel->error($this->user, _('Notice with that id does not exist.'));
return; return;
} }
$recipient = $notice->getProfile(); $recipient = $notice->getProfile();
@ -473,7 +473,7 @@ class ReplyCommand extends Command
} }
$notice = $recipient->getCurrentNotice(); $notice = $recipient->getCurrentNotice();
if (!$notice) { if (!$notice) {
$channel->error($this->user, _('User has no last notice')); $channel->error($this->user, _('User has no last notice.'));
return; return;
} }
} }
@ -488,7 +488,7 @@ class ReplyCommand extends Command
$this->text = common_shorten_links($this->text); $this->text = common_shorten_links($this->text);
if (Notice::contentTooLong($this->text)) { if (Notice::contentTooLong($this->text)) {
$channel->error($this->user, sprintf(_('Notice too long - maximum is %d characters, you sent %d'), $channel->error($this->user, sprintf(_('Notice too long - maximum is %1$d characters, you sent %2$d.'),
Notice::maxContent(), mb_strlen($this->text))); Notice::maxContent(), mb_strlen($this->text)));
return; return;
} }
@ -497,7 +497,7 @@ class ReplyCommand extends Command
array('reply_to' => $notice->id)); array('reply_to' => $notice->id));
if ($notice) { if ($notice) {
$channel->output($this->user, sprintf(_('Reply to %s sent'), $recipient->nickname)); $channel->output($this->user, sprintf(_('Reply to %s sent.'), $recipient->nickname));
} else { } else {
$channel->error($this->user, _('Error saving notice.')); $channel->error($this->user, _('Error saving notice.'));
} }
@ -529,7 +529,7 @@ class GetCommand extends Command
} }
$notice = $target->getCurrentNotice(); $notice = $target->getCurrentNotice();
if (!$notice) { if (!$notice) {
$channel->error($this->user, _('User has no last notice')); $channel->error($this->user, _('User has no last notice.'));
return; return;
} }
$notice_content = $notice->content; $notice_content = $notice->content;
@ -553,7 +553,7 @@ class SubCommand extends Command
{ {
if (!$this->other) { if (!$this->other) {
$channel->error($this->user, _('Specify the name of the user to subscribe to')); $channel->error($this->user, _('Specify the name of the user to subscribe to.'));
return; return;
} }
@ -581,7 +581,7 @@ class UnsubCommand extends Command
function execute($channel) function execute($channel)
{ {
if(!$this->other) { if(!$this->other) {
$channel->error($this->user, _('Specify the name of the user to unsubscribe from')); $channel->error($this->user, _('Specify the name of the user to unsubscribe from.'));
return; return;
} }
@ -647,7 +647,7 @@ class LoginCommand extends Command
$disabled = common_config('logincommand','disabled'); $disabled = common_config('logincommand','disabled');
$disabled = isset($disabled) && $disabled; $disabled = isset($disabled) && $disabled;
if($disabled) { if($disabled) {
$channel->error($this->user, _('Login command is disabled')); $channel->error($this->user, _('Login command is disabled.'));
return; return;
} }
$login_token = Login_token::staticGet('user_id',$this->user->id); $login_token = Login_token::staticGet('user_id',$this->user->id);
@ -661,12 +661,12 @@ class LoginCommand extends Command
$result = $login_token->insert(); $result = $login_token->insert();
if (!$result) { if (!$result) {
common_log_db_error($login_token, 'INSERT', __FILE__); common_log_db_error($login_token, 'INSERT', __FILE__);
$channel->error($this->user, sprintf(_('Could not create login token for %s'), $channel->error($this->user, sprintf(_('Could not create login token for %s.'),
$this->user->nickname)); $this->user->nickname));
return; return;
} }
$channel->output($this->user, $channel->output($this->user,
sprintf(_('This link is useable only once, and is good for only 2 minutes: %s'), sprintf(_('This link is useable only once, and is good for only 2 minutes: %s.'),
common_local_url('login', common_local_url('login',
array('user_id'=>$login_token->user_id, 'token'=>$login_token->token)))); array('user_id'=>$login_token->user_id, 'token'=>$login_token->token))));
} }

2
lib/noticeform.php
View File

@ -209,7 +209,7 @@ class NoticeForm extends Form
$this->out->elementStart('div', array('id' => 'notice_data-geo_wrap', $this->out->elementStart('div', array('id' => 'notice_data-geo_wrap',
'title' => common_local_url('geocode'))); 'title' => common_local_url('geocode')));
$this->out->checkbox('notice_data-geo', _('Share my location'), true); $this->out->checkbox('notice_data-geo', _('Share my location.'), true);
$this->out->elementEnd('div'); $this->out->elementEnd('div');
$this->out->inlineScript(' var NoticeDataGeoShareDisable_text = "'._('Do not share my location.').'";'. $this->out->inlineScript(' var NoticeDataGeoShareDisable_text = "'._('Do not share my location.').'";'.
' var NoticeDataGeoInfoMinimize_text = "'._('Hide this info').'";'); ' var NoticeDataGeoInfoMinimize_text = "'._('Hide this info').'";');