Merge branch '4.1-dev' into issue_36109

.drone.yml

@@ -57,13 +57,13 @@ steps:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Unit
 
-  - name: php81-unit
-    depends_on: [ phpcs ]
-    image: joomlaprojects/docker-images:php8.1
-    failure: ignore
-    commands:
-      - php -v
-      - ./libraries/vendor/bin/phpunit --testsuite Unit
+#  - name: php81-unit
+#    depends_on: [ phpcs ]
+#    image: joomlaprojects/docker-images:php8.1
+#    failure: ignore
+#    commands:
+#      - php -v
+#      - ./libraries/vendor/bin/phpunit --testsuite Unit
 
   - name: php72-integration
     depends_on: [ npm ]
@@ -420,6 +420,6 @@ steps:
 
 ---
 kind: signature
-hmac: daa8e5588cc88058bc57aadf35e3d9dd55eefaa9419c457ce374a0dd19eb7cda
+hmac: a6f3f2ed21261b612d052724e5f43a5dd55168f98cbaa48eeaa358816bb255df
 
 ...

.github/workflows/create-translation-pull-request-v4.yml

@@ -32,7 +32,7 @@ jobs:
           git remote add upstream https://github.com/joomla/joomla-cms.git
           git fetch upstream
           git checkout --progress --force -B translation refs/remotes/origin/translation          
-          git merge upstream/4.0-dev
+          git merge upstream/4.1-dev
 
       - name: Fetch and extract translations
         run: |
@@ -67,4 +67,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.API_TOKEN_GITHUB }}      
         run: |
           gh pr list -R joomla/joomla-cms --state open --author joomla-translation-bot -S "Translation Update" | grep -v "No pull" || \
-            gh pr create --title "Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base 4.0-dev
+            gh pr create --title "Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base 4.1-dev

administrator/components/com_content/forms/article.xml

@@ -920,11 +920,13 @@
 		<field
 			name="introtext"
 			label="COM_CONTENT_FIELD_INTROTEXT"
+			filter="JComponentHelper::filterText"
 		/>
 
 		<field
 			name="fulltext"
 			label="COM_CONTENT_FIELD_FULLTEXT"
+			filter="JComponentHelper::filterText"
 		/>
 	</fields>
 

administrator/components/com_finder/tmpl/maps/default.php

@@ -112,8 +112,13 @@
 							<?php if (!$branchFilter) : ?>
 							<td class="text-center btns itemnumber">
 							<?php if ($item->rgt - $item->lft > 1) : ?>
-								<a href="<?php echo Route::_('index.php?option=com_finder&view=maps&filter[branch]=' . $item->id); ?>">
-									<span class="btn btn-info"><?php echo floor(($item->rgt - $item->lft) / 2); ?></span></a>
+								<a href="<?php echo Route::_('index.php?option=com_finder&view=maps&filter[branch]=' . $item->id); ?>"
+									aria-describedby="tip-map<?php echo $i; ?>">
+									<span class="btn btn-info"><?php echo floor(($item->rgt - $item->lft) / 2); ?></span>
+								</a>
+								<div role="tooltip" id="tip-map<?php echo $i; ?>">
+									<?php echo Text::_('COM_FINDER_HEADING_CHILDREN'); ?>
+								</div>
 							<?php else : ?>
 								-
 							<?php endif; ?>

components/com_users/src/Controller/RegistrationController.php

@@ -67,7 +67,10 @@ public function activate()
 
 		if (!$userIdToActivate)
 		{
-			throw new \Exception(Text::_('COM_USERS_ACTIVATION_TOKEN_NOT_FOUND'), 403);
+			$this->setMessage(Text::_('COM_USERS_ACTIVATION_TOKEN_NOT_FOUND'));
+			$this->setRedirect(Route::_('index.php?option=com_users&view=login', false));
+
+			return false;
 		}
 
 		// Get the user we want to activate

installation/language/ar-AA/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Arabic (اللغة العربية)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Dr. Ashraf Damra</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/cs-CZ/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Czech (Čeština)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Czech Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/cy-GB/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Welsh (United Kingdom)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Joomla! Project - Welsh Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/da-DK/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Danish (Danmark)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Danish Translation Team (Transl.: Ronny Buelund)</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/de-AT/joomla.ini

