diff --git a/administrator/components/com_fields/src/Plugin/FieldsPlugin.php b/administrator/components/com_fields/src/Plugin/FieldsPlugin.php index caa0c6240b24e..cf9c5aafb0ad1 100644 --- a/administrator/components/com_fields/src/Plugin/FieldsPlugin.php +++ b/administrator/components/com_fields/src/Plugin/FieldsPlugin.php @@ -165,11 +165,6 @@ public function onCustomFieldsGetTypes() if ($app->getLanguage()->hasKey('PLG_FIELDS_' . $key . '_LABEL')) { $data['label'] = Text::sprintf('PLG_FIELDS_' . $key . '_LABEL', strtolower($key)); - - // Fix wrongly set parentheses in RTL languages - if ($app->getLanguage()->isRtl()) { - $data['label'] .= '‎'; - } } else { $data['label'] = $key; } diff --git a/administrator/components/com_languages/src/Model/InstalledModel.php b/administrator/components/com_languages/src/Model/InstalledModel.php index 9f33139c5205d..fad8d0486db2c 100644 --- a/administrator/components/com_languages/src/Model/InstalledModel.php +++ b/administrator/components/com_languages/src/Model/InstalledModel.php @@ -175,7 +175,6 @@ public function getData() if (\is_null($this->data)) { $this->data = []; - $isCurrentLanguageRtl = Factory::getLanguage()->isRtl(); $params = ComponentHelper::getParams('com_languages'); $installedLanguages = LanguageHelper::getInstalledLanguages(null, true, true, null, null, null); @@ -197,12 +196,6 @@ public function getData() $row->published = $defaultLanguage === $row->language ? 1 : 0; $row->checked_out = null; - // Fix wrongly set parentheses in RTL languages - if ($isCurrentLanguageRtl) { - $row->name = html_entity_decode($row->name . '‎', ENT_QUOTES, 'UTF-8'); - $row->nativeName = html_entity_decode($row->nativeName . '‎', ENT_QUOTES, 'UTF-8'); - } - $this->data[] = $row; } } diff --git a/administrator/modules/mod_login/src/Helper/LoginHelper.php b/administrator/modules/mod_login/src/Helper/LoginHelper.php index 81c1b04cfa622..baee2d8e412e0 100644 --- a/administrator/modules/mod_login/src/Helper/LoginHelper.php +++ b/administrator/modules/mod_login/src/Helper/LoginHelper.php @@ -52,13 +52,6 @@ function ($a, $b) { } ); - // Fix wrongly set parentheses in RTL languages - if ($app->getLanguage()->isRtl()) { - foreach ($languages as &$language) { - $language['text'] .= '‎'; - } - } - array_unshift($languages, HTMLHelper::_('select.option', '', Text::_('JDEFAULTLANGUAGE'))); return HTMLHelper::_('select.genericlist', $languages, 'lang', 'class="form-select"', 'value', 'text', null); diff --git a/installation/src/Form/Field/Installation/LanguageField.php b/installation/src/Form/Field/Installation/LanguageField.php index 20b86e57b132e..14dd68f8acf4a 100644 --- a/installation/src/Form/Field/Installation/LanguageField.php +++ b/installation/src/Form/Field/Installation/LanguageField.php @@ -67,13 +67,6 @@ protected function getOptions() // Get the list of available languages. $options = LanguageHelper::createLanguageListInstall($native); - // Fix wrongly set parentheses in RTL languages - if (Factory::getLanguage()->isRtl()) { - foreach ($options as &$option) { - $option['text'] .= '‎'; - } - } - if (!$options || $options instanceof \Exception) { $options = []; } else { diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 418dc86a677e4..9380b3db65852 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -2761,18 +2761,6 @@ parameters: count: 3 path: administrator/components/com_languages/src/Model/InstalledModel.php - - - message: ''' - #^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\: - 4\.3 will be removed in 7\.0 - Use the language service in the DI container or get from the application object - Example\: - Factory\:\:getApplication\(\)\-\>getLanguage\(\);$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: administrator/components/com_languages/src/Model/InstalledModel.php - - message: ''' #^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\: @@ -7394,18 +7382,6 @@ parameters: count: 1 path: installation/src/Controller/LanguageController.php - - - message: ''' - #^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\: - 4\.3 will be removed in 7\.0 - Use the language service in the DI container or get from the application object - Example\: - Factory\:\:getApplication\(\)\-\>getLanguage\(\);$# - ''' - identifier: staticMethod.deprecated - count: 1 - path: installation/src/Form/Field/Installation/LanguageField.php - - message: ''' #^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Form\\Form\: