From: nupplaPhil <admin@philipp.info>
Date: Sat, 18 Jan 2020 21:07:06 +0000 (+0100)
Subject: cleanup namespace usages for L10n
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f2fc22227a0dfae8f5c85f24f1c5bfa6e5c4c245;p=friendica-addons.git

cleanup namespace usages for L10n
---

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 415cf48c..586ff237 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -37,7 +37,6 @@ use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
diff --git a/advancedcontentfilter/src/middlewares.php b/advancedcontentfilter/src/middlewares.php
index f5c90fa6..b13a0d54 100644
--- a/advancedcontentfilter/src/middlewares.php
+++ b/advancedcontentfilter/src/middlewares.php
@@ -1,5 +1,6 @@
 <?php
-use Friendica\Core\L10n;
+
+use Friendica\DI;
 
 $container = $slim->getContainer();
 
diff --git a/blackout/blackout.php b/blackout/blackout.php
index 6f951e26..09fa0693 100644
--- a/blackout/blackout.php
+++ b/blackout/blackout.php
@@ -46,10 +46,10 @@
 
 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\DI;
 
 function blackout_install() {
 	Hook::register('page_header', 'addon/blackout/blackout.php', 'blackout_redirect');
diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index b21b4e95..caa4ef84 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -12,10 +12,10 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\System;
+use Friendica\DI;
 use Jaybizzle\CrawlerDetect\CrawlerDetect;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\L10n;
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
diff --git a/blockem/blockem.php b/blockem/blockem.php
index af2b0332..8fb2875a 100644
--- a/blockem/blockem.php
+++ b/blockem/blockem.php
@@ -9,7 +9,6 @@
 
 use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\DI;
 use Friendica\Util\Strings;
 
diff --git a/blogger/blogger.php b/blogger/blogger.php
index 287ad1ae..e0b5f535 100644
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -9,7 +9,6 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\DI;
 use Friendica\Util\Network;
diff --git a/buffer/buffer.php b/buffer/buffer.php
index 08b3020b..a583496d 100644
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -11,7 +11,6 @@ require 'addon/buffer/bufferapp.php';
 use Friendica\App;
 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/buglink/buglink.php b/buglink/buglink.php
index 3e9bae17..5d354109 100644
--- a/buglink/buglink.php
+++ b/buglink/buglink.php
@@ -8,7 +8,7 @@
 
 use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
+use Friendica\DI;
 
 function buglink_install()
 {
diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 32127489..a644991e 100644
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -9,7 +9,6 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
diff --git a/cookienotice/cookienotice.php b/cookienotice/cookienotice.php
index e796350f..17e2eb6d 100644
--- a/cookienotice/cookienotice.php
+++ b/cookienotice/cookienotice.php
@@ -10,7 +10,6 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/curweather/curweather.php b/curweather/curweather.php
index 6645a46b..2df31b0b 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -12,7 +12,6 @@
 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\DI;
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 25c6777c..96314d88 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -12,7 +12,6 @@ require_once 'addon/diaspora/Diaspora_Connection.php';
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\Core\Worker;
diff --git a/discourse/discourse.php b/discourse/discourse.php
index c0c322ce..f684425a 100644
--- a/discourse/discourse.php
+++ b/discourse/discourse.php
@@ -9,7 +9,6 @@
  */
 use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Protocol;
diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 45673714..9bcee9c2 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -11,7 +11,6 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 9609ba2d..7a887c6c 100644
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -12,7 +12,6 @@ use Friendica\Content\Pager;
 use Friendica\Content\Widget;
 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/fromapp/fromapp.php b/fromapp/fromapp.php
index 77cf1d7e..8f787cab 100644
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -7,7 +7,6 @@
  *
  */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\DI;
 
diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index 9531653e..b91cdab1 100644
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -8,9 +8,9 @@
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
@@ -105,5 +105,5 @@ function geocoordinates_addon_admin_post(&$a)
 
 	$language  = (!empty($_POST['language']) ? Strings::escapeTags(trim($_POST['language']))   : '');
 	Config::set('geocoordinates', 'language', $language);
-	info(DI::l10n()->t('Settings updated.'). EOL);
+	info(DI::l10n()->t('Settings updated.') . EOL);
 }
diff --git a/geonames/geonames.php b/geonames/geonames.php
index bd6a638e..e701d840 100644
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -9,7 +9,6 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/gnot/gnot.php b/gnot/gnot.php
index c39c7f26..686b1f65 100644
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -8,7 +8,6 @@
  *
  */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index f1f93b48..d94f1113 100644
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -10,10 +10,10 @@ use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\Strings;
 
diff --git a/group_text/group_text.php b/group_text/group_text.php
index 7ccacd92..b8a1d21f 100644
--- a/group_text/group_text.php
+++ b/group_text/group_text.php
@@ -6,7 +6,6 @@
  * Author: Thomas Willingham <https://kakste.com/profile/beardyunixer>
  */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\DI;
 
diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 37dfa68a..45ba2bf9 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -9,7 +9,6 @@
 require_once 'mod/item.php';
 use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 89e53852..71a4c718 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -10,7 +10,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
diff --git a/impressum/impressum.php b/impressum/impressum.php
index 5d7ebbf0..c7fc9cd4 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -10,7 +10,6 @@
 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\DI;
diff --git a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
index 41999a12..126ea832 100644
--- a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
+++ b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
@@ -6,7 +6,6 @@
 * Author: Thomas Willingham <https://kakste.com/profile/beardyunixer>
 */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\DI;
 
 function infiniteimprobabilitydrive_install()
diff --git a/irc/irc.php b/irc/irc.php
index aa42a0cc..c5d50d4e 100644
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -9,7 +9,6 @@
 
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 66f9ff61..a61045e8 100644
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -65,7 +65,6 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index 8810ec11..c3f62616 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -10,7 +10,6 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/krynn/krynn.php b/krynn/krynn.php
index 0a32659a..fe25fdf7 100644
--- a/krynn/krynn.php
+++ b/krynn/krynn.php
@@ -10,7 +10,6 @@
  *"My body was my sacrifice... for my magic. This damage is permanent." - Raistlin Majere
  */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\DI;
 
diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index ae3b8700..798e1a04 100644
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -10,7 +10,6 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/libertree/libertree.php b/libertree/libertree.php
index 902442ab..7dfd8a36 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -9,7 +9,6 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index f361d6e8..289e3f98 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -10,7 +10,6 @@ use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index 0798de68..382832c5 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -10,7 +10,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index f85ba13c..16d4faea 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -9,7 +9,6 @@
 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\Database\DBA;
diff --git a/markdown/markdown.php b/markdown/markdown.php
index 894045fe..f02bc2a0 100644
--- a/markdown/markdown.php
+++ b/markdown/markdown.php
@@ -9,7 +9,6 @@ use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Renderer;
-use Friendica\Core\L10n;
 use Friendica\DI;
 
 function markdown_install() {
diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php
index fd58b265..6f2c2844 100644
--- a/mathjax/mathjax.php
+++ b/mathjax/mathjax.php
@@ -10,7 +10,6 @@
 
 use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/membersince/membersince.php b/membersince/membersince.php
index 65fa4cda..6e96e904 100644
--- a/membersince/membersince.php
+++ b/membersince/membersince.php
@@ -8,7 +8,7 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
+use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
 
 function membersince_install()
diff --git a/morechoice/morechoice.php b/morechoice/morechoice.php
index 859e5de9..e1976c5d 100644
--- a/morechoice/morechoice.php
+++ b/morechoice/morechoice.php
@@ -9,7 +9,7 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
+use Friendica\DI;
 
 function morechoice_install() {
 
diff --git a/morepokes/morepokes.php b/morepokes/morepokes.php
index 428ebded..f943a8f4 100644
--- a/morepokes/morepokes.php
+++ b/morepokes/morepokes.php
@@ -7,7 +7,7 @@
  *
  */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
+use Friendica\DI;
 
 function morepokes_install()
 {
diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index 3ddd4694..6da93051 100644
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -9,7 +9,6 @@
 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\DI;
diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index bf535fe1..5135ac4d 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -11,10 +11,8 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Util\Emailer;
 
diff --git a/notimeline/notimeline.php b/notimeline/notimeline.php
index 15ea32d0..a0765b96 100644
--- a/notimeline/notimeline.php
+++ b/notimeline/notimeline.php
@@ -8,7 +8,6 @@
  *
  */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\DI;
 
 function notimeline_install()
diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 08bdcc88..85260c7f 100644
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -8,7 +8,6 @@
  *
  */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\DI;
 
 function nsfw_install()
diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php
index f0d1713a..9143fb49 100644
--- a/numfriends/numfriends.php
+++ b/numfriends/numfriends.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\DI;
 
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 307da599..a4aafcd3 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -13,7 +13,6 @@ use Friendica\DI;
 use Friendica\Core\Cache\Duration;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Util\ConfigFileLoader;
diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index 166a196f..83cebbb9 100644
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -11,7 +11,6 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/piwik/piwik.php b/piwik/piwik.php
index f4d10b22..e3afb937 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -33,7 +33,6 @@
 
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/planets/planets.php b/planets/planets.php
index e81d7fb7..ea543f40 100644
--- a/planets/planets.php
+++ b/planets/planets.php
@@ -7,7 +7,6 @@
  * Author: Tony Baldwin <https://free-haven.org/profile/tony>
  */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\DI;
 
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 16ea48ac..bcefef98 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -10,7 +10,6 @@ use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index e5f52bc4..90d396e0 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -11,7 +11,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\Worker;
diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php
index ee617457..1ce09205 100644
--- a/qcomment/qcomment.php
+++ b/qcomment/qcomment.php
@@ -18,7 +18,6 @@
  *
  */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\DI;
 use Friendica\Util\XML;
 
diff --git a/randplace/randplace.php b/randplace/randplace.php
index fc48e8de..886d79d1 100644
--- a/randplace/randplace.php
+++ b/randplace/randplace.php
@@ -19,7 +19,6 @@
  *
  */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\DI;
 
diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php
index 2baaa331..506eb722 100644
--- a/remote_permissions/remote_permissions.php
+++ b/remote_permissions/remote_permissions.php
@@ -9,7 +9,6 @@
 
 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/rendertime/rendertime.php b/rendertime/rendertime.php
index 0daa4830..c44d0a30 100644
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -8,7 +8,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\DI;
 
 function rendertime_install() {
diff --git a/securemail/securemail.php b/securemail/securemail.php
index 3a5ecd86..ef8edb3c 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -9,7 +9,6 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/showmore/showmore.php b/showmore/showmore.php
index f7d65317..bfde40f3 100644
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -8,7 +8,6 @@
  *
  */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\DI;
 use Friendica\Util\Strings;
 
diff --git a/startpage/startpage.php b/startpage/startpage.php
index 74d62716..9192b5a8 100644
--- a/startpage/startpage.php
+++ b/startpage/startpage.php
@@ -7,7 +7,6 @@
  *
  */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\DI;
 
 function startpage_install() {
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 086b064c..a89f9cef 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -44,7 +44,6 @@ use Friendica\Content\Text\HTML;
 use Friendica\Content\Text\Plaintext;
 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/superblock/superblock.php b/superblock/superblock.php
index 669a15f0..aed125a6 100644
--- a/superblock/superblock.php
+++ b/superblock/superblock.php
@@ -7,7 +7,6 @@
  *
  */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\DI;
 use Friendica\Util\Strings;
 
diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 13e79917..05be239a 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -9,7 +9,6 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Search;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/tictac/tictac.php b/tictac/tictac.php
index 0b2ed064..08a8c09c 100644
--- a/tictac/tictac.php
+++ b/tictac/tictac.php
@@ -5,9 +5,8 @@
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
-use Friendica\Core\Addon;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
+use Friendica\DI;
 
 function tictac_install() {
 	Hook::register('app_menu', 'addon/tictac/tictac.php', 'tictac_app_menu');
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 6bdfdf96..aff58f26 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -13,7 +13,6 @@ use Friendica\App;
 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\Database\DBA;
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 4550b658..b6da5e1a 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -71,7 +71,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Plaintext;
 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/viewsrc/viewsrc.php b/viewsrc/viewsrc.php
index 70395ba2..10f88359 100644
--- a/viewsrc/viewsrc.php
+++ b/viewsrc/viewsrc.php
@@ -7,7 +7,6 @@
  *
  */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\DI;
 use Friendica\Model\Item;
 use Friendica\Database\DBA;
diff --git a/webrtc/webrtc.php b/webrtc/webrtc.php
index 57f3a528..23a29ed9 100644
--- a/webrtc/webrtc.php
+++ b/webrtc/webrtc.php
@@ -8,8 +8,8 @@
  */
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Util\Strings;
 
 function webrtc_install() {
diff --git a/widgets/widget_friendheader.php b/widgets/widget_friendheader.php
index 734933c8..8ce1eac6 100644
--- a/widgets/widget_friendheader.php
+++ b/widgets/widget_friendheader.php
@@ -1,7 +1,6 @@
 <?php
 
 use Friendica\Content\Text\HTML;
-use Friendica\Core\L10n;
 use Friendica\DI;
 
 function friendheader_widget_name()
diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
index 5188ce97..af687119 100644
--- a/windowsphonepush/windowsphonepush.php
+++ b/windowsphonepush/windowsphonepush.php
@@ -30,7 +30,6 @@ use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/wppost/wppost.php b/wppost/wppost.php
index 4b1e41f7..052b4074 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -9,7 +9,6 @@
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index 378a4bdc..5c049f4d 100644
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -10,7 +10,6 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Util\Strings;