diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/action.php | 2 | ||||
| -rw-r--r-- | lib/api.php | 6 | ||||
| -rw-r--r-- | lib/common.php | 2 | ||||
| -rw-r--r-- | lib/mail.php | 7 | ||||
| -rw-r--r-- | lib/mailhandler.php | 4 | ||||
| -rw-r--r-- | lib/mediafile.php | 12 | ||||
| -rw-r--r-- | lib/noticeform.php | 2 | ||||
| -rw-r--r-- | lib/router.php | 8 | ||||
| -rw-r--r-- | lib/snapshot.php | 8 | ||||
| -rw-r--r-- | lib/subscriptionlist.php | 2 | ||||
| -rw-r--r-- | lib/util.php | 5 |
11 files changed, 34 insertions, 24 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 4ed49e452..d21851d50 100644 --- a/lib/api.php +++ b/lib/api.php @@ -140,12 +140,14 @@ class ApiAction extends Action // Note: some profiles don't have an associated user + $defaultDesign = Design::siteDesign(); + if (!empty($user)) { $design = $user->getDesign(); } if (empty($design)) { - $design = Design::siteDesign(); + $design = $defaultDesign; } $color = Design::toWebColor(empty($design->backgroundcolor) ? $defaultDesign->backgroundcolor : $design->backgroundcolor); @@ -787,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/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 4128741a8..6b87ed27f 100644 --- a/lib/router.php +++ b/lib/router.php @@ -445,19 +445,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/snapshot.php b/lib/snapshot.php index 2a10c6b93..a16087ac0 100644 --- a/lib/snapshot.php +++ b/lib/snapshot.php @@ -173,8 +173,12 @@ class Snapshot // XXX: Use OICU2 and OAuth to make authorized requests $reporturl = common_config('snapshot', 'reporturl'); - $request = HTTPClient::start(); - $request->post($reporturl, null, $this->stats); + try { + $request = HTTPClient::start(); + $request->post($reporturl, null, $this->stats); + } catch (Exception $e) { + common_log(LOG_WARNING, "Error in snapshot: " . $e->getMessage()); + } } /** 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'); diff --git a/lib/util.php b/lib/util.php index 5ffc0226f..3e52f5db1 100644 --- a/lib/util.php +++ b/lib/util.php @@ -119,6 +119,11 @@ function common_language() function common_munge_password($password, $id) { + if (is_object($id) || is_object($password)) { + $e = new Exception(); + common_log(LOG_ERR, __METHOD__ . ' object in param to common_munge_password ' . + str_replace("\n", " ", $e->getTraceAsString())); + } return md5($password . $id); } |