[5.0] Plugins: load language only when plugin it really needed. Performance optimisation.

plugins/system/actionlogs/src/Extension/ActionLogs.php

@@ -52,19 +52,6 @@ public function __construct(DispatcherInterface $dispatcher, array $config)
         PluginHelper::importPlugin('actionlog');
     }
 
-    /**
-     * Listener for the `onAfterInitialise` event
-     *
-     * @return  void
-     *
-     * @since   4.0.0
-     */
-    public function onAfterInitialise()
-    {
-        // Load plugin language files.
-        $this->loadLanguage();
-    }
-
     /**
      * Adds additional fields to the user editing form for logs e-mail notifications
      *
@@ -100,6 +87,9 @@ public function onContentPrepareForm(Form $form, $data)
             return true;
         }
 
+        // Load plugin language files.
+        $this->loadLanguage();
+
         // If we are on the save command, no data is passed to $data variable, we need to get it directly from request
         $jformData = $this->getApplication()->getInput()->get('jform', [], 'array');
 
@@ -175,6 +165,9 @@ public function onContentPrepareData($context, $data)
             return true;
         }
 
+        // Load plugin language files.
+        $this->loadLanguage();
+
         $data->actionlogs                       = new \stdClass();
         $data->actionlogs->actionlogsNotify     = $values->notify;
         $data->actionlogs->actionlogsExtensions = $values->extensions;

plugins/system/fields/src/Extension/Fields.php

@@ -31,14 +31,6 @@ final class Fields extends CMSPlugin
 {
     use UserFactoryAwareTrait;
 
-    /**
-     * Load the language file on instantiation.
-     *
-     * @var    boolean
-     * @since  3.7.0
-     */
-    protected $autoloadLanguage = true;
-
     /**
      * Normalizes the request data.
      *

plugins/system/guidedtours/src/Extension/GuidedTours.php

@@ -74,8 +74,7 @@ final class GuidedTours extends CMSPlugin implements SubscriberInterface
      */
     public function __construct(DispatcherInterface $dispatcher, array $config = [], bool $enabled = false)
     {
-        $this->autoloadLanguage = $enabled;
-        self::$enabled          = $enabled;
+        self::$enabled = $enabled;
 
         parent::__construct($dispatcher, $config);
     }
@@ -110,6 +109,9 @@ public function startTour(Event $event)
 
         $tour = null;
 
