Move away from OC_L10N

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

22 files changed, 26 insertions, 22 deletions

diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php
index 405dbaf703f..efe9c44ece7 100644
--- a/apps/encryption/templates/settings-admin.php
+++ b/apps/encryption/templates/settings-admin.php
@@ -1,6 +1,6 @@
 <?php
 /** @var array $_ */
-/** @var OC_L10N $l */
+/** @var \OCP\IL10N $l */
 script('encryption', 'settings-admin');
 script('core', 'multiselect');
 style('encryption', 'settings-admin');
diff --git a/apps/encryption/templates/settings-personal.php b/apps/encryption/templates/settings-personal.php
index b92a9a19723..2ea55e15c80 100644
--- a/apps/encryption/templates/settings-personal.php
+++ b/apps/encryption/templates/settings-personal.php
@@ -1,6 +1,6 @@
 <?php
 	/** @var array $_ */
-	/** @var OC_L10N $l */
+	/** @var \OCP\IL10N $l */
 script('encryption', 'settings-personal');
 script('core', 'multiselect');
 ?>
diff --git a/apps/federatedfilesharing/templates/settings-admin.php b/apps/federatedfilesharing/templates/settings-admin.php
index c454eeba17b..3ffd4bd5b27 100644
--- a/apps/federatedfilesharing/templates/settings-admin.php
+++ b/apps/federatedfilesharing/templates/settings-admin.php
@@ -1,5 +1,5 @@
 <?php
-/** @var OC_L10N $l */
+/** @var \OCP\IL10N $l */
 /** @var array $_ */
 script('federatedfilesharing', 'settings-admin');
 ?>
diff --git a/apps/federatedfilesharing/templates/settings-personal.php b/apps/federatedfilesharing/templates/settings-personal.php
index 6b43f70495f..98a1cd7f751 100644
--- a/apps/federatedfilesharing/templates/settings-personal.php
+++ b/apps/federatedfilesharing/templates/settings-personal.php
@@ -1,5 +1,5 @@
 <?php
-/** @var OC_L10N $l */
+/** @var \OCP\IL10N $l */
 /** @var array $_ */
 script('federatedfilesharing', 'settings-personal');
 style('federatedfilesharing', 'settings-personal');
diff --git a/apps/federation/templates/settings-admin.php b/apps/federation/templates/settings-admin.php
index 70d051ad7d6..8773851c768 100644
--- a/apps/federation/templates/settings-admin.php
+++ b/apps/federation/templates/settings-admin.php
@@ -2,7 +2,7 @@
 /** @var array $_ */
 use OCA\Federation\TrustedServers;
 
-/** @var OC_L10N $l */
+/** @var \OCP\IL10N $l */
 script('federation', 'settings-admin');
 style('federation', 'settings-admin')
 ?>
