cleanup namespace usages for L10n

diff --git a/doc/AddonStorageBackend.md b/doc/AddonStorageBackend.md
index ed6c5d87ae5853e5b29d543d361106aa79b36e82..a4f8c0dae712182969b15cbbb9ccbc22c491fba1 100644 (file)
--- 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 583573b58c300f7cf22c29cc92a2cc371a11651c..fdf7726e215746868e42d33fa8a79deb24612208 100644 (file)
--- 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 b541df3640dc33f257766ca35cb6736d993cc77e..e09f163efd19d3fa0588e37a665d16c886e78595 100644 (file)
--- 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 ecdd16de1f9888a6ebf698b92a6d201a32c0378e..b4f58814030780b3938a5bc89b34ac89df38e916 100644 (file)
--- 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 a78588e9f859532d018b9008825db9c1f923c765..ef55acab14a4fdcd826c97a311b985b9bef9024a 100644 (file)
--- 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 b0941c5589c8d4ef91f480919223d1e6815b31ef..3ed19e75bff2f9bc8c9af58e139c2aaf2197273c 100644 (file)
--- 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 6279bc24116b9ca2c0f84f61264c435417ed4fe5..1c14f9e77057f19aecdee24890c44c0a16da14b5 100644 (file)
--- 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 4a539665ad953a7a8c26d7a30433729fe0020181..d2e7baecae2bc4e0e200c51d9061002dcb96adb4 100644 (file)
--- 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 a318148aab37e5b132a1bba539d18e4355d6089d..975b601f9adf26e4dc90fc8ca67d67b23e9e7a1a 100644 (file)
--- 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 985acce8042841fbabb631f12fe7334493323b24..70db308f179766a88a1ed10db23e8a957b190c6d 100644 (file)
--- 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 a0752f8880e23ec54809bef58297335c62b5832b..1a262f76057f9e78320b0d66ed38eb13a5bcd4dd 100644 (file)
--- 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 e18874481358a8c9dff1a287bcc4def209f84ac2..bce7bf0cbf72395d874b93c03a1f93dd18b6dd2f 100644 (file)
--- 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 888940af6cd37cb1ce433b6b5c158984e88a4e9e..76ddb09a5f8ac1919ed5c01d951deadd95a893c1 100644 (file)
--- 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 2b4e2c2207ac9fc0708ee1941ec7b5f560c1ee2b..35cac53d0b660c08fe4907617420dd9230f1fcd6 100644 (file)
--- 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 94d483172f6c14ce76f6de678817d5baf1bb8210..2bbc2f2b61ed9ce5be8f31316262944bf558f8fc 100644 (file)
--- 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 f92a01cf606d552cc367ae24469463d9351e776c..5601c4449a86291d08ffb04349c3e70a623235ff 100644 (file)
--- 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 79dd1599bb300836844ae39153889413ea0c0cef..a4ade6f8c10eac558811aa60fc0821a606babdbe 100644 (file)
--- 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 dce6798b3c305c2288599a7f42ef5b275cf14da8..4f3acf5ef980bccb0edb88f2c4e632b2f6f5cb90 100644 (file)
--- 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 f7c1930cca7db2a2b63df548a79ee8310cf292d3..6d23c31158c4c1aa1436c4b2cf530d5b273f2e05 100644 (file)
--- 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 a639886ad2402d07db37a5943591ec35ddbd3816..606c0ba5809e9d0bdeaf3e73a81e958c8fb081bd 100644 (file)
--- 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 aeee5a76252b980c4020efa946eac7fbc015474b..e3382bddb8bdbbe03f6d9a46ea2001bf9419d7bb 100644 (file)
--- 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 cf6801d708e76573fb3ebf75f0986c0c07d21a66..3d397677bc9a9a5f065143564ec7e034074c9083 100644 (file)
--- 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 c187546b32d77eb09350c34592855dc40be82d5d..eab337d07f058de9bbbd2a8852ea8c7d403757a8 100644 (file)
--- 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 bff62a554d6e036db96a75de3dc28807db83b8d0..d1d3e89df4c47109e8dbdf56c79905387e7a410e 100644 (file)
--- 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 106705bd8a8525ba1ca980559b70e6dfbeb45034..b0154a80fd8d038999811cc9ee3b9ea7f705cd59 100644 (file)
--- 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 223e030232aa567ed91a865a822218d4373c1f47..536029338f815f174969a696fdfc0d59c60976b8 100644 (file)
--- 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 634a6d74a2cc833a0d516e01a8cbe90888f1cfdb..43d3f7871a399c1d9c787b261026230b43d0e1e1 100644 (file)
--- 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 d1b5523a42f373b4e05f9027e75318cf159a0770..3eb13460d4727c4108277ad6d0cca3c36669bed3 100644 (file)
--- 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 a6c7d9da47f15f16f595bac8e3ae1d375ed0bb08..e5a3f1e9b44c12fbb019f2bfff71be0a2ebac540 100644 (file)
--- 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 db30c7d94c0e908569873a87fb0c0f6eab2ad823..2580719975c33befec7d518157b9b8407c7cb218 100644 (file)
--- 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 57b55a0f9b3303cb1139f4f76aba0dd69ef69c1e..a00c5dfe35992d29b03213e5b3049f1a9ec5d271 100644 (file)
--- 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 949bbd5ae8ed567d2d766546d038249f58e15fa2..0034a2d87a50f966b269b57c317bcebc3ba14653 100644 (file)
--- 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 dddd1957dc564292c642039785a4c36124fc23a5..47c058b6eaf16f8c3a7b9645f8cdec1e49a10d03 100644 (file)
--- 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 2e530a17527adbafeb61a7d4db869fc6bc47390c..d979048a042a66086cbfbe8ba299005d9bd63961 100644 (file)
--- 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 5c4325048d2dfd34975e1365754b1844895930f7..2e8803fde3345d65d1491bce9ef1ef0429f954f3 100644 (file)
--- 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 990ebc194e2811f892fa678d18b26b3cb2fc5c3e..5bfed1c114749ca68da9c54e06080ed8480be251 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -1,7 +1,6 @@
 <?php
 
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Session;
 use Friendica\Core\System;