@@ -1,6 +1,6 @@
 ; Author J!German (Joomla! German Translation Team)
 ; (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
-; (C) Translation 2008 - 2021 J!German <https://www.jgerman.de>
+; (C) Translation 2008 - 2022 J!German <https://www.jgerman.de>
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 

installation/language/de-AT/langmetadata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation" version="4.0">
 	<name>German (Austria)</name>
-	<version>4.0.4</version>
-	<creationDate>October 2021</creationDate>
+	<version>4.0.6</version>
+	<creationDate>January 2022</creationDate>
 	<author>J!German</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

installation/language/de-CH/joomla.ini

@@ -1,6 +1,6 @@
 ; Author J!German (Joomla! German Translation Team)
 ; (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
-; (C) Translation 2008 - 2021 J!German <https://www.jgerman.de>
+; (C) Translation 2008 - 2022 J!German <https://www.jgerman.de>
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 

installation/language/de-CH/langmetadata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation" version="4.0">
 	<name>German (Switzerland)</name>
-	<version>4.0.4</version>
-	<creationDate>October 2021</creationDate>
+	<version>4.0.6</version>
+	<creationDate>January 2022</creationDate>
 	<author>J!German</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

installation/language/de-DE/joomla.ini

@@ -1,6 +1,6 @@
 ; Author J!German (Joomla! German Translation Team)
 ; (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
-; (C) Translation 2008 - 2021 J!German <https://www.jgerman.de>
+; (C) Translation 2008 - 2022 J!German <https://www.jgerman.de>
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 

installation/language/de-DE/langmetadata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation" version="4.0">
 	<name>German (Germany)</name>
-	<version>4.0.4</version>
-	<creationDate>October 2021</creationDate>
+	<version>4.0.6</version>
+	<creationDate>January 2022</creationDate>
 	<author>J!German</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

installation/language/de-LI/joomla.ini

@@ -1,6 +1,6 @@
 ; Author J!German (Joomla! German Translation Team)
 ; (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
-; (C) Translation 2008 - 2021 J!German <https://www.jgerman.de>
+; (C) Translation 2008 - 2022 J!German <https://www.jgerman.de>
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 

installation/language/de-LI/langmetadata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation" version="4.0">
 	<name>German (Lichtenstein)</name>
-	<version>4.0.4</version>
-	<creationDate>October 2021</creationDate>
+	<version>4.0.6</version>
+	<creationDate>January 2022</creationDate>
 	<author>J!German</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

installation/language/de-LU/joomla.ini

@@ -1,6 +1,6 @@
 ; Author J!German (Joomla! German Translation Team)
 ; (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
-; (C) Translation 2008 - 2021 J!German <https://www.jgerman.de>
+; (C) Translation 2008 - 2022 J!German <https://www.jgerman.de>
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 

installation/language/de-LU/langmetadata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation" version="4.0">
 	<name>German (Luxembourg)</name>
-	<version>4.0.4</version>
-	<creationDate>October 2021</creationDate>
+	<version>4.0.6</version>
+	<creationDate>January 2022</creationDate>
 	<author>J!German</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

installation/language/el-GR/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Greek (el-GR)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Ομάδα Μετάφρασης στα Ελληνικά: joomla. gr</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/en-AU/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>English (Australia)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/en-US/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>English (United States)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/es-ES/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Spanish (Spain)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Spanish [es-ES] Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/et-EE/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Estonian</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/eu-ES/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Basque</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Joomla! Basque Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/fa-IR/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Persian (پارسی)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>JoomlaFarsi.Com Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/fr-FR/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>French (fr-FR)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Joomla! Project - French translation team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/hu-HU/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Hungarian (Magyar)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Joomla! Magyarország</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/it-IT/joomla.ini

@@ -63,7 +63,7 @@ INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="Predefinito (Controllato da server)"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_ONE_WAY="Autenticazione a un fattore"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_TWO_WAY="Autenticazione a due fattori"
 INSTL_DATABASE_ENCRYPTION_MSG_CONN_NOT_ENCRYPT="Hai selezionato una connessione al database cifrata ma è stata stabilita una connessione non cifrata. Il motivo potrebbe essere dovuto da una settaggio del database impostato per restituire una connessione non cifrata in caso di errata configurazione dei parametri. Controlla e correggi i parametri di crittografia del database, o cambia l'impostazione da \"Connessione cifrata\" a \"Predefinita\"."
-INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="Il file inserito nel campo \“%s\” non esiste o non è accessibile."
+INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="Il file inserito nel campo \“%d\” non esiste o non è accessibile."
 INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_EMPTY="Il campo \"%s\" è vuoto o non contiene un percorso valido."
 INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="Hai inserito \"localhost\" come nome host. Una connessione cifrata verso il database potrebbe non andare a buon fine. Cambia \"localhost\" in \"127.0.0.1\" o \"::1\" o usa un nome host differente. Altrimenti, cambia il parametro \"Connessione cifrata\" in \"Predefinito\"."
 INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="Il server del database non supporta la connessione cifrata. Abilita il supporto TLS (altrimenti chiamato SSL nelle documentazioni) sul server del tuo database, oppure cambia nuovamente il parametro \"Connessione cifrata\" a \"Predefinito\"."
@@ -217,8 +217,8 @@ JYES="Sì"
 ; Framework strings necessary when no lang pack is available
 JLIB_DATABASE_ERROR_CONNECT_MYSQL="Non è stato possibile connettersi a MySQL."
 JLIB_DATABASE_ERROR_DATABASE="Si è verificato un errore del database."
-JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Non è stato possibile caricare il Database Driver: %s"
-JLIB_DATABASE_ERROR_VALID_MAIL="L'indirizzo email inserito non è valido. Inserisci un indirizzo email alternativo."
+JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Non è stato possibile caricare il Database Driver: %s."
+JLIB_DATABASE_ERROR_VALID_MAIL="L'indirizzo email inserito non è valido. Inserisci un altro indirizzo email."
 JLIB_ENVIRONMENT_SESSION_EXPIRED="La tua sessione è scaduta, ricarica la pagina."
 JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="JFolder: :delete: Il percorso non è una cartella. Percorso: %s"
 JLIB_FORM_FIELD_INVALID="Campo non valido: "

installation/language/it-IT/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Italiano (it-IT)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Italian Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/ja-JP/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Japanese (ja-JP)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Joomla!じゃぱん</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/ka-GE/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Georgian (Georgia)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Georgian Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/lv-LV/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Latvian (Latvia)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Joomla! Projekts</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/nl-BE/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Dutch (Belgium)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Dutch (BE) translation team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/nl-NL/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Dutch (nl-NL)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Dutch Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/pl-PL/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Polish (Poland)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Projekt Joomla!</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/pt-BR/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Português Brasil (pt-BR)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Projeto Joomla!</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/pt-PT/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="installation">
 	<name>Português (Portugal)</name>
-	<version>4.0.6</version>
+	<version>4.0.7</version>
 	<creationDate>January 2022</creationDate>
 	<author>Comunidade JoomlaPortugal</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>