diff --git a/apps/files/lib/Helper.php b/apps/files/lib/Helper.php
index 26bc020c871..b6b209dea70 100644
--- a/apps/files/lib/Helper.php
+++ b/apps/files/lib/Helper.php
@@ -45,7 +45,7 @@ class Helper {
 	public static function buildFileStorageStatistics($dir) {
 		// information about storage capacities
 		$storageInfo = \OC_Helper::getStorageInfo($dir);
-		$l = new \OC_L10N('files');
+		$l = \OC::$server->getL10N('files');
 		$maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
 		$maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize);
 		$maxHumanFileSize = $l->t('Upload (max. %s)', array($maxHumanFileSize));
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 92345d3063e..17958d330b7 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -1,4 +1,4 @@
-<?php /** @var $l OC_L10N */ ?>
+<?php /** @var $l \OCP\IL10N */ ?>
 <?php $_['appNavigation']->printPage(); ?>
 <div id="app-content">
 	<?php foreach ($_['appContents'] as $content) { ?>
diff --git a/apps/files/templates/recentlist.php b/apps/files/templates/recentlist.php
index 1667eb4cc8d..6c271a07f5f 100644
--- a/apps/files/templates/recentlist.php
+++ b/apps/files/templates/recentlist.php
@@ -1,4 +1,4 @@
-<?php /** @var $l OC_L10N */ ?>
+<?php /** @var $l \OCP\IL10N */ ?>
 <div id='notification'></div>
 
 <div id="emptycontent" class="hidden"></div>
diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php
index 909e839177c..fbc1d72a333 100644
--- a/apps/files_sharing/templates/authenticate.php
+++ b/apps/files_sharing/templates/authenticate.php
@@ -1,6 +1,6 @@
 <?php
 	/** @var $_ array */
-	/** @var $l OC_L10N */
+	/** @var $l \OCP\IL10N */
 	style('files_sharing', 'authenticate');
 	script('files_sharing', 'authenticate'); 
 ?>
diff --git a/apps/files_sharing/templates/list.php b/apps/files_sharing/templates/list.php
index 785b2bc72a4..ec13b5c1f77 100644
--- a/apps/files_sharing/templates/list.php
+++ b/apps/files_sharing/templates/list.php
@@ -1,4 +1,4 @@
-<?php /** @var $l OC_L10N */ ?>
+<?php /** @var $l \OCP\IL10N */ ?>
 <div id='notification'></div>
 
 <div id="emptycontent" class="hidden"></div>
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 80c7d4d7460..e1a816e7fee 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -1,5 +1,5 @@
 <?php
-/** @var $l OC_L10N */
+/** @var $l \OCP\IL10N */
 /** @var $_ array */
 ?>
 
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index 9ea8a9d14c4..c3f0304d408 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -1,4 +1,4 @@
-<?php /** @var $l OC_L10N */ ?>
+<?php /** @var $l \OCP\IL10N */ ?>
 <div id="controls">
 	<div id="file_action_panel"></div>
 </div>
diff --git a/core/templates/404.php b/core/templates/404.php
index a0d2f0160b7..79a67b3ce2c 100644
--- a/core/templates/404.php
+++ b/core/templates/404.php
@@ -1,6 +1,6 @@
 <?php
 /** @var $_ array */
-/** @var $l OC_L10N */
+/** @var $l \OCP\IL10N */
 /** @var $theme OC_Theme */
 // @codeCoverageIgnoreStart
 if(!isset($_)) {//also provide standalone error page
diff --git a/core/templates/exception.php b/core/templates/exception.php
index 899ea29456c..e90a3268155 100644
--- a/core/templates/exception.php
+++ b/core/templates/exception.php
@@ -1,6 +1,6 @@
 <?php
 	/** @var array $_ */
-	/** @var OC_L10N $l */
+	/** @var \OCP\IL10N $l */
 
 style('core', ['styles', 'header']);
 ?>
diff --git a/core/templates/login.php b/core/templates/login.php
index 36ed59e9309..46045f86b50 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,4 +1,4 @@
-<?php /** @var $l OC_L10N */ ?>
+<?php /** @var $l \OCP\IL10N */ ?>
 <?php
 vendor_script('jsTimezoneDetect/jstz');
 script('core', [
diff --git a/core/templates/twofactorshowchallenge.php b/core/templates/twofactorshowchallenge.php
index 197de8a288e..20b92be9520 100644
--- a/core/templates/twofactorshowchallenge.php
+++ b/core/templates/twofactorshowchallenge.php
@@ -1,5 +1,5 @@
 <?php
-/** @var $l OC_L10N */
+/** @var $l \OCP\IL10N */
 /** @var $_ array */
 /* @var $error boolean */
 $error = $_['error'];
diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index 671093ff08b..a1e845f132e 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -533,6 +533,9 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 		$this->query('OC\CapabilitiesManager')->registerCapability(function() use ($serviceName) {
 			return $this->query($serviceName);
 		});
+	}
 
+	public function query($name) {
+		return parent::query($name);
 	}
 }
diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php
index 47c3e5ee1c6..2b9d7afb367 100644
--- a/lib/private/Setup/AbstractDatabase.php
+++ b/lib/private/Setup/AbstractDatabase.php
@@ -29,12 +29,13 @@ namespace OC\Setup;
 use OC\AllConfig;
 use OC\DB\ConnectionFactory;
 use OCP\IConfig;
+use OCP\IL10N;
 use OCP\ILogger;
 use OCP\Security\ISecureRandom;
 
 abstract class AbstractDatabase {
 
-	/** @var \OC_L10N */
+	/** @var IL10N */
 	protected $trans;
 	/** @var string */
 	protected $dbDefinitionFile;
@@ -57,7 +58,7 @@ abstract class AbstractDatabase {
 	/** @var ISecureRandom */
 	protected $random;
 
-	public function __construct($trans, $dbDefinitionFile, IConfig $config, ILogger $logger, ISecureRandom $random) {
+	public function __construct(IL10N $trans, $dbDefinitionFile, IConfig $config, ILogger $logger, ISecureRandom $random) {
 		$this->trans = $trans;
 		$this->dbDefinitionFile = $dbDefinitionFile;
 		$this->config = $config;
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 9f89174e7f9..7878737bdef 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -127,7 +127,7 @@ class TemplateLayout extends \OC_Template {
 
 		}
 		// Send the language to our layouts
-		$this->assign('language', \OC_L10N::findLanguage());
+		$this->assign('language', \OC::$server->getL10NFactory()->findLanguage());
 
 		if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
 			if (empty(self::$versionHash)) {
diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php
index 42fd0ba7db3..e4c2caeafd7 100644
--- a/lib/private/legacy/util.php
+++ b/lib/private/legacy/util.php
@@ -526,7 +526,7 @@ class OC_Util {
 	 */
 	public static function addTranslations($application, $languageCode = null, $prepend = false) {
 		if (is_null($languageCode)) {
-			$languageCode = \OC_L10N::findLanguage($application);
+			$languageCode = \OC::$server->getL10NFactory()->findLanguage($application);
 		}
 		if (!empty($application)) {
 			$path = "$application/l10n/$languageCode";
diff --git a/lib/public/Util.php b/lib/public/Util.php
index d5b0752553d..08661fd88ca 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -195,7 +195,7 @@ class Util {
 	 * get l10n object
 	 * @param string $application
 	 * @param string|null $language
-	 * @return \OC_L10N
+	 * @return \OCP\IL10N
 	 * @since 6.0.0 - parameter $language was added in 8.0.0
 	 */
 	public static function getL10N($application, $language = null) {
diff --git a/settings/personal.php b/settings/personal.php
index a0d08aa0bd5..01c358de3ae 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -68,7 +68,7 @@ $storageInfo=OC_Helper::getStorageInfo('/');
 $user = OC::$server->getUserManager()->get(OC_User::getUser());
 $email = $user->getEMailAddress();
 
-$userLang=$config->getUserValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
+$userLang=$config->getUserValue( OC_User::getUser(), 'core', 'lang', \OC::$server->getL10NFactory()->findLanguage() );
 $languageCodes = \OC::$server->getL10NFactory()->findAvailableLanguages();
 
 // array of common languages