-
-
Notifications
You must be signed in to change notification settings - Fork 46
Closed
Description
New language relevant PR in upstream repo: joomla/joomla-cms#36474 Here are the upstream changes:
Click to expand the diff!
diff --git a/administrator/components/com_installer/src/View/Install/HtmlView.php b/administrator/components/com_installer/src/View/Install/HtmlView.php
index 869295b6eaaf..32cc41f03b16 100644
--- a/administrator/components/com_installer/src/View/Install/HtmlView.php
+++ b/administrator/components/com_installer/src/View/Install/HtmlView.php
@@ -13,6 +13,7 @@
use Joomla\CMS\Access\Exception\NotAllowed;
use Joomla\CMS\Factory;
+use Joomla\CMS\Helper\ContentHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Plugin\PluginHelper;
use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -60,6 +61,12 @@ public function display($tpl = null)
*/
protected function addToolbar()
{
+ if (ContentHelper::getActions('com_installer')->get('core.manage'))
+ {
+ ToolbarHelper::link('index.php?option=com_installer&view=manage', 'COM_INSTALLER_TOOLBAR_MANAGE', 'list');
+ ToolbarHelper::divider();
+ }
+
parent::addToolbar();
ToolbarHelper::help('Extensions:_Install');
diff --git a/administrator/components/com_installer/src/View/Manage/HtmlView.php b/administrator/components/com_installer/src/View/Manage/HtmlView.php
index 18ca4726c174..3262bae2834a 100644
--- a/administrator/components/com_installer/src/View/Manage/HtmlView.php
+++ b/administrator/components/com_installer/src/View/Manage/HtmlView.php
@@ -16,6 +16,7 @@
use Joomla\CMS\MVC\View\GenericDataException;
use Joomla\CMS\Pagination\Pagination;
use Joomla\CMS\Toolbar\Toolbar;
+use Joomla\CMS\Toolbar\ToolbarHelper;
use Joomla\Component\Installer\Administrator\View\Installer\HtmlView as InstallerViewDefault;
/**
@@ -83,8 +84,7 @@ public function display($tpl = null)
protected function addToolbar()
{
$toolbar = Toolbar::getInstance('toolbar');
-
- $canDo = ContentHelper::getActions('com_installer');
+ $canDo = ContentHelper::getActions('com_installer');
if ($canDo->get('core.edit.state'))
{
@@ -112,6 +112,12 @@ protected function addToolbar()
$toolbar->divider();
}
+ if ($canDo->get('core.manage'))
+ {
+ ToolbarHelper::link('index.php?option=com_installer&view=install', 'COM_INSTALLER_TOOLBAR_INSTALL_EXTENSIONS', 'upload');
+ $toolbar->divider();
+ }
+
parent::addToolbar();
$toolbar->help('Extensions:_Manage');
}
diff --git a/administrator/language/en-GB/com_installer.ini b/administrator/language/en-GB/com_installer.ini
index 76e757309ce7..0f6d7b22175e 100644
--- a/administrator/language/en-GB/com_installer.ini
+++ b/administrator/language/en-GB/com_installer.ini
@@ -232,6 +232,8 @@ COM_INSTALLER_TOOLBAR_DISCOVER="Discover"
COM_INSTALLER_TOOLBAR_FIND_LANGUAGES="Find languages"
COM_INSTALLER_TOOLBAR_FIND_UPDATES="Check For Updates"
COM_INSTALLER_TOOLBAR_INSTALL="Install"
+COM_INSTALLER_TOOLBAR_INSTALL_EXTENSIONS="Install Extensions"
+COM_INSTALLER_TOOLBAR_MANAGE="Manage Extensions"
COM_INSTALLER_TOOLBAR_PURGE="Clear Cache"
COM_INSTALLER_TOOLBAR_UPDATE="Update"
COM_INSTALLER_TYPE_CLIENT="Location"