cleanup namespace usages for L10n

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;

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;

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;

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

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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)
 {

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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)
 {

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;

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";

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";

mod/update_display.php

@@ -5,7 +5,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\DI;
 
 require_once "mod/display.php";

mod/update_network.php

@@ -5,7 +5,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\DI;
 
 require_once "mod/network.php";

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";

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";

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;

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;

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;

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;

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;
 
 /**

src/BaseModule.php

@@ -2,7 +2,6 @@
 
 namespace Friendica;
 
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 
 /**

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;

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;

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

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;

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;

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;

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;
 
 /**

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;

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;

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;

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;
 

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;

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
 {

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;

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;
 
 /**

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()
 	{

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;
 

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;

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;

src/Model/FileTag.php

@@ -5,7 +5,6 @@
 
 namespace Friendica\Model;
 
-use Friendica\Core\L10n;
 use Friendica\Database\DBA;
 use Friendica\DI;
 

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

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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

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;

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;

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;

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;
 

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;

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;

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

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;

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;