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 e37eed16a3dc5508a3cafa7273319680a4fa0f1e..824fa9ee9c7d678fe50f65b0d28a40209c282f4f 100644 (file)
--- a/plugins/RSSCloud/LoggingAggregator.php
+++ b/plugins/RSSCloud/LoggingAggregator.php
@@ -44,10 +44,9 @@ 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;
     var $url       = null;
 
@@ -58,7 +57,6 @@ class LoggingAggregatorAction extends Action
      *
      * @return boolean false if user doesn't exist
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -79,34 +77,31 @@ class LoggingAggregatorAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
 
         if (empty($this->url)) {
-            $this->showError('Hey, you have to provide a url parameter.');
+            // 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') {
-                $this->showError('This resource requires an HTTP 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') {
-                $this->showError('This resource requires an HTTP POST.');
+                // TRANS: Form validation error displayed when HTTP POST is not used.
+                $this->showError(_m('This resource requires an HTTP POST.'));
                 return;
             }
 
@@ -128,7 +123,6 @@ class LoggingAggregatorAction extends Action
      *
      * @return void
      */
-
     function showError($msg)
     {
         header('HTTP/1.1 400 Bad Request');
@@ -136,5 +130,4 @@ class LoggingAggregatorAction extends Action
         echo "<?xml version='1.0'?>\n";
         echo "<notifyResult success='false' msg='$msg' />\n";
     }
-
-}
\ No newline at end of file
+}