cleanup namespace usages for L10n

[friendica.git] / src / Module / Friendica.php

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 2eb2940ed36eede22cf4c1435d99640fdd501c5e..42b1be57dd2fc9301ebce2a29d30e06e2c2b7c2f 100644 (file)
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -5,7 +5,6 @@ namespace Friendica\Module;
 use Friendica\BaseModule;
 use Friendica\Core\Addon;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\User;
@@ -18,8 +17,7 @@ class Friendica extends BaseModule
 {
        public static function content(array $parameters = [])
        {
-               $app = DI::app();
-               $config = $app->getConfig();
+               $config = DI::config();
 
                $visibleAddonList = Addon::getVisibleList();
                if (!empty($visibleAddonList)) {
@@ -38,27 +36,27 @@ class Friendica extends BaseModule
                                }
                        }
                        $addon = [
-                               'title' => L10n::t('Installed addons/apps:'),
+                               'title' => DI::l10n()->t('Installed addons/apps:'),
                                'list'  => $sortedAddonList,
                        ];
                } else {
                        $addon = [
-                               'title' => L10n::t('No installed addons/apps'),
+                               'title' => DI::l10n()->t('No installed addons/apps'),
                        ];
                }
 
                $tos = ($config->get('system', 'tosdisplay')) ?
-                       L10n::t('Read about the <a href="%1$s/tos">Terms of Service</a> of this node.', $app->getBaseURL()) :
+                       DI::l10n()->t('Read about the <a href="%1$s/tos">Terms of Service</a> of this node.', DI::baseUrl()->get()) :
                        '';
 
                $blockList = $config->get('system', 'blocklist');
 
                if (!empty($blockList)) {
                        $blocked = [
-                               'title'  => L10n::t('On this server the following remote servers are blocked.'),
+                               'title'  => DI::l10n()->t('On this server the following remote servers are blocked.'),
                                'header' => [
-                                       L10n::t('Blocked domain'),
-                                       L10n::t('Reason for the block'),
+                                       DI::l10n()->t('Blocked domain'),
+                                       DI::l10n()->t('Reason for the block'),
                                ],
                                'list'   => $blockList,
                        ];
@@ -73,14 +71,14 @@ class Friendica extends BaseModule
                $tpl = Renderer::getMarkupTemplate('friendica.tpl');
 
                return Renderer::replaceMacros($tpl, [
-                       'about'     => L10n::t('This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.',
+                       'about'     => DI::l10n()->t('This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.',
                                '<strong>' . FRIENDICA_VERSION . '</strong>',
-                               $app->getBaseURL(),
+                               DI::baseUrl()->get(),
                                '<strong>' . DB_UPDATE_VERSION . '</strong>',
                                '<strong>' . $config->get('system', 'post_update_version') . '</strong>'),
-                       'friendica' => L10n::t('Please visit <a href="https://friendi.ca">Friendi.ca</a> to learn more about the Friendica project.'),
-                       'bugs'      => L10n::t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">' . L10n::t('the bugtracker at github') . '</a>',
-                       'info'      => L10n::t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'),
+                       'friendica' => DI::l10n()->t('Please visit <a href="https://friendi.ca">Friendi.ca</a> to learn more about the Friendica project.'),
+                       'bugs'      => DI::l10n()->t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">' . DI::l10n()->t('the bugtracker at github') . '</a>',
+                       'info'      => DI::l10n()->t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'),
 
                        'visible_addons' => $addon,
                        'tos'            => $tos,
@@ -98,7 +96,7 @@ class Friendica extends BaseModule
                        return;
                }
 
-               $config = $app->getConfig();
+               $config = DI::config();
 
                $register_policies = [
                        Register::CLOSED  => 'REGISTER_CLOSED',
@@ -125,7 +123,7 @@ class Friendica extends BaseModule
                        if (!empty($administrator)) {
                                $admin = [
                                        'name'    => $administrator['username'],
-                                       'profile' => $app->getBaseURL() . '/profile/' . $administrator['nickname'],
+                                       'profile' => DI::baseUrl()->get() . '/profile/' . $administrator['nickname'],
                                ];
                        }
                }
@@ -147,7 +145,7 @@ class Friendica extends BaseModule
 
                $data = [
                        'version'          => FRIENDICA_VERSION,
-                       'url'              => $app->getBaseURL(),
+                       'url'              => DI::baseUrl()->get(),
                        'addons'           => $visible_addons,
                        'locked_features'  => $locked_features,
                        'explicit_content' => intval($config->get('system', 'explicit_content', 0)),
@@ -155,9 +153,9 @@ class Friendica extends BaseModule
                        'register_policy'  => $register_policy,
                        'admin'            => $admin,
                        'site_name'        => $config->get('config', 'sitename'),
-                       'platform'         => FRIENDICA_PLATFORM,
+                       'platform'         => strtolower(FRIENDICA_PLATFORM),
                        'info'             => $config->get('config', 'info'),
-                       'no_scrape_url'    => $app->getBaseURL() . '/noscrape',
+                       'no_scrape_url'    => DI::baseUrl()->get() . '/noscrape',
                ];
 
                header('Content-type: application/json; charset=utf-8');