nextcloud
/
server
mirror of https://github.com/nextcloud/server
0
0
Fork 0
Code Issues Releases Wiki Activity

chore: Replace OC::$server->getL10N by OCP\Util::getL10N in lib and some apps 

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2024-02-01 16:13:27 +01:00 committed by Côme Chilliet
parent 961ccee5f6
commit b2e9e0fa0d
17 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/lib/Helper.php
View File

@ -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]);

2
apps/files_external/lib/MountConfig.php
View File

@ -152,7 +152,7 @@ class MountConfig {
* @param Backend[] $backends
*/
public static function dependencyMessage(array $backends): string {
$l = \OC::$server->getL10N('files_external');
$l = \OCP\Util::getL10N('files_external');
$message = '';
$dependencyGroups = [];

2
apps/files_trashbin/lib/Trashbin.php
View File

@ -1069,7 +1069,7 @@ class Trashbin {
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, '/');

2
apps/user_ldap/ajax/clearMappings.php
View File

@ -50,7 +50,7 @@ try {
}
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();

2
apps/user_ldap/ajax/deleteConfiguration.php
View File

@ -35,6 +35,6 @@ $helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig(), \OC::$server->get
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')]);
}

2
apps/user_ldap/ajax/testConfiguration.php
View File

@ -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']);

2
apps/user_ldap/ajax/wizard.php
View File

@ -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')]);

2
apps/user_ldap/lib/Access.php
View File

@ -354,7 +354,7 @@ class Access extends LDAPUtility {
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());
}
}

2
core/strings.php
View File

@ -25,7 +25,7 @@ declare(strict_types=1);
*
*/
//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");

10
lib/private/Files/View.php
View File

@ -1846,19 +1846,19 @@ class View {
[$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'));
}
}

4
lib/private/Share/Share.php
View File

@ -256,8 +256,8 @@ class Share extends Constants {
* @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'])) {

2
lib/private/Tags.php
View File

@ -235,7 +235,7 @@ class Tags implements ITags {
}
if ($tagId === false) {
$l10n = \OC::$server->getL10N('core');
$l10n = \OCP\Util::getL10N('core');
throw new \Exception(
$l10n->t('Could not find category "%s"', [$tag])
);

2
lib/private/TemplateLayout.php
View File

@ -249,7 +249,7 @@ class TemplateLayout extends \OC_Template {
// 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(),

2
lib/private/User/Manager.php
View File

@ -445,7 +445,7 @@ class Manager extends PublicEmitter implements IUserManager {
* @throws \InvalidArgumentException
*/
public function createUserFromBackend($uid, $password, UserInterface $backend) {
$l = \OC::$server->getL10N('lib');
$l = \OCP\Util::getL10N('lib');
$this->validateUserId($uid, true);

4
lib/private/User/Session.php
View File

@ -367,7 +367,7 @@ class Session implements IUserSession, Emitter {
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 @@ class Session implements IUserSession, Emitter {
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);
}

6
tests/lib/DateTimeFormatterTest.php
View File

@ -34,7 +34,7 @@ class DateTimeFormatterTest extends TestCase {
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 @@ class DateTimeFormatterTest extends TestCase {
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 @@ class DateTimeFormatterTest extends TestCase {
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],

4
tests/lib/L10N/L10nTest.php
View File

@ -201,12 +201,12 @@ class L10nTest extends TestCase {
}
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']));
}