Merge remote-tracking branch 'origin/1.1.x' into 1.1.x

[quix0rs-gnu-social.git] / plugins / RSSCloud / LoggingAggregator.php

diff --git a/plugins/RSSCloud/LoggingAggregator.php b/plugins/RSSCloud/LoggingAggregator.php
index c7d7a40e3bb0a7e973464a6f5158d0ce73e7f6e5..824fa9ee9c7d678fe50f65b0d28a40209c282f4f 100644 (file)
--- a/plugins/RSSCloud/LoggingAggregator.php
+++ b/plugins/RSSCloud/LoggingAggregator.php
@@ -44,7 +44,7 @@ if (!defined('STATUSNET')) {
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
- **/
+ */
 class LoggingAggregatorAction extends Action
 {
     var $challenge = null;
@@ -82,25 +82,25 @@ class LoggingAggregatorAction extends Action
         parent::handle($args);
 
         if (empty($this->url)) {
-            $this->showError(_('A URL parameter is required.'));
+            // TRANS: Form validation error displayed when a URL parameter is missing.
+            $this->showError(_m('A URL parameter is required.'));
             return;
         }
 
         if (!empty($this->challenge)) {
-
             // must be a GET
             if ($_SERVER['REQUEST_METHOD'] != 'GET') {
+                // TRANS: Form validation error displayed when HTTP GET is not used.
                 $this->showError(_m('This resource requires an HTTP GET.'));
                 return;
             }
 
             header('Content-Type: text/xml');
             echo $this->challenge;
-
         } else {
-
             // must be a POST
             if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+                // TRANS: Form validation error displayed when HTTP POST is not used.
                 $this->showError(_m('This resource requires an HTTP POST.'));
                 return;
             }