Replacing Factory::getLanguage() with Factory::getApplication()->getL…

…anguage()

administrator/components/com_admin/src/Model/HelpModel.php

@@ -110,7 +110,7 @@ public function &getPage()
     public function getLangTag()
     {
         if (\is_null($this->lang_tag)) {
-            $this->lang_tag = Factory::getLanguage()->getTag();
+            $this->lang_tag = Factory::getApplication()->getLanguage()->getTag();
 
             if (!is_dir(JPATH_BASE . '/help/' . $this->lang_tag)) {
                 // Use English as fallback

administrator/components/com_categories/src/Model/CategoryModel.php

@@ -398,7 +398,7 @@ public function validate($form, $data, $group = null)
      */
     protected function preprocessForm(Form $form, $data, $group = 'content')
     {
-        $lang      = Factory::getLanguage();
+        $lang      = Factory::getApplication()->getLanguage();
         $component = $this->getState('category.component');
         $section   = $this->getState('category.section');
         $extension = Factory::getApplication()->getInput()->get('extension', null);

administrator/components/com_joomlaupdate/src/Model/UpdateModel.php

@@ -1662,7 +1662,7 @@ private function checkCompatibility($updateFileUrl, $joomlaTargetVersion)
     protected function translateExtensionName(&$item)
     {
         // @todo: Cleanup duplicated code. from com_installer/src/Model/InstallerModel.php
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
         $path = $item->client_id ? JPATH_ADMINISTRATOR : JPATH_SITE;
 
         $extension = $item->element;

administrator/components/com_login/src/Model/LoginModel.php

@@ -131,7 +131,7 @@ protected static function _load($module)
         }
 
         $app      = Factory::getApplication();
-        $lang     = Factory::getLanguage()->getTag();
+        $lang     = Factory::getApplication()->getLanguage()->getTag();
         $clientId = (int) $app->getClientId();
 
         /** @var \Joomla\CMS\Cache\Controller\CallbackController $cache */

administrator/components/com_mails/src/Helper/MailsHelper.php

@@ -74,7 +74,7 @@ public static function loadTranslationFiles($extension)
             return;
         }
 
-        $lang   = Factory::getLanguage();
+        $lang   = Factory::getApplication()->getLanguage();
         $source = '';
 
         switch (substr($extension, 0, 3)) {

administrator/components/com_menus/src/Model/ItemModel.php

@@ -698,7 +698,7 @@ public function getItem($pk = null)
 
                 if (isset($args['option'])) {
                     // Load the language file for the component.
-                    $lang = Factory::getLanguage();
+                    $lang = Factory::getApplication()->getLanguage();
                     $lang->load($args['option'], JPATH_ADMINISTRATOR)
                         || $lang->load($args['option'], JPATH_ADMINISTRATOR . '/components/' . $args['option']);
 

administrator/components/com_menus/src/Model/ItemsModel.php

@@ -124,7 +124,7 @@ protected function populateState($ordering = 'a.lft', $direction = 'asc')
 
         // Load mod_menu.ini file when client is administrator
         if ($clientId == 1) {
-            Factory::getLanguage()->load('mod_menu', JPATH_ADMINISTRATOR);
+            Factory::getApplication()->getLanguage()->load('mod_menu', JPATH_ADMINISTRATOR);
         }
 
         $currentMenuType = $app->getUserState($this->context . '.menutype', '');

administrator/components/com_menus/src/Model/MenutypesModel.php

@@ -82,7 +82,7 @@ public function getReverseLookup()
      */
     public function getTypeOptions()
     {
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
         $list = [];
 
         // Get the list of components.

administrator/components/com_templates/src/Model/TemplateModel.php

@@ -368,7 +368,7 @@ public function getFiles()
             $app    = Factory::getApplication();
             $client = ApplicationHelper::getClientInfo($template->client_id);
             $path   = Path::clean($client->path . '/templates/' . $template->element . '/');
-            $lang   = Factory::getLanguage();
+            $lang   = Factory::getApplication()->getLanguage();
 
             // Load the core and/or local language file(s).
             $lang->load('tpl_' . $template->element, $client->path)

administrator/modules/mod_submenu/mod_submenu.php

@@ -26,7 +26,7 @@
 }
 
 if ($root && $root->hasChildren()) {
-    Factory::getLanguage()->load(
+    Factory::getApplication()->getLanguage()->load(
         'mod_menu',
         JPATH_ADMINISTRATOR,
         Factory::getLanguage()->getTag(),

administrator/modules/mod_submenu/src/Menu/Menu.php

@@ -45,7 +45,7 @@ public static function preprocess($parent)
         $app        = Factory::getApplication();
         $user       = $app->getIdentity();
         $children   = $parent->getChildren();
-        $language   = Factory::getLanguage();
+        $language   = Factory::getApplication()->getLanguage();
         $dispatcher = $app->getDispatcher();
 
         /**

administrator/templates/atum/html/layouts/chromes/body.php

@@ -43,7 +43,7 @@
 <div class="<?php echo $moduleClass; ?> module-wrapper">
     <<?php echo $moduleTag; ?> class="card pt-3<?php echo $moduleClassSfx; ?>">
         <?php if ($canEdit || $canChange) : ?>
-            <?php $dropdownPosition = Factory::getLanguage()->isRtl() ? 'start' : 'end'; ?>
+            <?php $dropdownPosition = Factory::getApplication()->getLanguage()->isRtl() ? 'start' : 'end'; ?>
             <div class="module-actions dropdown">
                 <button type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn" id="dropdownMenuButton-<?php echo $id; ?>">
                     <span class="icon-cogs" aria-hidden="true"></span>

administrator/templates/atum/html/layouts/chromes/well.php

@@ -53,7 +53,7 @@
         <?php if ($canEdit || $canChange || $headerIcon || $module->showtitle) : ?>
             <div class="card-header">
                 <?php if ($canEdit || $canChange) : ?>
-                    <?php $dropdownPosition = Factory::getLanguage()->isRtl() ? 'start' : 'end'; ?>
+                    <?php $dropdownPosition = Factory::getApplication()->getLanguage()->isRtl() ? 'start' : 'end'; ?>
                     <div class="module-actions dropdown">
                         <button type="button" data-bs-toggle="dropdown" data-bs-display="static" aria-haspopup="true" aria-expanded="false" class="btn" id="dropdownMenuButton-<?php echo $id; ?>">
                             <span class="icon-cogs" aria-hidden="true"></span>

build/helpTOC.php

@@ -127,7 +127,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
         $cleanMembers = array_unique($cleanMembers);
 
         // Get the language object
-        $language = Factory::getLanguage();
+        $language = Factory::getApplication()->getLanguage();
 
         // Load the admin com_admin language file
         $language->load('com_admin', JPATH_ADMINISTRATOR);

components/com_ajax/ajax.php

@@ -95,7 +95,7 @@
             if (method_exists($class, $method . 'Ajax')) {
                 // Load language file for module
                 $basePath = JPATH_BASE;
-                $lang     = Factory::getLanguage();
+                $lang     = Factory::getApplication()->getLanguage();
                 $lang->load('mod_' . $module, $basePath)
                 || $lang->load('mod_' . $module, $basePath . '/modules/mod_' . $module);
 
@@ -179,7 +179,7 @@
 
             if (method_exists($class, $method . 'Ajax')) {
                 // Load language file for template
-                $lang = Factory::getLanguage();
+                $lang = Factory::getApplication()->getLanguage();
                 $lang->load('tpl_' . $template, $basePath)
                 || $lang->load('tpl_' . $template, $basePath . '/templates/' . $template);
 

components/com_banners/src/Model/BannersModel.php

@@ -237,7 +237,7 @@ protected function getListQuery()
 
         // Filter by language
         if ($this->getState('filter.language')) {
-            $query->whereIn($db->quoteName('a.language'), [Factory::getLanguage()->getTag(), '*'], ParameterType::STRING);
+            $query->whereIn($db->quoteName('a.language'), [Factory::getApplication()->getLanguage()->getTag(), '*'], ParameterType::STRING);
         }
 
         $query->order($db->quoteName('a.sticky') . ' DESC, ' . ($randomise ? $query->rand() : $db->quoteName('a.ordering')));

components/com_config/src/Model/ModulesModel.php

@@ -82,7 +82,7 @@ public function getForm($data = [], $loadData = true)
      */
     protected function preprocessForm(Form $form, $data, $group = 'content')
     {
-        $lang     = Factory::getLanguage();
+        $lang     = Factory::getApplication()->getLanguage();
         $module   = $this->getState()->get('module.name');
         $basePath = JPATH_BASE;
 
@@ -121,7 +121,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
      */
     public function getPositions()
     {
-        $lang         = Factory::getLanguage();
+        $lang         = Factory::getApplication()->getLanguage();
         $templateName = Factory::getApplication()->getTemplate();
 
         // Load templateDetails.xml file

components/com_config/src/Model/TemplatesModel.php

@@ -91,7 +91,7 @@ public function getForm($data = [], $loadData = true)
      */
     protected function preprocessForm(Form $form, $data, $group = 'content')
     {
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
 
         $template = Factory::getApplication()->getTemplate();
 

components/com_contact/src/Model/ContactModel.php

@@ -151,7 +151,7 @@ protected function loadFormData()
         $data = (array) Factory::getApplication()->getUserState('com_contact.contact.data', []);
 
         if (empty($data['language']) && Multilanguage::isEnabled()) {
-            $data['language'] = Factory::getLanguage()->getTag();
+            $data['language'] = Factory::getApplication()->getLanguage()->getTag();
         }
 
         // Add contact catid to contact form data, so fields plugin can work properly
@@ -331,7 +331,7 @@ protected function buildContactExtendedData($contact)
 
             // Filter per language if plugin published
             if (Multilanguage::isEnabled()) {
-                $language = [Factory::getLanguage()->getTag(), '*'];
+                $language = [Factory::getApplication()->getLanguage()->getTag(), '*'];
                 $query->whereIn($db->quoteName('a.language'), $language, ParameterType::STRING);
             }
 

components/com_contact/src/Model/FeaturedModel.php

@@ -138,7 +138,7 @@ protected function getListQuery()
 
         // Filter by language
         if ($this->getState('filter.language')) {
-            $query->whereIn($db->quoteName('a.language'), [Factory::getLanguage()->getTag(), '*'], ParameterType::STRING);
+            $query->whereIn($db->quoteName('a.language'), [Factory::getApplication()->getLanguage()->getTag(), '*'], ParameterType::STRING);
         }
 
         // Add the list ordering clause.

components/com_content/src/Helper/AssociationHelper.php

@@ -60,7 +60,7 @@ public static function getAssociations($id = 0, $view = null, $layout = null)
                 $advClause[] = 'c2.access IN (' . $groups . ')';
 
                 // Filter by current language
-                $advClause[] = 'c2.language != ' . $db->quote(Factory::getLanguage()->getTag());
+                $advClause[] = 'c2.language != ' . $db->quote(Factory::getApplication()->getLanguage()->getTag());
 
                 if (!$user->authorise('core.edit.state', 'com_content') && !$user->authorise('core.edit', 'com_content')) {
                     // Filter by start and end dates.

components/com_content/src/Model/ArticleModel.php

@@ -173,7 +173,7 @@ public function getItem($pk = null)
 
                 // Filter by language
                 if ($this->getState('filter.language')) {
-                    $query->whereIn($db->quoteName('a.language'), [Factory::getLanguage()->getTag(), '*'], ParameterType::STRING);
+                    $query->whereIn($db->quoteName('a.language'), [Factory::getApplication()->getLanguage()->getTag(), '*'], ParameterType::STRING);
                 }
 
                 if (

components/com_finder/src/Model/SearchModel.php

@@ -235,7 +235,7 @@ protected function getListQuery()
 
         // Filter by language
         if ($this->getState('filter.language')) {
-            $query->where('l.language IN (' . $db->quote(Factory::getLanguage()->getTag()) . ', ' . $db->quote('*') . ')');
+            $query->where('l.language IN (' . $db->quote(Factory::getApplication()->getLanguage()->getTag()) . ', ' . $db->quote('*') . ')');
         }
 
         // Get the result ordering and direction.

components/com_finder/src/Model/SuggestionsModel.php

@@ -161,7 +161,7 @@ protected function populateState($ordering = null, $direction = null)
 
         // Set the query language
         if (Multilanguage::isEnabled()) {
-            $lang = Factory::getLanguage()->getTag();
+            $lang = Factory::getApplication()->getLanguage()->getTag();
         } else {
             $lang = Helper::getDefaultLanguage();
         }

components/com_users/src/Model/RegistrationModel.php

@@ -357,7 +357,7 @@ protected function loadFormData()
         $data = $this->getData();
 
         if (Multilanguage::isEnabled() && empty($data->language)) {
-            $data->language = Factory::getLanguage()->getTag();
+            $data->language = Factory::getApplication()->getLanguage()->getTag();
         }
 
         $this->preprocessData('com_users.registration', $data);

installation/src/Application/InstallationApplication.php

@@ -113,7 +113,7 @@ public function debugLanguage()
             return '';
         }
 
-        $lang   = Factory::getLanguage();
+        $lang   = Factory::getApplication()->getLanguage();
         $output = '<h4>' . Text::_('JDEBUG_LANGUAGE_FILES_IN_ERROR') . '</h4>';
 
         $errorfiles = $lang->getErrorFiles();

installation/src/Controller/JSONController.php

@@ -45,7 +45,7 @@ protected function sendJsonResponse($response)
         // Very crude workaround to give an error message when JSON is disabled
         if (!\function_exists('json_encode') || !\function_exists('json_decode')) {
             $this->app->setHeader('status', 500);
-            echo '{"token":"' . Session::getFormToken(true) . '","lang":"' . Factory::getLanguage()->getTag()
+            echo '{"token":"' . Session::getFormToken(true) . '","lang":"' . Factory::getApplication()->getLanguage()->getTag()
                 . '","error":true,"header":"' . Text::_('INSTL_HEADER_ERROR') . '","message":"' . Text::_('INSTL_WARNJSON') . '"}';
 
             return;

installation/src/Form/Field/Installation/LanguageField.php

@@ -68,7 +68,7 @@ protected function getOptions()
         $options = LanguageHelper::createLanguageListInstall($native);
 
         // Fix wrongly set parentheses in RTL languages
-        if (Factory::getLanguage()->isRtl()) {
+        if (Factory::getApplication()->getLanguage()->isRtl()) {
             foreach ($options as &$option) {
                 $option['text'] .= '‎';
             }

installation/src/Model/DatabaseModel.php

@@ -57,7 +57,7 @@ public function initialise(array $options, bool $select = true)
         $options = ArrayHelper::toObject($options);
 
         // Load the backend language files so that the DB error messages work.
-        $lang        = Factory::getLanguage();
+        $lang        = Factory::getApplication()->getLanguage();
         $currentLang = $lang->getTag();
 
         // Load the selected language

installation/src/Model/SetupModel.php

@@ -58,7 +58,7 @@ public function storeOptions($options)
 
         // Ensure that we have language
         if (!isset($options['language']) || empty($options['language'])) {
-            $options['language'] = Factory::getLanguage()->getTag();
+            $options['language'] = Factory::getApplication()->getLanguage()->getTag();
         }
 
         // Store passwords as a separate key that is not used in the forms
@@ -224,7 +224,7 @@ public function validateDbConnection(array $options)
         $options = ArrayHelper::toObject($options);
 
         // Load the backend language files so that the DB error messages work.
-        $lang        = Factory::getLanguage();
+        $lang        = Factory::getApplication()->getLanguage();
         $currentLang = $lang->getTag();
 
         // Load the selected language

installation/src/Response/JsonResponse.php

@@ -94,7 +94,7 @@ public function __construct($data)
         $this->token = Session::getFormToken(true);
 
         // Get the language and send its tag along
-        $this->lang = Factory::getLanguage()->getTag();
+        $this->lang = Factory::getApplication()->getLanguage()->getTag();
 
         // Get the message queue
         $messages = Factory::getApplication()->getMessageQueue();

layouts/joomla/content/readmore.php

@@ -16,7 +16,7 @@
 
 $params    = $displayData['params'];
 $item      = $displayData['item'];
-$direction = Factory::getLanguage()->isRtl() ? 'left' : 'right';
+$direction = Factory::getApplication()->getLanguage()->isRtl() ? 'left' : 'right';
 ?>
 
 <p class="readmore">

layouts/joomla/toolbar/basic.php

@@ -65,7 +65,7 @@
     $htmlAttributes .= ' onclick="' . $onclick . '"';
 }
 
-$direction = Factory::getLanguage()->isRtl() ? 'dropdown-menu-end' : '';
+$direction = Factory::getApplication()->getLanguage()->isRtl() ? 'dropdown-menu-end' : '';
 ?>
 <joomla-toolbar-button <?php echo $idAttr . $taskAttr . $listAttr . $formAttr . $validate . $msgAttr; ?>>
 <<?php echo $tagName; ?>

layouts/joomla/toolbar/dropdown.php

@@ -32,7 +32,7 @@
  * @var   string  $toggleSplit
  */
 
-$direction = Factory::getLanguage()->isRtl() ? 'dropdown-menu-end' : '';
+$direction = Factory::getApplication()->getLanguage()->isRtl() ? 'dropdown-menu-end' : '';
 
 /**
  * The dropdown class is also injected on the button from \Joomla\CMS\Toolbar\ToolbarButton::prepareOptions() and therefore we need the dropdown script whether we

libraries/src/Application/CliApplication.php

@@ -138,7 +138,7 @@ public function __construct(
         }
 
         $this->input    = new \Joomla\CMS\Input\Cli();
-        $this->language = Factory::getLanguage();
+        $this->language = Factory::getApplication()->getLanguage();
         $this->output   = $output ?: new Stdout();
         $this->cliInput = $cliInput ?: new CliInput();
 

libraries/src/Application/WebApplication.php

@@ -324,7 +324,7 @@ public function loadDocument(Document $document = null)
      */
     public function loadLanguage(Language $language = null)
     {
-        $this->language = $language ?? Factory::getLanguage();
+        $this->language = $language ?? Factory::getApplication()->getLanguage();
         OutputFilter::setLanguage($this->language);
 
         return $this;

libraries/src/Categories/Categories.php

@@ -120,7 +120,7 @@ public function __construct($options)
         $options['access']      = $options['access'] ?? 'true';
         $options['published']   = $options['published'] ?? 1;
         $options['countItems']  = $options['countItems'] ?? 0;
-        $options['currentlang'] = Multilanguage::isEnabled() ? Factory::getLanguage()->getTag() : 0;
+        $options['currentlang'] = Multilanguage::isEnabled() ? Factory::getApplication()->getLanguage()->getTag() : 0;
 
         $this->_options = $options;
     }
@@ -327,7 +327,7 @@ protected function _load($id)
                     '(' . $db->quoteName('s.lft') . ' < ' . $db->quoteName('c.lft')
                     . ' AND ' . $db->quoteName('c.lft') . ' < ' . $db->quoteName('s.rgt')
                     . ' AND ' . $db->quoteName('c.language')
-                    . ' IN (' . implode(',', $query->bindArray([Factory::getLanguage()->getTag(), '*'], ParameterType::STRING)) . '))'
+                    . ' IN (' . implode(',', $query->bindArray([Factory::getApplication()->getLanguage()->getTag(), '*'], ParameterType::STRING)) . '))'
                     . ' OR (' . $db->quoteName('c.lft') . ' <= ' . $db->quoteName('s.lft')
                     . ' AND ' . $db->quoteName('s.rgt') . ' <= ' . $db->quoteName('c.rgt') . ')'
                 );
@@ -345,7 +345,7 @@ protected function _load($id)
             $query->from($db->quoteName('#__categories', 'c'));
 
             if ($app->isClient('site') && Multilanguage::isEnabled()) {
-                $query->whereIn($db->quoteName('c.language'), [Factory::getLanguage()->getTag(), '*'], ParameterType::STRING);
+                $query->whereIn($db->quoteName('c.language'), [Factory::getApplication()->getLanguage()->getTag(), '*'], ParameterType::STRING);
             }
         }
 

libraries/src/Component/ComponentHelper.php

@@ -283,7 +283,7 @@ public static function filterText($text)
     public static function renderComponent($option, $params = [])
     {
         $app  = Factory::getApplication();
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
 
         if (!$app->isClient('api')) {
             // Load template language files.