+        // Load plugin language files
+        $this->loadLanguage();
+
         if ($tourId > 0) {
             $tour = $this->getTour($tourId);
         } elseif ($tourUid !== '') {
@@ -135,6 +137,9 @@ public function onBeforeCompileHead()
         $user = $app->getIdentity();
 
         if ($user != null && $user->id > 0) {
+            // Load plugin language files
+            $this->loadLanguage();
+
             Text::script('JCANCEL');
             Text::script('PLG_SYSTEM_GUIDEDTOURS_BACK');
             Text::script('PLG_SYSTEM_GUIDEDTOURS_COMPLETE');

plugins/system/jooa11y/src/Extension/Jooa11y.php

@@ -25,14 +25,6 @@
  */
 final class Jooa11y extends CMSPlugin implements SubscriberInterface
 {
-    /**
-     * Affects constructor behavior. If true, language files will be loaded automatically.
-     *
-     * @var    boolean
-     * @since  4.1.0
-     */
-    protected $autoloadLanguage = true;
-
     /**
      * Subscribe to certain events
      *
@@ -101,6 +93,9 @@ public function initJooa11y()
             return;
         }
 
+        // Load translations
+        $this->loadLanguage();
+
         // Get the document object.
         $document = $this->getApplication()->getDocument();
 

plugins/system/logout/src/Extension/Logout.php

@@ -26,15 +26,6 @@
  */
 final class Logout extends CMSPlugin
 {
-    /**
-     * Load the language file on instantiation.
-     *
-     * @var    boolean
-     *
-     * @since  3.1
-     */
-    protected $autoloadLanguage = true;
-
     /**
      * @param   DispatcherInterface      $dispatcher  The object to observe -- event dispatcher.
      * @param   array                    $config      An optional associative array of configuration settings.

plugins/system/privacyconsent/src/Extension/PrivacyConsent.php

@@ -36,14 +36,6 @@ final class PrivacyConsent extends CMSPlugin
 {
     use DatabaseAwareTrait;
 
-    /**
-     * Load the language file on instantiation.
-     *
-     * @var    boolean
-     * @since  3.9.0
-     */
-    protected $autoloadLanguage = true;
-
     /**
      * Adds additional fields to the user editing form
      *
@@ -63,6 +55,9 @@ public function onContentPrepareForm(Form $form, $data)
             return true;
         }
 
+        // Load plugin language files
+        $this->loadLanguage();
+
         // We only display this if user has not consented before
         if (is_object($data)) {
             $userId = $data->id ?? 0;
@@ -107,6 +102,9 @@ public function onUserBeforeSave($user, $isNew, $data)
 
         $userId = ArrayHelper::getValue($user, 'id', 0, 'int');
 
+        // Load plugin language files
+        $this->loadLanguage();
+
         // User already consented before, no need to check it further
         if ($userId > 0 && $this->isUserConsented($userId)) {
             return true;
@@ -256,6 +254,9 @@ public function onAfterRoute()
 
         // Check to see whether user already consented, if not, redirect to user profile page
         if ($userId > 0) {
+            // Load plugin language files
+            $this->loadLanguage();
+
             // If user consented before, no need to check it further
             if ($this->isUserConsented($userId)) {
                 return;

plugins/system/redirect/src/Extension/Redirect.php

@@ -34,14 +34,6 @@ final class Redirect extends CMSPlugin implements SubscriberInterface
 {
     use DatabaseAwareTrait;
 
-    /**
-     * Affects constructor behavior. If true, language files will be loaded automatically.
-     *
-     * @var    boolean
-     * @since  3.4
-     */
-    protected $autoloadLanguage = false;
-
     /**
      * Returns an array of events this subscriber will listen to.
      *
@@ -72,6 +64,9 @@ public function handleError(ErrorEvent $event)
             return;
         }
 
+        // Load translations
+        $this->loadLanguage();
+
         $uri = Uri::getInstance();
 
         // These are the original URLs

plugins/system/schemaorg/src/Extension/Schemaorg.php

@@ -47,14 +47,6 @@ final class Schemaorg extends CMSPlugin implements SubscriberInterface
     use SchemaorgPrepareDateTrait;
     use UserFactoryAwareTrait;
 
-    /**
-     * Load the language file on instantiation.
-     *
-     * @var    boolean
-     * @since  5.0.0
-     */
-    protected $autoloadLanguage = true;
-
     /**
      * Returns an array of events this subscriber will listen to.
      *
@@ -148,6 +140,9 @@ public function onContentPrepareForm(Model\PrepareFormEvent $event)
             return;
         }
 
+        // Load plugin language files.
+        $this->loadLanguage();
+
         // Load the form fields
         $form->loadFile(JPATH_PLUGINS . '/' . $this->_type . '/' . $this->_name . '/forms/schemaorg.xml');
 

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

@@ -29,14 +29,6 @@
  */
 final class Shortcut extends CMSPlugin implements SubscriberInterface
 {
-    /**
-     * Load the language file on instantiation.
-     *
-     * @var    boolean
-     * @since  4.2.0
-     */
-    protected $autoloadLanguage = true;
-
     /**
      * Returns an array of events this subscriber will listen to.
      *
@@ -75,6 +67,9 @@ public function initialize()
             return;
         }
 
+        // Load translations
+        $this->loadLanguage();
+
         $context = $this->getApplication()->getInput()->get('option') . '.' . $this->getApplication()->getInput()->get('view');
 
         $shortcuts = [];

plugins/system/tasknotification/src/Extension/TaskNotification.php

@@ -53,12 +53,6 @@ final class TaskNotification extends CMSPlugin implements SubscriberInterface
      */
     private const TASK_NOTIFICATION_FORM = 'task_notification';
 
-    /**
-     * @var boolean
-     * @since 4.1.0
-     */
-    protected $autoloadLanguage = true;
-
     /**
      * @inheritDoc
      *
@@ -94,6 +88,9 @@ public function injectTaskNotificationFieldset(Model\PrepareFormEvent $event): b
             return true;
         }
 
+        // Load translations
+        $this->loadLanguage();
+
         $formFile = JPATH_PLUGINS . '/' . $this->_type . '/' . $this->_name . '/forms/' . self::TASK_NOTIFICATION_FORM . '.xml';
 
         try {
@@ -131,6 +128,9 @@ public function notifyFailure(Event $event): void
             return;
         }
 
+        // Load translations
+        $this->loadLanguage();
+
         // @todo safety checks, multiple files [?]
         $outFile = $event->getArgument('subject')->snapshot['output_file'] ?? '';
         $data    = $this->getDataFromTask($event->getArgument('subject'));
@@ -158,6 +158,9 @@ public function notifyOrphan(Event $event): void
             return;
         }
 
+        // Load translations
+        $this->loadLanguage();
+
         $data = $this->getDataFromTask($event->getArgument('subject'));
         $this->sendMail('plg_system_tasknotification.orphan_mail', $data);
     }
@@ -181,6 +184,9 @@ public function notifySuccess(Event $event): void
             return;
         }
 
+        // Load translations
+        $this->loadLanguage();
+
         // @todo safety checks, multiple files [?]
         $outFile = $event->getArgument('subject')->snapshot['output_file'] ?? '';
         $data    = $this->getDataFromTask($event->getArgument('subject'));
@@ -211,6 +217,9 @@ public function notifyFatalRecovery(Event $event): void
             return;
         }
 
+        // Load translations
+        $this->loadLanguage();
+
         $data = $this->getDataFromTask($event->getArgument('subject'));
         $this->sendMail('plg_system_tasknotification.fatal_recovery_mail', $data);
     }

plugins/system/webauthn/src/Extension/Webauthn.php

@@ -66,14 +66,6 @@ final class Webauthn extends CMSPlugin implements SubscriberInterface
     // Handle user profile deletion
     use UserDeletion;
 
-    /**
-     * Autoload the language files
-     *
-     * @var    boolean
-     * @since  4.2.0
-     */
-    protected $autoloadLanguage = true;
-
     /**
      * Should I try to detect and register legacy event listeners, i.e. methods which accept unwrapped arguments? While
      * this maintains a great degree of backwards compatibility to Joomla! 3.x-style plugins it is much slower. You are

plugins/system/webauthn/src/PluginTraits/AdditionalLoginButtons.php

@@ -68,6 +68,9 @@ public function onUserLoginButtons(Event $event): void
             return;
         }
 
+        // Load plugin language files
+        $this->loadLanguage();
+
         // Load necessary CSS and Javascript files
         $this->addLoginCSSAndJavascript();
 

plugins/system/webauthn/src/PluginTraits/AjaxHandler.php

@@ -60,6 +60,9 @@ public function onAjaxWebauthn(AjaxEvent $event): void
         $returnURL = $this->getApplication()->getSession()->get('plg_system_webauthn.returnUrl', Uri::base());
         $result    = null;
 
+        // Load plugin language files
+        $this->loadLanguage();
+
         try {
             Log::add("Received AJAX callback.", Log::DEBUG, 'webauthn.system');
 

plugins/system/webauthn/src/PluginTraits/AjaxHandlerChallenge.php

@@ -48,6 +48,9 @@ public function onAjaxWebauthnChallenge(AjaxChallenge $event): void
         $session    = $this->getApplication()->getSession();
         $input      = $this->getApplication()->getInput();
 
+        // Load plugin language files
+        $this->loadLanguage();
+
         // Retrieve data from the request
         $username  = $input->getUsername('username', '');
         $returnUrl = base64_encode(

plugins/system/webauthn/src/PluginTraits/AjaxHandlerCreate.php

@@ -42,6 +42,9 @@ trait AjaxHandlerCreate
      */
     public function onAjaxWebauthnCreate(AjaxCreate $event): void
     {
+        // Load plugin language files
+        $this->loadLanguage();
+
         /**
          * Fundamental sanity check: this callback is only allowed after a Public Key has been created server-side and
          * the user it was created for matches the current user.

plugins/system/webauthn/src/PluginTraits/AjaxHandlerDelete.php

@@ -36,6 +36,9 @@ trait AjaxHandlerDelete
      */
     public function onAjaxWebauthnDelete(AjaxDelete $event): void
     {
+        // Load plugin language files
+        $this->loadLanguage();
+
         // Initialize objects
         $input      = $this->getApplication()->getInput();
         $repository = $this->authenticationHelper->getCredentialsRepository();

plugins/system/webauthn/src/PluginTraits/AjaxHandlerInitCreate.php

@@ -38,6 +38,9 @@ trait AjaxHandlerInitCreate
      */
     public function onAjaxWebauthnInitcreate(AjaxInitCreate $event): void
     {
+        // Load plugin language files
+        $this->loadLanguage();
+
         // Make sure I have a valid user
         $user = Factory::getApplication()->getIdentity();
 

plugins/system/webauthn/src/PluginTraits/AjaxHandlerLogin.php

@@ -47,6 +47,9 @@ trait AjaxHandlerLogin
      */
     public function onAjaxWebauthnLogin(AjaxLogin $event): void
     {
+        // Load plugin language files
+        $this->loadLanguage();
+
         $session   = $this->getApplication()->getSession();
         $returnUrl = $session->get('plg_system_webauthn.returnUrl', Uri::base());
         $userId    = $session->get('plg_system_webauthn.userId', 0);