summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/action.php2
-rw-r--r--lib/api.php2
-rw-r--r--lib/command.php54
-rw-r--r--lib/common.php2
-rw-r--r--lib/mail.php7
-rw-r--r--lib/mailhandler.php4
-rw-r--r--lib/mediafile.php12
-rw-r--r--lib/noticeform.php2
-rw-r--r--lib/router.php8
-rw-r--r--lib/subscriptionlist.php2
10 files changed, 47 insertions, 48 deletions
diff --git a/lib/action.php b/lib/action.php
index 1b4cb5cec..6efa9163d 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -141,7 +141,7 @@ class Action extends HTMLOutputter // lawsuit
function showTitle()
{
$this->element('title', null,
- sprintf(_("%s - %s"),
+ sprintf(_("%1$s - %2$s"),
$this->title(),
common_config('site', 'name')));
}
diff --git a/lib/api.php b/lib/api.php
index 06d7c079d..d21851d50 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -789,7 +789,7 @@ class ApiAction extends Action
$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);
$entry['content'] = common_xml_safe_str($message->rendered);
diff --git a/lib/command.php b/lib/command.php
index 67140c348..5a1a8bf33 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -85,7 +85,7 @@ class NudgeCommand extends Command
{
$recipient = User::staticGet('nickname', $this->other);
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));
}else{
if ($recipient->id == $this->user->id) {
@@ -96,7 +96,7 @@ class NudgeCommand extends Command
}
// XXX: notify by IM
// XXX: notify by SMS
- $channel->output($this->user, sprintf(_('Nudge sent to %s'),
+ $channel->output($this->user, sprintf(_('Nudge sent to %s.'),
$recipient->nickname));
}
}
@@ -149,7 +149,7 @@ class FavCommand extends Command
$notice = Notice::staticGet(substr($this->other,1));
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;
}
$recipient = $notice->getProfile();
@@ -165,7 +165,7 @@ class FavCommand extends Command
}
$notice = $recipient->getCurrentNotice();
if (!$notice) {
- $channel->error($this->user, _('User has no last notice'));
+ $channel->error($this->user, _('User has no last notice.'));
return;
}
}
@@ -214,7 +214,7 @@ class JoinCommand extends Command
}
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;
}
if (Group_block::isBlocked($group, $cur->getProfile())) {
@@ -231,12 +231,12 @@ class JoinCommand extends Command
$result = $member->insert();
if (!$result) {
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));
return;
}
- $channel->output($cur, sprintf(_('%s joined group %s'),
+ $channel->output($cur, sprintf(_('%1$s joined group %2$s'),
$cur->nickname,
$group->nickname));
}
@@ -281,12 +281,12 @@ class DropCommand extends Command
$result = $member->delete();
if (!$result) {
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));
return;
}
- $channel->output($cur, sprintf(_('%s left group %s'),
+ $channel->output($cur, sprintf(_('%1$s left group %2$s'),
$cur->nickname,
$group->nickname));
}
@@ -315,7 +315,7 @@ class WhoisCommand extends Command
$whois = sprintf(_("%1\$s (%2\$s)"), $recipient->nickname,
$recipient->profileurl);
if ($recipient->fullname) {
- $whois .= "\n" . sprintf(_('Fullname: %s'), $recipient->fullname);
+ $whois .= "\n" . sprintf(_('Full name: %s'), $recipient->fullname);
}
if ($recipient->location) {
$whois .= "\n" . sprintf(_('Location: %s'), $recipient->location);
@@ -355,7 +355,7 @@ class MessageCommand extends Command
$this->text = common_shorten_links($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)));
return;
}
@@ -373,7 +373,7 @@ class MessageCommand extends Command
$message = Message::saveNew($this->user->id, $other->id, $this->text, $channel->source());
if ($message) {
$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 {
$channel->error($this->user, _('Error sending direct message.'));
}
@@ -396,7 +396,7 @@ class RepeatCommand extends Command
$notice = Notice::staticGet(substr($this->other,1));
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;
}
$recipient = $notice->getProfile();
@@ -412,19 +412,19 @@ class RepeatCommand extends Command
}
$notice = $recipient->getCurrentNotice();
if (!$notice) {
- $channel->error($this->user, _('User has no last notice'));
+ $channel->error($this->user, _('User has no last notice.'));
return;
}
}
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;
}
if ($recipient->hasRepeated($notice->id)) {
- $channel->error($this->user, _('Already repeated that notice'));
+ $channel->error($this->user, _('Already repeated that notice.'));
return;
}
@@ -432,7 +432,7 @@ class RepeatCommand extends Command
if ($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 {
$channel->error($this->user, _('Error repeating notice.'));
}
@@ -457,7 +457,7 @@ class ReplyCommand extends Command
$notice = Notice::staticGet(substr($this->other,1));
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;
}
$recipient = $notice->getProfile();
@@ -473,7 +473,7 @@ class ReplyCommand extends Command
}
$notice = $recipient->getCurrentNotice();
if (!$notice) {
- $channel->error($this->user, _('User has no last notice'));
+ $channel->error($this->user, _('User has no last notice.'));
return;
}
}
@@ -488,7 +488,7 @@ class ReplyCommand extends Command
$this->text = common_shorten_links($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)));
return;
}
@@ -497,7 +497,7 @@ class ReplyCommand extends Command
array('reply_to' => $notice->id));
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 {
$channel->error($this->user, _('Error saving notice.'));
}
@@ -529,7 +529,7 @@ class GetCommand extends Command
}
$notice = $target->getCurrentNotice();
if (!$notice) {
- $channel->error($this->user, _('User has no last notice'));
+ $channel->error($this->user, _('User has no last notice.'));
return;
}
$notice_content = $notice->content;
@@ -553,7 +553,7 @@ class SubCommand extends Command
{
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;
}
@@ -581,7 +581,7 @@ class UnsubCommand extends Command
function execute($channel)
{
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;
}
@@ -647,7 +647,7 @@ class LoginCommand extends Command
$disabled = common_config('logincommand','disabled');
$disabled = isset($disabled) && $disabled;
if($disabled) {
- $channel->error($this->user, _('Login command is disabled'));
+ $channel->error($this->user, _('Login command is disabled.'));
return;
}
$login_token = Login_token::staticGet('user_id',$this->user->id);
@@ -661,12 +661,12 @@ class LoginCommand extends Command
$result = $login_token->insert();
if (!$result) {
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));
return;
}
$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',
array('user_id'=>$login_token->user_id, 'token'=>$login_token->token))));
}
diff --git a/lib/common.php b/lib/common.php
index fb5e5919e..7342c177a 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -197,7 +197,7 @@ function _have_config()
// XXX: Find a way to use htmlwriter for this instead of handcoded markup
if (!_have_config()) {
echo '<p>'. _('No configuration file found. ') .'</p>';
- echo '<p>'. _('I looked for configuration files in the following places: ') .'<br/> '. implode($_config_files, '<br/>');
+ echo '<p>'. _('I looked for configuration files in the following places: ') .'<br /> '. implode($_config_files, '<br />');
echo '<p>'. _('You may wish to run the installer to fix this.') .'</p>';
echo '<a href="install.php">'. _('Go to the installer.') .'</a>';
exit;
diff --git a/lib/mail.php b/lib/mail.php
index 472a88e06..c724764cc 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -251,11 +251,11 @@ function mail_subscribe_notify_profile($listenee, $other)
common_config('site', 'name'),
$other->profileurl,
($other->location) ?
- sprintf(_("Location: %s\n"), $other->location) : '',
+ sprintf(_("Location: %s"), $other->location) . "\n" : '',
($other->homepage) ?
- sprintf(_("Homepage: %s\n"), $other->homepage) : '',
+ sprintf(_("Homepage: %s"), $other->homepage) . "\n" : '',
($other->bio) ?
- sprintf(_("Bio: %s\n\n"), $other->bio) : '',
+ sprintf(_("Bio: %s"), $other->bio) . "\n\n" : '',
common_config('site', 'name'),
common_local_url('emailsettings'));
@@ -652,4 +652,3 @@ function mail_notify_attn($user, $notice)
common_init_locale();
mail_to_user($user, $subject, $body);
}
-
diff --git a/lib/mailhandler.php b/lib/mailhandler.php
index 32a8cd9bc..85be89f18 100644
--- a/lib/mailhandler.php
+++ b/lib/mailhandler.php
@@ -139,7 +139,7 @@ class MailHandler
$headers['From'] = $to;
$headers['To'] = $from;
- $headers['Subject'] = "Command complete";
+ $headers['Subject'] = _('Command complete');
return mail_send(array($from), $headers, $response);
}
@@ -225,7 +225,7 @@ class MailHandler
function unsupported_type($type)
{
- $this->error(null, "Unsupported message type: " . $type);
+ $this->error(null, sprintf(_('Unsupported message type: %s'), $type));
}
function cleanup_msg($msg)
diff --git a/lib/mediafile.php b/lib/mediafile.php
index 29d752f0c..e3d5b1dbc 100644
--- a/lib/mediafile.php
+++ b/lib/mediafile.php
@@ -176,7 +176,7 @@ class MediaFile
// Should never actually get here
@unlink($_FILES[$param]['tmp_name']);
- throw new ClientException(_('File exceeds user\'s quota!'));
+ throw new ClientException(_('File exceeds user\'s quota.'));
return;
}
@@ -198,7 +198,7 @@ class MediaFile
}
} else {
- throw new ClientException(_('Could not determine file\'s mime-type!'));
+ throw new ClientException(_('Could not determine file\'s MIME type.'));
return;
}
@@ -213,7 +213,7 @@ class MediaFile
// Should never actually get here
- throw new ClientException(_('File exceeds user\'s quota!'));
+ throw new ClientException(_('File exceeds user\'s quota.'));
return;
}
@@ -234,7 +234,7 @@ class MediaFile
$stream['uri'] . ' ' . $filepath));
}
} else {
- throw new ClientException(_('Could not determine file\'s mime-type!'));
+ throw new ClientException(_('Could not determine file\'s MIME type.'));
return;
}
@@ -272,7 +272,7 @@ class MediaFile
$hint = '';
}
throw new ClientException(sprintf(
- _('%s is not a supported filetype on this server.'), $filetype) . $hint);
+ _('%s is not a supported file type on this server.'), $filetype) . $hint);
}
static function respectsQuota($user, $filesize)
@@ -286,4 +286,4 @@ class MediaFile
}
}
-} \ No newline at end of file
+}
diff --git a/lib/noticeform.php b/lib/noticeform.php
index f0b704e87..5545d03ae 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -209,7 +209,7 @@ class NoticeForm extends Form
$this->out->elementStart('div', array('id' => 'notice_data-geo_wrap',
'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->inlineScript(' var NoticeDataGeoShareDisable_text = "'._('Do not share my location.').'";'.
' var NoticeDataGeoInfoMinimize_text = "'._('Hide this info').'";');
diff --git a/lib/router.php b/lib/router.php
index 287d3c79f..785e78fd0 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -442,19 +442,19 @@ class Router
// Social graph
$m->connect('api/friends/ids/:id.:format',
- array('action' => 'apiFriends',
+ array('action' => 'apiuserfriends',
'ids_only' => true));
$m->connect('api/followers/ids/:id.:format',
- array('action' => 'apiFollowers',
+ array('action' => 'apiuserfollowers',
'ids_only' => true));
$m->connect('api/friends/ids.:format',
- array('action' => 'apiFriends',
+ array('action' => 'apiuserfriends',
'ids_only' => true));
$m->connect('api/followers/ids.:format',
- array('action' => 'apiFollowers',
+ array('action' => 'apiuserfollowers',
'ids_only' => true));
// account
diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index 89f63e321..e1207774f 100644
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -123,7 +123,7 @@ class SubscriptionListItem extends ProfileListItem
}
$this->out->elementEnd('ul');
} else {
- $this->out->text(_('(none)'));
+ $this->out->text(_('(None)'));
}
$this->out->elementEnd('dd');
$this->out->elementEnd('dl');
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-12-28 05:31:35 +0000