From 384efdab1568d4f1e6efc132a9a7d95b4768823b Mon Sep 17 00:00:00 2001
From: Hannes Papenberg <info@joomlager.de>
Date: Wed, 22 May 2024 11:21:03 +0200
Subject: [PATCH 1/2] Replacing Factory::getLanguage() with
 Factory::getApplication()->getLanguage()

---
 .../components/com_admin/src/Model/HelpModel.php   |  2 +-
 .../com_categories/src/Model/CategoryModel.php     |  2 +-
 .../com_joomlaupdate/src/Model/UpdateModel.php     |  2 +-
 .../components/com_login/src/Model/LoginModel.php  |  2 +-
 .../com_mails/src/Helper/MailsHelper.php           |  2 +-
 .../components/com_menus/src/Model/ItemModel.php   |  2 +-
 .../components/com_menus/src/Model/ItemsModel.php  |  2 +-
 .../com_menus/src/Model/MenutypesModel.php         |  2 +-
 .../com_templates/src/Model/TemplateModel.php      |  2 +-
 administrator/modules/mod_submenu/mod_submenu.php  |  2 +-
 .../modules/mod_submenu/src/Menu/Menu.php          |  2 +-
 .../templates/atum/html/layouts/chromes/body.php   |  2 +-
 .../templates/atum/html/layouts/chromes/well.php   |  2 +-
 build/helpTOC.php                                  |  2 +-
 components/com_ajax/ajax.php                       |  4 ++--
 components/com_banners/src/Model/BannersModel.php  |  2 +-
 components/com_config/src/Model/ModulesModel.php   |  4 ++--
 components/com_config/src/Model/TemplatesModel.php |  2 +-
 components/com_contact/src/Model/ContactModel.php  |  4 ++--
 components/com_contact/src/Model/FeaturedModel.php |  2 +-
 .../com_content/src/Helper/AssociationHelper.php   |  2 +-
 components/com_content/src/Model/ArticleModel.php  |  2 +-
 components/com_finder/src/Model/SearchModel.php    |  2 +-
 .../com_finder/src/Model/SuggestionsModel.php      |  2 +-
 .../com_users/src/Model/RegistrationModel.php      |  2 +-
 .../src/Application/InstallationApplication.php    |  2 +-
 installation/src/Controller/JSONController.php     |  2 +-
 .../src/Form/Field/Installation/LanguageField.php  |  2 +-
 installation/src/Model/DatabaseModel.php           |  2 +-
 installation/src/Model/SetupModel.php              |  4 ++--
 installation/src/Response/JsonResponse.php         |  2 +-
 layouts/joomla/content/readmore.php                |  2 +-
 layouts/joomla/toolbar/basic.php                   |  2 +-
 layouts/joomla/toolbar/dropdown.php                |  2 +-
 libraries/src/Application/CliApplication.php       |  2 +-
 libraries/src/Application/WebApplication.php       |  2 +-
 libraries/src/Categories/Categories.php            |  6 +++---
 libraries/src/Component/ComponentHelper.php        |  2 +-
 libraries/src/Console/ExtensionRemoveCommand.php   |  2 +-
 libraries/src/Console/FinderIndexCommand.php       |  2 +-
 libraries/src/Console/SetConfigurationCommand.php  |  2 +-
 libraries/src/Console/UpdateCoreCommand.php        |  2 +-
 libraries/src/Document/HtmlDocument.php            |  2 +-
 libraries/src/Error/AbstractRenderer.php           |  4 ++--
 libraries/src/Filter/OutputFilter.php              |  2 +-
 libraries/src/Form/Field/AliastagField.php         |  2 +-
 libraries/src/Form/Field/CalendarField.php         |  2 +-
 libraries/src/Form/Field/ComponentlayoutField.php  |  2 +-
 libraries/src/Form/Field/ComponentsField.php       |  2 +-
 libraries/src/Form/Field/ContenttypeField.php      |  2 +-
 libraries/src/Form/Field/LanguageField.php         |  2 +-
 .../src/Form/Field/LastvisitdaterangeField.php     |  2 +-
 libraries/src/Form/Field/ModulelayoutField.php     |  2 +-
 libraries/src/Form/Field/PluginsField.php          |  2 +-
 .../src/Form/Field/RegistrationdaterangeField.php  |  2 +-
 libraries/src/Form/Field/SpacerField.php           |  2 +-
 libraries/src/Form/Field/TemplatestyleField.php    |  2 +-
 libraries/src/Form/Field/TransitionField.php       |  2 +-
 libraries/src/Form/Field/UseractiveField.php       |  2 +-
 libraries/src/Form/Form.php                        |  2 +-
 libraries/src/HTML/HTMLHelper.php                  |  2 +-
 libraries/src/HTML/Helpers/Behavior.php            |  2 +-
 libraries/src/Help/Help.php                        |  2 +-
 .../src/Installer/Adapter/TemplateAdapter.php      |  2 +-
 libraries/src/Installer/InstallerAdapter.php       |  2 +-
 libraries/src/Language/Text.php                    | 14 +++++++-------
 libraries/src/Layout/FileLayout.php                |  2 +-
 libraries/src/Menu/SiteMenu.php                    |  4 ++--
 libraries/src/Pathway/SitePathway.php              |  2 +-
 libraries/src/Plugin/CMSPlugin.php                 |  2 +-
 libraries/src/Toolbar/CoreButtonsTrait.php         |  2 +-
 libraries/src/Toolbar/ToolbarHelper.php            |  4 ++--
 modules/mod_menu/src/Helper/MenuHelper.php         |  2 +-
 .../confirmconsent/src/Field/ConsentBoxField.php   |  4 ++--
 .../tinymce/src/Field/TinymcebuilderField.php      |  2 +-
 .../src/DataCollector/LanguageErrorsCollector.php  |  2 +-
 .../src/DataCollector/LanguageFilesCollector.php   |  2 +-
 .../src/DataCollector/LanguageStringsCollector.php |  4 ++--
 plugins/user/profile/src/Field/TosField.php        |  4 ++--
 plugins/user/terms/src/Field/TermsField.php        |  2 +-
 80 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/administrator/components/com_admin/src/Model/HelpModel.php b/administrator/components/com_admin/src/Model/HelpModel.php