diff --git a/mod/regmod.php b/mod/regmod.php
index 4897df67b862c309d1fc154abe3a77d3cf23758d..2cfb57683494ab0db38b99cbda26e0a97f2cb146 100644 (file)
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -5,7 +5,6 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;

diff --git a/mod/removeme.php b/mod/removeme.php
index 85b0eaa11c8793ddcafacb2651e382650fd8c8ec..0e90bc197e495a61e0a6dbf24ebdca779dc9bb71 100644 (file)
--- a/mod/removeme.php
+++ b/mod/removeme.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/repair_ostatus.php b/mod/repair_ostatus.php
index 8ae9f3b266d33d62dc30c7ce7f954b5cbf1caf17..b4c6a9cbd636ea1fe29ebeec157669ae6494876a 100644 (file)
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;

diff --git a/mod/settings.php b/mod/settings.php
index 4a19e3e84964dc555de2cf09cbd546a18db71953..dbe58b0875545d8f8d8860fe554309d547b1d007 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -10,7 +10,6 @@ use Friendica\Content\Nav;
 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/subthread.php b/mod/subthread.php
index 5068437346a380f85343767a374582446da39266..f689eca9d87e61cde8aad0663008984dfc5e26a8 100644 (file)
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -5,7 +5,6 @@
 
 use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Session;
 use Friendica\Core\System;

diff --git a/mod/suggest.php b/mod/suggest.php
index ec8c9ce780c1ac082e633f46434ca84957e74b7d..77f75f8b8f3a816879cd9e9e8c071836e4ebe0e9 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -6,7 +6,6 @@
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Widget;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;

diff --git a/mod/tagger.php b/mod/tagger.php
index 38a13df9c5b2241c863d283ea440a2fbb2f1fd6d..568b5fd54de1c87484ba501c08db4962e4647e08 100644 (file)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -5,7 +5,6 @@
 
 use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Session;
 use Friendica\Core\System;

diff --git a/mod/tagrm.php b/mod/tagrm.php
index ebb9c50932f449ff1c1f820e2ce0e49fc4a4fbbc..aae4f9ed33d2d733c795e2710448e30595fbf8b5 100644 (file)
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -5,7 +5,6 @@
 
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\L10n;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;

