зеркало из https://github.com/nextcloud/activity.git
Remove unnecessary service
This commit is contained in:
Родитель
f2db20f7d0
Коммит
4430286911
|
@ -28,7 +28,7 @@ $navigationEntry = function () use ($c) {
|
|||
return [
|
||||
'id' => $c->getAppName(),
|
||||
'order' => 1,
|
||||
'name' => $c->query('ActivityL10N')->t('Activity'),
|
||||
'name' => $c->query('OCP\IL10N')->t('Activity'),
|
||||
'href' => $c->getServer()->getURLGenerator()->linkToRoute('activity.Activities.showList'),
|
||||
'icon' => $c->getServer()->getURLGenerator()->imagePath('activity', 'activity.svg'),
|
||||
];
|
||||
|
|
|
@ -58,11 +58,6 @@ class Application extends App {
|
|||
);
|
||||
});
|
||||
|
||||
$container->registerService('ActivityL10N', function(IContainer $c) {
|
||||
return $c->query('ServerContainer')->getL10N('activity');
|
||||
});
|
||||
|
||||
|
||||
$container->registerService('Consumer', function(IContainer $c) {
|
||||
/** @var \OC\Server $server */
|
||||
$server = $c->query('ServerContainer');
|
||||
|
@ -85,11 +80,11 @@ class Application extends App {
|
|||
$server->getURLGenerator(),
|
||||
$server->getContactsManager(),
|
||||
$c->query('OCA\Activity\ViewInfoCache'),
|
||||
$c->query('ActivityL10N'),
|
||||
$c->query('OCP\IL10N'),
|
||||
$c->query('CurrentUID')
|
||||
),
|
||||
$server->getL10NFactory(),
|
||||
$c->query('ActivityL10N')
|
||||
$c->query('OCP\IL10N')
|
||||
);
|
||||
});
|
||||
|
||||
|
@ -146,7 +141,7 @@ class Application extends App {
|
|||
$rssToken = ($c->query('CurrentUID') !== '') ? $server->getConfig()->getUserValue($c->query('CurrentUID'), 'activity', 'rsstoken') : '';
|
||||
|
||||
return new Navigation(
|
||||
$c->query('ActivityL10N'),
|
||||
$c->query('OCP\IL10N'),
|
||||
$server->getActivityManager(),
|
||||
$server->getURLGenerator(),
|
||||
$c->query('CurrentUID'),
|
||||
|
@ -196,7 +191,7 @@ class Application extends App {
|
|||
$server->getURLGenerator(),
|
||||
$c->query('ActivityData'),
|
||||
$c->query('UserSettings'),
|
||||
$c->query('ActivityL10N'),
|
||||
$c->query('OCP\IL10N'),
|
||||
$c->query('CurrentUID')
|
||||
);
|
||||
});
|
||||
|
|
|
@ -51,7 +51,7 @@ class ApplicationTest extends TestCase {
|
|||
public function queryData() {
|
||||
return array(
|
||||
array('ActivityData', 'OCA\Activity\Data'),
|
||||
array('ActivityL10N', 'OCP\IL10N'),
|
||||
array('OCP\IL10N', 'OCP\IL10N'),
|
||||
array('Consumer', 'OCA\Activity\Consumer'),
|
||||
array('Consumer', 'OCP\Activity\IConsumer'),
|
||||
array('DataHelper', 'OCA\Activity\DataHelper'),
|
||||
|
|
Загрузка…
Ссылка в новой задаче