Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>tags/v11.0RC2
<?php | <?php | ||||
/** @var array $_ */ | /** @var array $_ */ | ||||
/** @var OC_L10N $l */ | |||||
/** @var \OCP\IL10N $l */ | |||||
script('encryption', 'settings-admin'); | script('encryption', 'settings-admin'); | ||||
script('core', 'multiselect'); | script('core', 'multiselect'); | ||||
style('encryption', 'settings-admin'); | style('encryption', 'settings-admin'); |
<?php | <?php | ||||
/** @var array $_ */ | /** @var array $_ */ | ||||
/** @var OC_L10N $l */ | |||||
/** @var \OCP\IL10N $l */ | |||||
script('encryption', 'settings-personal'); | script('encryption', 'settings-personal'); | ||||
script('core', 'multiselect'); | script('core', 'multiselect'); | ||||
?> | ?> |
<?php | <?php | ||||
/** @var OC_L10N $l */ | |||||
/** @var \OCP\IL10N $l */ | |||||
/** @var array $_ */ | /** @var array $_ */ | ||||
script('federatedfilesharing', 'settings-admin'); | script('federatedfilesharing', 'settings-admin'); | ||||
?> | ?> |
<?php | <?php | ||||
/** @var OC_L10N $l */ | |||||
/** @var \OCP\IL10N $l */ | |||||
/** @var array $_ */ | /** @var array $_ */ | ||||
script('federatedfilesharing', 'settings-personal'); | script('federatedfilesharing', 'settings-personal'); | ||||
style('federatedfilesharing', 'settings-personal'); | style('federatedfilesharing', 'settings-personal'); |
/** @var array $_ */ | /** @var array $_ */ | ||||
use OCA\Federation\TrustedServers; | use OCA\Federation\TrustedServers; | ||||
/** @var OC_L10N $l */ | |||||
/** @var \OCP\IL10N $l */ | |||||
script('federation', 'settings-admin'); | script('federation', 'settings-admin'); | ||||
style('federation', 'settings-admin') | style('federation', 'settings-admin') | ||||
?> | ?> |
public static function buildFileStorageStatistics($dir) { | public static function buildFileStorageStatistics($dir) { | ||||
// information about storage capacities | // information about storage capacities | ||||
$storageInfo = \OC_Helper::getStorageInfo($dir); | $storageInfo = \OC_Helper::getStorageInfo($dir); | ||||
$l = new \OC_L10N('files'); | |||||
$l = \OC::$server->getL10N('files'); | |||||
$maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']); | $maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']); | ||||
$maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize); | $maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize); | ||||
$maxHumanFileSize = $l->t('Upload (max. %s)', array($maxHumanFileSize)); | $maxHumanFileSize = $l->t('Upload (max. %s)', array($maxHumanFileSize)); |
<?php /** @var $l OC_L10N */ ?> | |||||
<?php /** @var $l \OCP\IL10N */ ?> | |||||
<?php $_['appNavigation']->printPage(); ?> | <?php $_['appNavigation']->printPage(); ?> | ||||
<div id="app-content"> | <div id="app-content"> | ||||
<?php foreach ($_['appContents'] as $content) { ?> | <?php foreach ($_['appContents'] as $content) { ?> |
<?php /** @var $l OC_L10N */ ?> | |||||
<?php /** @var $l \OCP\IL10N */ ?> | |||||
<div id='notification'></div> | <div id='notification'></div> | ||||
<div id="emptycontent" class="hidden"></div> | <div id="emptycontent" class="hidden"></div> |
<?php | <?php | ||||
/** @var $_ array */ | /** @var $_ array */ | ||||
/** @var $l OC_L10N */ | |||||
/** @var $l \OCP\IL10N */ | |||||
style('files_sharing', 'authenticate'); | style('files_sharing', 'authenticate'); | ||||
script('files_sharing', 'authenticate'); | script('files_sharing', 'authenticate'); | ||||
?> | ?> |
<?php /** @var $l OC_L10N */ ?> | |||||
<?php /** @var $l \OCP\IL10N */ ?> | |||||
<div id='notification'></div> | <div id='notification'></div> | ||||
<div id="emptycontent" class="hidden"></div> | <div id="emptycontent" class="hidden"></div> |
<?php | <?php | ||||
/** @var $l OC_L10N */ | |||||
/** @var $l \OCP\IL10N */ | |||||
/** @var $_ array */ | /** @var $_ array */ | ||||
?> | ?> | ||||
<?php /** @var $l OC_L10N */ ?> | |||||
<?php /** @var $l \OCP\IL10N */ ?> | |||||
<div id="controls"> | <div id="controls"> | ||||
<div id="file_action_panel"></div> | <div id="file_action_panel"></div> | ||||
</div> | </div> |
<?php | <?php | ||||
/** @var $_ array */ | /** @var $_ array */ | ||||
/** @var $l OC_L10N */ | |||||
/** @var $l \OCP\IL10N */ | |||||
/** @var $theme OC_Theme */ | /** @var $theme OC_Theme */ | ||||
// @codeCoverageIgnoreStart | // @codeCoverageIgnoreStart | ||||
if(!isset($_)) {//also provide standalone error page | if(!isset($_)) {//also provide standalone error page |
<?php | <?php | ||||
/** @var array $_ */ | /** @var array $_ */ | ||||
/** @var OC_L10N $l */ | |||||
/** @var \OCP\IL10N $l */ | |||||
style('core', ['styles', 'header']); | style('core', ['styles', 'header']); | ||||
?> | ?> |
<?php /** @var $l OC_L10N */ ?> | |||||
<?php /** @var $l \OCP\IL10N */ ?> | |||||
<?php | <?php | ||||
vendor_script('jsTimezoneDetect/jstz'); | vendor_script('jsTimezoneDetect/jstz'); | ||||
script('core', [ | script('core', [ |
<?php | <?php | ||||
/** @var $l OC_L10N */ | |||||
/** @var $l \OCP\IL10N */ | |||||
/** @var $_ array */ | /** @var $_ array */ | ||||
/* @var $error boolean */ | /* @var $error boolean */ | ||||
$error = $_['error']; | $error = $_['error']; |
$this->query('OC\CapabilitiesManager')->registerCapability(function() use ($serviceName) { | $this->query('OC\CapabilitiesManager')->registerCapability(function() use ($serviceName) { | ||||
return $this->query($serviceName); | return $this->query($serviceName); | ||||
}); | }); | ||||
} | |||||
public function query($name) { | |||||
return parent::query($name); | |||||
} | } | ||||
} | } |
use OC\AllConfig; | use OC\AllConfig; | ||||
use OC\DB\ConnectionFactory; | use OC\DB\ConnectionFactory; | ||||
use OCP\IConfig; | use OCP\IConfig; | ||||
use OCP\IL10N; | |||||
use OCP\ILogger; | use OCP\ILogger; | ||||
use OCP\Security\ISecureRandom; | use OCP\Security\ISecureRandom; | ||||
abstract class AbstractDatabase { | abstract class AbstractDatabase { | ||||
/** @var \OC_L10N */ | |||||
/** @var IL10N */ | |||||
protected $trans; | protected $trans; | ||||
/** @var string */ | /** @var string */ | ||||
protected $dbDefinitionFile; | protected $dbDefinitionFile; | ||||
/** @var ISecureRandom */ | /** @var ISecureRandom */ | ||||
protected $random; | 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->trans = $trans; | ||||
$this->dbDefinitionFile = $dbDefinitionFile; | $this->dbDefinitionFile = $dbDefinitionFile; | ||||
$this->config = $config; | $this->config = $config; |
} | } | ||||
// Send the language to our layouts | // 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(\OC::$server->getSystemConfig()->getValue('installed', false)) { | ||||
if (empty(self::$versionHash)) { | if (empty(self::$versionHash)) { |
*/ | */ | ||||
public static function addTranslations($application, $languageCode = null, $prepend = false) { | public static function addTranslations($application, $languageCode = null, $prepend = false) { | ||||
if (is_null($languageCode)) { | if (is_null($languageCode)) { | ||||
$languageCode = \OC_L10N::findLanguage($application); | |||||
$languageCode = \OC::$server->getL10NFactory()->findLanguage($application); | |||||
} | } | ||||
if (!empty($application)) { | if (!empty($application)) { | ||||
$path = "$application/l10n/$languageCode"; | $path = "$application/l10n/$languageCode"; |
* get l10n object | * get l10n object | ||||
* @param string $application | * @param string $application | ||||
* @param string|null $language | * @param string|null $language | ||||
* @return \OC_L10N | |||||
* @return \OCP\IL10N | |||||
* @since 6.0.0 - parameter $language was added in 8.0.0 | * @since 6.0.0 - parameter $language was added in 8.0.0 | ||||
*/ | */ | ||||
public static function getL10N($application, $language = null) { | public static function getL10N($application, $language = null) { |
$user = OC::$server->getUserManager()->get(OC_User::getUser()); | $user = OC::$server->getUserManager()->get(OC_User::getUser()); | ||||
$email = $user->getEMailAddress(); | $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(); | $languageCodes = \OC::$server->getL10NFactory()->findAvailableLanguages(); | ||||
// array of common languages | // array of common languages |