Merge branch '1.0.x' into testing

[quix0rs-gnu-social.git] / actions / userrss.php

diff --git a/actions/userrss.php b/actions/userrss.php
index b7078fcaf886a2967a11cc3d2b058b89cf6f37c2..b60cc5e0c7100982f0f37f518fccecf29777d513 100644 (file)
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -37,6 +37,7 @@ class UserrssAction extends Rss10Action
         $this->tag  = $this->trimmed('tag');
 
         if (!$this->user) {
+            // TRANS: Client error displayed when user not found for an action.
             $this->clientError(_('No such user.'));
             return false;
         } else {
@@ -105,6 +106,7 @@ class UserrssAction extends Rss10Action
         $profile = $user->getProfile();
         if (!$profile) {
             common_log_db_error($user, 'SELECT', __FILE__);
+            // TRANS: Server error displayed in user RSS when user does not have a matching profile.
             $this->serverError(_('User without matching profile.'));
             return null;
         }
@@ -112,7 +114,7 @@ class UserrssAction extends Rss10Action
         return ($avatar) ? $avatar->url : null;
     }
 
-    # override parent to add X-SUP-ID URL
+    // override parent to add X-SUP-ID URL
 
     function initRss($limit=0)
     {