Translate a few more strings.

darcs-hash:20080708100519-533db-b326ea0bb16ea6c8244cfd00a0dd639d0553dd21.gz

diff --git a/actions/imsettings.php b/actions/imsettings.php
index c0fa5014ed507a1b728d30edc2b48e0c0a94e9b3..1cf3c4e69c527e3e4d4ea78627521cc0c9ff9a46 100644 (file)
--- 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 549182fb900033e94afe62564d29d76e7e95d432..3157f0e1d1d81d570f4dec290b4a764946b1b5ad 100644 (file)
--- 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 5b125c25b48c6f2e335654e621271a9b97226409..6e6dcb2c28ce6fad73532e95bf71840506f6bd41 100644 (file)
--- 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 74409d4b681923661854bfb88ddea8573b443dc0..d1d040a276d5db5930942d555c86f865c3df0d68 100644 (file)
--- 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 c20075b305e2e0f1c5c18a0de0a648b19a88280f..925a078b650b825582da16f2ec16fb33bc1c91d2 100644 (file)
--- 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;
                }
        }