index 2198e6430e80..76ecefe5d33c 100644
--- a/administrator/components/com_admin/src/Model/HelpModel.php
+++ b/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
diff --git a/administrator/components/com_categories/src/Model/CategoryModel.php b/administrator/components/com_categories/src/Model/CategoryModel.php
index 6e586b745332..741b67e3e384 100644
--- a/administrator/components/com_categories/src/Model/CategoryModel.php
+++ b/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);
diff --git a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
index b28ed81f2c71..bc8f87b3f85a 100644
--- a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
+++ b/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;
diff --git a/administrator/components/com_login/src/Model/LoginModel.php b/administrator/components/com_login/src/Model/LoginModel.php
index af855dbce62e..55c85eb0f90f 100644
--- a/administrator/components/com_login/src/Model/LoginModel.php
+++ b/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 */
diff --git a/administrator/components/com_mails/src/Helper/MailsHelper.php b/administrator/components/com_mails/src/Helper/MailsHelper.php
index 08d5bc777df7..816c3993a831 100644
--- a/administrator/components/com_mails/src/Helper/MailsHelper.php
+++ b/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)) {
diff --git a/administrator/components/com_menus/src/Model/ItemModel.php b/administrator/components/com_menus/src/Model/ItemModel.php
index 4f1103da3a6b..0825d0c91a43 100644
--- a/administrator/components/com_menus/src/Model/ItemModel.php
+++ b/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']);
 
diff --git a/administrator/components/com_menus/src/Model/ItemsModel.php b/administrator/components/com_menus/src/Model/ItemsModel.php
index 172fb75729d2..87ca186f3e19 100644
--- a/administrator/components/com_menus/src/Model/ItemsModel.php
+++ b/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', '');
diff --git a/administrator/components/com_menus/src/Model/MenutypesModel.php b/administrator/components/com_menus/src/Model/MenutypesModel.php
index 5dc288519f4e..dfc859a396a5 100644
--- a/administrator/components/com_menus/src/Model/MenutypesModel.php
+++ b/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.
diff --git a/administrator/components/com_templates/src/Model/TemplateModel.php b/administrator/components/com_templates/src/Model/TemplateModel.php
index 3f2fe024925a..8b360b0ce2cb 100644
--- a/administrator/components/com_templates/src/Model/TemplateModel.php
+++ b/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)
diff --git a/administrator/modules/mod_submenu/mod_submenu.php b/administrator/modules/mod_submenu/mod_submenu.php
index 1a5ed3285d9a..0cf25952636a 100644
--- a/administrator/modules/mod_submenu/mod_submenu.php
+++ b/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(),
diff --git a/administrator/modules/mod_submenu/src/Menu/Menu.php b/administrator/modules/mod_submenu/src/Menu/Menu.php
index d00d87a99316..d89015059fe3 100644
--- a/administrator/modules/mod_submenu/src/Menu/Menu.php
+++ b/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();
 
         /**
diff --git a/administrator/templates/atum/html/layouts/chromes/body.php b/administrator/templates/atum/html/layouts/chromes/body.php
index ab4c8f317e2d..99d182c86d57 100644
--- a/administrator/templates/atum/html/layouts/chromes/body.php
+++ b/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>
diff --git a/administrator/templates/atum/html/layouts/chromes/well.php b/administrator/templates/atum/html/layouts/chromes/well.php
index d61525e6cd2b..a39ab5431a29 100644
--- a/administrator/templates/atum/html/layouts/chromes/well.php
+++ b/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>
diff --git a/build/helpTOC.php b/build/helpTOC.php
index 70a6f2d35e55..932ba7f36529 100644
--- a/build/helpTOC.php
+++ b/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);
diff --git a/components/com_ajax/ajax.php b/components/com_ajax/ajax.php
index 4c06d66bf8cf..9674c1d1fc75 100644
--- a/components/com_ajax/ajax.php
+++ b/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);
 
diff --git a/components/com_banners/src/Model/BannersModel.php b/components/com_banners/src/Model/BannersModel.php
index 3de66123cfd8..c1f5c27e5a3c 100644
--- a/components/com_banners/src/Model/BannersModel.php
+++ b/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')));
diff --git a/components/com_config/src/Model/ModulesModel.php b/components/com_config/src/Model/ModulesModel.php
index bbd899c81d6b..65b062052a02 100644
--- a/components/com_config/src/Model/ModulesModel.php
+++ b/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
diff --git a/components/com_config/src/Model/TemplatesModel.php b/components/com_config/src/Model/TemplatesModel.php
index 04fa54ff037c..d2b9128001a9 100644
--- a/components/com_config/src/Model/TemplatesModel.php
+++ b/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();
 
diff --git a/components/com_contact/src/Model/ContactModel.php b/components/com_contact/src/Model/ContactModel.php
index f27770be3fd1..24cc57f4d582 100644
--- a/components/com_contact/src/Model/ContactModel.php
+++ b/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);
             }
 
diff --git a/components/com_contact/src/Model/FeaturedModel.php b/components/com_contact/src/Model/FeaturedModel.php
index 990340740df2..536f44ad24a1 100644
--- a/components/com_contact/src/Model/FeaturedModel.php
+++ b/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.
diff --git a/components/com_content/src/Helper/AssociationHelper.php b/components/com_content/src/Helper/AssociationHelper.php
index 45ce2595abd4..6416c3447af6 100644
--- a/components/com_content/src/Helper/AssociationHelper.php
+++ b/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.
diff --git a/components/com_content/src/Model/ArticleModel.php b/components/com_content/src/Model/ArticleModel.php
index dd64c43756e0..24dcd6a4ff19 100644
--- a/components/com_content/src/Model/ArticleModel.php
+++ b/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 (
diff --git a/components/com_finder/src/Model/SearchModel.php b/components/com_finder/src/Model/SearchModel.php
index 3c5214b60c2e..416e03e88e46 100644
--- a/components/com_finder/src/Model/SearchModel.php
+++ b/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.
diff --git a/components/com_finder/src/Model/SuggestionsModel.php b/components/com_finder/src/Model/SuggestionsModel.php
index afe9c010962f..675824882d9d 100644
--- a/components/com_finder/src/Model/SuggestionsModel.php
+++ b/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();
         }
diff --git a/components/com_users/src/Model/RegistrationModel.php b/components/com_users/src/Model/RegistrationModel.php
index 673553fe6a91..6059c893640c 100644
--- a/components/com_users/src/Model/RegistrationModel.php
+++ b/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);
diff --git a/installation/src/Application/InstallationApplication.php b/installation/src/Application/InstallationApplication.php
index 8385974fe05a..0f8fb58aa27f 100644
--- a/installation/src/Application/InstallationApplication.php
+++ b/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();
diff --git a/installation/src/Controller/JSONController.php b/installation/src/Controller/JSONController.php
index 2d224e00f8a9..527887244732 100644
--- a/installation/src/Controller/JSONController.php
+++ b/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;
diff --git a/installation/src/Form/Field/Installation/LanguageField.php b/installation/src/Form/Field/Installation/LanguageField.php
index dc80d658e7ab..d1c3f51a4f65 100644
--- a/installation/src/Form/Field/Installation/LanguageField.php
+++ b/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'] .= '&#x200E;';
             }
diff --git a/installation/src/Model/DatabaseModel.php b/installation/src/Model/DatabaseModel.php
index d00e69737546..8c5c611fb603 100644
--- a/installation/src/Model/DatabaseModel.php
+++ b/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
diff --git a/installation/src/Model/SetupModel.php b/installation/src/Model/SetupModel.php
index 9cb32473d9c7..1d6c49997410 100644
--- a/installation/src/Model/SetupModel.php
+++ b/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
diff --git a/installation/src/Response/JsonResponse.php b/installation/src/Response/JsonResponse.php
index fae375113512..4e5eb836cb15 100644
--- a/installation/src/Response/JsonResponse.php
+++ b/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();
diff --git a/layouts/joomla/content/readmore.php b/layouts/joomla/content/readmore.php
index 53127a969bdb..44fb4e6df94e 100644
--- a/layouts/joomla/content/readmore.php
+++ b/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">
diff --git a/layouts/joomla/toolbar/basic.php b/layouts/joomla/toolbar/basic.php
index 445831a99698..f5d4877300e5 100644
--- a/layouts/joomla/toolbar/basic.php
+++ b/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; ?>
diff --git a/layouts/joomla/toolbar/dropdown.php b/layouts/joomla/toolbar/dropdown.php
index 70edc0153166..07e6be48b379 100644
--- a/layouts/joomla/toolbar/dropdown.php
+++ b/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
diff --git a/libraries/src/Application/CliApplication.php b/libraries/src/Application/CliApplication.php
index 265087a1c0ae..9ecd72546a23 100644
--- a/libraries/src/Application/CliApplication.php
+++ b/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();
 
diff --git a/libraries/src/Application/WebApplication.php b/libraries/src/Application/WebApplication.php
index cb9de3d89f8d..f970f57e66ac 100644
--- a/libraries/src/Application/WebApplication.php
+++ b/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;
diff --git a/libraries/src/Categories/Categories.php b/libraries/src/Categories/Categories.php
index 1a4181b69f6a..ad4cc84ae143 100644
--- a/libraries/src/Categories/Categories.php
+++ b/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);
             }
         }
 
diff --git a/libraries/src/Component/ComponentHelper.php b/libraries/src/Component/ComponentHelper.php
index 0c127d3087d6..a305589cc06a 100644
--- a/libraries/src/Component/ComponentHelper.php
+++ b/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.
diff --git a/libraries/src/Console/ExtensionRemoveCommand.php b/libraries/src/Console/ExtensionRemoveCommand.php
index 82931c5a8b73..6538bcf98380 100644
--- a/libraries/src/Console/ExtensionRemoveCommand.php
+++ b/libraries/src/Console/ExtensionRemoveCommand.php
@@ -125,7 +125,7 @@ private function configureIO(InputInterface $input, OutputInterface $output): vo
     {
         $this->cliInput = $input;
         $this->ioStyle  = new SymfonyStyle($input, $output);
-        $language       = Factory::getLanguage();
+        $language       = Factory::getApplication()->getLanguage();
         $language->load('', JPATH_ADMINISTRATOR, null, false, false) ||
         $language->load('', JPATH_ADMINISTRATOR, null, true);
         $language->load('com_installer', JPATH_ADMINISTRATOR, null, false, false) ||
diff --git a/libraries/src/Console/FinderIndexCommand.php b/libraries/src/Console/FinderIndexCommand.php
index 1d91e843baf1..bcdf587df9bb 100644
--- a/libraries/src/Console/FinderIndexCommand.php
+++ b/libraries/src/Console/FinderIndexCommand.php
@@ -247,7 +247,7 @@ private function configureIO(InputInterface $input, OutputInterface $output): vo
             $language = $this->getLanguage();
         } catch (\UnexpectedValueException $e) {
             @trigger_error(sprintf('Language must be set in 6.0 in %s', __METHOD__), E_USER_DEPRECATED);
-            $language = Factory::getLanguage();
+            $language = Factory::getApplication()->getLanguage();
         }
 
         $language->load('', JPATH_ADMINISTRATOR, null, false, false) ||
diff --git a/libraries/src/Console/SetConfigurationCommand.php b/libraries/src/Console/SetConfigurationCommand.php
index 8692a185f8ec..b053cdfc57a5 100644
--- a/libraries/src/Console/SetConfigurationCommand.php
+++ b/libraries/src/Console/SetConfigurationCommand.php
@@ -104,7 +104,7 @@ class SetConfigurationCommand extends AbstractCommand
      */
     private function configureIO(InputInterface $input, OutputInterface $output)
     {
-        $language = Factory::getLanguage();
+        $language = Factory::getApplication()->getLanguage();
         $language->load('', JPATH_INSTALLATION, null, false, false) ||
         $language->load('', JPATH_INSTALLATION, null, true);
         $language->load('com_config', JPATH_ADMINISTRATOR, null, false, false) ||
diff --git a/libraries/src/Console/UpdateCoreCommand.php b/libraries/src/Console/UpdateCoreCommand.php
index 8a28fe15aab3..185ce5d01d10 100644
--- a/libraries/src/Console/UpdateCoreCommand.php
+++ b/libraries/src/Console/UpdateCoreCommand.php
@@ -133,7 +133,7 @@ private function configureIO(InputInterface $input, OutputInterface $output)
         $this->cliInput = $input;
         $this->ioStyle  = new SymfonyStyle($input, $output);
 
-        $language = Factory::getLanguage();
+        $language = Factory::getApplication()->getLanguage();
         $language->load('lib_joomla', JPATH_ADMINISTRATOR);
         $language->load('', JPATH_ADMINISTRATOR);
         $language->load('com_joomlaupdate', JPATH_ADMINISTRATOR);
diff --git a/libraries/src/Document/HtmlDocument.php b/libraries/src/Document/HtmlDocument.php
index 32bbe274dae8..5bb9caa53ed6 100644
--- a/libraries/src/Document/HtmlDocument.php
+++ b/libraries/src/Document/HtmlDocument.php
@@ -768,7 +768,7 @@ protected function _fetchTemplate($params = [])
         }
 
         // Load the language file for the template
-        $lang = CmsFactory::getLanguage();
+        $lang = CmsFactory::getApplication()->getLanguage();
 
         // 1.5 or core then 1.6
         $lang->load('tpl_' . $template, JPATH_BASE)
diff --git a/libraries/src/Error/AbstractRenderer.php b/libraries/src/Error/AbstractRenderer.php
index 4f21e5138b7c..adf9d7f628bb 100644
--- a/libraries/src/Error/AbstractRenderer.php
+++ b/libraries/src/Error/AbstractRenderer.php
@@ -105,8 +105,8 @@ protected function loadDocument(): Document
 
         // If there is a Language instance in Factory then let's pull the language and direction from its metadata
         if (Factory::$language) {
-            $attributes['language']  = Factory::getLanguage()->getTag();
-            $attributes['direction'] = Factory::getLanguage()->isRtl() ? 'rtl' : 'ltr';
+            $attributes['language']  = Factory::getApplication()->getLanguage()->getTag();
+            $attributes['direction'] = Factory::getApplication()->getLanguage()->isRtl() ? 'rtl' : 'ltr';
         }
 
         return Factory::getContainer()->get(FactoryInterface::class)->createDocument($this->type, $attributes);
diff --git a/libraries/src/Filter/OutputFilter.php b/libraries/src/Filter/OutputFilter.php
index a15f5bb21d3a..a20b744ad1f4 100644
--- a/libraries/src/Filter/OutputFilter.php
+++ b/libraries/src/Filter/OutputFilter.php
@@ -83,7 +83,7 @@ public static function stringURLSafe($string, $language = '')
         $str = str_replace('-', ' ', $string);
 
         // Transliterate on the language requested (fallback to current language if not specified)
-        $lang = $language == '' || $language == '*' ? Factory::getLanguage() : Language::getInstance($language);
+        $lang = $language == '' || $language == '*' ? Factory::getApplication()->getLanguage() : Language::getInstance($language);
         $str  = $lang->transliterate($str);
 
         // Trim white spaces at beginning and end of alias and make lowercase
