Improve System - Keyboard Shortcuts plugin code (#44855)

Author: joomdonation

plugins/system/shortcut/src/Extension/Shortcut.php

@@ -10,6 +10,7 @@
 
 namespace Joomla\Plugin\System\Shortcut\Extension;
 
+use Joomla\CMS\Event\Application\BeforeCompileHeadEvent;
 use Joomla\CMS\Event\GenericEvent;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
@@ -57,20 +58,23 @@ public static function getSubscribedEvents(): array
     /**
      * Add the javascript for the shortcuts
      *
+     * @param   BeforeCompileHeadEvent  $event  The event instance.
+     *
      * @return  void
      *
      * @since   4.2.0
      */
-    public function initialize()
+    public function initialize(BeforeCompileHeadEvent $event): void
     {
-        if (!$this->getApplication()->isClient('administrator')) {
+        $app = $event->getApplication();
+        if (!$app->isClient('administrator')) {
             return;
         }
 
         // Load translations
         $this->loadLanguage();
 
-        $context = $this->getApplication()->getInput()->get('option') . '.' . $this->getApplication()->getInput()->get('view');
+        $context = $app->getInput()->get('option') . '.' . $app->getInput()->get('view');
 
         $shortcuts = [];
 
@@ -92,7 +96,7 @@ public function initialize()
         Text::script('PLG_SYSTEM_SHORTCUT_THEN');
         Text::script('JCLOSE');
 
-        $document = $this->getApplication()->getDocument();
+        $document = $app->getDocument();
         $wa       = $document->getWebAssetManager();
         $wa->registerAndUseScript(
             'plg_system_shortcut.shortcut',
@@ -111,28 +115,29 @@ public function initialize()
     /**
      * Add default shortcuts to the document
      *
-     * @param   Event  $event  The event
+     * @param   Event  $event  The event instance.
      *
      * @return  void
      *
      * @since   4.2.0
      */
-    public function addShortcuts(Event $event)
+    public function addShortcuts(Event $event): void
     {
         $shortcuts = $event->getArgument('shortcuts', []);
 
+        $language  = $this->getApplication()->getLanguage();
         $shortcuts = array_merge(
             $shortcuts,
             [
-                'applyKey'   => (object) ['selector' => 'joomla-toolbar-button .button-apply', 'shortcut' => 'A', 'title' => $this->getApplication()->getLanguage()->_('JAPPLY')],
-                'saveKey'    => (object) ['selector' => 'joomla-toolbar-button .button-save', 'shortcut' => 'S', 'title' => $this->getApplication()->getLanguage()->_('JTOOLBAR_SAVE')],
-                'cancelKey'  => (object) ['selector' => 'joomla-toolbar-button .button-cancel', 'shortcut' => 'Q', 'title' => $this->getApplication()->getLanguage()->_('JCANCEL')],
-                'newKey'     => (object) ['selector' => 'joomla-toolbar-button .button-new', 'shortcut' => 'N', 'title' => $this->getApplication()->getLanguage()->_('JTOOLBAR_NEW')],
-                'searchKey'  => (object) ['selector' => 'input[placeholder=' . $this->getApplication()->getLanguage()->_('JSEARCH_FILTER') . ']', 'shortcut' => 'F', 'title' => $this->getApplication()->getLanguage()->_('JSEARCH_FILTER')],
-                'optionKey'  => (object) ['selector' => 'joomla-toolbar-button .button-options', 'shortcut' => 'O', 'title' => $this->getApplication()->getLanguage()->_('JOPTIONS')],
-                'helpKey'    => (object) ['selector' => 'joomla-toolbar-button .button-help', 'shortcut' => 'H', 'title' => $this->getApplication()->getLanguage()->_('JHELP')],
-                'toggleMenu' => (object) ['selector' => '#menu-collapse', 'shortcut' => 'M', 'title' => $this->getApplication()->getLanguage()->_('JTOGGLE_SIDEBAR_MENU')],
-                'dashboard'  => (object) ['selector' => (string) new Uri(Route::_('index.php?')), 'shortcut' => 'D', 'title' => $this->getApplication()->getLanguage()->_('JHOMEDASHBOARD')],
+                'applyKey'   => (object) ['selector' => 'joomla-toolbar-button .button-apply', 'shortcut' => 'A', 'title' => $language->_('JAPPLY')],
+                'saveKey'    => (object) ['selector' => 'joomla-toolbar-button .button-save', 'shortcut' => 'S', 'title' => $language->_('JTOOLBAR_SAVE')],
+                'cancelKey'  => (object) ['selector' => 'joomla-toolbar-button .button-cancel', 'shortcut' => 'Q', 'title' => $language->_('JCANCEL')],
+                'newKey'     => (object) ['selector' => 'joomla-toolbar-button .button-new', 'shortcut' => 'N', 'title' => $language->_('JTOOLBAR_NEW')],
+                'searchKey'  => (object) ['selector' => 'input[placeholder=' . $language->_('JSEARCH_FILTER') . ']', 'shortcut' => 'F', 'title' => $language->_('JSEARCH_FILTER')],
+                'optionKey'  => (object) ['selector' => 'joomla-toolbar-button .button-options', 'shortcut' => 'O', 'title' => $language->_('JOPTIONS')],
+                'helpKey'    => (object) ['selector' => 'joomla-toolbar-button .button-help', 'shortcut' => 'H', 'title' => $language->_('JHELP')],
+                'toggleMenu' => (object) ['selector' => '#menu-collapse', 'shortcut' => 'M', 'title' => $language->_('JTOGGLE_SIDEBAR_MENU')],
+                'dashboard'  => (object) ['selector' => (string) new Uri(Route::_('index.php?')), 'shortcut' => 'D', 'title' => $language->_('JHOMEDASHBOARD')],
             ]
         );