diff --git a/js/viewer/viewer.js b/js/viewer/viewer.js index b3e1e71335..34a839079d 100644 --- a/js/viewer/viewer.js +++ b/js/viewer/viewer.js @@ -134,7 +134,7 @@ var odfViewer = { $iframe.src = viewer; }) .fail(function() { odfViewer.onClose(); - OC.Notification.showTemporary('Failed to load Collabora Online - please try again later'); + OC.Notification.showTemporary(t('richdocuments', 'Failed to load {productName} - please try again later', {productName: oc_capabilities.richdocuments.productName || 'Collabora Online'})); }); $('body').css('overscroll-behavior-y', 'none'); if ($('#isPublic').val()) { diff --git a/lib/Capabilities.php b/lib/Capabilities.php index 9efc7b6982..9dfa3abeaf 100644 --- a/lib/Capabilities.php +++ b/lib/Capabilities.php @@ -30,6 +30,7 @@ use OCP\Files\SimpleFS\ISimpleFolder; use OCP\Http\Client\IClientService; use OCP\IConfig; +use OCP\IL10N; use OCP\IURLGenerator; class Capabilities implements ICapability { @@ -37,13 +38,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) { @@ -66,6 +71,7 @@ public function getCapabilities() { '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 25f69dcfdf..14349ac21e 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 @@ public function getID() { * {@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}