Merge branch '1.0.x' into testing

[quix0rs-gnu-social.git] / plugins / AutoSandbox / AutoSandboxPlugin.php

diff --git a/plugins/AutoSandbox/AutoSandboxPlugin.php b/plugins/AutoSandbox/AutoSandboxPlugin.php
index ffd8bf455e29c0e51d179d816d5ee4c8d598ace1..ebdc6132431c3362d807dabbe982d7c798f8297c 100644 (file)
--- a/plugins/AutoSandbox/AutoSandboxPlugin.php
+++ b/plugins/AutoSandbox/AutoSandboxPlugin.php
@@ -41,7 +41,7 @@ class AutoSandboxPlugin extends Plugin
     var $contact;
     var $debug;
 
-    function onInitializePlugin() 
+    function onInitializePlugin()
     {
         if(!isset($this->debug))
         {
@@ -53,7 +53,7 @@ class AutoSandboxPlugin extends Plugin
            if (!empty($default)) {
                $this->contact = $default;
            }
-        } 
+        }
     }
 
     function onPluginVersion(&$versions)
@@ -63,22 +63,26 @@ class AutoSandboxPlugin extends Plugin
                             'author' => 'Sean Carmody',
                             'homepage' => 'http://status.net/wiki/Plugin:AutoSandbox',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('Automatically sandboxes newly registered members.'));
         return true;
     }
 
     function onStartRegistrationFormData($action)
     {
-
-         $instr = 'Note you will initially be "sandboxed" so your posts will not appear in the public timeline.';
+         // TRANS: User instructions after registration.
+         $instr = _m('Note you will initially be "sandboxed" so your posts will not appear in the public timeline.');
 
          if (isset($this->contact)) {
              $contactuser = User::staticGet('nickname', $this->contact);
              if (!empty($contactuser)) {
                  $contactlink = "@<a href=\"$contactuser->uri\">$contactuser->nickname</a>";
-                 $instr = $instr . " Send a message to $contactlink to speed up the unsandboxing process.";
+                 // TRANS: User instructions after registration.
+                 // TRANS: %s is a clickable e-mailaddress.
+                 $instr = sprintf(_m('Note you will initially be "sandboxed" so your posts will not appear in the public timeline. '.
+                   'Send a message to %s to speed up the unsandboxing process.'),$contactlink);
              }
-         } 
+         }
 
          $output = common_markup_to_html($instr);
          $action->elementStart('div', 'instructions');