diff options
author | Julius Härtl <jus@bitgrid.net> | 2019-04-17 13:07:59 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-17 13:07:59 +0300 |
commit | f269b915bd915ed0724db1ded275d856a1903364 (patch) | |
tree | 9aec2957acec79ce7048d80b3c3b4ebb795c959e /lib | |
parent | 2e3842f6d5c60411c64ec5bc80ca4a0c880f4454 (diff) | |
parent | 455e1f260a5345114bf5f7563602f290af9c8bee (diff) |
Merge pull request #477 from nextcloud/bugfix/noid/product-name
Use product name from collabora capabilities
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Capabilities.php | 8 | ||||
-rw-r--r-- | lib/Settings/Section.php | 16 |
2 files changed, 19 insertions, 5 deletions
diff --git a/lib/Capabilities.php b/lib/Capabilities.php index 03d3b246..e05c7c3d 100644 --- a/lib/Capabilities.php +++ b/lib/Capabilities.php @@ -30,6 +30,7 @@ use OCP\Files\NotFoundException; use OCP\Files\SimpleFS\ISimpleFolder; use OCP\Http\Client\IClientService; use OCP\IConfig; +use OCP\IL10N; use OCP\IURLGenerator; class Capabilities implements ICapability { @@ -75,13 +76,17 @@ class Capabilities implements ICapability { /** @var ISimpleFolder */ private $appData; + /** @var IL10N */ + private $l10n; + /** * Capabilities constructor. * * @param IAppData $appData * @throws \OCP\Files\NotPermittedException */ - public function __construct(IAppData $appData) { + public function __construct(IAppData $appData, IL10N $l10n) { + $this->l10n = $l10n; try { $this->appData = $appData->getFolder('richdocuments'); } catch (NotFoundException $e) { @@ -98,6 +103,7 @@ class Capabilities implements ICapability { 'collabora' => $collaboraCapabilities, 'direct_editing' => isset($collaboraCapabilities['hasMobileSupport']) ? : false, 'templates' => isset($collaboraCapabilities['hasTemplateSaveAs']) ? : false, + 'productName' => isset($collaboraCapabilities['productName']) ? : $this->l10n->t('Collabora Online'), ], ]; } diff --git a/lib/Settings/Section.php b/lib/Settings/Section.php index 25f69dcf..14349ac2 100644 --- a/lib/Settings/Section.php +++ b/lib/Settings/Section.php @@ -23,23 +23,27 @@ namespace OCA\Richdocuments\Settings; +use OCA\Richdocuments\Capabilities; use OCP\IL10N; use OCP\IURLGenerator; use OCP\Settings\IIconSection; class Section implements IIconSection { /** @var IL10N */ - private $l; + private $l10n; /** @var IURLGenerator */ private $url; + /** @var Capabilities */ + private $capabilitites; /** * @param IL10N $l * @param IURLGenerator $url */ - public function __construct(IL10N $l, IURLGenerator $url) { - $this->l = $l; + public function __construct(IL10N $l10n, IURLGenerator $url, Capabilities $capabilities) { + $this->l10n = $l10n; $this->url = $url; + $this->capabilitites = $capabilities; } /** * {@inheritdoc} @@ -51,7 +55,11 @@ class Section implements IIconSection { * {@inheritdoc} */ public function getName() { - return $this->l->t('Collabora Online'); + $capabilitites = $this->capabilitites->getCapabilities(); + if (isset($capabilitites['richdocuments']['productName'])) { + return $capabilitites['richdocuments']['productName']; + } + return $this->l10n->t('Collabora Online'); } /** * {@inheritdoc} |