Skip to content

Commit

Permalink
5.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
YGomiero committed Aug 21, 2024
1 parent 896ee0c commit 5c956e1
Show file tree
Hide file tree
Showing 304 changed files with 2,151 additions and 1,818 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# AFUJ: Joomla! CMS™ - Version 5.1.2 avec pack fr-FR
# AFUJ: Joomla! CMS™ - Version 5.1.3 avec pack fr-FR

![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/AFUJ/joomla-cms-fr?color=green&include_prereleases&label=release&style=for-the-badge)

## DESCRIPTION

La version 5.1.2 de Joomla! incluant le pack de langue fr-FR et des traductions d'éléments à l'installation
La version 5.1.3 de Joomla! incluant le pack de langue fr-FR et des traductions d'éléments à l'installation

## 1- Aperçu
* Ceci est un package d'installation 5.1.1 francisé.
* Ceci est un package d'installation 5.1.3 francisé.
* Site officiel de Joomla! : (https://www.joomla.org)
* Historique des versions Joomla! 5.1 - [https://docs.joomla.org/Special:MyLanguage/Joomla_5.1_version_history](https://docs.joomla.org/Special:MyLanguage/Joomla_5.1_version_history)
* Modifications détaillées dans le journal des modifications : [https://github.com/joomla/joomla-cms/commits/5.1-dev](https://github.com/joomla/joomla-cms/commits/5.1-dev)
Expand Down
3 changes: 0 additions & 3 deletions README.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
Joomla! CMS™

The Joomla! 5.1 branch is under heavy development and not all links in this document are available yet
------------------------------------------------------------------------------------------------------

1- Overview
* This is a Joomla! 5.x installation/upgrade package.
* Joomla! Official site: https://www.joomla.org
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// phpcs:enable PSR1.Files.SideEffects

/**
* Plugins display controller.
* Actionlogs display controller.
*
* @since 4.0.0
*/
Expand Down
17 changes: 17 additions & 0 deletions administrator/components/com_admin/script.php
Original file line number Diff line number Diff line change
Expand Up @@ -2333,6 +2333,23 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
'/libraries/vendor/cweagans/composer-patches/src/Patches.php',
'/libraries/vendor/cweagans/composer-patches/tests/PatchEventTest.php',
'/libraries/vendor/laminas/laminas-diactoros/PATCHES.txt',
// From 5.1.2 to 5.1.3
'/libraries/vendor/joomla/application/rector.php',
'/libraries/vendor/joomla/console/.drone.jsonnet',
'/libraries/vendor/joomla/console/.drone.yml',
'/libraries/vendor/joomla/database/.drone.jsonnet',
'/libraries/vendor/joomla/database/.drone.yml',
'/libraries/vendor/joomla/database/phpunit.appveyor_sql2012sp1.xml.dist',
'/libraries/vendor/joomla/database/phpunit.appveyor_sql2014.xml.dist',
'/libraries/vendor/joomla/database/phpunit.appveyor_sql2017.xml.dist',
'/libraries/vendor/joomla/database/phpunit.mariadb.xml.dist',
'/libraries/vendor/joomla/database/phpunit.mysql.xml.dist',
'/libraries/vendor/joomla/database/phpunit.mysqli.xml.dist',
'/libraries/vendor/joomla/database/phpunit.pgsql.xml.dist',
'/libraries/vendor/joomla/database/phpunit.sqlite.xml.dist',
'/libraries/vendor/joomla/database/phpunit.sqlsrv.xml.dist',
'/libraries/vendor/joomla/session/.drone.jsonnet',
'/libraries/vendor/joomla/session/.drone.yml',
];

$folders = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class VotelistField extends ListField
*
* @param \SimpleXMLElement $element The SimpleXMLElement object representing the `<field>` tag for the form field object.
* @param mixed $value The form field value to validate.
* @param string $group The field name group control value. This acts as as an array container for the field.
* @param string $group The field name group control value. This acts as an array container for the field.
* For example if the field has name="foo" and the group value is set to "bar" then the
* full field name would end up being "bar[foo]".
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class VoteradioField extends RadioField
*
* @param \SimpleXMLElement $element The SimpleXMLElement object representing the `<field>` tag for the form field object.
* @param mixed $value The form field value to validate.
* @param string $group The field name group control value. This acts as as an array container for the field.
* @param string $group The field name group control value. This acts as an array container for the field.
* For example if the field has name="foo" and the group value is set to "bar" then the
* full field name would end up being "bar[foo]".
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ protected function addToolbar()
if (
$user->authorise('core.create', 'com_content')
&& $user->authorise('core.edit', 'com_content')
&& $user->authorise('core.execute.transition', 'com_content')
) {
$childBar->popupButton('batch', 'JTOOLBAR_BATCH')
->popupType('inline')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ protected function getInput()
// Build the query.
$query->select('element, name')
->from('#__extensions')
->where('client_id = 0')
->where('type = ' . $db->quote('template'))
->where('enabled = 1');
->where($db->quoteName('client_id') . ' = 0')
->where($db->quoteName('type') . ' = ' . $db->quote('template'))
->where($db->quoteName('enabled') . ' = 1');

// Set the query and load the templates.
$db->setQuery($query);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ protected function getListQuery()
if (stripos($search, 'id:') === 0) {
$search = (int) substr($search, 3);
$query->where($db->quoteName('a.id') . ' = :search')
->bind(':id', $search, ParameterType::INTEGER);
->bind(':search', $search, ParameterType::INTEGER);
} else {
$search = '%' . str_replace(' ', '%', trim($search)) . '%';
$query->where($db->quoteName('a.title') . ' LIKE :search')
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_finder/tmpl/index/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
Text::_('COM_FINDER_CONTENT_PLUGIN'),
[
'class' => 'alert-link',
'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES)),
'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)),
'data-checkin-url' => Route::_('index.php?option=com_plugins&task=plugins.checkin&format=json&cid[]=' . $this->finderPluginId),
'data-close-on-message' => '',
'data-reload-on-close' => '',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
Text::_('COM_FINDER_CONTENT_PLUGIN'),
[
'class' => 'alert-link',
'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES)),
'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)),
'data-checkin-url' => Route::_('index.php?option=com_plugins&task=plugins.checkin&format=json&cid[]=' . $this->finderPluginId),
'data-close-on-message' => '',
'data-reload-on-close' => '',
Expand Down
42 changes: 35 additions & 7 deletions administrator/components/com_menus/src/View/Menu/XmlView.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,22 +115,22 @@ protected function addXmlChild($xml, $item)
{
$node = $xml->addChild('menuitem');

$node['type'] = $item->type;

if ($item->title) {
$node['title'] = htmlentities($item->title, ENT_XML1);
}

if ($item->link) {
$node['link'] = $item->link;
}
$node['type'] = $item->type;

if ($item->element) {
$node['element'] = $item->element;
}

if (isset($item->class) && $item->class) {
$node['class'] = htmlentities($item->class, ENT_XML1);
if ($item->link) {
$node['link'] = $item->link;
}

if (isset($item->class) && trim($item->class)) {
$node['class'] = htmlentities(trim($item->class), ENT_XML1);
}

if ($item->access) {
Expand All @@ -141,6 +141,34 @@ protected function addXmlChild($xml, $item)
$node['target'] = '_blank';
}

if ($item->getParams()->get('ajax-badge')) {
$node['ajax-badge'] = $item->getParams()->get('ajax-badge');
}

if ($item->icon) {
$node['icon'] = $item->icon;
}

if ($item->getParams()->get('menu-quicktask')) {
$node['quicktask'] = $item->getParams()->get('menu-quicktask');

if ($item->getParams()->get('menu-quicktask-title')) {
$node['quicktask-title'] = $item->getParams()->get('menu-quicktask-title');
}

if ($item->getParams()->get('menu-quicktask-icon')) {
$node['quicktask-icon'] = $item->getParams()->get('menu-quicktask-icon');
}

if ($item->getParams()->get('menu-quicktask-permission')) {
$node['quicktask-permission'] = $item->getParams()->get('menu-quicktask-permission');
}
}

if ($item->getParams()->get('dashboard')) {
$node['dashboard'] = $item->getParams()->get('dashboard');
}

if ($item->getParams() && $hideitems = $item->getParams()->get('hideitems')) {
$item->getParams()->set('hideitems', $this->getModel('Menu')->getExtensionElementsForMenuItems($hideitems));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Mail\MailHelper;
use Joomla\CMS\Router\Route;

/** @var \Joomla\Component\Messages\Administrator\View\Message\HtmlView $this */
Expand Down Expand Up @@ -41,7 +42,7 @@
<dd><?php echo $this->item->subject; ?></dd>

<dt><?php echo Text::_('COM_MESSAGES_FIELD_MESSAGE_LABEL'); ?></dt>
<dd><?php echo $this->item->message; ?></dd>
<dd><?php echo MailHelper::convertRelativeToAbsoluteUrls($this->item->message); ?></dd>
</dl>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
Text::_('COM_REDIRECT_SYSTEM_PLUGIN'),
[
'class' => 'alert-link',
'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES)),
'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)),
'data-checkin-url' => Route::_('index.php?option=com_plugins&task=plugins.checkin&format=json&cid[]=' . $redirectPluginId),
'data-close-on-message' => '',
'data-reload-on-close' => '',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
Text::_('COM_REDIRECT_SYSTEM_PLUGIN'),
[
'class' => 'alert-link',
'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES)),
'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)),
'data-checkin-url' => Route::_('index.php?option=com_plugins&task=plugins.checkin&format=json&cid[]=' . $redirectPluginId),
'data-close-on-message' => '',
'data-reload-on-close' => '',
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_users/src/Helper/Mfa.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public static function getConfigurationInterface(User $user): ?string
/** @var CMSApplication $app */
$app = Factory::getApplication();

if (!$app->getInput()->getCmd('option', '') === 'com_users') {
if ($app->getInput()->getCmd('option', '') !== 'com_users') {
$app->getLanguage()->load('com_users');
$app->getDocument()
->getWebAssetManager()
Expand Down
11 changes: 10 additions & 1 deletion administrator/components/com_users/src/Model/UserModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public function getForm($data = [], $loadData = true)

// When multilanguage is set, a user's default site language should also be a Content Language
if (Multilanguage::isEnabled()) {
$form->setFieldAttribute('language', 'type', 'frontend_language', 'params');
$form->setFieldAttribute('language', 'type', 'frontendlanguage', 'params');
}

$userId = (int) $form->getValue('id');
Expand Down Expand Up @@ -268,6 +268,15 @@ public function save($data)
}
}

// Unset the username if it should not be overwritten
if (
!$my->authorise('core.manage', 'com_users')
&& (int) $user->id === (int) $my->id
&& !ComponentHelper::getParams('com_users')->get('change_login_name')
) {
unset($data['username']);
}

// Bind the data.
if (!$user->bind($data)) {
$this->setError($user->getError());
Expand Down
4 changes: 2 additions & 2 deletions administrator/language/en-GB/install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension client="administrator" type="language" method="upgrade">
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>5.1.2</version>
<creationDate>2024-07</creationDate>
<version>5.1.3</version>
<creationDate>2024-08</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions administrator/language/en-GB/langmetadata.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<metafile client="administrator">
<name>English (en-GB)</name>
<version>5.1.2</version>
<creationDate>2024-07</creationDate>
<version>5.1.3</version>
<creationDate>2024-08</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
4 changes: 3 additions & 1 deletion administrator/language/fr-FR/com_joomlaupdate.ini
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ COM_JOOMLAUPDATE_SELF_EMPTYSTATE_CONTENT="Vous devez d'abord mettre à jour ce c
COM_JOOMLAUPDATE_SELF_EMPTYSTATE_TITLE="Une nouvelle version du composant de mise à jour de Joomla est disponible"
COM_JOOMLAUPDATE_SYSTEM_CHECK="Vérification du système"
COM_JOOMLAUPDATE_TOOLBAR_CHECK="Rechercher des mises à jour"
COM_JOOMLAUPDATE_UPDATE_CHANGE_UPDATE_SOURCE_FAILED="Échec de la réinitialisation du canal de mise à jour de \"%1$s\" à \"%2$s\". Veuillez le modifier dans les options du composant de mise à jour de Joomla pour ne pas manquer les futures mises à jour."
COM_JOOMLAUPDATE_UPDATE_CHANGE_UPDATE_SOURCE_OK="Le canal de mise à jour a été réinitialisé de \"%1$s\" à \"%2$s\"."
COM_JOOMLAUPDATE_UPDATE_CHECK="Vérification de mise à jour"
COM_JOOMLAUPDATE_UPDATE_CONFIRM_BACKUP="Je possède une sauvegarde du site et suis prêt à effectuer la mise à jour."
COM_JOOMLAUPDATE_UPDATE_EMPTYSTATE_TITLE="Mettre le site à jour vers \"Joomla %s\""
Expand Down Expand Up @@ -169,7 +171,7 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATE_NOTICE="Avant de mettre à jour Joomla, ass
COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATEFOUND="Une mise à jour de Joomla a été trouvée"
COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_CUSTOM="Vous êtes sur le canal de mise à jour &quot;%s&quot;. Ce n'est pas un canal de mise à jour officiel de Joomla."
COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_DEFAULT="Vous êtes sur le canal de mise à jour &quot;%s&quot;. Grâce à ce canal, vous recevrez des notifications pour toutes les mises à jour de la version actuelle de Joomla (5.x)"
COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_NEXT="Vous êtes sur le canal de mise à jour &quot;%s&quot;. Grâce à ce canal, vous recevrez des notifications pour toutes les mises à jour de la version actuelle de Joomla (5.x) et vous serez également averti lorsque la prochaine version majeure (6.x) sera disponible. Avant de passer à la version 6.x, vous devrez évaluer sa compatibilité avec votre environnement."
COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_NEXT="Vous êtes sur le canal de mise à jour &quot;%s&quot;. Par ce canal, vous serez informé lorsque la future version majeure (6.x) sera disponible. Avant de passer à la version 6.x, vous devrez évaluer sa compatibilité avec votre environnement. Vous ne serez pas informé des mises à jour de la version actuelle de Joomla (5.x)."
COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_TESTING="Vous êtes sur le canal de mise à jour &quot;%s&quot;. Ce canal est consacré aux tests des nouvelles versions et corrections de Joomla.<br>Il est uniquement destiné aux membres du JBS (Joomla Bug Squad&trade;) et autres testeurs de la communauté. <strong>N'utilisez pas ce canal sur un site en production</strong>."
COM_JOOMLAUPDATE_VIEW_DEFAULT_UPLOAD_INTRO="Vous pouvez utiliser cette fonction pour mettre à jour Joomla si votre serveur se trouve derrière un pare-feu ou s'il est incapable de contacter les serveurs de mise à jour. Téléchargez le <em><strong>pack de mise à jour de Joomla</strong></em> en format ZIP à partir de <a class='alert-link' href='%s' target='_blank' rel='noopener noreferrer'>la page officielle de téléchargement de Joomla</a>, puis utilisez les champs ci-dessous pour l'envoyer et l'installer."
COM_JOOMLAUPDATE_VIEW_UPDATE_BYTESEXTRACTED="Octets extraits"
Expand Down
4 changes: 2 additions & 2 deletions administrator/language/fr-FR/install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension client="administrator" type="language" method="upgrade">
<name>French (fr-FR)</name>
<tag>fr-FR</tag>
<version>5.1.2</version>
<creationDate>2024-07-09</creationDate>
<version>5.1.3</version>
<creationDate>2024-08-20</creationDate>
<author>Joomla! Project - French translation team</author>
<authorEmail>traduction@joomla.fr</authorEmail>
<authorUrl>www.joomla.fr</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions administrator/language/fr-FR/langmetadata.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<metafile client="administrator">
<name>French (fr-FR)</name>
<version>5.1.2</version>
<creationDate>2024-07</creationDate>
<version>5.1.3</version>
<creationDate>2024-08-20</creationDate>
<author>Joomla! Project - French translation team</author>
<authorEmail>traduction@joomla.fr</authorEmail>
<authorUrl>www.joomla.fr</authorUrl>
Expand Down
4 changes: 2 additions & 2 deletions administrator/manifests/files/joomla.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<authorUrl>www.joomla.org</authorUrl>
<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<version>5.1.2</version>
<creationDate>2024-07</creationDate>
<version>5.1.3</version>
<creationDate>2024-08</creationDate>
<description>FILES_JOOMLA_XML_DESCRIPTION</description>

<scriptfile>administrator/components/com_admin/script.php</scriptfile>
Expand Down
4 changes: 2 additions & 2 deletions administrator/manifests/packages/pkg_en-GB.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension type="package" method="upgrade">
<name>English (en-GB) Language Pack</name>
<packagename>en-GB</packagename>
<version>5.1.2.1</version>
<creationDate>2024-07</creationDate>
<version>5.1.3.1</version>
<creationDate>2024-08</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
8 changes: 4 additions & 4 deletions administrator/manifests/packages/pkg_fr-FR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension type="package" method="upgrade">
<name>French (fr-FR) Language pack</name>
<packagename>fr-FR</packagename>
<version>5.1.2.1</version>
<creationDate>2024-07-09</creationDate>
<version>5.1.3.1</version>
<creationDate>2024-08-20</creationDate>
<author>Joomla! Project - French translation team</author>
<authorEmail>traduction@joomla.fr</authorEmail>
<authorUrl>www.joomla.fr</authorUrl>
Expand All @@ -13,8 +13,8 @@
<packager>Joomla! Project - French translation team</packager>
<packagerurl>www.joomla.fr</packagerurl>
<description><![CDATA[<div style="text-align: left;">
<h3>Joomla! Full French (fr-FR) Language Package - Version 5.1.2 v1</h3>
<h3>Pack de langue Joomla! français (fr-FR) complet - Version 5.1.2 v1</h3>
<h3>Joomla! Full French (fr-FR) Language Package - Version 5.1.3 v1</h3>
<h3>Pack de langue Joomla! français (fr-FR) complet - Version 5.1.3 v1</h3>
<p><a href="https:/www.joomla.fr" target="_blank">www.joomla.fr</a> - <a href="mailto:traduction@joomla.fr">traduction@joomla.fr</a></p>
</div>]]></description>
<blockChildUninstall>true</blockChildUninstall>
Expand Down
4 changes: 2 additions & 2 deletions api/language/en-GB/install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<extension client="api" type="language" method="upgrade">
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>5.1.2</version>
<creationDate>2024-07</creationDate>
<version>5.1.3</version>
<creationDate>2024-08</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
Loading

0 comments on commit 5c956e1

Please sign in to comment.