X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FBaseModule.php;h=be4788045c2d283d73c5c30080c1ebf661ee7710;hb=f00792d370cfbf1d52b37e3eed7e80e682df9d8a;hp=90ba9e13290fe93b0b2ab080ad8ef9dadf51547e;hpb=018275919ce1862e08c9aaf7f8098c610fe71916;p=friendica.git diff --git a/src/BaseModule.php b/src/BaseModule.php index 90ba9e1329..be4788045c 100644 --- 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; @@ -37,32 +38,41 @@ use Friendica\Model\User; abstract class BaseModule implements ICanHandleRequests { /** @var array */ - protected static $parameters = []; + protected $parameters = []; - public function __construct(array $parameters = []) + /** @var L10n */ + protected $l10n; + + public function __construct(L10n $l10n, array $parameters = []) { - static::$parameters = $parameters; + $this->parameters = $parameters; + $this->l10n = $l10n; } /** - * @return array + * Wraps the L10n::t() function for Modules + * + * @see L10n::t() */ - public static function getParameters(): array + protected function t(string $s, ...$args): string { - return self::$parameters; + return $this->l10n->t($s, $args); } /** - * {@inheritDoc} + * Wraps the L10n::tt() function for Modules + * + * @see L10n::tt() */ - public static function init(array $parameters = []) + protected function tt(string $singular, string $plurarl, int $count): string { + return $this->l10n->tt($singular, $plurarl, $count); } /** * {@inheritDoc} */ - public static function rawContent(array $parameters = []) + public function rawContent() { // echo ''; // exit; @@ -71,7 +81,7 @@ abstract class BaseModule implements ICanHandleRequests /** * {@inheritDoc} */ - public static function content(array $parameters = []) + public function content(): string { return ''; } @@ -79,21 +89,21 @@ abstract class BaseModule implements ICanHandleRequests /** * {@inheritDoc} */ - public static function delete(array $parameters = []) + public function delete() { } /** * {@inheritDoc} */ - public static function patch(array $parameters = []) + public function patch() { } /** * {@inheritDoc} */ - public static function post(array $parameters = []) + public function post() { // DI::baseurl()->redirect('module'); } @@ -101,19 +111,12 @@ abstract class BaseModule implements ICanHandleRequests /** * {@inheritDoc} */ - public static function afterpost(array $parameters = []) - { - } - - /** - * {@inheritDoc} - */ - public static function put(array $parameters = []) + public function put() { } /** Gets the name of the current class */ - public static function getClassName(): string + public function getClassName(): string { return static::class; }