summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/imsettings.php7
-rw-r--r--actions/repliesrss.php2
-rw-r--r--actions/shownotice.php6
-rw-r--r--actions/showstream.php2
-rw-r--r--lib/util.php2
5 files changed, 10 insertions, 9 deletions
diff --git a/actions/imsettings.php b/actions/imsettings.php
index c0fa5014e..1cf3c4e69 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -191,11 +191,8 @@ class ImsettingsAction extends SettingsAction {
$jabber);
}
- # XXX: I18N
-
- $msg = 'A confirmation code was sent to the IM address you added. ' .
- ' You must approve ' . jabber_daemon_address() .
- ' for sending messages to you.';
+ $msg = sprintf(_('A confirmation code was sent to the IM address you added. ' .
+ 'You must approve %s for sending messages to you.'), jabber_daemon_address());
$this->show_form($msg, TRUE);
}
diff --git a/actions/repliesrss.php b/actions/repliesrss.php
index 549182fb9..3157f0e1d 100644
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -77,7 +77,7 @@ class RepliesrssAction extends Rss10Action {
'link' => common_local_url('replies',
array('nickname' =>
$user->nickname)),
- 'description' => sprintf(_('Feed for replies to '), $user->nickname));
+ 'description' => sprintf(_('Feed for replies to %s'), $user->nickname));
return $c;
}
diff --git a/actions/shownotice.php b/actions/shownotice.php
index 5b125c25b..6e6dcb2c2 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -42,7 +42,7 @@ class ShownoticeAction extends StreamAction {
# Looks like we're good; show the header
- common_show_header($profile->nickname."'s status on ".common_exact_date($notice->created),
+ common_show_header(sprintf(_('%1$s\'s status on %2$s'), $profile->nickname, common_exact_date($notice->created)),
NULL, $profile,
array($this, 'show_top'));
@@ -60,4 +60,8 @@ class ShownoticeAction extends StreamAction {
common_notice_form();
}
}
+
+ function no_such_notice() {
+ common_user_error('No such notice.');
+ }
}
diff --git a/actions/showstream.php b/actions/showstream.php
index 74409d4b6..d1d040a27 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -92,7 +92,7 @@ class ShowstreamAction extends StreamAction {
}
function no_such_user() {
- common_user_error('No such user');
+ common_user_error(_('No such user.'));
}
function show_profile($profile) {
diff --git a/lib/util.php b/lib/util.php
index c20075b30..925a078b6 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -892,7 +892,7 @@ function common_save_replies($notice) {
if (!$id) {
$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
common_log(LOG_ERROR, 'DB error inserting reply: ' . $last_error->message);
- common_server_error('DB error inserting reply: ' . $last_error->message);
+ common_server_error(_('DB error inserting reply: %s', $last_error->message));
return;
}
}