diff --git a/mod/uimport.php b/mod/uimport.php
index 7bc2702ddeabad11d351b249efa085d80caf4d1a..03bec61867aa6c2402b0161977a3ec3ffc144095 100644 (file)
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -6,10 +6,10 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\UserImport;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 
 function uimport_post(App $a)
 {

diff --git a/mod/unfollow.php b/mod/unfollow.php
index 96dc06ab016ce48406068a081cec0c1c2b2cedb4..f64c2a4c961f77d0e0c283461ca9ce8f84d76dcd 100644 (file)
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;

diff --git a/mod/update_community.php b/mod/update_community.php
index 4f1cd263b8e769bf69ba62125f99891d24397d89..c861b750ecdc97b124f7322c465867a244bf0405 100644 (file)
--- a/mod/update_community.php
+++ b/mod/update_community.php
@@ -3,7 +3,6 @@
 // See update_profile.php for documentation
 
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\DI;
 
 require_once 'mod/community.php';
@@ -20,7 +19,7 @@ function update_community_content(App $a) {
        }
 
        if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) {
-               $replace = "<br />".DI::l10n()->t("[Embedded content - reload page to view]")."<br />";
+               $replace = "<br />" . DI::l10n()->t("[Embedded content - reload page to view]") . "<br />";
                $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 a347873da9ee713e9f76853e2ef9c25f4c965cbc..bd9ced0e9a44a5dc392f0ab2c5759111b0076c83 100644 (file)
--- 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 = "<br />".DI::l10n()->t("[Embedded content - reload page to view]")."<br />";
+               $replace = "<br />" . DI::l10n()->t("[Embedded content - reload page to view]") . "<br />";
                $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 9d725fed2676376233d41bd4cdad5cd6b28fb3d0..b8f3d8f498e64503c4df7f7eba65f12e459f2253 100644 (file)
--- 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 212b6a6b1ae746ef19ceb8841178e2033f97efc5..9aa0443f1e3cc76700abb4d6253390daf47aabf7 100644 (file)
--- 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 4027d4a33d9087cd96135c644b54f81f18b8ea76..4065b5d1f8cfd12c376f22780162420b72450bb8 100644 (file)
--- 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 = "<br />".DI::l10n()->t("[Embedded content - reload page to view]")."<br />";
+               $replace = "<br />" . DI::l10n()->t("[Embedded content - reload page to view]") . "<br />";
                $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 8d94d34a1b68eecb26c11f66d50acff36b4d9ca7..348a384c2ef6293e80f4cffbbb1193d8e445874f 100644 (file)
--- 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 = "<br />".DI::l10n()->t("[Embedded content - reload page to view]")."<br />";
+               $replace = "<br />" . DI::l10n()->t("[Embedded content - reload page to view]") . "<br />";
                $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 368eec3c9a5729e23f92a389cc1fc7264dd349e9..342e988f3a042285d27c4a91f2b9f68eba39a6da 100644 (file)
--- 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 a8f704cd995f780d584121a34758ad13f83e6acc..f04698c5643641c110909406038cedad429098a4 100644 (file)
--- 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 814a32fd468c52d208125b2ab7b40c075737cd33..2f92b2f03cde260121aab3f85bfa71434948d588 100644 (file)
--- 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 cf9759b714b74423e2c05e3105b057df46f543ba..085201fc44e213bcf56db63e0d89322746400563 100644 (file)
--- 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 968855acb55582b690b41823cfe307a911bb6918..27ea4ac605d0caaf767f0f5bd3cabd1b1640b161 100644 (file)
--- 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 666496ba96cdfd8c03cbae58d1d93d0203d0c6cb..2250f22bbca611940e4368a7abc7f3e922ca6ac2 100644 (file)
--- 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 5635905bbcec82b72162520f0f852211790d06ff..74f1817d1fd42df35f084d3239f800f0c43cc2fe 100644 (file)
--- 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 f9d6b04941912a160000316241a44d157025b10f..184707220f64a4aca5743749d8e5795f1db8cf4d 100644 (file)
--- 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 563c0ab929d1d5ea4f5ac2c3d82a7a3435aa89e9..ef8a3d9a2d0d89e89f2fc5f139d37210c7ef8fd3 100644 (file)
--- 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 7c2061c47ca405f7a97e400dfaadb02dc8d1205f..f3f3392ec189c907ef77be4cd3f8723c70dca2a7 100644 (file)
--- 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 30e4a1c0872df48f9bd3ca0bf2c433db2e2b6211..041d07246b00a73ea52dd168025f9390c1cf556d 100644 (file)
--- 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 3eceb21c2189a68da527064acccb9e67191f443d..8865e3c8c490ecab7dee55aed34553d1f635fcbe 100644 (file)
--- 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 f8dace08c403d9b26a0d806cc896558d548ea07f..800aa760e6d92d57e342aca68843811739613ca3 100644 (file)
--- 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 4a0a329b4cd20df8aeba102273dc5374ab4de7b8..11e6ee2115c7fb219d78c0d85990af65aaa2b67b 100644 (file)
--- 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 1cd076139006be80c43718a5975beb0cbf757585..798d6b0a63efe05310a78c0de7be2c2bbbbe00d8 100644 (file)
--- 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 2052d216d2040b07b3dfd3890c5d340e0e6b436a..55277432b6fc5ca22c59bca452a4d068ec43d751 100644 (file)
--- 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 293f9ae0e6e31b44eb3fce24fe3fa04b4b21b679..693be2d6f033c127c1a748cdcf4f05883cac3fd0 100644 (file)
--- 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 fbb5683af1ac7b9cfd201a37c4cd19be996b9446..bce4b617f96e243d3e58177e75d8b92e851d18de 100644 (file)
--- 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 69d667caa2709767f516e6e1b704eb9f12736050..ebfc78ca7e885ae922eae5047fa76c9f3fef33fc 100644 (file)
--- 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 612ae792f5ea8f4a96ad050e5eb2e967f7f4c577..f57d5c3f27fee4f9fb9daad55a1700fbfa661c16 100644 (file)
--- 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 2e97c8157e32c19a9f2bf232ae3c90a14b8d9b94..102a4f14c1618aba62cf2247516701bdf3ae6818 100644 (file)
--- 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 5794f08f54a7fea1e9e0ec1db7094362fd5c5916..a76fa4666bc7d63ea43b1eda5b8ede14d0491a3a 100644 (file)
--- 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 4c56263ab0805e62418b2d0c5aeebeebcf7e9c9a..e2a45783ba4c96843cdf2330af2b49ad084582f5 100644 (file)
--- 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 d93b2469d1fab44b6f75cb1f5b019f1aecc859b5..5d2c4aa197285f36bf67a8ccfa8e44be8e48ff44 100644 (file)
--- 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 ce2e9d53b2cc98b43a537bcb7db3e01af66dc209..1f20482d53f2d1f43a6d95ed00f1b529f0310108 100644 (file)
--- 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 662fdbdffb584708ddb25790043791f8e5cbb633..9908c8a33328309136b487f0068651d12f2c457e 100644 (file)
--- 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 a810fff6707708ecbcc43f31cf6d3b54376258b4..c38e78000b6a25247625d5afacee96ca3aee87ab 100644 (file)
--- 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 050e79de50eed567a5e496f508710dbe851fa4c2..88208564dc4913ae9bf75a40229facc532bbdb99 100644 (file)
--- 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 77bf39878a6d4e0f43c8e74df9e707f2f8294ab4..de351db4aae333ef75c1c96853be22640800ee0c 100644 (file)
--- 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 461cddf2937f0016aff0d89ad7cbe6268de0b346..60d7f1e43e396d6754e7aa0d3d8e6424463e5dfd 100644 (file)
--- 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 bb19fbe9b75b8b096cac47f4f63bc240f27b4ad0..c45f0f68fa6b5e64a324b8f95b400b140f9e4880 100644 (file)
--- 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 be93f3e4d83cf00089e4ff76488a2bb7349e6e1e..171d9761cb3d35be85216934e5f2e84802062762 100644 (file)
--- 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 878b7c3e5802abaaf42455234be8b641de2f18d2..ebf87deda42bcf74ad7696c4194b66129cd355ef 100644 (file)
--- 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 48276aa5dd8c0e71d89446b30516a8bb72e76365..634bd08c702b08284b46f51a293759f67346b8cc 100644 (file)
--- 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 ed99a39f890b30435a1ef225f29be39e21e3669e..8eaf418a85fa10351df2f0938bbd4302ba4a4991 100644 (file)
--- 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 4ae395fc002cdbeb51e62ea22844a1878cc56e7a..e620c6233b57861838e5b0c6bf885ef3027024a9 100644 (file)
--- 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 4368e6eed564e85c1534311806bc88f2c0e0e6a1..f750108d70c272d33e44e7cb17c9a0b12ae8e2fb 100644 (file)
--- 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 9171d70fe86b430b255c09a87a6c21f0e75289be..2c735feff224af64d8634477d5021018c1c56b77 100644 (file)
--- 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 4d7407432222ce9d833b11a5f70ee3b7e7725074..d6d1c300665c23e90feca8b883d0b0878056a524 100644 (file)
--- 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 6ceb20c05ce5edc5bc1863e28081a6284476646c..1d7e459a2755f10629c516b46d711ccb5aef9c39 100644 (file)
--- 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 9bdcd9b7df4e8f8873cf2c3ef8df942a9526e532..d4666b27f854922473dacaec17f4f90ed8b06ee4 100644 (file)
--- 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 f04057a98fde301993e62baabcc612efd5c26ef9..95f5615973172d9e6d17241fccb116bbea064633 100644 (file)
--- 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 fe8bf614cfc4cac606f665eb469f763e271b46da..63d7c954ed54f8881a5b4adef3bf7ca6f6e7ad8e 100644 (file)
--- 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 c13edb3f3008930428f373803c0ea4e18380e79a..a9295f6f929841adc377a4ef76850d474bfc0ae3 100644 (file)
--- 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 9a7aa5956c62ee003015178f3a4274ab5ef92505..aedd8500be79b5b46e45848049034d7d5cde6495 100644 (file)
--- 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 50b513bfcf5e7e592fe204cbb5f37f843ef16027..af62911b73a78a5220ba61a486d01a78bf1b34c8 100644 (file)
--- 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 0c2529b92e431f42862ef46de68c9e4a14d11728..f1263e6ca90d2dae90955b6271f253c1e37ebffe 100644 (file)
--- 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 3da022322a26d034653c0728165eba327ac0e9ba..00d4de6953ee3bc84adcfa78137d5bb099718249 100644 (file)
--- 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 03794a155edee8357e8ee194223d6f366b68c31f..aae73c1fc755e2e9db08bf9481f9dbad546a1412 100644 (file)
--- 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 158738fd8e21f256cce7f79a92c8fa09656c9a0a..d5e0bdc6f09eb5a706e3d4abe20c9882cec3660d 100644 (file)
--- 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 2d38d5926c7b3ed060ad3d5fe50fe3def060ffa0..710708087374cdfff71c6d347fa6115b40fb79be 100644 (file)
--- 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 b9105c81d53055b57a192fc221ea8921e27c8846..662dc17e4c24c047402f27b8773b9b7b879b80e2 100644 (file)
--- 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 22585f86a5c6c0a78630391cecf2472d5c6eb458..6b16935ab1aefb551c3099209f0123286d273362 100644 (file)
--- 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 057b4a9aa10864ec8659b3cc1409066b73cb15ca..7a625e600ae608766641bfe82eadc44dcea00a47 100644 (file)
--- 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 2df9f0090d7cc99ea0a497e5a30deaa2cc4d9d71..7349f45fad28ca494a16293d97ae86c873df8faf 100644 (file)
--- 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 ea61a617287c26b1e582fccc7b2912609a408c4b..f0cfb0c11c1019180a0c6354e0e65b521674524d 100644 (file)
--- 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 eeb04feeb0a42c08dfdf758db9cae773dad3f955..42bb943da0a5c54f6b31fcd40697e12bd99c261a 100644 (file)
--- 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 4a6b7b28eb2feccfcf3d059404c57efbaf679f75..2f51dde6459d8571ac51bfc77d6c1e07a947ad41 100644 (file)
--- 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 a5d4801a9fb77c0a9ebab7d1e15da4ceafa65508..1c1763e8885786bd13d93a3daefb77ca2ffb4aae 100644 (file)
--- 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 19e7363130f9620fa110197817cf336ccc7ba63b..6549dd1e0f3eaf105f00dce9eec247d454b8e794 100644 (file)
--- 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 9e0e4d4eaf0541b283f0fa51a6d321e0f305d69e..5f2156e649b3d5570049842a6dbf31348a104ace 100644 (file)
--- 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 528e553440b7b9ab867f07a8e09d5c01ecd92bfc..03b27e9ab83e98f59f626a4725768e43607c0038 100644 (file)
--- 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 d3c0639b79be598eb771d0726811cfd8d0f89fb4..6393a6b7539cf5fa2ce88bdf57f42c94f1b4db3b 100644 (file)
--- 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 388b497ecbc5b742fad5a2a503a6c1b5e1c41a61..929cabdaf96a069d8eb67fc16948ac474ecaaa57 100644 (file)
--- 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 5d2e22a6f42017709d8d90ea3a4f2228c6c296ba..7e05caa6f6bfbd687cc988425495414aac88500e 100644 (file)
--- 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 b5380c536fb2461776d66807322f5e4258d93fc2..8a777ec5fe622e3e6dcf1b8377003d8abc368511 100644 (file)
--- 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 ad3963cb9af2015b7dc94d562d4567d3f49ee66d..a66e2b318fab66158e7c8987253eea7134c4e785 100644 (file)
--- 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 ef6a5edf919f738dac4744592cff26fa288cbc38..8f52ec38ce7e26be09de2ce0c278600aa051e24f 100644 (file)
--- 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 9dec1ca23ada861d2f260570289638efbbea4698..cc12e9dd211d6d72661a6a37f27a48365d6fc6bd 100644 (file)
--- 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 93cb5f5a8aa46f461377c7e6f4eb46bc3972cdc4..7c5c764cdf800ac485eea916d96c1806148a9038 100644 (file)
--- 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 5ff618ae62b7c710c5d760dc6fb33b216ba2391e..28c849a861abbf4a7c9e5e9353913cd9db259be9 100644 (file)
--- 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 b48ad7f03d540d523c4744bd3e8dfa832bf365cb..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;

diff --git a/src/Module/Group.php b/src/Module/Group.php
index e9d4020ead04ea658945ab315f07282d4c8ba3b2..6767479c3aa5fcb7b5b1ff2aa59734f0e95e70fe 100644 (file)
--- 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 f75bdd8caa44f7eb23c46c187f30b3f5af69fb4a..11f2ed91e01678ef729a4c282cbbfb72bc4542bf 100644 (file)
--- 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 6c2395b0e2030e5379359366a70c15a3ff341a1d..2457a167dc04791af74a57121382754002f6d22b 100644 (file)
--- 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 061ab2a43380034bf992feab3f1885138f30a301..fb31a30eede0d8022d91360f1c778432d3e97ff8 100644 (file)
--- 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 6ce025208ac4690113a5a9f888df78744fca1f03..f89920e54b6b8269c57cce10f418f2fb6a5b880c 100644 (file)
--- 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 2e8d088b0878b9b8c8e7ba11867b6767025fdd4e..e20d80f2055bb6351a57ddf02c5b36b38c692f7c 100644 (file)
--- 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 b467d14ec324d05c38461171209dc24db053cfe0..df569377b9a9bb722470cac3fd954c59b993dcf5 100644 (file)
--- 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 c033f097da403ea259818442d067706d4d690122..17185d1438c99a2f3281dbf48d6720d2bddf72c2 100644 (file)
--- 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 d855045de803ef1eaf868d382f1ac9a53c0f0b1d..a9e79cdd611594b47d942c910d12822895b305ea 100644 (file)
--- 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 09cdb02dac30090ffaa806844da142fab7549e12..d426ff4131f30375ffccb45f9b6da92195680da7 100644 (file)
--- 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 7aeb1c2262e0518caf220fefb3a6b3ad635bc1ad..3c1b6a03eeafadd14c333d1fac4de2d4c5a6fe43 100644 (file)
--- 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 cc341bad23c6052b41c19b94d2c24b92bf6b3489..34ee4db83324c229d54d1a0d943be3d13c4f75f2 100644 (file)
--- 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 77033741cc4b79072691e72a1d649eb1a419cc1d..6e960f8b629a4a1a23bdf258a01b7602d1262d19 100644 (file)
--- 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 0e83f3070f68cb87a04ae5a479f64a38fde9ffeb..e05a47307cd4c454a57d64477ba6304dd357efd6 100644 (file)
--- 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 deb9509450b99f97951a34e3e58058fb064e3fda..e0d5716d69cf490fdad9e32a8b58c1fe274fed88 100644 (file)
--- 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 9530d29f147daf1a296386f32fca7ed2f35e4451..289c717e4d34c369deffcc0b2658ba71a8feb396 100644 (file)
--- 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 2455e2cb834922e9021534f1ae879b968a20d00f..6f8a02cb5d856492e461eee657dbb620e4041862 100644 (file)
--- 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 093c0f9fbd57922c2563f842acb6356ceb2d6225..84dd4c2dda7dd7bd900085dcce642fe22a85798a 100644 (file)
--- 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 2b86617c168433b4a04c0209e8e85b08dc78969d..ca5f7b609100612a2d23fadd27bbc270f9e74184 100644 (file)
--- 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 72232ac7d670a11f2f268e27acb80f487af02de2..141a3732d373866498636e4f5e3d99175e6b2b4f 100644 (file)
--- 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 9e5a7b18a1d5c9b866ceeb9ba64bbb47d8e2adae..b56d2b507425e3c86b55257b3c2bf7a210b66e27 100644 (file)
--- 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 443256d9769499d26275db6195d5f2f1ad820819..b8fd515d2c4ebbd1749e4c73eadda5d81649e0b5 100644 (file)
--- 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 968bab9dde1bb469e52893c3af5945f8be95f873..3fdb28a6f9018de1669c9b9d4a4d74ac15d9b4bd 100644 (file)
--- 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 dffb23eb6f6a2feaa5c79da01bcc6e5f06f0dc56..579d2bf82a0bcc6d5356321b3f4d6544e23862cc 100644 (file)
--- 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 f80e466a844cc648640dae2a181f0bff18e5cc89..6a8821e5f7715adfbde4e9d16350f298c9d9b05a 100644 (file)
--- 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 0385b8dba42e5f6122ea017c5ba16c4fe50a2aac..ab3400801eb86bf5fae13ef3e698d0ace8df7b77 100644 (file)
--- 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 fbfb0b183d11762fe4c486c693713a01b9fff4f1..18c372c53c59ff96e52174b3411633b32ef80e9f 100644 (file)
--- 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 62867d82bff129ebcbccb2e1e8a7fceb05ad7b81..2eae0300aee375fd1e33c2beea62b7c5b9f3c4bc 100644 (file)
--- 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 36ec0ca0c6c0c0c7a2e60f0f0efe772fd3459ded..71a18f4eedf13aa58fa047da723320bbe845671d 100644 (file)
--- 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 be71278faece666ae95db8c35f7c04b72ca0e329..d2c850385939cb80ed2497ec1248c2d42934e0fd 100644 (file)
--- a/src/Module/Special/HTTPException.php
+++ b/src/Module/Special/HTTPException.php
@@ -1,12 +1,10 @@
 <?php
 
-
 namespace Friendica\Module\Special;
 
-use Friendica\Core\L10n;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
+use Friendica\DI;
 
 /**
  * This special module displays HTTPException when they are thrown in modules.

diff --git a/src/Module/Tos.php b/src/Module/Tos.php
index 7380488e072c2f95d3b6f12fc5ee67faede622f0..436a143f0fc35d93bef0d31623e8fb3ef2832398 100644 (file)
--- a/src/Module/Tos.php
+++ b/src/Module/Tos.php
@@ -10,7 +10,6 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Content\Text\BBCode;
 use Friendica\DI;

diff --git a/src/Module/Welcome.php b/src/Module/Welcome.php
index 3e757e7cf51d1720e321fe2f7440ac3e2e0abaed..7f102c13d3de8b511c8e5b67e7c7e7f9f09ad2fc 100644 (file)
--- a/src/Module/Welcome.php
+++ b/src/Module/Welcome.php
@@ -3,7 +3,6 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 

diff --git a/src/Object/Post.php b/src/Object/Post.php
index c49061e0f1f2c02b75e0d2f3cc2d019602154447..73389d877c6ae76295451c4ffd7fa633188460ac 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -9,7 +9,6 @@ use Friendica\Content\Feature;
 use Friendica\Core\Addon;
 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/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index e0780c78b51a85851ce53abba22595e65f26ca6a..2dda8db5b5b9d96947cb0369467065f0944bd95c 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -15,7 +15,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Cache\Duration;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 53eab49660f3839b37782f3ffa94890c696a2c5a..0e8fc52e83ca9bdfabcdcd0e5a9fe540ac429c2d 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -10,7 +10,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Cache\Duration;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;

diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php
index 9df0413fbc25604021ee2cdaaa51046cc7198ffd..ecbfcae5432d398519dfe7595ca0d302414900ec 100644 (file)
--- a/src/Util/Temporal.php
+++ b/src/Util/Temporal.php
@@ -8,9 +8,9 @@ namespace Friendica\Util;
 
 use DateTime;
 use DateTimeZone;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 
 /**
  * Temporal class

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 8c3fbb8ba25375c4d521be5e632e96db6dd228d9..4f9d522df9eb32ae5b7691910fd570e9a9ca5503 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -5,7 +5,6 @@
 namespace Friendica\Worker;
 
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;

diff --git a/tests/Util/SampleStorageBackend.php b/tests/Util/SampleStorageBackend.php
index 62b4f12bb31dc2fd2cbffe22847bf94502122ce3..f16c3a64158784814592ec649976cf9109835c94 100644 (file)
--- a/tests/Util/SampleStorageBackend.php
+++ b/tests/Util/SampleStorageBackend.php
@@ -2,12 +2,10 @@
 
 namespace Friendica\Test\Util;
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Model\Storage\IStorage;
 
 use Friendica\Core\L10n;
-use Mockery\MockInterface;
 
 /**
  * A backend storage example class

diff --git a/update.php b/update.php
index 6d575438384a0692abd951724f98b492335b18be..6e44452d83368d28cc46d9d4820587cd01e080a7 100644 (file)
--- a/update.php
+++ b/update.php
@@ -2,7 +2,6 @@
 
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;

diff --git a/view/theme/duepuntozero/config.php b/view/theme/duepuntozero/config.php
index 68d005d31876b744408ce03f841a477e53a9f473..4b8852d7cb58b4346f7cd26ceb1fd38e1eead1ef 100644 (file)
--- a/view/theme/duepuntozero/config.php
+++ b/view/theme/duepuntozero/config.php
@@ -5,7 +5,6 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 

diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php
index c7b016df9fd0028d1ae14ea7f32f6fc45d36f285..975678228dadfcafa20dc0aecc9f6190c02db97f 100644 (file)
--- a/view/theme/frio/config.php
+++ b/view/theme/frio/config.php
@@ -2,7 +2,6 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 

diff --git a/view/theme/frio/php/Image.php b/view/theme/frio/php/Image.php
index 7d0c6092d3989f5c661229af49c1d8f468eea3a1..c18c32d11a655a237194cf5dd978de741fa706a8 100644 (file)
--- a/view/theme/frio/php/Image.php
+++ b/view/theme/frio/php/Image.php
@@ -4,11 +4,11 @@
  * contain methods to deal with images
  */
 
+use Friendica\DI;
+
 /**
  * This class contains methods to deal with images
  */
-use Friendica\Core\L10n;
-
 class Image
 {
        /**

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 89f40a662cbbdababdd40c9f8f20f4014aa75edd..ccc4d1c85eecf6200b5eeb332eadc57d01f6f72e 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -12,7 +12,6 @@ use Friendica\Content\Text\Plaintext;
 use Friendica\Content\Widget;
 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/view/theme/quattro/config.php b/view/theme/quattro/config.php
index 4dcb3e207635eebc765f99d00d8a61a70281064c..07e8245784b1b7c07be72ccc089be3fdecf8af46 100644 (file)
--- a/view/theme/quattro/config.php
+++ b/view/theme/quattro/config.php
@@ -5,7 +5,6 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 

diff --git a/view/theme/vier/config.php b/view/theme/vier/config.php
index cc01687484535114ae2088a8f73d70159dc394fd..dcc9365f366d1cfb285f6e8ca55aae8809442459 100644 (file)
--- a/view/theme/vier/config.php
+++ b/view/theme/vier/config.php
@@ -5,7 +5,6 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index aac2ec02dc8617cd7a35f698d4c3d2bb51c2b523..30b7536ab52dcb8fbffd5f085ea57db194631034 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -13,7 +13,6 @@ use Friendica\App;
 use Friendica\Content\ForumManager;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
 use Friendica\Database\DBA;