diff --git a/doc/AddonStorageBackend.md b/doc/AddonStorageBackend.md
index ed6c5d87ae..a4f8c0dae7 100644
--- a/doc/AddonStorageBackend.md
+++ b/doc/AddonStorageBackend.md
@@ -136,26 +136,26 @@ namespace Friendica\Addon\samplestorage;
use Friendica\Model\Storage\IStorage;
-use Friendica\Core\Config;
+use Friendica\Core\Config\IConfiguration;
use Friendica\Core\L10n;
class SampleStorageBackend implements IStorage
{
const NAME = 'Sample Storage';
- /** @var Config\IConfiguration */
+ /** @var IConfiguration */
private $config;
- /** @var \Friendica\Core\L10n */
+ /** @var L10n */
private $l10n;
/**
* SampleStorageBackend constructor.
- * @param Config\IConfiguration $config The configuration of Friendica
+ * @param IConfiguration $config The configuration of Friendica
*
* You can add here every dynamic class as dependency you like and add them to a private field
* Friendica automatically creates these classes and passes them as argument to the constructor
*/
- public function __construct(Config\IConfiguration $config, \Friendica\Core\L10n $l10n)
+ public function __construct(IConfiguration $config, L10n $l10n)
{
$this->config = $config;
$this->l10n = $l10n;
diff --git a/include/api.php b/include/api.php
index 583573b58c..fdf7726e21 100644
--- a/include/api.php
+++ b/include/api.php
@@ -13,7 +13,6 @@ use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Session;
diff --git a/include/conversation.php b/include/conversation.php
index b541df3640..e09f163efd 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -10,7 +10,6 @@ use Friendica\Content\Pager;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
diff --git a/include/enotify.php b/include/enotify.php
index ecdd16de1f..b4f5881403 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -6,12 +6,10 @@
use Friendica\Content\Text\BBCode;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
-use Friendica\Model\Contact;
use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Model\ItemContent;
@@ -20,7 +18,6 @@ use Friendica\Model\UserItem;
use Friendica\Protocol\Activity;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Emailer;
-use Friendica\Util\Strings;
/**
* Creates a notification entry and possibly sends a mail
diff --git a/include/items.php b/include/items.php
index a78588e9f8..ef55acab14 100644
--- a/include/items.php
+++ b/include/items.php
@@ -5,7 +5,6 @@
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
diff --git a/mod/api.php b/mod/api.php
index b0941c5589..3ed19e75bf 100644
--- a/mod/api.php
+++ b/mod/api.php
@@ -5,7 +5,6 @@
use Friendica\App;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
diff --git a/mod/cal.php b/mod/cal.php
index 6279bc2411..1c14f9e770 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -12,7 +12,6 @@ use Friendica\Content\Feature;
use Friendica\Content\Nav;
use Friendica\Content\Widget;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Database\DBA;
diff --git a/mod/common.php b/mod/common.php
index 4a539665ad..d2e7baecae 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -6,7 +6,6 @@
use Friendica\App;
use Friendica\Content\ContactSelector;
use Friendica\Content\Pager;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
diff --git a/mod/community.php b/mod/community.php
index a318148aab..975b601f9a 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -10,7 +10,6 @@ use Friendica\Content\Pager;
use Friendica\Content\Widget\TrendingTags;
use Friendica\Core\ACL;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Database\DBA;
diff --git a/mod/crepair.php b/mod/crepair.php
index 985acce804..70db308f17 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -5,7 +5,6 @@
use Friendica\App;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index a0752f8880..1a262f7605 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -20,7 +20,6 @@
use Friendica\App;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
@@ -29,7 +28,6 @@ use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Group;
use Friendica\Model\User;
-use Friendica\Network\Probe;
use Friendica\Protocol\Activity;
use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index e188744813..bce7bf0cbf 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -6,13 +6,11 @@
use Friendica\App;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Core\Session;
use Friendica\Database\DBA;
use Friendica\DI;
-use Friendica\Module\Security\Login;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\OStatus;
use Friendica\Util\Network;
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 888940af6c..76ddb09a5f 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -14,7 +14,6 @@
use Friendica\App;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
diff --git a/mod/display.php b/mod/display.php
index 2b4e2c2207..35cac53d0b 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -9,7 +9,6 @@ use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\ACL;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
diff --git a/mod/editpost.php b/mod/editpost.php
index 94d483172f..2bbc2f2b61 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -6,7 +6,6 @@
use Friendica\App;
use Friendica\Content\Feature;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
diff --git a/mod/events.php b/mod/events.php
index f92a01cf60..5601c4449a 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -8,7 +8,6 @@ use Friendica\App;
use Friendica\Content\Nav;
use Friendica\Content\Widget\CalendarExport;
use Friendica\Core\ACL;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\Theme;
diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 79dd1599bb..a4ade6f8c1 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -6,7 +6,6 @@
*/
use Friendica\App;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
diff --git a/mod/follow.php b/mod/follow.php
index dce6798b3c..4f3acf5ef9 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -4,10 +4,8 @@
*/
use Friendica\App;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
-use Friendica\Core\System;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index f7c1930cca..6d23c31158 100644
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
@@ -5,7 +5,6 @@
use Friendica\App;
use Friendica\Core\ACL;
-use Friendica\Core\L10n;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Util\DateTimeFormat;
diff --git a/mod/item.php b/mod/item.php
index a639886ad2..606c0ba580 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -21,7 +21,6 @@ use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Session;
diff --git a/mod/lockview.php b/mod/lockview.php
index aeee5a7625..e3382bddb8 100644
--- a/mod/lockview.php
+++ b/mod/lockview.php
@@ -4,7 +4,6 @@
*/
use Friendica\App;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Group;
diff --git a/mod/lostpass.php b/mod/lostpass.php
index cf6801d708..3d397677bc 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -6,7 +6,6 @@
use Friendica\App;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
diff --git a/mod/match.php b/mod/match.php
index c187546b32..eab337d07f 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -6,7 +6,6 @@
use Friendica\App;
use Friendica\Content\Widget;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Search;
use Friendica\Database\DBA;
diff --git a/mod/message.php b/mod/message.php
index bff62a554d..d1d3e89df4 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -8,7 +8,6 @@ use Friendica\Content\Nav;
use Friendica\Content\Pager;
use Friendica\Content\Text\BBCode;
use Friendica\Core\ACL;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
diff --git a/mod/network.php b/mod/network.php
index 106705bd8a..b0154a80fd 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -14,7 +14,6 @@ use Friendica\Content\Text\HTML;
use Friendica\Core\ACL;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
diff --git a/mod/notes.php b/mod/notes.php
index 223e030232..536029338f 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -6,7 +6,6 @@
use Friendica\App;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
-use Friendica\Core\L10n;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Item;
diff --git a/mod/notifications.php b/mod/notifications.php
index 634a6d74a2..43d3f7871a 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -8,15 +8,12 @@ use Friendica\App;
use Friendica\Content\ContactSelector;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
-use Friendica\Core\L10n;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Module\Security\Login;
-use Friendica\Model\Contact;
-use Friendica\Model\Introduction;
function notifications_post(App $a)
{
diff --git a/mod/oexchange.php b/mod/oexchange.php
index d1b5523a42..3eb13460d4 100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -3,7 +3,6 @@
* @file mod/oexchange.php
*/
use Friendica\App;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\Security\Login;
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index a6c7d9da47..e5a3f1e9b4 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -4,7 +4,6 @@
*/
use Friendica\App;
-use Friendica\Core\L10n;
use Friendica\Core\Protocol;
use Friendica\DI;
use Friendica\Model\Contact;
diff --git a/mod/photos.php b/mod/photos.php
index db30c7d94c..2580719975 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -11,7 +11,6 @@ use Friendica\Content\Text\BBCode;
use Friendica\Core\ACL;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
diff --git a/mod/ping.php b/mod/ping.php
index 57b55a0f9b..a00c5dfe35 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -9,7 +9,6 @@ use Friendica\Content\Text\BBCode;
use Friendica\Core\Cache\Duration;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
diff --git a/mod/poke.php b/mod/poke.php
index 949bbd5ae8..0034a2d87a 100644
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -15,7 +15,6 @@
use Friendica\App;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\System;
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index dddd1957dc..47c058b6ea 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -6,7 +6,6 @@
use Friendica\App;
use Friendica\BaseModule;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
diff --git a/mod/profiles.php b/mod/profiles.php
index 2e530a1752..d979048a04 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -10,7 +10,6 @@ use Friendica\Content\Feature;
use Friendica\Content\Nav;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
diff --git a/mod/profperm.php b/mod/profperm.php
index 5c4325048d..2e8803fde3 100644
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -4,7 +4,6 @@
*/
use Friendica\App;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Protocol;
use Friendica\Content\Text\HTML;
use Friendica\Database\DBA;
diff --git a/mod/redir.php b/mod/redir.php
index 990ebc194e..5bfed1c114 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -1,7 +1,6 @@
get(local_user(), "system", "bandwidth_saver")) {
- $replace = "
".DI::l10n()->t("[Embedded content - reload page to view]")."
";
+ $replace = "
" . DI::l10n()->t("[Embedded content - reload page to view]") . "
";
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
$text = preg_replace($pattern, $replace, $text);
$pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
diff --git a/mod/update_contact.php b/mod/update_contact.php
index a347873da9..bd9ced0e9a 100644
--- a/mod/update_contact.php
+++ b/mod/update_contact.php
@@ -3,7 +3,6 @@
// See update_profile.php for documentation
use Friendica\App;
-use Friendica\Core\L10n;
use Friendica\DI;
use Friendica\Module\Contact;
@@ -20,7 +19,7 @@ function update_contact_content(App $a)
}
if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) {
- $replace = "
".DI::l10n()->t("[Embedded content - reload page to view]")."
";
+ $replace = "
" . DI::l10n()->t("[Embedded content - reload page to view]") . "
";
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
$text = preg_replace($pattern, $replace, $text);
$pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
diff --git a/mod/update_display.php b/mod/update_display.php
index 9d725fed26..b8f3d8f498 100644
--- a/mod/update_display.php
+++ b/mod/update_display.php
@@ -5,7 +5,6 @@
*/
use Friendica\App;
-use Friendica\Core\L10n;
use Friendica\DI;
require_once "mod/display.php";
diff --git a/mod/update_network.php b/mod/update_network.php
index 212b6a6b1a..9aa0443f1e 100644
--- a/mod/update_network.php
+++ b/mod/update_network.php
@@ -5,7 +5,6 @@
*/
use Friendica\App;
-use Friendica\Core\L10n;
use Friendica\DI;
require_once "mod/network.php";
diff --git a/mod/update_notes.php b/mod/update_notes.php
index 4027d4a33d..4065b5d1f8 100644
--- a/mod/update_notes.php
+++ b/mod/update_notes.php
@@ -6,7 +6,6 @@
*/
use Friendica\App;
-use Friendica\Core\L10n;
use Friendica\DI;
require_once("mod/notes.php");
@@ -33,7 +32,7 @@ function update_notes_content(App $a) {
$text = notes_content($a, $profile_uid);
if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) {
- $replace = "
".DI::l10n()->t("[Embedded content - reload page to view]")."
";
+ $replace = "
" . DI::l10n()->t("[Embedded content - reload page to view]") . "
";
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
$text = preg_replace($pattern, $replace, $text);
$pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
diff --git a/mod/update_profile.php b/mod/update_profile.php
index 8d94d34a1b..348a384c2e 100644
--- a/mod/update_profile.php
+++ b/mod/update_profile.php
@@ -6,7 +6,6 @@
*/
use Friendica\App;
-use Friendica\Core\L10n;
use Friendica\DI;
use Friendica\Module\Profile;
@@ -31,7 +30,7 @@ function update_profile_content(App $a) {
$text = Profile::content([], $profile_uid);
if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) {
- $replace = "
".DI::l10n()->t("[Embedded content - reload page to view]")."
";
+ $replace = "
" . DI::l10n()->t("[Embedded content - reload page to view]") . "
";
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
$text = preg_replace($pattern, $replace, $text);
$pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
diff --git a/mod/videos.php b/mod/videos.php
index 368eec3c9a..342e988f3a 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -7,7 +7,6 @@ use Friendica\App;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Database\DBA;
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index a8f704cd99..f04698c564 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -5,7 +5,6 @@
use Friendica\App;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Session;
use Friendica\Database\DBA;
use Friendica\Model\Attach;
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 814a32fd46..2f92b2f03c 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -10,7 +10,6 @@
use Friendica\App;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Session;
use Friendica\Database\DBA;
diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index cf9759b714..085201fc44 100644
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -3,7 +3,6 @@
* @file mod/wallmessage.php
*/
use Friendica\App;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
diff --git a/src/App/Router.php b/src/App/Router.php
index 968855acb5..27ea4ac605 100644
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@ -8,7 +8,6 @@ use FastRoute\Dispatcher;
use FastRoute\RouteCollector;
use FastRoute\RouteParser\Std;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Network\HTTPException;
/**
diff --git a/src/BaseModule.php b/src/BaseModule.php
index 666496ba96..2250f22bbc 100644
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -2,7 +2,6 @@
namespace Friendica;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
/**
diff --git a/src/Console/ArchiveContact.php b/src/Console/ArchiveContact.php
index 5635905bbc..74f1817d1f 100644
--- a/src/Console/ArchiveContact.php
+++ b/src/Console/ArchiveContact.php
@@ -3,7 +3,6 @@
namespace Friendica\Console;
use Friendica\App;
-use Friendica\Core\L10n;
use Friendica\Database\Database;
use Friendica\Util\Strings;
use RuntimeException;
diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index f9d6b04941..184707220f 100644
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -5,7 +5,6 @@
namespace Friendica\Content;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\Util\Network;
diff --git a/src/Content/Feature.php b/src/Content/Feature.php
index 563c0ab929..ef8a3d9a2d 100644
--- a/src/Content/Feature.php
+++ b/src/Content/Feature.php
@@ -7,7 +7,6 @@ namespace Friendica\Content;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\DI;
class Feature
diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index 7c2061c47c..f3f3392ec1 100644
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -7,7 +7,6 @@ namespace Friendica\Content;
use Friendica\Core\Protocol;
use Friendica\Content\Text\HTML;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 30e4a1c087..041d07246b 100644
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -7,7 +7,6 @@ namespace Friendica\Content;
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Database\DBA;
diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index 3eceb21c21..8865e3c8c4 100644
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -13,7 +13,6 @@ use Exception;
use Friendica\Core\Cache\Duration;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
diff --git a/src/Content/Pager.php b/src/Content/Pager.php
index f8dace08c4..800aa760e6 100644
--- a/src/Content/Pager.php
+++ b/src/Content/Pager.php
@@ -2,8 +2,8 @@
namespace Friendica\Content;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Util\Strings;
/**
diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 4a0a329b4c..11e6ee2115 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -12,7 +12,6 @@ use Friendica\Content\OEmbed;
use Friendica\Content\Smilies;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index 1cd0761390..798d6b0a63 100644
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -9,7 +9,6 @@ use DOMDocument;
use DOMXPath;
use Friendica\Content\Widget\ContactBlock;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Config;
use Friendica\Core\Renderer;
use Friendica\DI;
diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 2052d216d2..55277432b6 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -6,7 +6,6 @@ namespace Friendica\Content;
use Friendica\Core\Addon;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
diff --git a/src/Content/Widget/CalendarExport.php b/src/Content/Widget/CalendarExport.php
index 293f9ae0e6..693be2d6f0 100644
--- a/src/Content/Widget/CalendarExport.php
+++ b/src/Content/Widget/CalendarExport.php
@@ -7,7 +7,6 @@
namespace Friendica\Content\Widget;
use Friendica\Content\Feature;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
diff --git a/src/Content/Widget/ContactBlock.php b/src/Content/Widget/ContactBlock.php
index fbb5683af1..bce4b617f9 100644
--- a/src/Content/Widget/ContactBlock.php
+++ b/src/Content/Widget/ContactBlock.php
@@ -8,7 +8,6 @@ namespace Friendica\Content\Widget;
use Friendica\Content\Text\HTML;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
diff --git a/src/Content/Widget/SavedSearches.php b/src/Content/Widget/SavedSearches.php
index 69d667caa2..ebfc78ca7e 100644
--- a/src/Content/Widget/SavedSearches.php
+++ b/src/Content/Widget/SavedSearches.php
@@ -2,9 +2,9 @@
namespace Friendica\Content\Widget;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
+use Friendica\DI;
class SavedSearches
{
diff --git a/src/Content/Widget/TagCloud.php b/src/Content/Widget/TagCloud.php
index 612ae792f5..f57d5c3f27 100644
--- a/src/Content/Widget/TagCloud.php
+++ b/src/Content/Widget/TagCloud.php
@@ -6,7 +6,6 @@
namespace Friendica\Content\Widget;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
diff --git a/src/Content/Widget/TrendingTags.php b/src/Content/Widget/TrendingTags.php
index 2e97c8157e..102a4f14c1 100644
--- a/src/Content/Widget/TrendingTags.php
+++ b/src/Content/Widget/TrendingTags.php
@@ -2,8 +2,8 @@
namespace Friendica\Content\Widget;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Model\Term;
/**
diff --git a/src/DI.php b/src/DI.php
index 5794f08f54..a76fa4666b 100644
--- a/src/DI.php
+++ b/src/DI.php
@@ -3,7 +3,6 @@
namespace Friendica;
use Dice\Dice;
-use Friendica\Core\L10n;
use Psr\Log\LoggerInterface;
/**
@@ -158,7 +157,7 @@ abstract class DI
}
/**
- * @return L10n
+ * @return Core\L10n
*/
public static function l10n()
{
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 4c56263ab0..e2a45783ba 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -8,7 +8,6 @@ namespace Friendica\Database;
use Exception;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Util\DateTimeFormat;
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index d93b2469d1..5d2c4aa197 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -8,7 +8,6 @@ use Friendica\App\BaseURL;
use Friendica\Content\Pager;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Session;
diff --git a/src/Model/Event.php b/src/Model/Event.php
index ce2e9d53b2..1f20482d53 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -7,7 +7,6 @@ namespace Friendica\Model;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\System;
diff --git a/src/Model/FileTag.php b/src/Model/FileTag.php
index 662fdbdffb..9908c8a333 100644
--- a/src/Model/FileTag.php
+++ b/src/Model/FileTag.php
@@ -5,7 +5,6 @@
namespace Friendica\Model;
-use Friendica\Core\L10n;
use Friendica\Database\DBA;
use Friendica\DI;
diff --git a/src/Model/Group.php b/src/Model/Group.php
index a810fff670..c38e78000b 100644
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -6,11 +6,11 @@
namespace Friendica\Model;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
+use Friendica\DI;
/**
* functions for interacting with the group database table
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 050e79de50..88208564dc 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -10,7 +10,6 @@ use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index 77bf39878a..de351db4aa 100644
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -5,13 +5,10 @@
*/
namespace Friendica\Model;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\DI;
-use Friendica\Model\Item;
-use Friendica\Model\Photo;
use Friendica\Database\DBA;
use Friendica\Network\Probe;
use Friendica\Protocol\Activity;
diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 461cddf293..60d7f1e43e 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -8,7 +8,6 @@ namespace Friendica\Model;
use Friendica\Core\Cache\Duration;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;
diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index bb19fbe9b7..c45f0f68fa 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -13,7 +13,6 @@ use Friendica\Content\Widget\ContactBlock;
use Friendica\Core\Cache\Duration;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
diff --git a/src/Model/User.php b/src/Model/User.php
index be93f3e4d8..171d9761cb 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -11,7 +11,6 @@ use DivineOmega\PasswordExposed;
use Exception;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
diff --git a/src/Module/Admin/Addons/Details.php b/src/Module/Admin/Addons/Details.php
index 878b7c3e58..ebf87deda4 100644
--- a/src/Module/Admin/Addons/Details.php
+++ b/src/Module/Admin/Addons/Details.php
@@ -4,7 +4,6 @@ namespace Friendica\Module\Admin\Addons;
use Friendica\Content\Text\Markdown;
use Friendica\Core\Addon;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
diff --git a/src/Module/Admin/Addons/Index.php b/src/Module/Admin/Addons/Index.php
index 48276aa5dd..634bd08c70 100644
--- a/src/Module/Admin/Addons/Index.php
+++ b/src/Module/Admin/Addons/Index.php
@@ -3,7 +3,6 @@
namespace Friendica\Module\Admin\Addons;
use Friendica\Core\Addon;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
diff --git a/src/Module/Admin/Blocklist/Contact.php b/src/Module/Admin/Blocklist/Contact.php
index ed99a39f89..8eaf418a85 100644
--- a/src/Module/Admin/Blocklist/Contact.php
+++ b/src/Module/Admin/Blocklist/Contact.php
@@ -3,7 +3,6 @@
namespace Friendica\Module\Admin\Blocklist;
use Friendica\Content\Pager;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
diff --git a/src/Module/Admin/Blocklist/Server.php b/src/Module/Admin/Blocklist/Server.php
index 4ae395fc00..e620c6233b 100644
--- a/src/Module/Admin/Blocklist/Server.php
+++ b/src/Module/Admin/Blocklist/Server.php
@@ -3,7 +3,6 @@
namespace Friendica\Module\Admin\Blocklist;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
diff --git a/src/Module/Admin/DBSync.php b/src/Module/Admin/DBSync.php
index 4368e6eed5..f750108d70 100644
--- a/src/Module/Admin/DBSync.php
+++ b/src/Module/Admin/DBSync.php
@@ -3,7 +3,6 @@
namespace Friendica\Module\Admin;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Update;
use Friendica\Database\DBA;
diff --git a/src/Module/Admin/Features.php b/src/Module/Admin/Features.php
index 9171d70fe8..2c735feff2 100644
--- a/src/Module/Admin/Features.php
+++ b/src/Module/Admin/Features.php
@@ -4,7 +4,6 @@ namespace Friendica\Module\Admin;
use Friendica\Content\Feature;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php
index 4d74074322..d6d1c30066 100644
--- a/src/Module/Admin/Federation.php
+++ b/src/Module/Admin/Federation.php
@@ -3,9 +3,9 @@
namespace Friendica\Module\Admin;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Module\BaseAdminModule;
class Federation extends BaseAdminModule
diff --git a/src/Module/Admin/Item/Delete.php b/src/Module/Admin/Item/Delete.php
index 6ceb20c05c..1d7e459a27 100644
--- a/src/Module/Admin/Item/Delete.php
+++ b/src/Module/Admin/Item/Delete.php
@@ -2,7 +2,6 @@
namespace Friendica\Module\Admin\Item;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Model\Item;
diff --git a/src/Module/Admin/Item/Source.php b/src/Module/Admin/Item/Source.php
index 9bdcd9b7df..d4666b27f8 100644
--- a/src/Module/Admin/Item/Source.php
+++ b/src/Module/Admin/Item/Source.php
@@ -2,7 +2,6 @@
namespace Friendica\Module\Admin\Item;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Model;
diff --git a/src/Module/Admin/Logs/Settings.php b/src/Module/Admin/Logs/Settings.php
index f04057a98f..95f5615973 100644
--- a/src/Module/Admin/Logs/Settings.php
+++ b/src/Module/Admin/Logs/Settings.php
@@ -3,7 +3,6 @@
namespace Friendica\Module\Admin\Logs;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
diff --git a/src/Module/Admin/Logs/View.php b/src/Module/Admin/Logs/View.php
index fe8bf614cf..63d7c954ed 100644
--- a/src/Module/Admin/Logs/View.php
+++ b/src/Module/Admin/Logs/View.php
@@ -3,8 +3,8 @@
namespace Friendica\Module\Admin\Logs;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Strings;
diff --git a/src/Module/Admin/Queue.php b/src/Module/Admin/Queue.php
index c13edb3f30..a9295f6f92 100644
--- a/src/Module/Admin/Queue.php
+++ b/src/Module/Admin/Queue.php
@@ -2,7 +2,6 @@
namespace Friendica\Module\Admin;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index 9a7aa5956c..aedd8500be 100644
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -4,10 +4,8 @@ namespace Friendica\Module\Admin;
use Friendica\App;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Search;
-use Friendica\Core\StorageManager;
use Friendica\Core\Theme;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php
index 50b513bfcf..af62911b73 100644
--- a/src/Module/Admin/Summary.php
+++ b/src/Module/Admin/Summary.php
@@ -4,7 +4,6 @@ namespace Friendica\Module\Admin;
use Friendica\Core\Addon;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\Update;
@@ -16,7 +15,6 @@ use Friendica\Module\BaseAdminModule;
use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Util\ConfigFileLoader;
use Friendica\Util\DateTimeFormat;
-use Friendica\Util\FileSystem;
use Friendica\Util\Network;
class Summary extends BaseAdminModule
diff --git a/src/Module/Admin/Themes/Details.php b/src/Module/Admin/Themes/Details.php
index 0c2529b92e..f1263e6ca9 100644
--- a/src/Module/Admin/Themes/Details.php
+++ b/src/Module/Admin/Themes/Details.php
@@ -3,7 +3,6 @@
namespace Friendica\Module\Admin\Themes;
use Friendica\Content\Text\Markdown;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Theme;
use Friendica\DI;
diff --git a/src/Module/Admin/Themes/Embed.php b/src/Module/Admin/Themes/Embed.php
index 3da022322a..00d4de6953 100644
--- a/src/Module/Admin/Themes/Embed.php
+++ b/src/Module/Admin/Themes/Embed.php
@@ -2,7 +2,6 @@
namespace Friendica\Module\Admin\Themes;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
diff --git a/src/Module/Admin/Themes/Index.php b/src/Module/Admin/Themes/Index.php
index 03794a155e..aae73c1fc7 100644
--- a/src/Module/Admin/Themes/Index.php
+++ b/src/Module/Admin/Themes/Index.php
@@ -3,7 +3,6 @@
namespace Friendica\Module\Admin\Themes;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Theme;
use Friendica\DI;
diff --git a/src/Module/Admin/Tos.php b/src/Module/Admin/Tos.php
index 158738fd8e..d5e0bdc6f0 100644
--- a/src/Module/Admin/Tos.php
+++ b/src/Module/Admin/Tos.php
@@ -3,7 +3,6 @@
namespace Friendica\Module\Admin;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php
index 2d38d5926c..7107080873 100644
--- a/src/Module/Admin/Users.php
+++ b/src/Module/Admin/Users.php
@@ -4,7 +4,6 @@ namespace Friendica\Module\Admin;
use Friendica\Content\Pager;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
diff --git a/src/Module/AllFriends.php b/src/Module/AllFriends.php
index b9105c81d5..662dc17e4c 100644
--- a/src/Module/AllFriends.php
+++ b/src/Module/AllFriends.php
@@ -5,7 +5,6 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Content\ContactSelector;
use Friendica\Content\Pager;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Model;
diff --git a/src/Module/Apps.php b/src/Module/Apps.php
index 22585f86a5..6b16935ab1 100644
--- a/src/Module/Apps.php
+++ b/src/Module/Apps.php
@@ -5,7 +5,6 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Content\Nav;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
diff --git a/src/Module/Attach.php b/src/Module/Attach.php
index 057b4a9aa1..7a625e600a 100644
--- a/src/Module/Attach.php
+++ b/src/Module/Attach.php
@@ -7,9 +7,7 @@
namespace Friendica\Module;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
-use Friendica\Core\System;
use Friendica\DI;
use Friendica\Model\Attach as MAttach;
diff --git a/src/Module/Base/Api.php b/src/Module/Base/Api.php
index 2df9f0090d..7349f45fad 100644
--- a/src/Module/Base/Api.php
+++ b/src/Module/Base/Api.php
@@ -2,9 +2,7 @@
namespace Friendica\Module\Base;
-use Friendica\App\Arguments;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
use Friendica\DI;
use Friendica\Network\HTTPException;
diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php
index ea61a61728..f0cfb0c11c 100644
--- a/src/Module/BaseAdminModule.php
+++ b/src/Module/BaseAdminModule.php
@@ -4,7 +4,6 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\Addon;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\DI;
diff --git a/src/Module/BaseSearchModule.php b/src/Module/BaseSearchModule.php
index eeb04feeb0..42bb943da0 100644
--- a/src/Module/BaseSearchModule.php
+++ b/src/Module/BaseSearchModule.php
@@ -5,7 +5,6 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Content\ContactSelector;
use Friendica\Content\Pager;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Search;
use Friendica\DI;
diff --git a/src/Module/BaseSettingsModule.php b/src/Module/BaseSettingsModule.php
index 4a6b7b28eb..2f51dde645 100644
--- a/src/Module/BaseSettingsModule.php
+++ b/src/Module/BaseSettingsModule.php
@@ -4,7 +4,6 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Content\Feature;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
diff --git a/src/Module/Bookmarklet.php b/src/Module/Bookmarklet.php
index a5d4801a9f..1c1763e888 100644
--- a/src/Module/Bookmarklet.php
+++ b/src/Module/Bookmarklet.php
@@ -4,7 +4,6 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\ACL;
-use Friendica\Core\L10n;
use Friendica\DI;
use Friendica\Module\Security\Login;
use Friendica\Network\HTTPException;
diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 19e7363130..6549dd1e0f 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -11,7 +11,6 @@ use Friendica\Content\Text\BBCode;
use Friendica\Content\Widget;
use Friendica\Core\ACL;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\Worker;
diff --git a/src/Module/Credits.php b/src/Module/Credits.php
index 9e0e4d4eaf..5f2156e649 100644
--- a/src/Module/Credits.php
+++ b/src/Module/Credits.php
@@ -3,7 +3,6 @@
namespace Friendica\Module;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
/**
diff --git a/src/Module/Debug/Babel.php b/src/Module/Debug/Babel.php
index 528e553440..03b27e9ab8 100644
--- a/src/Module/Debug/Babel.php
+++ b/src/Module/Debug/Babel.php
@@ -4,7 +4,6 @@ namespace Friendica\Module\Debug;
use Friendica\BaseModule;
use Friendica\Content\Text;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Model\Item;
use Friendica\Util\XML;
diff --git a/src/Module/Debug/Feed.php b/src/Module/Debug/Feed.php
index d3c0639b79..6393a6b753 100644
--- a/src/Module/Debug/Feed.php
+++ b/src/Module/Debug/Feed.php
@@ -3,7 +3,6 @@
namespace Friendica\Module\Debug;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Model;
diff --git a/src/Module/Debug/ItemBody.php b/src/Module/Debug/ItemBody.php
index 388b497ecb..929cabdaf9 100644
--- a/src/Module/Debug/ItemBody.php
+++ b/src/Module/Debug/ItemBody.php
@@ -3,7 +3,6 @@
namespace Friendica\Module\Debug;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Network\HTTPException;
diff --git a/src/Module/Debug/Localtime.php b/src/Module/Debug/Localtime.php
index 5d2e22a6f4..7e05caa6f6 100644
--- a/src/Module/Debug/Localtime.php
+++ b/src/Module/Debug/Localtime.php
@@ -4,7 +4,6 @@ namespace Friendica\Module\Debug;
use Friendica\BaseModule;
use Friendica\Core\Installer;
-use Friendica\Core\L10n;
use Friendica\DI;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal;
diff --git a/src/Module/Debug/Probe.php b/src/Module/Debug/Probe.php
index b5380c536f..8a777ec5fe 100644
--- a/src/Module/Debug/Probe.php
+++ b/src/Module/Debug/Probe.php
@@ -3,8 +3,8 @@
namespace Friendica\Module\Debug;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Network\HTTPException;
use Friendica\Network\Probe as NetworkProbe;
diff --git a/src/Module/Debug/WebFinger.php b/src/Module/Debug/WebFinger.php
index ad3963cb9a..a66e2b318f 100644
--- a/src/Module/Debug/WebFinger.php
+++ b/src/Module/Debug/WebFinger.php
@@ -3,8 +3,8 @@
namespace Friendica\Module\Debug;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Network\Probe;
/**
diff --git a/src/Module/Delegation.php b/src/Module/Delegation.php
index ef6a5edf91..8f52ec38ce 100644
--- a/src/Module/Delegation.php
+++ b/src/Module/Delegation.php
@@ -4,7 +4,6 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Database\DBA;
diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 9dec1ca23a..cc12e9dd21 100644
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -7,7 +7,6 @@ use Friendica\Content\Nav;
use Friendica\Content\Pager;
use Friendica\Content\Widget;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Session;
use Friendica\Core\Renderer;
use Friendica\DI;
diff --git a/src/Module/Filer/SaveTag.php b/src/Module/Filer/SaveTag.php
index 93cb5f5a8a..7c5c764cdf 100644
--- a/src/Module/Filer/SaveTag.php
+++ b/src/Module/Filer/SaveTag.php
@@ -3,7 +3,6 @@
namespace Friendica\Module\Filer;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Model;
diff --git a/src/Module/FollowConfirm.php b/src/Module/FollowConfirm.php
index 5ff618ae62..28c849a861 100644
--- a/src/Module/FollowConfirm.php
+++ b/src/Module/FollowConfirm.php
@@ -2,8 +2,6 @@
namespace Friendica\Module;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
-use Friendica\Model\Introduction;
use Friendica\DI;
/**
diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index b48ad7f03d..42b1be57dd 100644
--- 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;
diff --git a/src/Module/Group.php b/src/Module/Group.php
index e9d4020ead..6767479c3a 100644
--- a/src/Module/Group.php
+++ b/src/Module/Group.php
@@ -7,7 +7,6 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
diff --git a/src/Module/HTTPException/MethodNotAllowed.php b/src/Module/HTTPException/MethodNotAllowed.php
index f75bdd8caa..11f2ed91e0 100644
--- a/src/Module/HTTPException/MethodNotAllowed.php
+++ b/src/Module/HTTPException/MethodNotAllowed.php
@@ -3,7 +3,7 @@
namespace Friendica\Module\HTTPException;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
+use Friendica\DI;
use Friendica\Network\HTTPException;
class MethodNotAllowed extends BaseModule
diff --git a/src/Module/HTTPException/PageNotFound.php b/src/Module/HTTPException/PageNotFound.php
index 6c2395b0e2..2457a167dc 100644
--- a/src/Module/HTTPException/PageNotFound.php
+++ b/src/Module/HTTPException/PageNotFound.php
@@ -3,7 +3,7 @@
namespace Friendica\Module\HTTPException;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
+use Friendica\DI;
use Friendica\Network\HTTPException;
class PageNotFound extends BaseModule
diff --git a/src/Module/Help.php b/src/Module/Help.php
index 061ab2a433..fb31a30eed 100644
--- a/src/Module/Help.php
+++ b/src/Module/Help.php
@@ -5,7 +5,6 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Content\Nav;
use Friendica\Content\Text\Markdown;
-use Friendica\Core\L10n;
use Friendica\DI;
use Friendica\Network\HTTPException;
use Friendica\Util\Strings;
diff --git a/src/Module/Home.php b/src/Module/Home.php
index 6ce025208a..f89920e54b 100644
--- a/src/Module/Home.php
+++ b/src/Module/Home.php
@@ -4,7 +4,6 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\Security\Login;
diff --git a/src/Module/Install.php b/src/Module/Install.php
index 2e8d088b08..e20d80f205 100644
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -6,7 +6,6 @@ use Friendica\App;
use Friendica\BaseModule;
use Friendica\Core;
use Friendica\Core\Config\Cache\ConfigCache;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Network\HTTPException;
diff --git a/src/Module/Invite.php b/src/Module/Invite.php
index b467d14ec3..df569377b9 100644
--- a/src/Module/Invite.php
+++ b/src/Module/Invite.php
@@ -3,7 +3,6 @@
namespace Friendica\Module;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Model;
diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index c033f097da..17185d1438 100644
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.php
@@ -6,7 +6,6 @@ use Friendica\BaseModule;
use Friendica\Content\Feature;
use Friendica\Core\ACL;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Theme;
use Friendica\DI;
diff --git a/src/Module/Item/Ignore.php b/src/Module/Item/Ignore.php
index d855045de8..a9e79cdd61 100644
--- a/src/Module/Item/Ignore.php
+++ b/src/Module/Item/Ignore.php
@@ -2,12 +2,9 @@
namespace Friendica\Module\Item;
-use Friendica\App;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
use Friendica\Core\Session;
use Friendica\Core\System;
-use Friendica\Database\Database;
use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Network\HTTPException;
diff --git a/src/Module/Maintenance.php b/src/Module/Maintenance.php
index 09cdb02dac..d426ff4131 100644
--- a/src/Module/Maintenance.php
+++ b/src/Module/Maintenance.php
@@ -3,7 +3,6 @@
namespace Friendica\Module;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\DI;
use Friendica\Network\HTTPException;
diff --git a/src/Module/Notifications/Notify.php b/src/Module/Notifications/Notify.php
index 7aeb1c2262..3c1b6a03ee 100644
--- a/src/Module/Notifications/Notify.php
+++ b/src/Module/Notifications/Notify.php
@@ -3,7 +3,6 @@
namespace Friendica\Module\Notifications;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\DI;
use Friendica\Network\HTTPException;
diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index cc341bad23..34ee4db833 100644
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -6,12 +6,10 @@
namespace Friendica\Module;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\DI;
use Friendica\Model\Photo as MPhoto;
-use Friendica\Object\Image;
/**
* Photo Module
diff --git a/src/Module/Profile.php b/src/Module/Profile.php
index 77033741cc..6e960f8b62 100644
--- a/src/Module/Profile.php
+++ b/src/Module/Profile.php
@@ -9,7 +9,6 @@ use Friendica\Content\Widget;
use Friendica\Core\ACL;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Database\DBA;
diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php
index 0e83f3070f..e05a47307c 100644
--- a/src/Module/Profile/Contacts.php
+++ b/src/Module/Profile/Contacts.php
@@ -7,7 +7,6 @@ use Friendica\Content\ContactSelector;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php
index deb9509450..e0d5716d69 100644
--- a/src/Module/Proxy.php
+++ b/src/Module/Proxy.php
@@ -6,8 +6,6 @@
namespace Friendica\Module;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
use Friendica\Core\Logger;
use Friendica\DI;
use Friendica\Model\Photo;
diff --git a/src/Module/Register.php b/src/Module/Register.php
index 9530d29f14..289c717e4d 100644
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -7,7 +7,6 @@ use Friendica\Content\Text\BBCode;
use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
-use Friendica\Core\L10n as L10nClass;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\Worker;
@@ -260,7 +259,7 @@ class Register extends BaseModule
$arr['blocked'] = $blocked;
$arr['verified'] = $verified;
- $arr['language'] = L10nClass::detectLanguage($_SERVER, $_GET, DI::config()->get('system', 'language'));
+ $arr['language'] = L10n::detectLanguage($_SERVER, $_GET, DI::config()->get('system', 'language'));
try {
$result = Model\User::create($arr);
diff --git a/src/Module/Search/Acl.php b/src/Module/Search/Acl.php
index 2455e2cb83..6f8a02cb5d 100644
--- a/src/Module/Search/Acl.php
+++ b/src/Module/Search/Acl.php
@@ -5,7 +5,6 @@ namespace Friendica\Module\Search;
use Friendica\BaseModule;
use Friendica\Content\Widget;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Search;
diff --git a/src/Module/Search/Directory.php b/src/Module/Search/Directory.php
index 093c0f9fbd..84dd4c2dda 100644
--- a/src/Module/Search/Directory.php
+++ b/src/Module/Search/Directory.php
@@ -3,7 +3,6 @@
namespace Friendica\Module\Search;
use Friendica\Content\Widget;
-use Friendica\Core\L10n;
use Friendica\DI;
use Friendica\Module\BaseSearchModule;
use Friendica\Module\Security\Login;
diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 2b86617c16..ca5f7b6091 100644
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -8,7 +8,6 @@ use Friendica\Content\Text\HTML;
use Friendica\Content\Widget;
use Friendica\Core\Cache\Duration;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
diff --git a/src/Module/Search/Saved.php b/src/Module/Search/Saved.php
index 72232ac7d6..141a3732d3 100644
--- a/src/Module/Search/Saved.php
+++ b/src/Module/Search/Saved.php
@@ -3,7 +3,6 @@
namespace Friendica\Module\Search;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Util\Strings;
diff --git a/src/Module/Security/Login.php b/src/Module/Security/Login.php
index 9e5a7b18a1..b56d2b5074 100644
--- a/src/Module/Security/Login.php
+++ b/src/Module/Security/Login.php
@@ -9,7 +9,6 @@ namespace Friendica\Module\Security;
use Friendica\BaseModule;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\DI;
diff --git a/src/Module/Security/TwoFactor/Recovery.php b/src/Module/Security/TwoFactor/Recovery.php
index 443256d976..b8fd515d2c 100644
--- a/src/Module/Security/TwoFactor/Recovery.php
+++ b/src/Module/Security/TwoFactor/Recovery.php
@@ -3,8 +3,6 @@
namespace Friendica\Module\Security\TwoFactor;
use Friendica\BaseModule;
-use Friendica\App\Authentication;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\DI;
diff --git a/src/Module/Security/TwoFactor/Verify.php b/src/Module/Security/TwoFactor/Verify.php
index 968bab9dde..3fdb28a6f9 100644
--- a/src/Module/Security/TwoFactor/Verify.php
+++ b/src/Module/Security/TwoFactor/Verify.php
@@ -3,7 +3,6 @@
namespace Friendica\Module\Security\TwoFactor;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\DI;
diff --git a/src/Module/Settings/Delegation.php b/src/Module/Settings/Delegation.php
index dffb23eb6f..579d2bf82a 100644
--- a/src/Module/Settings/Delegation.php
+++ b/src/Module/Settings/Delegation.php
@@ -2,10 +2,7 @@
namespace Friendica\Module\Settings;
-use Friendica\App\Arguments;
use Friendica\BaseModule;
-use Friendica\Core\L10n;
-use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Database\DBA;
diff --git a/src/Module/Settings/TwoFactor/AppSpecific.php b/src/Module/Settings/TwoFactor/AppSpecific.php
index f80e466a84..6a8821e5f7 100644
--- a/src/Module/Settings/TwoFactor/AppSpecific.php
+++ b/src/Module/Settings/TwoFactor/AppSpecific.php
@@ -2,7 +2,6 @@
namespace Friendica\Module\Settings\TwoFactor;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Model\TwoFactor\AppSpecificPassword;
diff --git a/src/Module/Settings/TwoFactor/Index.php b/src/Module/Settings/TwoFactor/Index.php
index 0385b8dba4..ab3400801e 100644
--- a/src/Module/Settings/TwoFactor/Index.php
+++ b/src/Module/Settings/TwoFactor/Index.php
@@ -2,7 +2,6 @@
namespace Friendica\Module\Settings\TwoFactor;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\DI;
diff --git a/src/Module/Settings/TwoFactor/Recovery.php b/src/Module/Settings/TwoFactor/Recovery.php
index fbfb0b183d..18c372c53c 100644
--- a/src/Module/Settings/TwoFactor/Recovery.php
+++ b/src/Module/Settings/TwoFactor/Recovery.php
@@ -2,7 +2,6 @@
namespace Friendica\Module\Settings\TwoFactor;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Model\TwoFactor\RecoveryCode;
diff --git a/src/Module/Settings/TwoFactor/Verify.php b/src/Module/Settings/TwoFactor/Verify.php
index 62867d82bf..2eae0300ae 100644
--- a/src/Module/Settings/TwoFactor/Verify.php
+++ b/src/Module/Settings/TwoFactor/Verify.php
@@ -6,7 +6,6 @@ use BaconQrCode\Renderer\Image\SvgImageBackEnd;
use BaconQrCode\Renderer\ImageRenderer;
use BaconQrCode\Renderer\RendererStyle\RendererStyle;
use BaconQrCode\Writer;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\DI;
diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php
index 36ec0ca0c6..71a18f4eed 100644
--- a/src/Module/Settings/UserExport.php
+++ b/src/Module/Settings/UserExport.php
@@ -7,7 +7,6 @@ namespace Friendica\Module\Settings;
use Friendica\App;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
diff --git a/src/Module/Special/HTTPException.php b/src/Module/Special/HTTPException.php
index be71278fae..d2c8503859 100644
--- a/src/Module/Special/HTTPException.php
+++ b/src/Module/Special/HTTPException.php
@@ -1,12 +1,10 @@