Merge remote-tracking branch 'upstream/develop' into api-rework

[friendica.git] / src / BaseModule.php

diff --git a/src/BaseModule.php b/src/BaseModule.php
index 2873357fd85425dea6c6d6d48ab790765bd576b1..be4788045c2d283d73c5c30080c1ebf661ee7710 100644 (file)
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -22,6 +22,7 @@
 namespace Friendica;
 
 use Friendica\Capabilities\ICanHandleRequests;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Model\User;
 
@@ -39,16 +40,33 @@ abstract class BaseModule implements ICanHandleRequests
        /** @var array */
        protected $parameters = [];
 
-       public function __construct(array $parameters = [])
+       /** @var L10n */
+       protected $l10n;
+
+       public function __construct(L10n $l10n, array $parameters = [])
        {
                $this->parameters = $parameters;
+               $this->l10n       = $l10n;
        }
 
        /**
-        * {@inheritDoc}
+        * Wraps the L10n::t() function for Modules
+        *
+        * @see L10n::t()
+        */
+       protected function t(string $s, ...$args): string
+       {
+               return $this->l10n->t($s, $args);
+       }
+
+       /**
+        * Wraps the L10n::tt() function for Modules
+        *
+        * @see L10n::tt()
         */
-       public function init()
+       protected function tt(string $singular, string $plurarl, int $count): string
        {
+               return $this->l10n->tt($singular, $plurarl, $count);
        }
 
        /**
@@ -90,13 +108,6 @@ abstract class BaseModule implements ICanHandleRequests
                // DI::baseurl()->redirect('module');
        }
 
-       /**
-        * {@inheritDoc}
-        */
-       public function afterpost()
-       {
-       }
-
        /**
         * {@inheritDoc}
         */