From d6efc901946c91cf26a4436c4b58b1636e4bc9c9 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sat, 18 Jan 2020 22:07:07 +0100 Subject: [PATCH] cleanup namespace usages for L10n --- doc/AddonStorageBackend.md | 10 +++++----- include/api.php | 1 - include/conversation.php | 1 - include/enotify.php | 3 --- include/items.php | 1 - mod/api.php | 1 - mod/cal.php | 1 - mod/common.php | 1 - mod/community.php | 1 - mod/crepair.php | 1 - mod/dfrn_confirm.php | 2 -- mod/dfrn_poll.php | 2 -- mod/dfrn_request.php | 1 - mod/display.php | 1 - mod/editpost.php | 1 - mod/events.php | 1 - mod/fbrowser.php | 1 - mod/follow.php | 2 -- mod/fsuggest.php | 1 - mod/item.php | 1 - mod/lockview.php | 1 - mod/lostpass.php | 1 - mod/match.php | 1 - mod/message.php | 1 - mod/network.php | 1 - mod/notes.php | 1 - mod/notifications.php | 3 --- mod/oexchange.php | 1 - mod/ostatus_subscribe.php | 1 - mod/photos.php | 1 - mod/ping.php | 1 - mod/poke.php | 1 - mod/profile_photo.php | 1 - mod/profiles.php | 1 - mod/profperm.php | 1 - mod/redir.php | 1 - mod/regmod.php | 1 - mod/removeme.php | 1 - mod/repair_ostatus.php | 1 - mod/settings.php | 1 - mod/subthread.php | 1 - mod/suggest.php | 1 - mod/tagger.php | 1 - mod/tagrm.php | 1 - mod/uimport.php | 2 +- mod/unfollow.php | 1 - mod/update_community.php | 3 +-- mod/update_contact.php | 3 +-- mod/update_display.php | 1 - mod/update_network.php | 1 - mod/update_notes.php | 3 +-- mod/update_profile.php | 3 +-- mod/videos.php | 1 - mod/wall_attach.php | 1 - mod/wall_upload.php | 1 - mod/wallmessage.php | 1 - src/App/Router.php | 1 - src/BaseModule.php | 1 - src/Console/ArchiveContact.php | 1 - src/Content/ContactSelector.php | 1 - src/Content/Feature.php | 1 - src/Content/ForumManager.php | 1 - src/Content/Nav.php | 1 - src/Content/OEmbed.php | 1 - src/Content/Pager.php | 2 +- src/Content/Text/BBCode.php | 1 - src/Content/Text/HTML.php | 1 - src/Content/Widget.php | 1 - src/Content/Widget/CalendarExport.php | 1 - src/Content/Widget/ContactBlock.php | 1 - src/Content/Widget/SavedSearches.php | 2 +- src/Content/Widget/TagCloud.php | 1 - src/Content/Widget/TrendingTags.php | 2 +- src/DI.php | 3 +-- src/Database/DBStructure.php | 1 - src/Model/Contact.php | 1 - src/Model/Event.php | 1 - src/Model/FileTag.php | 1 - src/Model/Group.php | 2 +- src/Model/Item.php | 1 - src/Model/Mail.php | 3 --- src/Model/Photo.php | 1 - src/Model/Profile.php | 1 - src/Model/User.php | 1 - src/Module/Admin/Addons/Details.php | 1 - src/Module/Admin/Addons/Index.php | 1 - src/Module/Admin/Blocklist/Contact.php | 1 - src/Module/Admin/Blocklist/Server.php | 1 - src/Module/Admin/DBSync.php | 1 - src/Module/Admin/Features.php | 1 - src/Module/Admin/Federation.php | 2 +- src/Module/Admin/Item/Delete.php | 1 - src/Module/Admin/Item/Source.php | 1 - src/Module/Admin/Logs/Settings.php | 1 - src/Module/Admin/Logs/View.php | 2 +- src/Module/Admin/Queue.php | 1 - src/Module/Admin/Site.php | 2 -- src/Module/Admin/Summary.php | 2 -- src/Module/Admin/Themes/Details.php | 1 - src/Module/Admin/Themes/Embed.php | 1 - src/Module/Admin/Themes/Index.php | 1 - src/Module/Admin/Tos.php | 1 - src/Module/Admin/Users.php | 1 - src/Module/AllFriends.php | 1 - src/Module/Apps.php | 1 - src/Module/Attach.php | 2 -- src/Module/Base/Api.php | 2 -- src/Module/BaseAdminModule.php | 1 - src/Module/BaseSearchModule.php | 1 - src/Module/BaseSettingsModule.php | 1 - src/Module/Bookmarklet.php | 1 - src/Module/Contact.php | 1 - src/Module/Credits.php | 1 - src/Module/Debug/Babel.php | 1 - src/Module/Debug/Feed.php | 1 - src/Module/Debug/ItemBody.php | 1 - src/Module/Debug/Localtime.php | 1 - src/Module/Debug/Probe.php | 2 +- src/Module/Debug/WebFinger.php | 2 +- src/Module/Delegation.php | 1 - src/Module/Directory.php | 1 - src/Module/Filer/SaveTag.php | 1 - src/Module/FollowConfirm.php | 2 -- src/Module/Friendica.php | 1 - src/Module/Group.php | 1 - src/Module/HTTPException/MethodNotAllowed.php | 2 +- src/Module/HTTPException/PageNotFound.php | 2 +- src/Module/Help.php | 1 - src/Module/Home.php | 1 - src/Module/Install.php | 1 - src/Module/Invite.php | 1 - src/Module/Item/Compose.php | 1 - src/Module/Item/Ignore.php | 3 --- src/Module/Maintenance.php | 1 - src/Module/Notifications/Notify.php | 1 - src/Module/Photo.php | 2 -- src/Module/Profile.php | 1 - src/Module/Profile/Contacts.php | 1 - src/Module/Proxy.php | 2 -- src/Module/Register.php | 3 +-- src/Module/Search/Acl.php | 1 - src/Module/Search/Directory.php | 1 - src/Module/Search/Index.php | 1 - src/Module/Search/Saved.php | 1 - src/Module/Security/Login.php | 1 - src/Module/Security/TwoFactor/Recovery.php | 2 -- src/Module/Security/TwoFactor/Verify.php | 1 - src/Module/Settings/Delegation.php | 3 --- src/Module/Settings/TwoFactor/AppSpecific.php | 1 - src/Module/Settings/TwoFactor/Index.php | 1 - src/Module/Settings/TwoFactor/Recovery.php | 1 - src/Module/Settings/TwoFactor/Verify.php | 1 - src/Module/Settings/UserExport.php | 1 - src/Module/Special/HTTPException.php | 4 +--- src/Module/Tos.php | 1 - src/Module/Welcome.php | 1 - src/Object/Post.php | 1 - src/Protocol/Diaspora.php | 1 - src/Protocol/OStatus.php | 1 - src/Util/Temporal.php | 2 +- src/Worker/Delivery.php | 1 - tests/Util/SampleStorageBackend.php | 2 -- update.php | 1 - view/theme/duepuntozero/config.php | 1 - view/theme/frio/config.php | 1 - view/theme/frio/php/Image.php | 4 ++-- view/theme/frio/theme.php | 1 - view/theme/quattro/config.php | 1 - view/theme/vier/config.php | 1 - view/theme/vier/theme.php | 1 - 170 files changed, 26 insertions(+), 205 deletions(-) diff --git a/doc/AddonStorageBackend.md b/doc/AddonStorageBackend.md index ed6c5d87a..a4f8c0dae 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 583573b58..fdf7726e2 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 b541df364..e09f163ef 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 ecdd16de1..b4f588140 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 a78588e9f..ef55acab1 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 b0941c558..3ed19e75b 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 6279bc241..1c14f9e77 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 4a539665a..d2e7baeca 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 a318148aa..975b601f9 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 985acce80..70db308f1 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 a0752f888..1a262f760 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 e18874481..bce7bf0cb 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 888940af6..76ddb09a5 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 2b4e2c220..35cac53d0 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 94d483172..2bbc2f2b6 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 f92a01cf6..5601c4449 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 79dd1599b..a4ade6f8c 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 dce6798b3..4f3acf5ef 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 f7c1930cc..6d23c3115 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 a639886ad..606c0ba58 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 aeee5a762..e3382bddb 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 cf6801d70..3d397677b 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 c187546b3..eab337d07 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 bff62a554..d1d3e89df 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 106705bd8..b0154a80f 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 223e03023..536029338 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 634a6d74a..43d3f7871 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 d1b5523a4..3eb13460d 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 a6c7d9da4..e5a3f1e9b 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 db30c7d94..258071997 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 57b55a0f9..a00c5dfe3 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 949bbd5ae..0034a2d87 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 dddd1957d..47c058b6e 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 2e530a175..d979048a0 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 5c4325048..2e8803fde 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 990ebc194..5bfed1c11 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 a347873da..bd9ced0e9 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 9d725fed2..b8f3d8f49 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 212b6a6b1..9aa0443f1 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 4027d4a33..4065b5d1f 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 8d94d34a1..348a384c2 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 368eec3c9..342e988f3 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 a8f704cd9..f04698c56 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 814a32fd4..2f92b2f03 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 cf9759b71..085201fc4 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 968855acb..27ea4ac60 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 666496ba9..2250f22bb 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 5635905bb..74f1817d1 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 f9d6b0494..184707220 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 563c0ab92..ef8a3d9a2 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 7c2061c47..f3f3392ec 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 30e4a1c08..041d07246 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 3eceb21c2..8865e3c8c 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 f8dace08c..800aa760e 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 4a0a329b4..11e6ee211 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 1cd076139..798d6b0a6 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 2052d216d..55277432b 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 293f9ae0e..693be2d6f 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 fbb5683af..bce4b617f 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 69d667caa..ebfc78ca7 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 612ae792f..f57d5c3f2 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 2e97c8157..102a4f14c 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 5794f08f5..a76fa4666 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 4c56263ab..e2a45783b 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 d93b2469d..5d2c4aa19 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 ce2e9d53b..1f20482d5 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 662fdbdff..9908c8a33 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 a810fff67..c38e78000 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 050e79de5..88208564d 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 77bf39878..de351db4a 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 461cddf29..60d7f1e43 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 bb19fbe9b..c45f0f68f 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 be93f3e4d..171d9761c 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 878b7c3e5..ebf87deda 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 48276aa5d..634bd08c7 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 ed99a39f8..8eaf418a8 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 4ae395fc0..e620c6233 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 4368e6eed..f750108d7 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 9171d70fe..2c735feff 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 4d7407432..d6d1c3006 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 6ceb20c05..1d7e459a2 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 9bdcd9b7d..d4666b27f 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 f04057a98..95f561597 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 fe8bf614c..63d7c954e 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 c13edb3f3..a9295f6f9 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 9a7aa5956..aedd8500b 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 50b513bfc..af62911b7 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 0c2529b92..f1263e6ca 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 3da022322..00d4de695 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 03794a155..aae73c1fc 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 158738fd8..d5e0bdc6f 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 2d38d5926..710708087 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 b9105c81d..662dc17e4 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 22585f86a..6b16935ab 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 057b4a9aa..7a625e600 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 2df9f0090..7349f45fa 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 ea61a6172..f0cfb0c11 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 eeb04feeb..42bb943da 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 4a6b7b28e..2f51dde64 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 a5d4801a9..1c1763e88 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 19e736313..6549dd1e0 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 9e0e4d4ea..5f2156e64 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 528e55344..03b27e9ab 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 d3c0639b7..6393a6b75 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 388b497ec..929cabdaf 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 5d2e22a6f..7e05caa6f 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 b5380c536..8a777ec5f 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 ad3963cb9..a66e2b318 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 ef6a5edf9..8f52ec38c 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 9dec1ca23..cc12e9dd2 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 93cb5f5a8..7c5c764cd 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 5ff618ae6..28c849a86 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 b48ad7f03..42b1be57d 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 e9d4020ea..6767479c3 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 f75bdd8ca..11f2ed91e 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 6c2395b0e..2457a167d 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 061ab2a43..fb31a30ee 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 6ce025208..f89920e54 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 2e8d088b0..e20d80f20 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 b467d14ec..df569377b 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 c033f097d..17185d143 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 d855045de..a9e79cdd6 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 09cdb02da..d426ff413 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 7aeb1c226..3c1b6a03e 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 cc341bad2..34ee4db83 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 77033741c..6e960f8b6 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 0e83f3070..e05a47307 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 deb950945..e0d5716d6 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 9530d29f1..289c717e4 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 2455e2cb8..6f8a02cb5 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 093c0f9fb..84dd4c2dd 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 2b86617c1..ca5f7b609 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 72232ac7d..141a3732d 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 9e5a7b18a..b56d2b507 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 443256d97..b8fd515d2 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 968bab9dd..3fdb28a6f 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 dffb23eb6..579d2bf82 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 f80e466a8..6a8821e5f 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 0385b8dba..ab3400801 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 fbfb0b183..18c372c53 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 62867d82b..2eae0300a 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 36ec0ca0c..71a18f4ee 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 be71278fa..d2c850385 100644 --- a/src/Module/Special/HTTPException.php +++ b/src/Module/Special/HTTPException.php @@ -1,12 +1,10 @@