diff --git a/libraries/src/Form/Field/AliastagField.php b/libraries/src/Form/Field/AliastagField.php
index 83b39d18f2ee..91f59229bcdb 100644
--- a/libraries/src/Form/Field/AliastagField.php
+++ b/libraries/src/Form/Field/AliastagField.php
@@ -55,7 +55,7 @@ protected function getOptions()
 
         $options = $db->loadObjectList();
 
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
 
         foreach ($options as $i => $item) {
             $parts     = explode('.', $item->value);
diff --git a/libraries/src/Form/Field/CalendarField.php b/libraries/src/Form/Field/CalendarField.php
index e4efa25f9946..f2c03c6dba0f 100644
--- a/libraries/src/Form/Field/CalendarField.php
+++ b/libraries/src/Form/Field/CalendarField.php
@@ -254,7 +254,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
             if ($translateFormat && $translateFormat !== 'false') {
                 $showTime = (string) $this->element['showtime'];
 
-                $lang  = Factory::getLanguage();
+                $lang  = Factory::getApplication()->getLanguage();
                 $debug = $lang->setDebug(false);
 
                 if ($showTime && $showTime !== 'false') {
diff --git a/libraries/src/Form/Field/ComponentlayoutField.php b/libraries/src/Form/Field/ComponentlayoutField.php
index 8e043cefabbb..01b331833807 100644
--- a/libraries/src/Form/Field/ComponentlayoutField.php
+++ b/libraries/src/Form/Field/ComponentlayoutField.php
@@ -84,7 +84,7 @@ protected function getInput()
         // If a template, extension and view are present build the options.
         if ($extension && $view && $client) {
             // Load language file
-            $lang = Factory::getLanguage();
+            $lang = Factory::getApplication()->getLanguage();
             $lang->load($extension . '.sys', JPATH_ADMINISTRATOR)
             || $lang->load($extension . '.sys', JPATH_ADMINISTRATOR . '/components/' . $extension);
 
diff --git a/libraries/src/Form/Field/ComponentsField.php b/libraries/src/Form/Field/ComponentsField.php
index f1fea01e44a4..f7a40f812d8f 100644
--- a/libraries/src/Form/Field/ComponentsField.php
+++ b/libraries/src/Form/Field/ComponentsField.php
@@ -60,7 +60,7 @@ protected function getOptions()
         $items = $db->setQuery($query)->loadObjectList();
 
         if ($items) {
-            $lang = Factory::getLanguage();
+            $lang = Factory::getApplication()->getLanguage();
 
             foreach ($items as &$item) {
                 // Load language
diff --git a/libraries/src/Form/Field/ContenttypeField.php b/libraries/src/Form/Field/ContenttypeField.php
index 5477f799a33a..1c2942224194 100644
--- a/libraries/src/Form/Field/ContenttypeField.php
+++ b/libraries/src/Form/Field/ContenttypeField.php
@@ -62,7 +62,7 @@ protected function getInput()
      */
     protected function getOptions()
     {
-        $lang  = Factory::getLanguage();
+        $lang  = Factory::getApplication()->getLanguage();
         $db    = $this->getDatabase();
         $query = $db->getQuery(true)
             ->select(
diff --git a/libraries/src/Form/Field/LanguageField.php b/libraries/src/Form/Field/LanguageField.php
index 3c28e8c7c0d2..d1f25b955c94 100644
--- a/libraries/src/Form/Field/LanguageField.php
+++ b/libraries/src/Form/Field/LanguageField.php
@@ -85,7 +85,7 @@ function ($a, $b) {
                 break;
             case 'active':
             case 'auto':
-                $lang        = Factory::getLanguage();
+                $lang        = Factory::getApplication()->getLanguage();
                 $this->value = $lang->getTag();
                 break;
             default:
diff --git a/libraries/src/Form/Field/LastvisitdaterangeField.php b/libraries/src/Form/Field/LastvisitdaterangeField.php
index 0fcc190d2de7..f8fa165a12e1 100644
--- a/libraries/src/Form/Field/LastvisitdaterangeField.php
+++ b/libraries/src/Form/Field/LastvisitdaterangeField.php
@@ -38,7 +38,7 @@ public function __construct($form = null)
         $this->type = 'LastvisitDateRange';
 
         // Load the required language
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
         $lang->load('com_users', JPATH_ADMINISTRATOR);
 
         // Set the pre-defined options
diff --git a/libraries/src/Form/Field/ModulelayoutField.php b/libraries/src/Form/Field/ModulelayoutField.php
index b66d0ec53c79..3d316575a7b5 100644
--- a/libraries/src/Form/Field/ModulelayoutField.php
+++ b/libraries/src/Form/Field/ModulelayoutField.php
@@ -82,7 +82,7 @@ protected function getInput()
         // If an extension and view are present build the options.
         if ($module && $client) {
             // Load language file
-            $lang = Factory::getLanguage();
+            $lang = Factory::getApplication()->getLanguage();
             $lang->load($module . '.sys', $client->path)
                 || $lang->load($module . '.sys', $client->path . '/modules/' . $module);
 
diff --git a/libraries/src/Form/Field/PluginsField.php b/libraries/src/Form/Field/PluginsField.php
index 9d7091c3b16d..31f0de286a3d 100644
--- a/libraries/src/Form/Field/PluginsField.php
+++ b/libraries/src/Form/Field/PluginsField.php
@@ -152,7 +152,7 @@ protected function getOptions()
         }
 
         $options   = $db->setQuery($query)->loadObjectList();
-        $lang      = Factory::getLanguage();
+        $lang      = Factory::getApplication()->getLanguage();
         $useGlobal = $this->element['useglobal'];
 
         if ($useGlobal) {
diff --git a/libraries/src/Form/Field/RegistrationdaterangeField.php b/libraries/src/Form/Field/RegistrationdaterangeField.php
index b8c2fe402498..36b38fa83202 100644
--- a/libraries/src/Form/Field/RegistrationdaterangeField.php
+++ b/libraries/src/Form/Field/RegistrationdaterangeField.php
@@ -59,7 +59,7 @@ public function __construct($form = null)
         parent::__construct($form);
 
         // Load the required language
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
         $lang->load('com_users', JPATH_ADMINISTRATOR);
     }
 }
diff --git a/libraries/src/Form/Field/SpacerField.php b/libraries/src/Form/Field/SpacerField.php
index d686ec7c3aab..b11d55f64c8c 100644
--- a/libraries/src/Form/Field/SpacerField.php
+++ b/libraries/src/Form/Field/SpacerField.php
@@ -90,7 +90,7 @@ protected function getLabel()
                     'UTF-8'
                 ) . '"';
 
-                if (Factory::getLanguage()->isRtl()) {
+                if (Factory::getApplication()->getLanguage()->isRtl()) {
                     $label .= ' data-bs-placement="left"';
                 }
             }
diff --git a/libraries/src/Form/Field/TemplatestyleField.php b/libraries/src/Form/Field/TemplatestyleField.php
index 8a88b3214c26..a62679d8a972 100644
--- a/libraries/src/Form/Field/TemplatestyleField.php
+++ b/libraries/src/Form/Field/TemplatestyleField.php
@@ -132,7 +132,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     protected function getGroups()
     {
         $groups = [];
-        $lang   = Factory::getLanguage();
+        $lang   = Factory::getApplication()->getLanguage();
 
         // Get the client and client_id.
         $client = ApplicationHelper::getClientInfo($this->clientName, true);
diff --git a/libraries/src/Form/Field/TransitionField.php b/libraries/src/Form/Field/TransitionField.php
index 3a064d6df550..be8cba9ab7cf 100644
--- a/libraries/src/Form/Field/TransitionField.php
+++ b/libraries/src/Form/Field/TransitionField.php
@@ -128,7 +128,7 @@ protected function getGroups()
 
         $items = $db->setQuery($query)->loadObjectList();
 
-        Factory::getLanguage()->load('com_workflow', JPATH_ADMINISTRATOR);
+        Factory::getApplication()->getLanguage()->load('com_workflow', JPATH_ADMINISTRATOR);
 
         $parts = explode('.', $extension);
 
diff --git a/libraries/src/Form/Field/UseractiveField.php b/libraries/src/Form/Field/UseractiveField.php
index 8d874d5bfbb3..6090dd734d86 100644
--- a/libraries/src/Form/Field/UseractiveField.php
+++ b/libraries/src/Form/Field/UseractiveField.php
@@ -54,7 +54,7 @@ public function __construct($form = null)
         parent::__construct($form);
 
         // Load the required language
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
         $lang->load('com_users', JPATH_ADMINISTRATOR);
     }
 }
diff --git a/libraries/src/Form/Form.php b/libraries/src/Form/Form.php
index 391089c5108c..a891cd4ba590 100644
--- a/libraries/src/Form/Form.php
+++ b/libraries/src/Form/Form.php
@@ -1479,7 +1479,7 @@ protected function loadField($element, $group = null, $value = null)
             $default = (string) ($element['default'] ? $element['default'] : $element->default);
 
             if (($translate = $element['translate_default']) && ((string) $translate === 'true' || (string) $translate === '1')) {
-                $lang = Factory::getLanguage();
+                $lang = Factory::getApplication()->getLanguage();
 
                 if ($lang->hasKey($default)) {
                     $debug   = $lang->setDebug(false);
diff --git a/libraries/src/HTML/HTMLHelper.php b/libraries/src/HTML/HTMLHelper.php
index ba48e27f778c..b55dbe622418 100644
--- a/libraries/src/HTML/HTMLHelper.php
+++ b/libraries/src/HTML/HTMLHelper.php
@@ -908,7 +908,7 @@ public static function date($input = 'now', $format = null, $tz = true, $gregori
         // If no format is given use the default locale based format.
         if (!$format) {
             $format = Text::_('DATE_FORMAT_LC1');
-        } elseif (Factory::getLanguage()->hasKey($format)) {
+        } elseif (Factory::getApplication()->getLanguage()->hasKey($format)) {
             // $format is an existing language key
             $format = Text::_($format);
         }
diff --git a/libraries/src/HTML/Helpers/Behavior.php b/libraries/src/HTML/Helpers/Behavior.php
index 3799531a1551..8ddab2006e46 100644
--- a/libraries/src/HTML/Helpers/Behavior.php
+++ b/libraries/src/HTML/Helpers/Behavior.php
@@ -292,7 +292,7 @@ protected static function calendartranslation()
             'DRAG_TO_MOVE'    => Text::_('JLIB_HTML_BEHAVIOR_DRAG_TO_MOVE'),
             'PART_TODAY'      => $today,
             'DAY_FIRST'       => Text::_('JLIB_HTML_BEHAVIOR_DISPLAY_S_FIRST'),
-            'WEEKEND'         => Factory::getLanguage()->getWeekEnd(),
+            'WEEKEND'         => Factory::getApplication()->getLanguage()->getWeekEnd(),
             'CLOSE'           => Text::_('JLIB_HTML_BEHAVIOR_CLOSE'),
             'TODAY'           => Text::_('JLIB_HTML_BEHAVIOR_TODAY'),
             'TIME_PART'       => Text::_('JLIB_HTML_BEHAVIOR_SHIFT_CLICK_OR_DRAG_TO_CHANGE_VALUE'),
diff --git a/libraries/src/Help/Help.php b/libraries/src/Help/Help.php
index 9e8afda5ad84..16a968b4310f 100644
--- a/libraries/src/Help/Help.php
+++ b/libraries/src/Help/Help.php
@@ -85,7 +85,7 @@ public static function createUrl($ref, $useComponent = false, $override = null,
         /*
          *  Replace substitution codes in the URL.
          */
-        $lang    = Factory::getLanguage();
+        $lang    = Factory::getApplication()->getLanguage();
         $version = new Version();
         $jver    = explode('.', $version->getShortVersion());
         $jlang   = explode('-', $lang->getTag());
diff --git a/libraries/src/Installer/Adapter/TemplateAdapter.php b/libraries/src/Installer/Adapter/TemplateAdapter.php
index 2f3f1d7ed2a3..420b51eff682 100644
--- a/libraries/src/Installer/Adapter/TemplateAdapter.php
+++ b/libraries/src/Installer/Adapter/TemplateAdapter.php
@@ -316,7 +316,7 @@ protected function parseQueries()
         if (\in_array($this->route, ['install', 'discover_install'])) {
             $db    = $this->getDatabase();
             $query = $db->getQuery(true);
-            $lang  = Factory::getLanguage();
+            $lang  = Factory::getApplication()->getLanguage();
             $debug = $lang->setDebug(false);
 
             $columns = [
diff --git a/libraries/src/Installer/InstallerAdapter.php b/libraries/src/Installer/InstallerAdapter.php
index 05d3cec3596f..3096246cc3e5 100644
--- a/libraries/src/Installer/InstallerAdapter.php
+++ b/libraries/src/Installer/InstallerAdapter.php
@@ -500,7 +500,7 @@ protected function doDatabaseTransactions()
      */
     protected function doLoadLanguage($extension, $source, $base = JPATH_ADMINISTRATOR)
     {
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
         $lang->load($extension . '.sys', $source) || $lang->load($extension . '.sys', $base);
     }
 
diff --git a/libraries/src/Language/Text.php b/libraries/src/Language/Text.php
index e54d1f0c3311..b6d66cd93ec4 100644
--- a/libraries/src/Language/Text.php
+++ b/libraries/src/Language/Text.php
@@ -66,7 +66,7 @@ public static function _($string, $jsSafe = false, $interpretBackSlashes = true,
             return $string;
         }
 
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
 
         if ($script) {
             static::$strings[$string] = $lang->_($string, $jsSafe, $interpretBackSlashes);
@@ -96,7 +96,7 @@ private static function passSprintf(&$string, $jsSafe = false, $interpretBackSla
             return false;
         }
 
-        $lang         = Factory::getLanguage();
+        $lang         = Factory::getApplication()->getLanguage();
         $string_parts = explode(',', $string);
 
         // Pass all parts through the Text translator
@@ -151,7 +151,7 @@ private static function passSprintf(&$string, $jsSafe = false, $interpretBackSla
      */
     public static function alt($string, $alt, $jsSafe = false, $interpretBackSlashes = true, $script = false)
     {
-        if (Factory::getLanguage()->hasKey($string . '_' . $alt)) {
+        if (Factory::getApplication()->getLanguage()->hasKey($string . '_' . $alt)) {
             $string .= '_' . $alt;
         }
 
@@ -187,7 +187,7 @@ public static function alt($string, $alt, $jsSafe = false, $interpretBackSlashes
      */
     public static function plural($string, $n)
     {
-        $lang  = Factory::getLanguage();
+        $lang  = Factory::getApplication()->getLanguage();
         $args  = \func_get_args();
         $count = \count($args);
 
@@ -255,7 +255,7 @@ public static function plural($string, $n)
      */
     public static function sprintf($string)
     {
-        $lang  = Factory::getLanguage();
+        $lang  = Factory::getApplication()->getLanguage();
         $args  = \func_get_args();
         $count = \count($args);
 
@@ -294,7 +294,7 @@ public static function sprintf($string)
      */
     public static function printf($string)
     {
-        $lang  = Factory::getLanguage();
+        $lang  = Factory::getApplication()->getLanguage();
         $args  = \func_get_args();
         $count = \count($args);
 
@@ -358,7 +358,7 @@ public static function script($string = null, $jsSafe = false, $interpretBackSla
 
             // Normalize the key and translate the string.
             $key                   = strtoupper($string);
-            $strings[$key]         = Factory::getLanguage()->_($string, $jsSafe, $interpretBackSlashes);
+            $strings[$key]         = Factory::getApplication()->getLanguage()->_($string, $jsSafe, $interpretBackSlashes);
             static::$strings[$key] = $strings[$key];
 
             // Load core.js dependency
diff --git a/libraries/src/Layout/FileLayout.php b/libraries/src/Layout/FileLayout.php
index e0f812496e0e..4dac22b52017 100644
--- a/libraries/src/Layout/FileLayout.php
+++ b/libraries/src/Layout/FileLayout.php
@@ -320,7 +320,7 @@ public function getSuffixes()
      */
     public function loadLanguageSuffixes()
     {
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
 
         $langTag   = $lang->getTag();
         $langParts = explode('-', $langTag);
diff --git a/libraries/src/Menu/SiteMenu.php b/libraries/src/Menu/SiteMenu.php
index 2f6023c2fef7..f914434f5ce3 100644
--- a/libraries/src/Menu/SiteMenu.php
+++ b/libraries/src/Menu/SiteMenu.php
@@ -69,7 +69,7 @@ public function __construct($options = [])
     {
         // Extract the internal dependencies before calling the parent constructor since it calls $this->load()
         $this->app      = isset($options['app']) && $options['app'] instanceof CMSApplication ? $options['app'] : Factory::getApplication();
-        $this->language = isset($options['language']) && $options['language'] instanceof Language ? $options['language'] : Factory::getLanguage();
+        $this->language = isset($options['language']) && $options['language'] instanceof Language ? $options['language'] : Factory::getApplication()->getLanguage();
 
         if (!isset($options['db']) || !($options['db'] instanceof DatabaseDriver)) {
             @trigger_error(sprintf('Database will be mandatory in 5.0.'), E_USER_DEPRECATED);
@@ -235,7 +235,7 @@ public function getItems($attributes, $values, $firstonly = false)
             if (($key = array_search('language', $attributes)) === false) {
                 if (Multilanguage::isEnabled()) {
                     $attributes[] = 'language';
-                    $values[]     = [Factory::getLanguage()->getTag(), '*'];
+                    $values[]     = [Factory::getApplication()->getLanguage()->getTag(), '*'];
                 }
             } elseif ($values[$key] === null) {
                 unset($attributes[$key], $values[$key]);
diff --git a/libraries/src/Pathway/SitePathway.php b/libraries/src/Pathway/SitePathway.php
index eed24b09a956..6e9fe154855f 100644
--- a/libraries/src/Pathway/SitePathway.php
+++ b/libraries/src/Pathway/SitePathway.php
@@ -37,7 +37,7 @@ public function __construct(SiteApplication $app = null)
 
         $app  = $app ?: Factory::getContainer()->get(SiteApplication::class);
         $menu = $app->getMenu();
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
 
         if ($item = $menu->getActive()) {
             $menus = $menu->getMenu();
diff --git a/libraries/src/Plugin/CMSPlugin.php b/libraries/src/Plugin/CMSPlugin.php
index 066632388633..a942a039e338 100644
--- a/libraries/src/Plugin/CMSPlugin.php
+++ b/libraries/src/Plugin/CMSPlugin.php
@@ -175,7 +175,7 @@ public function loadLanguage($extension = '', $basePath = JPATH_ADMINISTRATOR)
         }
 
         $extension = strtolower($extension);
-        $lang      = $this->getApplication() ? $this->getApplication()->getLanguage() : Factory::getLanguage();
+        $lang      = $this->getApplication() ? $this->getApplication()->getLanguage() : Factory::getApplication()->getLanguage();
 
         // If language already loaded, don't load it again.
         if ($lang->getPaths($extension)) {
diff --git a/libraries/src/Toolbar/CoreButtonsTrait.php b/libraries/src/Toolbar/CoreButtonsTrait.php
index 3c17eaaf9dd7..5d89e3412dbd 100644
--- a/libraries/src/Toolbar/CoreButtonsTrait.php
+++ b/libraries/src/Toolbar/CoreButtonsTrait.php
@@ -515,7 +515,7 @@ public function versions(
         int $width = 500,
         string $text = 'JTOOLBAR_VERSIONS'
     ): CustomButton {
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
         $lang->load('com_contenthistory', JPATH_ADMINISTRATOR, $lang->getTag(), true);
 
         // Options array for Layout
diff --git a/libraries/src/Toolbar/ToolbarHelper.php b/libraries/src/Toolbar/ToolbarHelper.php
index dd6ce583cbbb..8d236a749ad7 100644
--- a/libraries/src/Toolbar/ToolbarHelper.php
+++ b/libraries/src/Toolbar/ToolbarHelper.php
@@ -211,7 +211,7 @@ public static function back($alt = 'JTOOLBAR_BACK', $href = 'javascript:history.
         $bar = Toolbar::getInstance('toolbar');
 
         // Add a back button.
-        $arrow  = Factory::getLanguage()->isRtl() ? 'arrow-right' : 'arrow-left';
+        $arrow  = Factory::getApplication()->getLanguage()->isRtl() ? 'arrow-right' : 'arrow-left';
         $bar->appendButton('Link', $arrow, $alt, $href);
     }
 
@@ -672,7 +672,7 @@ public static function preferences($component, $height = 550, $width = 875, $alt
      */
     public static function versions($typeAlias, $itemId, $height = 800, $width = 500, $alt = 'JTOOLBAR_VERSIONS')
     {
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
         $lang->load('com_contenthistory', JPATH_ADMINISTRATOR, $lang->getTag(), true);
 
         /** @var \Joomla\CMS\Table\ContentType $contentTypeTable */
diff --git a/modules/mod_menu/src/Helper/MenuHelper.php b/modules/mod_menu/src/Helper/MenuHelper.php
index 184fc3429914..18fba92477a7 100644
--- a/modules/mod_menu/src/Helper/MenuHelper.php
+++ b/modules/mod_menu/src/Helper/MenuHelper.php
@@ -233,7 +233,7 @@ public static function getDefault()
 
         // Look for the home menu
         if (Multilanguage::isEnabled()) {
-            return $menu->getDefault(Factory::getLanguage()->getTag());
+            return $menu->getDefault(Factory::getApplication()->getLanguage()->getTag());
         }
 
         return $menu->getDefault();
diff --git a/plugins/content/confirmconsent/src/Field/ConsentBoxField.php b/plugins/content/confirmconsent/src/Field/ConsentBoxField.php
index 8357cac139e5..d56a3f4f7be1 100644
--- a/plugins/content/confirmconsent/src/Field/ConsentBoxField.php
+++ b/plugins/content/confirmconsent/src/Field/ConsentBoxField.php
@@ -277,7 +277,7 @@ private function getAssignedArticleUrl()
         }
 
         $associatedArticles = Associations::getAssociations('com_content', '#__content', 'com_content.item', $article->id);
-        $currentLang        = Factory::getLanguage()->getTag();
+        $currentLang        = Factory::getApplication()->getLanguage()->getTag();
 
         if (isset($associatedArticles) && $currentLang !== $article->language && \array_key_exists($currentLang, $associatedArticles)) {
             return Route::_(
@@ -312,7 +312,7 @@ private function getAssignedMenuItemUrl()
 
         if ($itemId > 0 && Associations::isEnabled()) {
             $privacyAssociated = Associations::getAssociations('com_menus', '#__menu', 'com_menus.item', $itemId, 'id', '', '');
-            $currentLang       = Factory::getLanguage()->getTag();
+            $currentLang       = Factory::getApplication()->getLanguage()->getTag();
 
             if (isset($privacyAssociated[$currentLang])) {
                 $itemId = $privacyAssociated[$currentLang]->id;
diff --git a/plugins/editors/tinymce/src/Field/TinymcebuilderField.php b/plugins/editors/tinymce/src/Field/TinymcebuilderField.php
index e9ba844b4f2e..9127a252c650 100644
--- a/plugins/editors/tinymce/src/Field/TinymcebuilderField.php
+++ b/plugins/editors/tinymce/src/Field/TinymcebuilderField.php
@@ -143,7 +143,7 @@ protected function getLayoutData()
         $data['setsForms'] = $setsForms;
 
         // Check for TinyMCE language file
-        $language      = Factory::getLanguage();
+        $language      = Factory::getApplication()->getLanguage();
         $languageFile1 = 'media/vendor/tinymce/langs/' . $language->getTag() . (JDEBUG ? '.js' : '.min.js');
         $languageFile2 = 'media/vendor/tinymce/langs/' . substr($language->getTag(), 0, strpos($language->getTag(), '-')) . (JDEBUG ? '.js' : '.min.js');
 
diff --git a/plugins/system/debug/src/DataCollector/LanguageErrorsCollector.php b/plugins/system/debug/src/DataCollector/LanguageErrorsCollector.php
index d774f1e1c6f2..7b0d1cb9de46 100644
--- a/plugins/system/debug/src/DataCollector/LanguageErrorsCollector.php
+++ b/plugins/system/debug/src/DataCollector/LanguageErrorsCollector.php
@@ -124,7 +124,7 @@ public function getAssets()
      */
     private function getData(): array
     {
-        $errorFiles = Factory::getLanguage()->getErrorFiles();
+        $errorFiles = Factory::getApplication()->getLanguage()->getErrorFiles();
         $errors     = [];
 
         if (\count($errorFiles)) {
diff --git a/plugins/system/debug/src/DataCollector/LanguageFilesCollector.php b/plugins/system/debug/src/DataCollector/LanguageFilesCollector.php
index 634407b77f50..693f3c3f76d6 100644
--- a/plugins/system/debug/src/DataCollector/LanguageFilesCollector.php
+++ b/plugins/system/debug/src/DataCollector/LanguageFilesCollector.php
@@ -51,7 +51,7 @@ class LanguageFilesCollector extends AbstractDataCollector implements AssetProvi
      */
     public function collect(): array
     {
-        $paths  = Factory::getLanguage()->getPaths();
+        $paths  = Factory::getApplication()->getLanguage()->getPaths();
         $loaded = [];
 
         foreach ($paths as $extension => $files) {
diff --git a/plugins/system/debug/src/DataCollector/LanguageStringsCollector.php b/plugins/system/debug/src/DataCollector/LanguageStringsCollector.php
index b8536796b669..7953902971e4 100644
--- a/plugins/system/debug/src/DataCollector/LanguageStringsCollector.php
+++ b/plugins/system/debug/src/DataCollector/LanguageStringsCollector.php
@@ -113,7 +113,7 @@ public function getAssets(): array
      */
     private function getData(): array
     {
-        $orphans = Factory::getLanguage()->getOrphans();
+        $orphans = Factory::getApplication()->getLanguage()->getOrphans();
 
         $data = [];
 
@@ -184,6 +184,6 @@ private function getData(): array
      */
     private function getCount(): int
     {
-        return \count(Factory::getLanguage()->getOrphans());
+        return \count(Factory::getApplication()->getLanguage()->getOrphans());
     }
 }
diff --git a/plugins/user/profile/src/Field/TosField.php b/plugins/user/profile/src/Field/TosField.php
index b1d2a7bcf9fc..b194d512eaea 100644
--- a/plugins/user/profile/src/Field/TosField.php
+++ b/plugins/user/profile/src/Field/TosField.php
@@ -77,7 +77,7 @@ protected function getLabel()
                 'UTF-8'
             ) . '"';
 
-            if (Factory::getLanguage()->isRtl()) {
+            if (Factory::getApplication()->getLanguage()->isRtl()) {
                 $label .= ' data-bs-placement="left"';
             }
         }
@@ -103,7 +103,7 @@ protected function getLabel()
                 $tosAssociated = Associations::getAssociations('com_content', '#__content', 'com_content.item', $tosArticle);
             }
 
-            $currentLang = Factory::getLanguage()->getTag();
+            $currentLang = Factory::getApplication()->getLanguage()->getTag();
 
             if (isset($tosAssociated) && $currentLang !== $article->language && \array_key_exists($currentLang, $tosAssociated)) {
                 $url  = RouteHelper::getArticleRoute(
diff --git a/plugins/user/terms/src/Field/TermsField.php b/plugins/user/terms/src/Field/TermsField.php
index 113f3ac8c4a0..8c6e77c2fc88 100644
--- a/plugins/user/terms/src/Field/TermsField.php
+++ b/plugins/user/terms/src/Field/TermsField.php
@@ -95,7 +95,7 @@ protected function getLayoutData()
                 $termsAssociated = Associations::getAssociations('com_content', '#__content', 'com_content.item', $termsArticle);
             }
 
-            $currentLang = Factory::getLanguage()->getTag();
+            $currentLang = Factory::getApplication()->getLanguage()->getTag();
 
             if (isset($termsAssociated) && $currentLang !== $article->language && \array_key_exists($currentLang, $termsAssociated)) {
                 $article->link = RouteHelper::getArticleRoute(

From 91152ad1413cc7c40cc5a7f5506e33a8c22fe91a Mon Sep 17 00:00:00 2001
From: Hannes Papenberg <info@joomlager.de>
Date: Wed, 22 May 2024 11:42:54 +0200
Subject: [PATCH 2/2] Additional occurences

---
 .../com_actionlogs/src/Field/LogsdaterangeField.php       | 2 +-
 .../com_actionlogs/src/Helper/ActionlogsHelper.php        | 4 ++--
 .../com_associations/src/Helper/AssociationsHelper.php    | 2 +-
 .../com_categories/src/Field/ComponentsCategoryField.php  | 2 +-
 .../com_config/src/Field/ConfigComponentsField.php        | 2 +-
 .../components/com_config/src/Helper/ConfigHelper.php     | 2 +-
 .../components/com_config/src/Model/ComponentModel.php    | 4 ++--
 .../com_contact/src/Extension/ContactComponent.php        | 4 ++--
 .../com_content/src/Extension/ContentComponent.php        | 6 +++---
 .../components/com_content/src/Helper/ContentHelper.php   | 2 +-
 .../components/com_content/src/Model/ArticlesModel.php    | 2 +-
 .../src/Helper/ContenthistoryHelper.php                   | 2 +-
 .../com_fields/src/Field/ComponentsFieldgroupField.php    | 2 +-
 .../com_fields/src/Field/ComponentsFieldsField.php        | 2 +-
 .../components/com_fields/src/Helper/FieldsHelper.php     | 4 ++--
 .../components/com_fields/src/Model/FieldModel.php        | 6 +++---
 .../components/com_fields/src/Model/GroupModel.php        | 2 +-
 .../components/com_finder/src/Field/ContentmapField.php   | 2 +-
 .../components/com_finder/src/Field/ContenttypesField.php | 2 +-
 .../components/com_finder/src/Helper/LanguageHelper.php   | 4 ++--
 .../components/com_finder/src/Model/StatisticsModel.php   | 2 +-
 .../components/com_finder/src/Service/HTML/Filter.php     | 8 ++++----
 .../components/com_finder/src/Service/HTML/Finder.php     | 4 ++--
 .../components/com_finder/src/Service/HTML/Query.php      | 2 +-
 administrator/components/com_finder/tmpl/maps/default.php | 2 +-
 .../com_guidedtours/src/Helper/GuidedtoursHelper.php      | 2 +-
 .../components/com_installer/src/Model/InstallerModel.php | 2 +-
 .../com_languages/src/Controller/InstalledController.php  | 4 ++--
 .../components/com_languages/src/Model/InstalledModel.php | 2 +-
 .../components/com_menus/src/Model/ItemsModel.php         | 2 +-
 .../components/com_menus/src/Model/MenutypesModel.php     | 2 +-
 .../components/com_modules/src/Helper/ModulesHelper.php   | 4 ++--
 .../components/com_modules/src/Model/ModuleModel.php      | 2 +-
 .../components/com_modules/src/Model/ModulesModel.php     | 4 ++--
 .../components/com_modules/src/Model/PositionsModel.php   | 2 +-
 .../components/com_modules/src/Model/SelectModel.php      | 2 +-
 .../components/com_plugins/src/Model/PluginModel.php      | 2 +-
 .../components/com_plugins/src/Model/PluginsModel.php     | 2 +-
 .../components/com_privacy/src/Model/ExportModel.php      | 2 +-
 .../components/com_privacy/src/Model/RequestModel.php     | 2 +-
 .../components/com_templates/src/Model/StyleModel.php     | 2 +-
 .../components/com_users/src/Helper/DebugHelper.php       | 4 ++--
 .../components/com_users/src/Model/MailModel.php          | 2 +-
 .../components/com_users/src/Service/HTML/Users.php       | 2 +-
 .../com_workflow/src/Field/ComponentsWorkflowField.php    | 2 +-
 administrator/modules/mod_submenu/mod_submenu.php         | 2 +-
 46 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/administrator/components/com_actionlogs/src/Field/LogsdaterangeField.php b/administrator/components/com_actionlogs/src/Field/LogsdaterangeField.php
index f211355b965d..14100b4f8c54 100644
--- a/administrator/components/com_actionlogs/src/Field/LogsdaterangeField.php
+++ b/administrator/components/com_actionlogs/src/Field/LogsdaterangeField.php
@@ -60,7 +60,7 @@ public function __construct($form = null)
         parent::__construct($form);
 
         // Load the required language
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
         $lang->load('com_actionlogs', JPATH_ADMINISTRATOR);
     }
 }
diff --git a/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php b/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
index 658788a9486c..5d28de8d16ec 100644
--- a/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
+++ b/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
@@ -100,7 +100,7 @@ public static function loadTranslationFiles($extension)
             return;
         }
 
-        $lang   = Factory::getLanguage();
+        $lang   = Factory::getApplication()->getLanguage();
         $source = '';
 
         switch (substr($extension, 0, 3)) {
@@ -274,7 +274,7 @@ public static function getContentTypeLink($component, $contentType, $id, $urlVar
      */
     public static function loadActionLogPluginsLanguage()
     {
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
         $db   = Factory::getDbo();
 
         // Get all (both enabled and disabled) actionlog plugins
diff --git a/administrator/components/com_associations/src/Helper/AssociationsHelper.php b/administrator/components/com_associations/src/Helper/AssociationsHelper.php
index bdc6199a01f0..7eba724768f3 100644
--- a/administrator/components/com_associations/src/Helper/AssociationsHelper.php
+++ b/administrator/components/com_associations/src/Helper/AssociationsHelper.php
@@ -390,7 +390,7 @@ public static function getSupportedExtension($extensionName)
 
         // Get the translated titles.
         $languagePath = JPATH_ADMINISTRATOR . '/components/' . $extensionName;
-        $lang         = Factory::getLanguage();
+        $lang         = Factory::getApplication()->getLanguage();
 
         $lang->load($extensionName . '.sys', JPATH_ADMINISTRATOR);
         $lang->load($extensionName . '.sys', $languagePath);
diff --git a/administrator/components/com_categories/src/Field/ComponentsCategoryField.php b/administrator/components/com_categories/src/Field/ComponentsCategoryField.php
index c6599b83b612..20ed0e240926 100644
--- a/administrator/components/com_categories/src/Field/ComponentsCategoryField.php
+++ b/administrator/components/com_categories/src/Field/ComponentsCategoryField.php
@@ -65,7 +65,7 @@ protected function getOptions()
             $section   = (\count($parts) > 1) ? $parts[1] : null;
 
             // Load component language files
-            $lang = Factory::getLanguage();
+            $lang = Factory::getApplication()->getLanguage();
             $lang->load($component, JPATH_BASE)
             || $lang->load($component, JPATH_ADMINISTRATOR . '/components/' . $component);
 
diff --git a/administrator/components/com_config/src/Field/ConfigComponentsField.php b/administrator/components/com_config/src/Field/ConfigComponentsField.php
index 7ec5fb115417..575dbde211df 100644
--- a/administrator/components/com_config/src/Field/ConfigComponentsField.php
+++ b/administrator/components/com_config/src/Field/ConfigComponentsField.php
@@ -53,7 +53,7 @@ protected function getOptions()
         $items = $db->setQuery($query)->loadObjectList();
 
         if ($items) {
-            $lang = Factory::getLanguage();
+            $lang = Factory::getApplication()->getLanguage();
 
             foreach ($items as &$item) {
                 // Load language
diff --git a/administrator/components/com_config/src/Helper/ConfigHelper.php b/administrator/components/com_config/src/Helper/ConfigHelper.php
index 115d38440216..39b8986913fd 100644
--- a/administrator/components/com_config/src/Helper/ConfigHelper.php
+++ b/administrator/components/com_config/src/Helper/ConfigHelper.php
@@ -142,7 +142,7 @@ public static function loadLanguageForComponent($component)
             return;
         }
 
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
 
         // Load the core file then
         // Load extension-local file.
diff --git a/administrator/components/com_config/src/Model/ComponentModel.php b/administrator/components/com_config/src/Model/ComponentModel.php
index 17554c579163..318ebfbb8e8b 100644
--- a/administrator/components/com_config/src/Model/ComponentModel.php
+++ b/administrator/components/com_config/src/Model/ComponentModel.php
@@ -94,7 +94,7 @@ public function getForm($data = [], $loadData = true)
             return false;
         }
 
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
         $lang->load($option, JPATH_BASE)
         || $lang->load($option, JPATH_BASE . "/components/$option");
 
@@ -135,7 +135,7 @@ public function getComponent()
         $option = $state->get('component.option');
 
         // Load common and local language files.
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
         $lang->load($option, JPATH_BASE)
         || $lang->load($option, JPATH_BASE . "/components/$option");
 
diff --git a/administrator/components/com_contact/src/Extension/ContactComponent.php b/administrator/components/com_contact/src/Extension/ContactComponent.php
index d4402a106003..0158384f9892 100644
--- a/administrator/components/com_contact/src/Extension/ContactComponent.php
+++ b/administrator/components/com_contact/src/Extension/ContactComponent.php
@@ -120,7 +120,7 @@ public function validateSection($section, $item = null)
      */
     public function getContexts(): array
     {
-        Factory::getLanguage()->load('com_contact', JPATH_ADMINISTRATOR);
+        Factory::getApplication()->getLanguage()->load('com_contact', JPATH_ADMINISTRATOR);
 
         $contexts = [
             'com_contact.contact'    => Text::_('COM_CONTACT_FIELDS_CONTEXT_CONTACT'),
@@ -168,7 +168,7 @@ protected function getStateColumnForSection(string $section = null)
      */
     public function getSchemaorgContexts(): array
     {
-        Factory::getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
+        Factory::getApplication()->getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
 
         $contexts = [
             'com_contact.contact' => Text::_('COM_CONTACT'),
diff --git a/administrator/components/com_content/src/Extension/ContentComponent.php b/administrator/components/com_content/src/Extension/ContentComponent.php
index 092b7396a806..e91c511b6a83 100644
--- a/administrator/components/com_content/src/Extension/ContentComponent.php
+++ b/administrator/components/com_content/src/Extension/ContentComponent.php
@@ -176,7 +176,7 @@ public function validateSection($section, $item = null)
      */
     public function getContexts(): array
     {
-        Factory::getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
+        Factory::getApplication()->getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
 
         $contexts = [
             'com_content.article'    => Text::_('COM_CONTENT'),
@@ -195,7 +195,7 @@ public function getContexts(): array
      */
     public function getSchemaorgContexts(): array
     {
-        Factory::getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
+        Factory::getApplication()->getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
 
         $contexts = [
             'com_content.article' => Text::_('COM_CONTENT'),
@@ -213,7 +213,7 @@ public function getSchemaorgContexts(): array
      */
     public function getWorkflowContexts(): array
     {
-        Factory::getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
+        Factory::getApplication()->getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
 
         $contexts = [
             'com_content.article' => Text::_('COM_CONTENT'),
diff --git a/administrator/components/com_content/src/Helper/ContentHelper.php b/administrator/components/com_content/src/Helper/ContentHelper.php
index 46aa32889767..1da128559d3c 100644
--- a/administrator/components/com_content/src/Helper/ContentHelper.php
+++ b/administrator/components/com_content/src/Helper/ContentHelper.php
@@ -95,7 +95,7 @@ public static function onPrepareForm(Form $form, $data)
         $data = (array) $data;
 
         // Make workflows translatable
-        Factory::getLanguage()->load('com_workflow', JPATH_ADMINISTRATOR);
+        Factory::getApplication()->getLanguage()->load('com_workflow', JPATH_ADMINISTRATOR);
 
         $form->setFieldAttribute('workflow_id', 'default', 'inherit');
 
diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php
index 3d3f40673d6a..9a19d6091b97 100644
--- a/administrator/components/com_content/src/Model/ArticlesModel.php
+++ b/administrator/components/com_content/src/Model/ArticlesModel.php
@@ -575,7 +575,7 @@ public function getTransitions()
 
         try {
             if (\count($stage_ids) || \count($workflow_ids)) {
-                Factory::getLanguage()->load('com_workflow', JPATH_ADMINISTRATOR);
+                Factory::getApplication()->getLanguage()->load('com_workflow', JPATH_ADMINISTRATOR);
 
                 $query = $db->getQuery(true);
 
diff --git a/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php b/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php
index dafd8c048d72..c15d4d725ad5 100644
--- a/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php
+++ b/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php
@@ -248,7 +248,7 @@ public static function loadLanguageFiles($typeAlias)
 
         if (\is_array($aliasArray) && \count($aliasArray) == 2) {
             $component = ($aliasArray[1] == 'category') ? 'com_categories' : $aliasArray[0];
-            $lang      = Factory::getLanguage();
+            $lang      = Factory::getApplication()->getLanguage();
 
             /**
              * Loading language file from the administrator/language directory then
diff --git a/administrator/components/com_fields/src/Field/ComponentsFieldgroupField.php b/administrator/components/com_fields/src/Field/ComponentsFieldgroupField.php
index 0a7f763baf9f..6afaa0cbf8a3 100644
--- a/administrator/components/com_fields/src/Field/ComponentsFieldgroupField.php
+++ b/administrator/components/com_fields/src/Field/ComponentsFieldgroupField.php
@@ -59,7 +59,7 @@ protected function getOptions()
         $options = [];
 
         if (\count($items)) {
-            $lang = Factory::getLanguage();
+            $lang = Factory::getApplication()->getLanguage();
 
             $components = [];
 
diff --git a/administrator/components/com_fields/src/Field/ComponentsFieldsField.php b/administrator/components/com_fields/src/Field/ComponentsFieldsField.php
index fecd3715fd76..19418f4837cf 100644
--- a/administrator/components/com_fields/src/Field/ComponentsFieldsField.php
+++ b/administrator/components/com_fields/src/Field/ComponentsFieldsField.php
@@ -59,7 +59,7 @@ protected function getOptions()
         $options = [];
 
         if (\count($items)) {
-            $lang = Factory::getLanguage();
+            $lang = Factory::getApplication()->getLanguage();
 
             $components = [];
 
diff --git a/administrator/components/com_fields/src/Helper/FieldsHelper.php b/administrator/components/com_fields/src/Helper/FieldsHelper.php
index 8e70a96a4312..0b05db8a07f5 100644
--- a/administrator/components/com_fields/src/Helper/FieldsHelper.php
+++ b/administrator/components/com_fields/src/Helper/FieldsHelper.php
@@ -437,7 +437,7 @@ public static function prepareForm($context, Form $form, $data)
             if (!$label) {
                 $key = strtoupper($component . '_FIELDS_' . $section . '_LABEL');
 
-                if (!Factory::getLanguage()->hasKey($key)) {
+                if (!Factory::getApplication()->getLanguage()->hasKey($key)) {
                     $key = 'JGLOBAL_FIELDS';
                 }
 
@@ -447,7 +447,7 @@ public static function prepareForm($context, Form $form, $data)
             if (!$description) {
                 $key = strtoupper($component . '_FIELDS_' . $section . '_DESC');
 
-                if (Factory::getLanguage()->hasKey($key)) {
+                if (Factory::getApplication()->getLanguage()->hasKey($key)) {
                     $description = $key;
                 }
             }
diff --git a/administrator/components/com_fields/src/Model/FieldModel.php b/administrator/components/com_fields/src/Model/FieldModel.php
index c6eff9511df6..af4d2a4f510f 100644
--- a/administrator/components/com_fields/src/Model/FieldModel.php
+++ b/administrator/components/com_fields/src/Model/FieldModel.php
@@ -1028,13 +1028,13 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
             // Allow to override the default value label and description through the plugin
             $key = 'PLG_FIELDS_' . strtoupper($dataObject->type) . '_DEFAULT_VALUE_LABEL';
 
-            if (Factory::getLanguage()->hasKey($key)) {
+            if (Factory::getApplication()->getLanguage()->hasKey($key)) {
                 $form->setFieldAttribute('default_value', 'label', $key);
             }
 
             $key = 'PLG_FIELDS_' . strtoupper($dataObject->type) . '_DEFAULT_VALUE_DESC';
 
-            if (Factory::getLanguage()->hasKey($key)) {
+            if (Factory::getApplication()->getLanguage()->hasKey($key)) {
                 $form->setFieldAttribute('default_value', 'description', $key);
             }
 
@@ -1096,7 +1096,7 @@ function () use ($component, $section) {
         }
 
         if (file_exists($path)) {
-            $lang = Factory::getLanguage();
+            $lang = Factory::getApplication()->getLanguage();
             $lang->load($component, JPATH_BASE);
             $lang->load($component, JPATH_BASE . '/components/' . $component);
 
diff --git a/administrator/components/com_fields/src/Model/GroupModel.php b/administrator/components/com_fields/src/Model/GroupModel.php
index 69caf97134ff..063483afd747 100644
--- a/administrator/components/com_fields/src/Model/GroupModel.php
+++ b/administrator/components/com_fields/src/Model/GroupModel.php
@@ -258,7 +258,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
         $path = Path::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/models/forms/fieldgroup/' . $section . '.xml');
 
         if (file_exists($path)) {
-            $lang = Factory::getLanguage();
+            $lang = Factory::getApplication()->getLanguage();
             $lang->load($component, JPATH_BASE);
             $lang->load($component, JPATH_BASE . '/components/' . $component);
 
diff --git a/administrator/components/com_finder/src/Field/ContentmapField.php b/administrator/components/com_finder/src/Field/ContentmapField.php
index e35a26205d31..affacc8d54fc 100644
--- a/administrator/components/com_finder/src/Field/ContentmapField.php
+++ b/administrator/components/com_finder/src/Field/ContentmapField.php
@@ -103,7 +103,7 @@ protected function getGroups()
      */
     private function prepareLevel($parent, $parents)
     {
-        $lang    = Factory::getLanguage();
+        $lang    = Factory::getApplication()->getLanguage();
         $entries = [];
 
         foreach ($parents[$parent] as $item) {
diff --git a/administrator/components/com_finder/src/Field/ContenttypesField.php b/administrator/components/com_finder/src/Field/ContenttypesField.php
index 45d78df38e5b..2ec815c64691 100644
--- a/administrator/components/com_finder/src/Field/ContenttypesField.php
+++ b/administrator/components/com_finder/src/Field/ContenttypesField.php
@@ -45,7 +45,7 @@ class ContenttypesField extends ListField
      */
     public function getOptions()
     {
-        $lang    = Factory::getLanguage();
+        $lang    = Factory::getApplication()->getLanguage();
         $options = [];
 
         $db    = $this->getDatabase();
diff --git a/administrator/components/com_finder/src/Helper/LanguageHelper.php b/administrator/components/com_finder/src/Helper/LanguageHelper.php
index 34380b58f57e..2b589a67af61 100644
--- a/administrator/components/com_finder/src/Helper/LanguageHelper.php
+++ b/administrator/components/com_finder/src/Helper/LanguageHelper.php
@@ -102,7 +102,7 @@ public static function branchLanguageTitle($branchName)
      */
     public static function loadComponentLanguage()
     {
-        Factory::getLanguage()->load('com_finder', JPATH_SITE);
+        Factory::getApplication()->getLanguage()->load('com_finder', JPATH_SITE);
     }
 
     /**
@@ -139,7 +139,7 @@ public static function loadPluginLanguage()
         }
 
         // Load generic language strings.
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
         $lang->load('plg_content_finder', JPATH_ADMINISTRATOR);
 
         // Load language file for each plugin.
diff --git a/administrator/components/com_finder/src/Model/StatisticsModel.php b/administrator/components/com_finder/src/Model/StatisticsModel.php
index 8845712b15b5..b7a4b0ebd0f6 100644
--- a/administrator/components/com_finder/src/Model/StatisticsModel.php
+++ b/administrator/components/com_finder/src/Model/StatisticsModel.php
@@ -74,7 +74,7 @@ public function getData()
         $db->setQuery($query);
         $data->type_list = $db->loadObjectList();
 
-        $lang    = Factory::getLanguage();
+        $lang    = Factory::getApplication()->getLanguage();
         $plugins = PluginHelper::getPlugin('finder');
 
         foreach ($plugins as $plugin) {
diff --git a/administrator/components/com_finder/src/Service/HTML/Filter.php b/administrator/components/com_finder/src/Service/HTML/Filter.php
index 92d660e4515d..3debb52f35d7 100644
--- a/administrator/components/com_finder/src/Service/HTML/Filter.php
+++ b/administrator/components/com_finder/src/Service/HTML/Filter.php
@@ -146,7 +146,7 @@ public function slider($options = [])
             }
 
             // Translate node titles if possible.
-            $lang = Factory::getLanguage();
+            $lang = Factory::getApplication()->getLanguage();
 
             foreach ($nodes as $nk => $nv) {
                 if (trim($nv->parent_title, '*') === 'Language') {
@@ -218,7 +218,7 @@ public function select($idxQuery, $options)
 
         // Try to load the results from cache.
         $cache   = Factory::getCache('com_finder', '');
-        $cacheId = 'filter_select_' . serialize([$idxQuery->filter, $options, $groups, Factory::getLanguage()->getTag()]);
+        $cacheId = 'filter_select_' . serialize([$idxQuery->filter, $options, $groups, Factory::getApplication()->getLanguage()->getTag()]);
 
         // Check the cached results.
         if ($cache->contains($cacheId)) {
@@ -303,7 +303,7 @@ public function select($idxQuery, $options)
 
                 // Apply multilanguage filter
                 if (Multilanguage::isEnabled()) {
-                    $language = [Factory::getLanguage()->getTag(), '*'];
+                    $language = [Factory::getApplication()->getLanguage()->getTag(), '*'];
                     $query->whereIn($db->quoteName('t.language'), $language, ParameterType::STRING);
                 }
 
@@ -326,7 +326,7 @@ public function select($idxQuery, $options)
                 }
 
                 // Translate branch nodes if possible.
-                $language = Factory::getLanguage();
+                $language = Factory::getApplication()->getLanguage();
                 $root     = [];
 
                 foreach ($branches[$bk]->nodes as $node_id => $node) {
diff --git a/administrator/components/com_finder/src/Service/HTML/Finder.php b/administrator/components/com_finder/src/Service/HTML/Finder.php
index 642fcf86f584..a2f0a37617b3 100644
--- a/administrator/components/com_finder/src/Service/HTML/Finder.php
+++ b/administrator/components/com_finder/src/Service/HTML/Finder.php
@@ -57,7 +57,7 @@ public function typeslist()
         // Compile the options.
         $options = [];
 
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
 
         foreach ($rows as $row) {
             $key       = $lang->hasKey(LanguageHelper::branchPlural($row->text)) ? LanguageHelper::branchPlural($row->text) : $row->text;
@@ -92,7 +92,7 @@ public function mapslist()
         }
 
         // Translate.
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
 
         foreach ($branches as $branch) {
             $key                    = LanguageHelper::branchPlural($branch->text);
diff --git a/administrator/components/com_finder/src/Service/HTML/Query.php b/administrator/components/com_finder/src/Service/HTML/Query.php
index 2f2a6ffaafa5..8deec182f836 100644
--- a/administrator/components/com_finder/src/Service/HTML/Query.php
+++ b/administrator/components/com_finder/src/Service/HTML/Query.php
@@ -82,7 +82,7 @@ public static function explained(IndexerQuery $query)
             // Process the taxonomy branches.
             foreach ($query->filters as $branch => $nodes) {
                 // Process the taxonomy nodes.
-                $lang = Factory::getLanguage();
+                $lang = Factory::getApplication()->getLanguage();
 
                 foreach ($nodes as $title => $id) {
                     // Translate the title for Types
diff --git a/administrator/components/com_finder/tmpl/maps/default.php b/administrator/components/com_finder/tmpl/maps/default.php
index 2b9ca870ffec..0364fb783861 100644
--- a/administrator/components/com_finder/tmpl/maps/default.php
+++ b/administrator/components/com_finder/tmpl/maps/default.php
@@ -22,7 +22,7 @@
 
 $listOrder     = $this->escape($this->state->get('list.ordering'));
 $listDirn      = $this->escape($this->state->get('list.direction'));
-$lang          = Factory::getLanguage();
+$lang          = Factory::getApplication()->getLanguage();
 $branchFilter  = $this->escape($this->state->get('filter.branch'));
 
 Text::script('COM_FINDER_MAPS_CONFIRM_DELETE_PROMPT');
diff --git a/administrator/components/com_guidedtours/src/Helper/GuidedtoursHelper.php b/administrator/components/com_guidedtours/src/Helper/GuidedtoursHelper.php
index f3b6198b99b4..8c9f31ccf9cb 100644
--- a/administrator/components/com_guidedtours/src/Helper/GuidedtoursHelper.php
+++ b/administrator/components/com_guidedtours/src/Helper/GuidedtoursHelper.php
@@ -42,7 +42,7 @@ public static function loadTranslationFiles($uid, bool $steps = false)
             return;
         }
 
-        $lang   = Factory::getLanguage();
+        $lang   = Factory::getApplication()->getLanguage();
 
         // The uid has an extension separator so we need to check the extension language files
         if (strpos($uid, '.') > 0) {
diff --git a/administrator/components/com_installer/src/Model/InstallerModel.php b/administrator/components/com_installer/src/Model/InstallerModel.php
index e57297043d0f..748f1e1e1392 100644
--- a/administrator/components/com_installer/src/Model/InstallerModel.php
+++ b/administrator/components/com_installer/src/Model/InstallerModel.php
@@ -146,7 +146,7 @@ protected function _getList($query, $limitstart = 0, $limit = 0)
      */
     protected function translate(&$items)
     {
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
 
         foreach ($items as &$item) {
             if (\strlen($item->manifest_cache) && $data = json_decode($item->manifest_cache)) {
diff --git a/administrator/components/com_languages/src/Controller/InstalledController.php b/administrator/components/com_languages/src/Controller/InstalledController.php
index d92d01a8d93a..111aaf259b49 100644
--- a/administrator/components/com_languages/src/Controller/InstalledController.php
+++ b/administrator/components/com_languages/src/Controller/InstalledController.php
@@ -44,7 +44,7 @@ public function setDefault()
         if ($model->publish($cid)) {
             // Switching to the new administrator language for the message
             if ($model->getState('client_id') == 1) {
-                $language          = Factory::getLanguage();
+                $language          = Factory::getApplication()->getLanguage();
                 $newLang           = Language::getInstance($cid);
                 Factory::$language = $newLang;
                 $this->app->loadLanguage($language = $newLang);
@@ -92,7 +92,7 @@ public function switchAdminLanguage()
         if ($model->switchAdminLanguage($cid)) {
             // Switching to the new language for the message
             $languageName      = $info['nativeName'];
-            $language          = Factory::getLanguage();
+            $language          = Factory::getApplication()->getLanguage();
             $newLang           = Language::getInstance($cid);
             Factory::$language = $newLang;
             $this->app->loadLanguage($language = $newLang);
diff --git a/administrator/components/com_languages/src/Model/InstalledModel.php b/administrator/components/com_languages/src/Model/InstalledModel.php
index 60a3683f3dd9..4ab23d34fd5d 100644
--- a/administrator/components/com_languages/src/Model/InstalledModel.php
+++ b/administrator/components/com_languages/src/Model/InstalledModel.php
@@ -178,7 +178,7 @@ public function getData()
         if (\is_null($this->data)) {
             $this->data = [];
 
-            $isCurrentLanguageRtl = Factory::getLanguage()->isRtl();
+            $isCurrentLanguageRtl = Factory::getApplication()->getLanguage()->isRtl();
             $params               = ComponentHelper::getParams('com_languages');
             $installedLanguages   = LanguageHelper::getInstalledLanguages(null, true, true, null, null, null);
 
diff --git a/administrator/components/com_menus/src/Model/ItemsModel.php b/administrator/components/com_menus/src/Model/ItemsModel.php
index 87ca186f3e19..f85a23dbeac8 100644
--- a/administrator/components/com_menus/src/Model/ItemsModel.php
+++ b/administrator/components/com_menus/src/Model/ItemsModel.php
@@ -574,7 +574,7 @@ public function getItems()
 
         if (!isset($this->cache[$store])) {
             $items  = parent::getItems();
-            $lang   = Factory::getLanguage();
+            $lang   = Factory::getApplication()->getLanguage();
             $client = $this->state->get('filter.client_id');
 
             if ($items) {
diff --git a/administrator/components/com_menus/src/Model/MenutypesModel.php b/administrator/components/com_menus/src/Model/MenutypesModel.php
index dfc859a396a5..4c5aebbeff9b 100644
--- a/administrator/components/com_menus/src/Model/MenutypesModel.php
+++ b/administrator/components/com_menus/src/Model/MenutypesModel.php
@@ -442,7 +442,7 @@ protected function getTypeOptionsFromLayouts($component, $view)
         $options     = [];
         $layouts     = [];
         $layoutNames = [];
-        $lang        = Factory::getLanguage();
+        $lang        = Factory::getApplication()->getLanguage();
         $client      = ApplicationHelper::getClientInfo($this->getState('client_id'));
 
         // Get the views for this component.
diff --git a/administrator/components/com_modules/src/Helper/ModulesHelper.php b/administrator/components/com_modules/src/Helper/ModulesHelper.php
index 5a68b64c3ef8..ea0cc9a18cf3 100644
--- a/administrator/components/com_modules/src/Helper/ModulesHelper.php
+++ b/administrator/components/com_modules/src/Helper/ModulesHelper.php
@@ -168,7 +168,7 @@ public static function getModules($clientId)
 
         $db->setQuery($query);
         $modules = $db->loadObjectList();
-        $lang    = Factory::getLanguage();
+        $lang    = Factory::getApplication()->getLanguage();
 
         foreach ($modules as $i => $module) {
             $extension = $module->value;
@@ -219,7 +219,7 @@ public static function getAssignmentOptions($clientId)
     public static function getTranslatedModulePosition($clientId, $template, $position)
     {
         // Template translation
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
         $path = $clientId ? JPATH_ADMINISTRATOR : JPATH_SITE;
 
         $loaded = $lang->getPaths('tpl_' . $template . '.sys');
diff --git a/administrator/components/com_modules/src/Model/ModuleModel.php b/administrator/components/com_modules/src/Model/ModuleModel.php
index 406b9949b6c3..58f9c29defcc 100644
--- a/administrator/components/com_modules/src/Model/ModuleModel.php
+++ b/administrator/components/com_modules/src/Model/ModuleModel.php
@@ -787,7 +787,7 @@ protected function prepareTable($table)
      */
     protected function preprocessForm(Form $form, $data, $group = 'content')
     {
-        $lang     = Factory::getLanguage();
+        $lang     = Factory::getApplication()->getLanguage();
         $clientId = $this->getState('item.client_id');
         $module   = $this->getState('item.module');
 
diff --git a/administrator/components/com_modules/src/Model/ModulesModel.php b/administrator/components/com_modules/src/Model/ModulesModel.php
index 2eabe05b6d4c..9c0342c28d78 100644
--- a/administrator/components/com_modules/src/Model/ModulesModel.php
+++ b/administrator/components/com_modules/src/Model/ModulesModel.php
@@ -227,7 +227,7 @@ protected function _getList($query, $limitstart = 0, $limit = 0)
      */
     protected function translate(&$items)
     {
-        $lang       = Factory::getLanguage();
+        $lang       = Factory::getApplication()->getLanguage();
         $clientPath = $this->getState('client_id') ? JPATH_ADMINISTRATOR : JPATH_SITE;
 
         foreach ($items as $item) {
@@ -411,7 +411,7 @@ protected function getListQuery()
         // Filter on the language.
         if ($language = $this->getState('filter.language')) {
             if ($language === 'current') {
-                $language = [Factory::getLanguage()->getTag(), '*'];
+                $language = [Factory::getApplication()->getLanguage()->getTag(), '*'];
                 $query->whereIn($db->quoteName('a.language'), $language, ParameterType::STRING);
             } else {
                 $query->where($db->quoteName('a.language') . ' = :language')
diff --git a/administrator/components/com_modules/src/Model/PositionsModel.php b/administrator/components/com_modules/src/Model/PositionsModel.php
index 81c0aebe6ac9..1c0804dadd17 100644
--- a/administrator/components/com_modules/src/Model/PositionsModel.php
+++ b/administrator/components/com_modules/src/Model/PositionsModel.php
@@ -99,7 +99,7 @@ protected function populateState($ordering = 'ordering', $direction = 'asc')
     public function getItems()
     {
         if (!isset($this->items)) {
-            $lang            = Factory::getLanguage();
+            $lang            = Factory::getApplication()->getLanguage();
             $search          = $this->getState('filter.search');
             $state           = $this->getState('filter.state');
             $clientId        = $this->getState('client_id');
diff --git a/administrator/components/com_modules/src/Model/SelectModel.php b/administrator/components/com_modules/src/Model/SelectModel.php
index 643ca2450304..43a5e29b0d5d 100644
--- a/administrator/components/com_modules/src/Model/SelectModel.php
+++ b/administrator/components/com_modules/src/Model/SelectModel.php
@@ -129,7 +129,7 @@ public function getItems()
         $items = parent::getItems();
 
         $client = ApplicationHelper::getClientInfo($this->getState('client_id', 0));
-        $lang   = Factory::getLanguage();
+        $lang   = Factory::getApplication()->getLanguage();
 
         // Loop through the results to add the XML metadata,
         // and load language support.
diff --git a/administrator/components/com_plugins/src/Model/PluginModel.php b/administrator/components/com_plugins/src/Model/PluginModel.php
index b4284a637c81..ddd1fd875778 100644
--- a/administrator/components/com_plugins/src/Model/PluginModel.php
+++ b/administrator/components/com_plugins/src/Model/PluginModel.php
@@ -250,7 +250,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
     {
         $folder  = $this->getState('item.folder');
         $element = $this->getState('item.element');
-        $lang    = Factory::getLanguage();
+        $lang    = Factory::getApplication()->getLanguage();
 
         // Load the core and/or local language sys file(s) for the ordering field.
         $db    = $this->getDatabase();
diff --git a/administrator/components/com_plugins/src/Model/PluginsModel.php b/administrator/components/com_plugins/src/Model/PluginsModel.php
index 6e631b7f0208..a99d7a918403 100644
--- a/administrator/components/com_plugins/src/Model/PluginsModel.php
+++ b/administrator/components/com_plugins/src/Model/PluginsModel.php
@@ -183,7 +183,7 @@ protected function _getList($query, $limitstart = 0, $limit = 0)
      */
     protected function translate(&$items)
     {
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
 
         foreach ($items as &$item) {
             $source    = JPATH_PLUGINS . '/' . $item->folder . '/' . $item->element;
diff --git a/administrator/components/com_privacy/src/Model/ExportModel.php b/administrator/components/com_privacy/src/Model/ExportModel.php
index 8ae502d1d713..61c931a44186 100644
--- a/administrator/components/com_privacy/src/Model/ExportModel.php
+++ b/administrator/components/com_privacy/src/Model/ExportModel.php
@@ -174,7 +174,7 @@ public function emailDataExport($id = null)
          * Error messages will still be displayed to the administrator, so those messages should continue to use the Text class.
          */
 
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
 
         $db = $this->getDatabase();
 
diff --git a/administrator/components/com_privacy/src/Model/RequestModel.php b/administrator/components/com_privacy/src/Model/RequestModel.php
index 47b531c848b6..859abbaea1d7 100644
--- a/administrator/components/com_privacy/src/Model/RequestModel.php
+++ b/administrator/components/com_privacy/src/Model/RequestModel.php
@@ -259,7 +259,7 @@ public function notifyUserAdminCreatedRequest($id)
          * Error messages will still be displayed to the administrator, so those messages should continue to use the Text class.
          */
 
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
 
         $db = $this->getDatabase();
 
diff --git a/administrator/components/com_templates/src/Model/StyleModel.php b/administrator/components/com_templates/src/Model/StyleModel.php
index 0d8984b4b262..c5138dad8b2c 100644
--- a/administrator/components/com_templates/src/Model/StyleModel.php
+++ b/administrator/components/com_templates/src/Model/StyleModel.php
@@ -385,7 +385,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
     {
         $clientId = $this->getState('item.client_id');
         $template = $this->getState('item.template');
-        $lang     = Factory::getLanguage();
+        $lang     = Factory::getApplication()->getLanguage();
         $client   = ApplicationHelper::getClientInfo($clientId);
 
         if (!$form->loadFile('style_' . $client->name, true)) {
diff --git a/administrator/components/com_users/src/Helper/DebugHelper.php b/administrator/components/com_users/src/Helper/DebugHelper.php
index 263577485805..71297453a439 100644
--- a/administrator/components/com_users/src/Helper/DebugHelper.php
+++ b/administrator/components/com_users/src/Helper/DebugHelper.php
@@ -47,7 +47,7 @@ public static function getComponents()
         $items = $db->setQuery($query)->loadObjectList();
 
         if (\count($items)) {
-            $lang = Factory::getLanguage();
+            $lang = Factory::getApplication()->getLanguage();
 
             foreach ($items as &$item) {
                 // Load language
@@ -128,7 +128,7 @@ public static function getDebugActions($component = null)
                 }
 
                 // Load language
-                $lang      = Factory::getLanguage();
+                $lang      = Factory::getApplication()->getLanguage();
                 $extension = 'com_config';
                 $source    = JPATH_ADMINISTRATOR . '/components/' . $extension;
 
diff --git a/administrator/components/com_users/src/Model/MailModel.php b/administrator/components/com_users/src/Model/MailModel.php
index 6de5f948c44a..62b661d5c577 100644
--- a/administrator/components/com_users/src/Model/MailModel.php
+++ b/administrator/components/com_users/src/Model/MailModel.php
@@ -105,7 +105,7 @@ public function send()
         $user     = $this->getCurrentUser();
         $access   = new Access();
         $db       = $this->getDatabase();
-        $language = Factory::getLanguage();
+        $language = Factory::getApplication()->getLanguage();
 
         $mode         = \array_key_exists('mode', $data) ? (int) $data['mode'] : 0;
         $subject      = \array_key_exists('subject', $data) ? $data['subject'] : '';
diff --git a/administrator/components/com_users/src/Service/HTML/Users.php b/administrator/components/com_users/src/Service/HTML/Users.php
index 83adfbc60a48..9c381c71142f 100644
--- a/administrator/components/com_users/src/Service/HTML/Users.php
+++ b/administrator/components/com_users/src/Service/HTML/Users.php
@@ -402,7 +402,7 @@ public function editor($value)
         }
 
         $db    = Factory::getDbo();
-        $lang  = Factory::getLanguage();
+        $lang  = Factory::getApplication()->getLanguage();
         $query = $db->getQuery(true)
             ->select($db->quoteName('name'))
             ->from($db->quoteName('#__extensions'))
diff --git a/administrator/components/com_workflow/src/Field/ComponentsWorkflowField.php b/administrator/components/com_workflow/src/Field/ComponentsWorkflowField.php
index cd4ed6361082..bd7d2d56029d 100644
--- a/administrator/components/com_workflow/src/Field/ComponentsWorkflowField.php
+++ b/administrator/components/com_workflow/src/Field/ComponentsWorkflowField.php
@@ -59,7 +59,7 @@ protected function getOptions()
         $options = [];
 
         if (\count($items)) {
-            $lang = Factory::getLanguage();
+            $lang = Factory::getApplication()->getLanguage();
 
             $components = [];
 
diff --git a/administrator/modules/mod_submenu/mod_submenu.php b/administrator/modules/mod_submenu/mod_submenu.php
index 0cf25952636a..07a044674681 100644
--- a/administrator/modules/mod_submenu/mod_submenu.php
+++ b/administrator/modules/mod_submenu/mod_submenu.php
@@ -29,7 +29,7 @@
     Factory::getApplication()->getLanguage()->load(
         'mod_menu',
         JPATH_ADMINISTRATOR,
-        Factory::getLanguage()->getTag(),
+        Factory::getApplication()->getLanguage()->getTag(),
         true
     );