From b600c70970e627a1b16899427a9b811a4ce2db51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Thu, 1 Feb 2024 16:13:27 +0100 Subject: [PATCH] chore: Replace OC::$server->getL10N by OCP\Util::getL10N in lib and some apps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- apps/files/lib/Helper.php | 2 +- apps/files_external/lib/MountConfig.php | 2 +- apps/files_trashbin/lib/Trashbin.php | 2 +- apps/user_ldap/ajax/clearMappings.php | 2 +- apps/user_ldap/ajax/deleteConfiguration.php | 2 +- apps/user_ldap/ajax/testConfiguration.php | 2 +- apps/user_ldap/ajax/wizard.php | 2 +- apps/user_ldap/lib/Access.php | 2 +- core/strings.php | 2 +- lib/private/Files/View.php | 10 +++++----- lib/private/Share/Share.php | 4 ++-- lib/private/Tags.php | 2 +- lib/private/TemplateLayout.php | 2 +- lib/private/User/Manager.php | 2 +- lib/private/User/Session.php | 4 ++-- tests/lib/DateTimeFormatterTest.php | 6 +++--- tests/lib/L10N/L10nTest.php | 4 ++-- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/apps/files/lib/Helper.php b/apps/files/lib/Helper.php index 1d9591cafe056..680df4f16c769 100644 --- a/apps/files/lib/Helper.php +++ b/apps/files/lib/Helper.php @@ -48,7 +48,7 @@ class Helper { public static function buildFileStorageStatistics($dir) { // information about storage capacities $storageInfo = \OC_Helper::getStorageInfo($dir); - $l = \OC::$server->getL10N('files'); + $l = \OCP\Util::getL10N('files'); $maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']); $maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize); $maxHumanFileSize = $l->t('Upload (max. %s)', [$maxHumanFileSize]); diff --git a/apps/files_external/lib/MountConfig.php b/apps/files_external/lib/MountConfig.php index 98b34b0c9f253..5ddff0f57fc0a 100644 --- a/apps/files_external/lib/MountConfig.php +++ b/apps/files_external/lib/MountConfig.php @@ -152,7 +152,7 @@ public static function getBackendStatus($class, $options, $isPersonal, $testOnly * @param Backend[] $backends */ public static function dependencyMessage(array $backends): string { - $l = \OC::$server->getL10N('files_external'); + $l = \OCP\Util::getL10N('files_external'); $message = ''; $dependencyGroups = []; diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php index 442abc13670c6..ced40313d621a 100644 --- a/apps/files_trashbin/lib/Trashbin.php +++ b/apps/files_trashbin/lib/Trashbin.php @@ -1069,7 +1069,7 @@ private static function getVersionsFromTrash($filename, $timestamp, string $user private static function getUniqueFilename($location, $filename, View $view) { $ext = pathinfo($filename, PATHINFO_EXTENSION); $name = pathinfo($filename, PATHINFO_FILENAME); - $l = \OC::$server->getL10N('files_trashbin'); + $l = \OCP\Util::getL10N('files_trashbin'); $location = '/' . trim($location, '/'); diff --git a/apps/user_ldap/ajax/clearMappings.php b/apps/user_ldap/ajax/clearMappings.php index 395e3ec3016a3..ecc45a60de7e1 100644 --- a/apps/user_ldap/ajax/clearMappings.php +++ b/apps/user_ldap/ajax/clearMappings.php @@ -50,7 +50,7 @@ function ($uid) { } if ($mapping === null || !$result) { - $l = \OC::$server->getL10N('user_ldap'); + $l = \OCP\Util::getL10N('user_ldap'); throw new \Exception($l->t('Failed to clear the mappings.')); } \OC_JSON::success(); diff --git a/apps/user_ldap/ajax/deleteConfiguration.php b/apps/user_ldap/ajax/deleteConfiguration.php index 82bfb6de82ada..2f1ca3d724fa8 100644 --- a/apps/user_ldap/ajax/deleteConfiguration.php +++ b/apps/user_ldap/ajax/deleteConfiguration.php @@ -35,6 +35,6 @@ if ($helper->deleteServerConfiguration($prefix)) { \OC_JSON::success(); } else { - $l = \OC::$server->getL10N('user_ldap'); + $l = \OCP\Util::getL10N('user_ldap'); \OC_JSON::error(['message' => $l->t('Failed to delete the server configuration')]); } diff --git a/apps/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php index 9d89b641d667f..187eeb4295bae 100644 --- a/apps/user_ldap/ajax/testConfiguration.php +++ b/apps/user_ldap/ajax/testConfiguration.php @@ -30,7 +30,7 @@ \OC_JSON::checkAppEnabled('user_ldap'); \OC_JSON::callCheck(); -$l = \OC::$server->getL10N('user_ldap'); +$l = \OCP\Util::getL10N('user_ldap'); $ldapWrapper = new OCA\User_LDAP\LDAP(); $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $_POST['ldap_serverconfig_chooser']); diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php index 8692251c7c047..63241667825a8 100644 --- a/apps/user_ldap/ajax/wizard.php +++ b/apps/user_ldap/ajax/wizard.php @@ -31,7 +31,7 @@ \OC_JSON::checkAppEnabled('user_ldap'); \OC_JSON::callCheck(); -$l = \OC::$server->getL10N('user_ldap'); +$l = \OCP\Util::getL10N('user_ldap'); if (!isset($_POST['action'])) { \OC_JSON::error(['message' => $l->t('No action specified')]); diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index e608d5f80f029..70f9e1411b1dc 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -354,7 +354,7 @@ public function setPassword($userDN, $password) { return @$this->invokeLDAPMethod('exopPasswd', $userDN, '', $password) || @$this->invokeLDAPMethod('modReplace', $userDN, $password); } catch (ConstraintViolationException $e) { - throw new HintException('Password change rejected.', \OC::$server->getL10N('user_ldap')->t('Password change rejected. Hint: ') . $e->getMessage(), (int)$e->getCode()); + throw new HintException('Password change rejected.', \OCP\Util::getL10N('user_ldap')->t('Password change rejected. Hint: ') . $e->getMessage(), (int)$e->getCode()); } } diff --git a/core/strings.php b/core/strings.php index fa23fb1ac654c..50051936eb05a 100644 --- a/core/strings.php +++ b/core/strings.php @@ -25,7 +25,7 @@ * */ //some strings that are used in /lib but won't be translatable unless they are in /core too -$l = \OC::$server->getL10N('core'); +$l = \OCP\Util::getL10N('core'); $l->t("Personal"); $l->t("Users"); $l->t("Apps"); diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index df8990790bb50..2f8f3c08a80db 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -1846,19 +1846,19 @@ public function verifyPath($path, $fileName): void { [$storage, $internalPath] = $this->resolvePath($path); $storage->verifyPath($internalPath, $fileName); } catch (ReservedWordException $ex) { - $l = \OC::$server->getL10N('lib'); + $l = \OCP\Util::getL10N('lib'); throw new InvalidPathException($l->t('File name is a reserved word')); } catch (InvalidCharacterInPathException $ex) { - $l = \OC::$server->getL10N('lib'); + $l = \OCP\Util::getL10N('lib'); throw new InvalidPathException($l->t('File name contains at least one invalid character')); } catch (FileNameTooLongException $ex) { - $l = \OC::$server->getL10N('lib'); + $l = \OCP\Util::getL10N('lib'); throw new InvalidPathException($l->t('File name is too long')); } catch (InvalidDirectoryException $ex) { - $l = \OC::$server->getL10N('lib'); + $l = \OCP\Util::getL10N('lib'); throw new InvalidPathException($l->t('Dot files are not allowed')); } catch (EmptyFileNameException $ex) { - $l = \OC::$server->getL10N('lib'); + $l = \OCP\Util::getL10N('lib'); throw new InvalidPathException($l->t('Empty filename is not allowed')); } } diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php index 3aa01b3cf299f..8322c141b1f53 100644 --- a/lib/private/Share/Share.php +++ b/lib/private/Share/Share.php @@ -256,8 +256,8 @@ public static function getItemShared($itemType, $itemSource, $format = self::FOR * @throws \Exception */ public static function getBackend($itemType) { - $l = \OC::$server->getL10N('lib'); - $logger = \OC::$server->get(LoggerInterface::class); + $l = \OCP\Util::getL10N('lib'); + $logger = \OCP\Server::get(LoggerInterface::class); if (isset(self::$backends[$itemType])) { return self::$backends[$itemType]; } elseif (isset(self::$backendTypes[$itemType]['class'])) { diff --git a/lib/private/Tags.php b/lib/private/Tags.php index 766166beadd36..7b0c509324570 100644 --- a/lib/private/Tags.php +++ b/lib/private/Tags.php @@ -235,7 +235,7 @@ public function getIdsForTag($tag) { } if ($tagId === false) { - $l10n = \OC::$server->getL10N('core'); + $l10n = \OCP\Util::getL10N('core'); throw new \Exception( $l10n->t('Could not find category "%s"', [$tag]) ); diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 96d0ae3e5174d..b4490dfe101d0 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -249,7 +249,7 @@ public function __construct($renderAs, $appId = '') { // this is on purpose outside of the if statement below so that the initial state is prefilled (done in the getConfig() call) // see https://github.com/nextcloud/server/pull/22636 for details $jsConfigHelper = new JSConfigHelper( - \OC::$server->getL10N('lib'), + \OCP\Util::getL10N('lib'), \OCP\Server::get(Defaults::class), \OC::$server->getAppManager(), \OC::$server->getSession(), diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php index 5013c9bed7af0..705f5fbe66bd6 100644 --- a/lib/private/User/Manager.php +++ b/lib/private/User/Manager.php @@ -445,7 +445,7 @@ public function createUser($uid, $password) { * @throws \InvalidArgumentException */ public function createUserFromBackend($uid, $password, UserInterface $backend) { - $l = \OC::$server->getL10N('lib'); + $l = \OCP\Util::getL10N('lib'); $this->validateUserId($uid, true); diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php index a411326c93f31..b7f291343798f 100644 --- a/lib/private/User/Session.php +++ b/lib/private/User/Session.php @@ -367,7 +367,7 @@ public function completeLogin(IUser $user, array $loginDetails, $regenerateSessi if (!$user->isEnabled()) { // disabled users can not log in // injecting l10n does not work - there is a circular dependency between session and \OCP\L10N\IFactory - $message = \OC::$server->getL10N('lib')->t('User disabled'); + $message = \OCP\Util::getL10N('lib')->t('User disabled'); throw new LoginException($message); } @@ -406,7 +406,7 @@ public function completeLogin(IUser $user, array $loginDetails, $regenerateSessi return true; } - $message = \OC::$server->getL10N('lib')->t('Login canceled by app'); + $message = \OCP\Util::getL10N('lib')->t('Login canceled by app'); throw new LoginException($message); } diff --git a/tests/lib/DateTimeFormatterTest.php b/tests/lib/DateTimeFormatterTest.php index 71d98ba758133..3409c0d92078f 100644 --- a/tests/lib/DateTimeFormatterTest.php +++ b/tests/lib/DateTimeFormatterTest.php @@ -34,7 +34,7 @@ public static function tearDownAfterClass(): void { protected function setUp(): void { parent::setUp(); - $this->formatter = new \OC\DateTimeFormatter(new \DateTimeZone('UTC'), \OC::$server->getL10N('lib', 'en')); + $this->formatter = new \OC\DateTimeFormatter(new \DateTimeZone('UTC'), \OCP\Util::getL10N('lib', 'en')); } protected function getTimestampAgo($time, $seconds = 0, $minutes = 0, $hours = 0, $days = 0, $years = 0) { @@ -43,7 +43,7 @@ protected function getTimestampAgo($time, $seconds = 0, $minutes = 0, $hours = 0 public function formatTimeSpanData() { $time = 1416916800; // Use a fixed timestamp so we don't switch days/years with the getTimestampAgo - $deL10N = \OC::$server->getL10N('lib', 'de'); + $deL10N = \OCP\Util::getL10N('lib', 'de'); return [ ['seconds ago', $time, $time], ['in a few seconds', $time + 5 , $time], @@ -84,7 +84,7 @@ public function testFormatTimeSpan($expected, $timestamp, $compare, $locale = nu public function formatDateSpanData() { $time = 1416916800; // Use a fixed timestamp so we don't switch days/years with the getTimestampAgo - $deL10N = \OC::$server->getL10N('lib', 'de'); + $deL10N = \OCP\Util::getL10N('lib', 'de'); return [ // Normal testing ['today', $this->getTimestampAgo($time, 30, 15), $time], diff --git a/tests/lib/L10N/L10nTest.php b/tests/lib/L10N/L10nTest.php index bd1fce295472b..9817f8b0141e9 100644 --- a/tests/lib/L10N/L10nTest.php +++ b/tests/lib/L10N/L10nTest.php @@ -201,12 +201,12 @@ public function testFactoryGetLanguageCode() { } public function testServiceGetLanguageCode() { - $l = \OC::$server->getL10N('lib', 'de'); + $l = \OCP\Util::getL10N('lib', 'de'); $this->assertEquals('de', $l->getLanguageCode()); } public function testWeekdayName() { - $l = \OC::$server->getL10N('lib', 'de'); + $l = \OCP\Util::getL10N('lib', 'de'); $this->assertEquals('Mo.', $l->l('weekdayName', new \DateTime('2017-11-6'), ['width' => 'abbreviated'])); }