From 3329685beb28b8a487692b7fa147a23c492930c8 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sat, 23 Oct 2010 19:23:25 +0200
Subject: [PATCH] * onPluginVersion added. * i18n fix: use _m() in plugins,
 don't use _() * some translator documentation added. * superfluous whitespace
 removed.

---
 plugins/OpenX/OpenXPlugin.php                 | 25 ++++++++++++++-----
 plugins/OpenX/openxadminpanel.php             | 20 ++++++++++++++-
 .../RegisterThrottlePlugin.php                |  2 +-
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/plugins/OpenX/OpenXPlugin.php b/plugins/OpenX/OpenXPlugin.php
index 3206e4c711..5d3bb2306c 100644
--- a/plugins/OpenX/OpenXPlugin.php
+++ b/plugins/OpenX/OpenXPlugin.php
@@ -75,7 +75,6 @@ if (!defined('STATUSNET')) {
  *
  * @seeAlso  UAPPlugin
  */
-
 class OpenXPlugin extends UAPPlugin
 {
     public $adScript = null;
@@ -103,7 +102,6 @@ class OpenXPlugin extends UAPPlugin
      *
      * @return void
      */
-
     protected function showMediumRectangle($action)
     {
         $this->showAd($action, $this->mediumRectangle);
@@ -116,7 +114,6 @@ class OpenXPlugin extends UAPPlugin
      *
      * @return void
      */
-
     protected function showRectangle($action)
     {
         $this->showAd($action, $this->rectangle);
@@ -129,7 +126,6 @@ class OpenXPlugin extends UAPPlugin
      *
      * @return void
      */
-
     protected function showWideSkyscraper($action)
     {
         $this->showAd($action, $this->wideSkyscraper);
@@ -142,7 +138,6 @@ class OpenXPlugin extends UAPPlugin
      *
      * @return void
      */
-
     protected function showLeaderboard($action)
     {
         $this->showAd($action, $this->leaderboard);
@@ -156,7 +151,6 @@ class OpenXPlugin extends UAPPlugin
      *
      * @return void
      */
-
     protected function showAd($action, $zone)
     {
 $scr = <<<ENDOFSCRIPT
@@ -211,4 +205,23 @@ ENDOFSCRIPT;
         }
         return true;
     }
+
+    /**
+     * Add our version information to output
+     *
+     * @param array &$versions Array of version-data arrays
+     *
+     * @return boolean hook value
+     */
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'OpenX',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Evan Prodromou',
+                            'homepage' => 'http://status.net/wiki/Plugin:OpenX',
+                            'rawdescription' =>
+                            // TRANS: Plugin description.
+                            _m('Plugin for <a href="http://www.openx.org/">OpenX Ad Server</a>.'));
+        return true;
+    }
 }
diff --git a/plugins/OpenX/openxadminpanel.php b/plugins/OpenX/openxadminpanel.php
index a6c6c8184f..0bd09c70a4 100644
--- a/plugins/OpenX/openxadminpanel.php
+++ b/plugins/OpenX/openxadminpanel.php
@@ -49,6 +49,7 @@ class OpenXadminpanelAction extends AdminPanelAction
      */
     function title()
     {
+        // TRANS: Page title for OpenX admin panel.
         return _m('TITLE', 'OpenX');
     }
 
@@ -59,6 +60,7 @@ class OpenXadminpanelAction extends AdminPanelAction
      */
     function getInstructions()
     {
+        // TRANS: Instructions for OpenX admin panel.
         return _m('OpenX settings for this StatusNet site');
     }
 
@@ -161,31 +163,41 @@ class OpenXAdminPanelForm extends AdminForm
         $this->out->elementStart('ul', 'form_data');
         $this->li();
         $this->input('adScript',
+                     // TRANS: Form label in OpenX admin panel.
                      _m('Ad script URL'),
+                     // TRANS: Tooltip for form label in OpenX admin panel.
                      _m('Script URL'),
                      'openx');
         $this->unli();
         $this->li();
         $this->input('mediumRectangle',
+                     // TRANS: Form label in OpenX admin panel. Refers to advertisement format.
                      _m('Medium rectangle'),
+                     // TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
                      _m('Medium rectangle zone'),
                      'openx');
         $this->unli();
         $this->li();
         $this->input('rectangle',
+                     // TRANS: Form label in OpenX admin panel. Refers to advertisement format.
                      _m('Rectangle'),
+                     // TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
                      _m('Rectangle zone'),
                      'openx');
         $this->unli();
         $this->li();
         $this->input('leaderboard',
+                     // TRANS: Form label in OpenX admin panel. Refers to advertisement format.
                      _m('Leaderboard'),
+                     // TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
                      _m('Leaderboard zone'),
                      'openx');
         $this->unli();
         $this->li();
         $this->input('wideSkyscraper',
+                     // TRANS: Form label in OpenX admin panel. Refers to advertisement format.
                      _m('Skyscraper'),
+                     // TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
                      _m('Wide skyscraper zone'),
                      'openx');
         $this->unli();
@@ -199,6 +211,12 @@ class OpenXAdminPanelForm extends AdminForm
      */
     function formActions()
     {
-        $this->out->submit('submit', _m('Save'), 'submit', null, _m('Save OpenX settings'));
+        $this->out->submit('submit',
+                    // TRANS: Submit button text in OpenX admin panel.
+                    _m('BUTTON','Save'),
+                    'submit',
+                    null,
+                    // TRANS: Submit button title in OpenX admin panel.
+                    _m('Save OpenX settings'));
     }
 }
diff --git a/plugins/RegisterThrottle/RegisterThrottlePlugin.php b/plugins/RegisterThrottle/RegisterThrottlePlugin.php
index 7e2dde80fa..0078d3c600 100644
--- a/plugins/RegisterThrottle/RegisterThrottlePlugin.php
+++ b/plugins/RegisterThrottle/RegisterThrottlePlugin.php
@@ -158,7 +158,7 @@ class RegisterThrottlePlugin extends Plugin
             foreach ($ids as $id) {
                 $profile = Profile::staticGet('id', $id);
                 if ($profile && $profile->isSilenced()) {
-                    throw new Exception(_("A banned user has registered from this address."));
+                    throw new Exception(_m("A banned user has registered from this address."));
                 }
             }
         }