From 740659a04c28f8b2bfd9265d459dd3bca202300f Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 28 Oct 2016 21:46:28 +0200 Subject: [PATCH] Move away from OC_L10N Signed-off-by: Roeland Jago Douma --- apps/encryption/templates/settings-admin.php | 2 +- apps/encryption/templates/settings-personal.php | 2 +- apps/federatedfilesharing/templates/settings-admin.php | 2 +- apps/federatedfilesharing/templates/settings-personal.php | 2 +- apps/federation/templates/settings-admin.php | 2 +- apps/files/lib/Helper.php | 2 +- apps/files/templates/index.php | 2 +- apps/files/templates/recentlist.php | 2 +- apps/files_sharing/templates/authenticate.php | 2 +- apps/files_sharing/templates/list.php | 2 +- apps/files_sharing/templates/public.php | 2 +- apps/files_trashbin/templates/index.php | 2 +- core/templates/404.php | 2 +- core/templates/exception.php | 2 +- core/templates/login.php | 2 +- core/templates/twofactorshowchallenge.php | 2 +- lib/private/AppFramework/DependencyInjection/DIContainer.php | 3 +++ lib/private/Setup/AbstractDatabase.php | 5 +++-- lib/private/TemplateLayout.php | 2 +- lib/private/legacy/util.php | 2 +- lib/public/Util.php | 2 +- settings/personal.php | 2 +- 22 files changed, 26 insertions(+), 22 deletions(-) diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php index 405dbaf703..efe9c44ece 100644 --- a/apps/encryption/templates/settings-admin.php +++ b/apps/encryption/templates/settings-admin.php @@ -1,6 +1,6 @@ diff --git a/apps/federatedfilesharing/templates/settings-admin.php b/apps/federatedfilesharing/templates/settings-admin.php index c454eeba17..3ffd4bd5b2 100644 --- a/apps/federatedfilesharing/templates/settings-admin.php +++ b/apps/federatedfilesharing/templates/settings-admin.php @@ -1,5 +1,5 @@ diff --git a/apps/federatedfilesharing/templates/settings-personal.php b/apps/federatedfilesharing/templates/settings-personal.php index 6b43f70495..98a1cd7f75 100644 --- a/apps/federatedfilesharing/templates/settings-personal.php +++ b/apps/federatedfilesharing/templates/settings-personal.php @@ -1,5 +1,5 @@ diff --git a/apps/files/lib/Helper.php b/apps/files/lib/Helper.php index 26bc020c87..b6b209dea7 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 92345d3063..17958d330b 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -1,4 +1,4 @@ - + printPage(); ?>
diff --git a/apps/files/templates/recentlist.php b/apps/files/templates/recentlist.php index 1667eb4cc8..6c271a07f5 100644 --- a/apps/files/templates/recentlist.php +++ b/apps/files/templates/recentlist.php @@ -1,4 +1,4 @@ - +
diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php index 909e839177..fbc1d72a33 100644 --- a/apps/files_sharing/templates/authenticate.php +++ b/apps/files_sharing/templates/authenticate.php @@ -1,6 +1,6 @@ diff --git a/apps/files_sharing/templates/list.php b/apps/files_sharing/templates/list.php index 785b2bc72a..ec13b5c1f7 100644 --- a/apps/files_sharing/templates/list.php +++ b/apps/files_sharing/templates/list.php @@ -1,4 +1,4 @@ - +
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 80c7d4d746..e1a816e7fe 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -1,5 +1,5 @@ diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index 9ea8a9d14c..c3f0304d40 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -1,4 +1,4 @@ - +
diff --git a/core/templates/404.php b/core/templates/404.php index a0d2f0160b..79a67b3ce2 100644 --- a/core/templates/404.php +++ b/core/templates/404.php @@ -1,6 +1,6 @@ diff --git a/core/templates/login.php b/core/templates/login.php index 36ed59e930..46045f86b5 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -1,4 +1,4 @@ - + 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 47c3e5ee1c..2b9d7afb36 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 9f89174e7f..7878737bde 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 42fd0ba7db..e4c2caeafd 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 d5b0752553..08661fd88c 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 a0d08aa0bd..01c358de3a 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