search

joomlagerman / joomla

The J!German translation team provides German translation for Joomla!
https://www.jgerman.de
GNU General Public License v2.0
25 stars 46 forks source link

[5.3] Upmerges 2024-11-13 #3342

Closed jgerman-bot closed 13 hours ago

jgerman-bot commented 17 hours ago

New language relevant PR in upstream repo: https://github.com/joomla/joomla-cms/pull/44448 Here are the upstream changes:

Click to expand the diff! ```diff diff --git a/administrator/components/com_finder/src/Controller/IndexerController.php b/administrator/components/com_finder/src/Controller/IndexerController.php index f232264c18826..ce5696d82b2e5 100644 --- a/administrator/components/com_finder/src/Controller/IndexerController.php +++ b/administrator/components/com_finder/src/Controller/IndexerController.php @@ -365,7 +365,7 @@ class_alias(DebugAdapter::class, Adapter::class); $output .= '
'; foreach (DebugIndexer::$item as $key => $value) { - $output .= '
' . $key . '
' . $value . '
'; + $output .= '
' . $key . '
' . $value . '
'; } $output .= '
'; @@ -375,7 +375,7 @@ class_alias(DebugAdapter::class, Adapter::class); $output .= '
'; foreach (DebugIndexer::$item->getElements() as $key => $element) { - $output .= '
' . $key . '
' . $element . '
'; + $output .= '
' . $key . '
' . $element . '
'; } $output .= '
'; @@ -392,7 +392,7 @@ class_alias(DebugAdapter::class, Adapter::class); ]; foreach (DebugIndexer::$item->getInstructions() as $key => $element) { - $output .= '
' . $contexts[$key] . '
' . json_encode($element) . '
'; + $output .= '
' . $contexts[$key] . '
' . json_encode($element) . '
'; } $output .= ''; @@ -402,7 +402,7 @@ class_alias(DebugAdapter::class, Adapter::class); $output .= '
'; foreach (DebugIndexer::$item->getTaxonomy() as $key => $element) { - $output .= '
' . $key . '
' . json_encode($element) . '
'; + $output .= '
' . $key . '
' . json_encode($element) . '
'; } $output .= '
'; diff --git a/administrator/modules/mod_submenu/src/Menu/Menu.php b/administrator/modules/mod_submenu/src/Menu/Menu.php index d00d87a993162..54dc4abe936d6 100644 --- a/administrator/modules/mod_submenu/src/Menu/Menu.php +++ b/administrator/modules/mod_submenu/src/Menu/Menu.php @@ -100,7 +100,9 @@ public static function preprocess($parent) // Exclude item with menu item option set to exclude from menu modules if ($itemParams->get('menu-permission')) { - @list($action, $asset) = explode(';', $itemParams->get('menu-permission')); + $parts = explode(';', $itemParams->get('menu-permission')); + $action = $parts[0]; + $asset = $parts[1] ?? null; if (!$user->authorise($action, $asset)) { $parent->removeChild($item); diff --git a/components/com_finder/src/Model/SearchModel.php b/components/com_finder/src/Model/SearchModel.php index 30da21a70b307..2d729cbb3f54a 100644 --- a/components/com_finder/src/Model/SearchModel.php +++ b/components/com_finder/src/Model/SearchModel.php @@ -260,6 +260,12 @@ protected function getListQuery() $query->order('ordering ' . $db->escape($direction)); + /* + * Prevent invalid records from being returned in the final query. + * This can happen if the search results are queried while the indexer is running. + */ + $query->where($db->quoteName('object') . ' != ' . $db->quote('')); + /* * If there are no optional or required search terms in the query, we * can get the results in one relatively simple database query. diff --git a/installation/language/af-ZA/langmetadata.xml b/installation/language/af-ZA/langmetadata.xml index 70a96d35459fa..af27f549c407a 100644 --- a/installation/language/af-ZA/langmetadata.xml +++ b/installation/language/af-ZA/langmetadata.xml @@ -1,8 +1,8 @@ Afrikaans (Suid-Afrika) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Afrikaans Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ar-AA/langmetadata.xml b/installation/language/ar-AA/langmetadata.xml index 219c4995c6b16..309586c0c8df2 100644 --- a/installation/language/ar-AA/langmetadata.xml +++ b/installation/language/ar-AA/langmetadata.xml @@ -1,8 +1,8 @@ Arabic (اللغة العربية) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Dr. Ashraf Damra (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/be-BY/langmetadata.xml b/installation/language/be-BY/langmetadata.xml index db8ecc9f63a5d..c5656ec660be2 100644 --- a/installation/language/be-BY/langmetadata.xml +++ b/installation/language/be-BY/langmetadata.xml @@ -1,8 +1,8 @@ Belarusian (Belarus) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla Belarus Community (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/bg-BG/langmetadata.xml b/installation/language/bg-BG/langmetadata.xml index 95a21506fe861..0784cf6aac76a 100644 --- a/installation/language/bg-BG/langmetadata.xml +++ b/installation/language/bg-BG/langmetadata.xml @@ -1,8 +1,8 @@ Bulgarian (bg-BG) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Bulgaria (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ca-ES/joomla.ini b/installation/language/ca-ES/joomla.ini index 1ee353b7fb07d..29b523e8791d9 100644 --- a/installation/language/ca-ES/joomla.ini +++ b/installation/language/ca-ES/joomla.ini @@ -121,7 +121,7 @@ INSTL_REMOVE_INST_FOLDER="Estàs segur que vols esborrar? Si confirmes la carpet INSTL_LANGUAGES="Instal·lar idiomes addicionals" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Idioma" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="Triar idioma" -INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Etiqueta de l`idioma" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Etiqueta de l'idioma" INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versió" INSTL_LANGUAGES_DESC="La interfície de Joomla està disponible en diversos idiomes. Triï els idiomes que desitgi seleccionant la seva casella de selecció i després premi el botó \"Instal·lar idioma seleccionat\".
Nota: aquesta operació pot trigar uns deu segons per idioma seleccionat a descarregar i instal·lar. Si us plau, no seleccioni més de 3 idiomes a instal·lar per evitar expiracions de temps." INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Aquesta operació pot trigar més de 10 segons per idioma per a completar-se.
Si us plau, esperi mentre es descarreguen i s'instal·len els idiomes...…" @@ -203,11 +203,11 @@ INSTL_ZIP_SUPPORT_AVAILABLE="Suport nadiu ZIP" JADMINISTRATOR="Administrador" JEMAIL="Correu electrònic" JERROR="Error" -JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="S`ha produït un error mentre es processava la teva sol·licitud." +JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="S'ha produït un error mentre es processava la teva sol·licitud." JGLOBAL_ISFREESOFTWARE="%s és programari lliure sota %s." JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="El paquet d'idioma no concorda amb aquesta versió de Joomla! Algunes cadenes poden faltar i es mostraran en anglès." JGLOBAL_SELECT_AN_OPTION="Selecciona una opció" -JGLOBAL_SELECT_NO_RESULTS_MATCH="No s`han trobat resultatsque coincideixin amb la teva cerca" +JGLOBAL_SELECT_NO_RESULTS_MATCH="Cap resultat no coincideix" JGLOBAL_SELECT_SOME_OPTIONS="Selecciona algunes opcions" JHIDEPASSWORD="Amagar contrasenya" JINVALID_TOKEN="La petició més recent s'ha denegat perquè contenia un codi de seguretat no vàlid. Actualitza la pàgina i torna-ho a provar." @@ -224,7 +224,7 @@ JSKIP="Ometre" JUSERNAME="Nom d'usuari" JYES="Sí" ; Framework strings necessary when no lang pack is available -JLIB_DATABASE_ERROR_CONNECT_MYSQL="No s`ha pogut connectar a MySQL." +JLIB_DATABASE_ERROR_CONNECT_MYSQL="No s'ha pogut connectar a MySQL." JLIB_DATABASE_ERROR_DATABASE="Ha hagut un error a la base de dades." JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="No s'ha pogut carregar el controlador de la base de dades: %s" JLIB_DATABASE_ERROR_VALID_MAIL="L'adreça de correu que has introduït no és vàlida. Introdueix una adreça de correu electrònic diferent." @@ -233,23 +233,23 @@ JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: La ruta no és una carpeta. Ru JLIB_FORM_FIELD_INVALID="Camp no vàlid: " JLIB_FORM_VALIDATE_FIELD_INVALID="Camp no vàlid: %s" JLIB_FORM_VALIDATE_FIELD_REQUIRED="Camp requerit: %s" -JLIB_INSTALLER_ABORT="S`està avortant la instal·lació de l'idioma: %s" -JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Extensió %1$s: no s`ha pogut crear el directori: %2$s" -JLIB_INSTALLER_ABORT_NOINSTALLPATH="La ruta d`instal·lació no existeix" -JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Paquet %1$s: S'ha produït un error configurant la extensió: %2$s." +JLIB_INSTALLER_ABORT="S'està aturant la instal·lació de l'idioma: %s" +JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Extensió %1$s: No s'ha pogut crear el directori: %2$s" +JLIB_INSTALLER_ABORT_NOINSTALLPATH="La ruta d'instal·lació no existeix." +JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Paquet %1$s: S'ha produït un error en instal·lar una extensió: %2$s." JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="Paquet %s: no hi ha arxius a instal·lar!" JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT="Error connectant al servidor: %s" JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Instal·lació: Error en copiar el fitxer %1$s a %2$s." JLIB_INSTALLER_INSTALL="Instal·la" -JLIB_INSTALLER_NOT_ERROR="Si l`error és relacionat amb la instal·lació dels arxius d`idioma de TinyMCE no tindrà efecte sobre la instal·lació dels arxius. Alguns paquets d`idioma creats abans de Joomla! 3.2.0 poden intentar instal·lar els arxius per separat de TinyMCE. Ara que aquests arxius estan inclosos al core ja no és necessari instal·lar-los." +JLIB_INSTALLER_NOT_ERROR="Si l'error està relacionat amb la instal·lació dels fitxers d'idioma de TinyMCE, no tindrà efecte en la instal·lació dels idiomes. Alguns paquets d'idioma creats abans de Joomla! 3.2.0 poden intentar instal·lar fitxers d'idioma per separat de TinyMCE. Com que ara s'inclouen al nucli, ja no cal instal·lar-los." JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="No es pot crear un idioma de contingut per a l'idioma %s: %s." -JLIB_UPDATER_ERROR_COLLECTION_FOPEN="La configuració de PHP allow_url_fopen és desactivada. Aquesta configuració ha de ser habilitada per al programa d`actualització per a funcionar. " +JLIB_UPDATER_ERROR_COLLECTION_FOPEN="La configuració de PHP allow_url_fopen està desactivada. Aquesta configuració ha d'estar activada perquè l'actualitzador funcioni." JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: No es pot obrir %s" -JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Actualitza: :Col·lecció: No s`ha pogut analitzar %s" +JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: No s'ha pogut analitzar %s" JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Actualització: No s'ha pogut obrir el lloc d'actualització #%d "%s", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: No s'ha pogut connectar amb la base de dades
joomla.library: %1$s - %2$s." ; Strings for the language debugger -JDEBUG_LANGUAGE_FILES_IN_ERROR="Parsejant errors als arxius d`idioma" +JDEBUG_LANGUAGE_FILES_IN_ERROR="Anàlisi d'errors en fitxers d'idioma" JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Cadenes sense traduir" JNONE="Cap" ; Necessary for errors diff --git a/installation/language/ca-ES/langmetadata.xml b/installation/language/ca-ES/langmetadata.xml index 235aab1a1dd9c..1fac15b02cfbb 100644 --- a/installation/language/ca-ES/langmetadata.xml +++ b/installation/language/ca-ES/langmetadata.xml @@ -1,8 +1,8 @@ Catalan (ca-ES) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Catalan [ca-ES] Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/cs-CZ/langmetadata.xml b/installation/language/cs-CZ/langmetadata.xml index f09db895095ab..41bffe49b0b3b 100644 --- a/installation/language/cs-CZ/langmetadata.xml +++ b/installation/language/cs-CZ/langmetadata.xml @@ -1,8 +1,8 @@ Czech (Čeština) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Czech Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/cy-GB/langmetadata.xml b/installation/language/cy-GB/langmetadata.xml index 271495b24a5ad..e38025a1861a3 100644 --- a/installation/language/cy-GB/langmetadata.xml +++ b/installation/language/cy-GB/langmetadata.xml @@ -1,8 +1,8 @@ Welsh (United Kingdom) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Project - Welsh Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/da-DK/langmetadata.xml b/installation/language/da-DK/langmetadata.xml index 2e2c07e0ed5b9..12a5de7098a2e 100644 --- a/installation/language/da-DK/langmetadata.xml +++ b/installation/language/da-DK/langmetadata.xml @@ -1,8 +1,8 @@ Danish (Danmark) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Danish Translation Team (Transl.: Ronny Buelund) (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/de-AT/joomla.ini b/installation/language/de-AT/joomla.ini index f227211c3ddca..dce80a3bd9dc0 100644 --- a/installation/language/de-AT/joomla.ini +++ b/installation/language/de-AT/joomla.ini @@ -105,7 +105,7 @@ INSTL_INSTALL_JOOMLA="Joomla! installieren" ; Site View INSTL_ADMIN_EMAIL_DESC="E-Mail-Adresse des Super Benutzers" -INSTL_ADMIN_PASSWORD_DESC="Passwort des Super Benutzer" +INSTL_ADMIN_PASSWORD_DESC="Passwort des Super Benutzers" INSTL_ADMIN_PASSWORD_LENGTH="Mindestens 12 Zeichen eingeben." INSTL_ADMIN_USER_DESC="Name des Super Benutzers" INSTL_ADMIN_USERNAME_DESC="Benutzername des Super Benutzers" diff --git a/installation/language/de-AT/langmetadata.xml b/installation/language/de-AT/langmetadata.xml index 7667542d51fa6..0601ad0978965 100644 --- a/installation/language/de-AT/langmetadata.xml +++ b/installation/language/de-AT/langmetadata.xml @@ -1,8 +1,8 @@ German (Austria) - 5.1.4 - 2024-08 + 5.2.0 + 2024-10 J!German (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/de-CH/joomla.ini b/installation/language/de-CH/joomla.ini index 76401bbb1b132..3b8e6b2e44b5d 100644 --- a/installation/language/de-CH/joomla.ini +++ b/installation/language/de-CH/joomla.ini @@ -105,7 +105,7 @@ INSTL_INSTALL_JOOMLA="Joomla! installieren" ; Site View INSTL_ADMIN_EMAIL_DESC="E-Mail-Adresse des Super Benutzers" -INSTL_ADMIN_PASSWORD_DESC="Passwort des Super Benutzer" +INSTL_ADMIN_PASSWORD_DESC="Passwort des Super Benutzers" INSTL_ADMIN_PASSWORD_LENGTH="Mindestens 12 Zeichen eingeben." INSTL_ADMIN_USER_DESC="Name des Super Benutzers" INSTL_ADMIN_USERNAME_DESC="Benutzername des Super Benutzers" diff --git a/installation/language/de-CH/langmetadata.xml b/installation/language/de-CH/langmetadata.xml index e6fb8343718f3..4aa57b461f74a 100644 --- a/installation/language/de-CH/langmetadata.xml +++ b/installation/language/de-CH/langmetadata.xml @@ -1,8 +1,8 @@ German (Switzerland) - 5.1.4 - 2024-08 + 5.2.0 + 2024-10 J!German (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/de-DE/joomla.ini b/installation/language/de-DE/joomla.ini index 5c3d380ed6c7c..b821deefbcb61 100644 --- a/installation/language/de-DE/joomla.ini +++ b/installation/language/de-DE/joomla.ini @@ -105,7 +105,7 @@ INSTL_INSTALL_JOOMLA="Joomla! installieren" ; Site View INSTL_ADMIN_EMAIL_DESC="E-Mail-Adresse des Super Benutzers" -INSTL_ADMIN_PASSWORD_DESC="Passwort des Super Benutzer" +INSTL_ADMIN_PASSWORD_DESC="Passwort des Super Benutzers" INSTL_ADMIN_PASSWORD_LENGTH="Mindestens 12 Zeichen eingeben." INSTL_ADMIN_USER_DESC="Name des Super Benutzers" INSTL_ADMIN_USERNAME_DESC="Benutzername des Super Benutzers" diff --git a/installation/language/de-DE/langmetadata.xml b/installation/language/de-DE/langmetadata.xml index 22fcff6014a3f..02d12bf487923 100644 --- a/installation/language/de-DE/langmetadata.xml +++ b/installation/language/de-DE/langmetadata.xml @@ -1,8 +1,8 @@ German (Germany) - 5.1.4 - 2024-08 + 5.2.0 + 2024-10 J!German (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/de-LI/joomla.ini b/installation/language/de-LI/joomla.ini index 6ce485e6c2e00..faceb5e0bedb4 100644 --- a/installation/language/de-LI/joomla.ini +++ b/installation/language/de-LI/joomla.ini @@ -105,7 +105,7 @@ INSTL_INSTALL_JOOMLA="Joomla! installieren" ; Site View INSTL_ADMIN_EMAIL_DESC="E-Mail-Adresse des Super Benutzers" -INSTL_ADMIN_PASSWORD_DESC="Passwort des Super Benutzer" +INSTL_ADMIN_PASSWORD_DESC="Passwort des Super Benutzers" INSTL_ADMIN_PASSWORD_LENGTH="Mindestens 12 Zeichen eingeben." INSTL_ADMIN_USER_DESC="Name des Super Benutzers" INSTL_ADMIN_USERNAME_DESC="Benutzername des Super Benutzers" diff --git a/installation/language/de-LI/langmetadata.xml b/installation/language/de-LI/langmetadata.xml index ada6a4be6af88..a98ea08f6a775 100644 --- a/installation/language/de-LI/langmetadata.xml +++ b/installation/language/de-LI/langmetadata.xml @@ -1,8 +1,8 @@ German (Liechtenstein) - 5.1.4 - 2024-08 + 5.2.0 + 2024-10 J!German (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/de-LU/joomla.ini b/installation/language/de-LU/joomla.ini index d06ba38f5db68..94971540e15c0 100644 --- a/installation/language/de-LU/joomla.ini +++ b/installation/language/de-LU/joomla.ini @@ -105,7 +105,7 @@ INSTL_INSTALL_JOOMLA="Joomla! installieren" ; Site View INSTL_ADMIN_EMAIL_DESC="E-Mail-Adresse des Super Benutzers" -INSTL_ADMIN_PASSWORD_DESC="Passwort des Super Benutzer" +INSTL_ADMIN_PASSWORD_DESC="Passwort des Super Benutzers" INSTL_ADMIN_PASSWORD_LENGTH="Mindestens 12 Zeichen eingeben." INSTL_ADMIN_USER_DESC="Name des Super Benutzers" INSTL_ADMIN_USERNAME_DESC="Benutzername des Super Benutzers" diff --git a/installation/language/de-LU/langmetadata.xml b/installation/language/de-LU/langmetadata.xml index 16f488ab5e17f..aa8df89bdd588 100644 --- a/installation/language/de-LU/langmetadata.xml +++ b/installation/language/de-LU/langmetadata.xml @@ -1,8 +1,8 @@ German (Luxembourg) - 5.1.4 - 2024-08 + 5.2.0 + 2024-10 J!German (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/el-GR/langmetadata.xml b/installation/language/el-GR/langmetadata.xml index 4001fd77cd652..394d4a5606414 100644 --- a/installation/language/el-GR/langmetadata.xml +++ b/installation/language/el-GR/langmetadata.xml @@ -1,8 +1,8 @@ Greek (el-GR) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Ομάδα Μετάφρασης: joomla. gr (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/en-AU/langmetadata.xml b/installation/language/en-AU/langmetadata.xml index 0294456b865aa..9f2aaaa6aa687 100644 --- a/installation/language/en-AU/langmetadata.xml +++ b/installation/language/en-AU/langmetadata.xml @@ -1,8 +1,8 @@ English (Australia) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/en-CA/langmetadata.xml b/installation/language/en-CA/langmetadata.xml index 3dbc857333448..1ea5f559d6a3b 100644 --- a/installation/language/en-CA/langmetadata.xml +++ b/installation/language/en-CA/langmetadata.xml @@ -1,8 +1,8 @@ English (Canada) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/en-NZ/langmetadata.xml b/installation/language/en-NZ/langmetadata.xml index c2ff43cdeaa47..3fbfa1ec268f0 100644 --- a/installation/language/en-NZ/langmetadata.xml +++ b/installation/language/en-NZ/langmetadata.xml @@ -1,8 +1,8 @@ English (New Zealand) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/en-US/langmetadata.xml b/installation/language/en-US/langmetadata.xml index 01eaa24903f6e..5fa52ad12b3b0 100644 --- a/installation/language/en-US/langmetadata.xml +++ b/installation/language/en-US/langmetadata.xml @@ -1,8 +1,8 @@ English (United States) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/es-ES/langmetadata.xml b/installation/language/es-ES/langmetadata.xml index ee1c3e452e9e6..ebdae25aa7f63 100644 --- a/installation/language/es-ES/langmetadata.xml +++ b/installation/language/es-ES/langmetadata.xml @@ -1,8 +1,8 @@ Spanish (es-ES) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Spanish [es-ES] Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/et-EE/langmetadata.xml b/installation/language/et-EE/langmetadata.xml index af63a37fa04d7..759f58959ba05 100644 --- a/installation/language/et-EE/langmetadata.xml +++ b/installation/language/et-EE/langmetadata.xml @@ -1,8 +1,8 @@ Estonian - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/eu-ES/langmetadata.xml b/installation/language/eu-ES/langmetadata.xml index 98ad00d769573..b925ec6b6a303 100644 --- a/installation/language/eu-ES/langmetadata.xml +++ b/installation/language/eu-ES/langmetadata.xml @@ -1,8 +1,8 @@ Basque - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Basque Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/fa-AF/langmetadata.xml b/installation/language/fa-AF/langmetadata.xml index 35d9ab80897bf..96384ed5b1616 100644 --- a/installation/language/fa-AF/langmetadata.xml +++ b/installation/language/fa-AF/langmetadata.xml @@ -1,8 +1,8 @@ فارسی (دری) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 JoomlaPersian Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/fa-IR/langmetadata.xml b/installation/language/fa-IR/langmetadata.xml index 3e4844b31c45b..46941219b0027 100644 --- a/installation/language/fa-IR/langmetadata.xml +++ b/installation/language/fa-IR/langmetadata.xml @@ -1,8 +1,8 @@ Persian (fa-IR) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Persian Translation Team: joomlafarsi.com (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/fi-FI/langmetadata.xml b/installation/language/fi-FI/langmetadata.xml index 2aef587e79a08..60cdf88c83b8b 100644 --- a/installation/language/fi-FI/langmetadata.xml +++ b/installation/language/fi-FI/langmetadata.xml @@ -1,8 +1,8 @@ Finnish (Finland) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Finnish translation team: Joomla.fi (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/fr-CA/langmetadata.xml b/installation/language/fr-CA/langmetadata.xml index f34c8ad804213..301193efa15db 100644 --- a/installation/language/fr-CA/langmetadata.xml +++ b/installation/language/fr-CA/langmetadata.xml @@ -1,8 +1,8 @@ French (Canada) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Project - French translation team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/fr-FR/langmetadata.xml b/installation/language/fr-FR/langmetadata.xml index b5c4b2972e624..34afbd2b413fa 100644 --- a/installation/language/fr-FR/langmetadata.xml +++ b/installation/language/fr-FR/langmetadata.xml @@ -1,8 +1,8 @@ French (fr-FR) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Project - French translation team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/he-IL/langmetadata.xml b/installation/language/he-IL/langmetadata.xml index f55e120082d98..4ffa7de5f2302 100644 --- a/installation/language/he-IL/langmetadata.xml +++ b/installation/language/he-IL/langmetadata.xml @@ -1,8 +1,8 @@ Hebrew (Israel) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 פרוייקט ג'ומלה (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/hr-HR/langmetadata.xml b/installation/language/hr-HR/langmetadata.xml index 7aeeb6ca525b7..a545855f21d7f 100644 --- a/installation/language/hr-HR/langmetadata.xml +++ b/installation/language/hr-HR/langmetadata.xml @@ -1,8 +1,8 @@ Croatian (Croatia) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Hrvatska team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/hu-HU/langmetadata.xml b/installation/language/hu-HU/langmetadata.xml index 2141a287869b9..121877b323878 100644 --- a/installation/language/hu-HU/langmetadata.xml +++ b/installation/language/hu-HU/langmetadata.xml @@ -1,8 +1,8 @@ Hungarian (Magyar) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Magyarország (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/id-ID/langmetadata.xml b/installation/language/id-ID/langmetadata.xml index e5eaa9ac66b8e..775b526bae3ed 100644 --- a/installation/language/id-ID/langmetadata.xml +++ b/installation/language/id-ID/langmetadata.xml @@ -1,8 +1,8 @@ Bahasa Indonesia (id-ID) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Indonesia (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/it-IT/langmetadata.xml b/installation/language/it-IT/langmetadata.xml index 672599842bdfe..8ca7a4a326ffc 100644 --- a/installation/language/it-IT/langmetadata.xml +++ b/installation/language/it-IT/langmetadata.xml @@ -1,8 +1,8 @@ Italiano (it-IT) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Project (Italian Translation Team) (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ja-JP/langmetadata.xml b/installation/language/ja-JP/langmetadata.xml index 8dee39f45a356..1b1fb3ad0c0c5 100644 --- a/installation/language/ja-JP/langmetadata.xml +++ b/installation/language/ja-JP/langmetadata.xml @@ -1,8 +1,8 @@ Japanese (Japan) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla!じゃぱん (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ka-GE/langmetadata.xml b/installation/language/ka-GE/langmetadata.xml index 873c9fb9bb8cc..3e724dee41a1b 100644 --- a/installation/language/ka-GE/langmetadata.xml +++ b/installation/language/ka-GE/langmetadata.xml @@ -1,8 +1,8 @@ Georgian (Georgia) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Georgian Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt @@ -11,7 +11,7 @@ Georgian (ka-GE) - Georgian (Georgia) + ქართული (საქართველო) ka-GE 0 diff --git a/installation/language/kk-KZ/langmetadata.xml b/installation/language/kk-KZ/langmetadata.xml index 0b0ddf21ebe35..f9e16b7386a41 100644 --- a/installation/language/kk-KZ/langmetadata.xml +++ b/installation/language/kk-KZ/langmetadata.xml @@ -1,8 +1,8 @@ Kazakh (Kazakhstan) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Sarvarov Akylkerey (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ko-KR/langmetadata.xml b/installation/language/ko-KR/langmetadata.xml index 7bd0443466129..192ef121f9b3e 100644 --- a/installation/language/ko-KR/langmetadata.xml +++ b/installation/language/ko-KR/langmetadata.xml @@ -1,8 +1,8 @@ Korean (Republic of Korea) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! 프로젝트 (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/lt-LT/langmetadata.xml b/installation/language/lt-LT/langmetadata.xml index 91a26ca396067..ba26bca70ef38 100644 --- a/installation/language/lt-LT/langmetadata.xml +++ b/installation/language/lt-LT/langmetadata.xml @@ -1,8 +1,8 @@ Lietuvių (lt-LT) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Oskaras Jankauskas (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/lv-LV/langmetadata.xml b/installation/language/lv-LV/langmetadata.xml index 914960e864cd5..7c8e1cbc77b58 100644 --- a/installation/language/lv-LV/langmetadata.xml +++ b/installation/language/lv-LV/langmetadata.xml @@ -1,8 +1,8 @@ Latvian (Latvia) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Projekts (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/mk-MK/langmetadata.xml b/installation/language/mk-MK/langmetadata.xml index 955cd09007b27..452e9408e2bbd 100644 --- a/installation/language/mk-MK/langmetadata.xml +++ b/installation/language/mk-MK/langmetadata.xml @@ -1,8 +1,8 @@ Macedonian (mk-MK) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/nl-BE/langmetadata.xml b/installation/language/nl-BE/langmetadata.xml index 512e77e966700..82e66cef39219 100644 --- a/installation/language/nl-BE/langmetadata.xml +++ b/installation/language/nl-BE/langmetadata.xml @@ -1,8 +1,8 @@ Dutch (Belgium) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Dutch (BE) translation team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/nl-NL/langmetadata.xml b/installation/language/nl-NL/langmetadata.xml index ab6d3907bbd56..a5fd018ef41a3 100644 --- a/installation/language/nl-NL/langmetadata.xml +++ b/installation/language/nl-NL/langmetadata.xml @@ -1,8 +1,8 @@ Dutch (nl-NL) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Dutch Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/pl-PL/langmetadata.xml b/installation/language/pl-PL/langmetadata.xml index 19a6029471ea8..232b9b7edeba4 100644 --- a/installation/language/pl-PL/langmetadata.xml +++ b/installation/language/pl-PL/langmetadata.xml @@ -1,8 +1,8 @@ Polski (PL) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Projekt Joomla! (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/pt-BR/langmetadata.xml b/installation/language/pt-BR/langmetadata.xml index 586987be4ca3b..1869c17c9bc4c 100644 --- a/installation/language/pt-BR/langmetadata.xml +++ b/installation/language/pt-BR/langmetadata.xml @@ -1,8 +1,8 @@ Portuguese (Brazil) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Projeto Joomla! (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/pt-PT/langmetadata.xml b/installation/language/pt-PT/langmetadata.xml index f6a78bd6e206b..519b56bfb926f 100644 --- a/installation/language/pt-PT/langmetadata.xml +++ b/installation/language/pt-PT/langmetadata.xml @@ -1,8 +1,8 @@ Português (Portugal) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Comunidade JoomlaPortugal (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ro-RO/langmetadata.xml b/installation/language/ro-RO/langmetadata.xml index e1efab542168d..dc91faee49fb9 100644 --- a/installation/language/ro-RO/langmetadata.xml +++ b/installation/language/ro-RO/langmetadata.xml @@ -1,8 +1,8 @@ Română (România) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Horia Negura - Quanta (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/sk-SK/langmetadata.xml b/installation/language/sk-SK/langmetadata.xml index 4bfe8541f2144..0814189cef8fa 100644 --- a/installation/language/sk-SK/langmetadata.xml +++ b/installation/language/sk-SK/langmetadata.xml @@ -1,8 +1,8 @@ Slovak (Slovakia) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Slovak translation team : Peter Michnica (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/sl-SI/langmetadata.xml b/installation/language/sl-SI/langmetadata.xml index a1f3072fa16c9..80572990449c8 100644 --- a/installation/language/sl-SI/langmetadata.xml +++ b/installation/language/sl-SI/langmetadata.xml @@ -1,8 +1,8 @@ Slovenščina (Slovenija) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Slovenska prevajalska ekipa (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/sr-YU/langmetadata.xml b/installation/language/sr-YU/langmetadata.xml index 10ae691e47858..fa989d640d9a9 100644 --- a/installation/language/sr-YU/langmetadata.xml +++ b/installation/language/sr-YU/langmetadata.xml @@ -1,8 +1,8 @@ Srpski (Republika Srbija) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Goran Nešić - UIX Web Design & Saša Matić Bardak.RS (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/sv-SE/langmetadata.xml b/installation/language/sv-SE/langmetadata.xml index eec0bee49ae68..2fc807daa57a6 100644 --- a/installation/language/sv-SE/langmetadata.xml +++ b/installation/language/sv-SE/langmetadata.xml @@ -1,8 +1,8 @@ Swedish (Sweden) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Swedish Translation Team - SvenskJoomla (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ta-IN/langmetadata.xml b/installation/language/ta-IN/langmetadata.xml index 3cdedffc665db..cdc6a0c834215 100644 --- a/installation/language/ta-IN/langmetadata.xml +++ b/installation/language/ta-IN/langmetadata.xml @@ -1,8 +1,8 @@ Tamil (India) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Ilagnayeru 'MIG' Manickam, Elango Samy Manim (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/th-TH/langmetadata.xml b/installation/language/th-TH/langmetadata.xml index cb0827dfc50cd..82846ae1d1e0b 100644 --- a/installation/language/th-TH/langmetadata.xml +++ b/installation/language/th-TH/langmetadata.xml @@ -1,8 +1,8 @@ Thai (ภาษาไทย) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Thai Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/tr-TR/langmetadata.xml b/installation/language/tr-TR/langmetadata.xml index e72c261162f89..b191c018d196f 100644 --- a/installation/language/tr-TR/langmetadata.xml +++ b/installation/language/tr-TR/langmetadata.xml @@ -1,8 +1,8 @@ Turkish (Turkey) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Türkiye (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/uk-UA/langmetadata.xml b/installation/language/uk-UA/langmetadata.xml index cdb5d99e6434f..2aa2342644eee 100644 --- a/installation/language/uk-UA/langmetadata.xml +++ b/installation/language/uk-UA/langmetadata.xml @@ -1,8 +1,8 @@ Ukrainian (uk-UA) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Denys Nosov (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/ur-PK/langmetadata.xml b/installation/language/ur-PK/langmetadata.xml index 1d069c8a458d7..27d86ad1016be 100644 --- a/installation/language/ur-PK/langmetadata.xml +++ b/installation/language/ur-PK/langmetadata.xml @@ -1,8 +1,8 @@ Urdu (ur-PK) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Urdu Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/vi-VN/langmetadata.xml b/installation/language/vi-VN/langmetadata.xml index 72a6d8255a89f..4c0a00d02d8ce 100644 --- a/installation/language/vi-VN/langmetadata.xml +++ b/installation/language/vi-VN/langmetadata.xml @@ -1,8 +1,8 @@ Vietnamese (Vietnam) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla! Project (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/zh-CN/langmetadata.xml b/installation/language/zh-CN/langmetadata.xml index 614d2451d6df1..c570e9105c1d5 100644 --- a/installation/language/zh-CN/langmetadata.xml +++ b/installation/language/zh-CN/langmetadata.xml @@ -1,8 +1,8 @@ Chinese Simplified (China) - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 Joomla中文网 (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/zh-TW/langmetadata.xml b/installation/language/zh-TW/langmetadata.xml index 3d34820750e48..edefb718d0c10 100644 --- a/installation/language/zh-TW/langmetadata.xml +++ b/installation/language/zh-TW/langmetadata.xml @@ -1,8 +1,8 @@ 正體中文 - 5.2.0 - 2024-10 + 5.2.2 + 2024-11 正體中文 Translation Team (C) 2005 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/libraries/src/Form/Field/CalendarField.php b/libraries/src/Form/Field/CalendarField.php index 0c72d801cfa23..fa1d9cd04226e 100644 --- a/libraries/src/Form/Field/CalendarField.php +++ b/libraries/src/Form/Field/CalendarField.php @@ -11,6 +11,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\Form\FormField; +use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\Registry\Registry; @@ -320,7 +321,7 @@ protected function getInput() $date = \DateTimeImmutable::createFromFormat('U', strtotime($value)); $value = $date->format($this->filterFormat); } else { - $value = strftime($this->format, strtotime($value)); + $value = date(HTMLHelper::strftimeFormatToDateFormat($this->format), strtotime($value)); } date_default_timezone_set($tz); diff --git a/libraries/src/Form/Rule/EmailRule.php b/libraries/src/Form/Rule/EmailRule.php index ce66dc071e732..0d1b41ea79ffc 100644 --- a/libraries/src/Form/Rule/EmailRule.php +++ b/libraries/src/Form/Rule/EmailRule.php @@ -164,7 +164,9 @@ public function test(\SimpleXMLElement $element, $value, $group = null, ?Registr $query = $db->getQuery(true); // Get the extra field check attribute. - $userId = ($form instanceof Form) ? (int) $form->getValue('id') : 0; + $userId = ($form instanceof Form) && $form->getValue('id') + ? (int) $form->getValue('id') + : (($input instanceof Registry) ? (int) $input->get('id') : 0); // Build the query. $query->select('COUNT(*)') diff --git a/libraries/src/HTML/HTMLHelper.php b/libraries/src/HTML/HTMLHelper.php index aeb74f1266eaf..558a7aeb20402 100644 --- a/libraries/src/HTML/HTMLHelper.php +++ b/libraries/src/HTML/HTMLHelper.php @@ -1271,6 +1271,18 @@ public static function strftimeFormatToDateFormat(string $strftimeformat) '%H', '%M', '%S', + '%a', + '%A', + '%e', + '%j', + '%u', + '%w', + '%W', + '%b', + '%B', + '%h', + '%g', + '%I', ], [ 'Y', @@ -1279,6 +1291,18 @@ public static function strftimeFormatToDateFormat(string $strftimeformat) 'H', 'i', 's', + 'D', + 'l', + 'j', + 'z', + 'N', + 'w', + 'W', + 'M', + 'F', + 'M', + 'y', + 'h', ], $strftimeformat ); diff --git a/package.json b/package.json index 9634e8f35ed58..9f41f930ab071 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "watch": "node build/build.mjs --watch", "watch:com_media": "node build/build.mjs --watch-com-media", "lint:js": "eslint --config build/.eslintrc --ignore-pattern '/media/' --ext .mjs,.es6.js,.es6,.vue .", - "lint:testjs": "eslint --config build/.eslintrc --ext .js tests/System", + "lint:testjs": "eslint --config build/.eslintrc --ext .js,.mjs tests/System", "lint:css": "stylelint --config build/.stylelintrc.json \"administrator/components/com_media/resources/**/*.scss\" \"administrator/templates/**/*.scss\" \"build/media_source/**/*.scss\" \"build/media_source/**/*.css\" \"templates/**/*.scss\" \"installation/template/**/*.scss\"", "install": "node build/build.mjs --prepare", "update": "node build/build.mjs --copy-assets && node build/build.mjs --build-pages && node build/build.mjs --compile-js && node build/build.mjs --compile-css && node build/build.mjs --compile-bs && node --env-file=./build/production.env build/build.mjs --com-media", diff --git a/tests/System/integration/administrator/components/com_actionlogs/Actionlogs.cy.js b/tests/System/integration/administrator/components/com_actionlogs/Actionlogs.cy.js index 8fbd3ef065474..ae4d7392b26a4 100644 --- a/tests/System/integration/administrator/components/com_actionlogs/Actionlogs.cy.js +++ b/tests/System/integration/administrator/components/com_actionlogs/Actionlogs.cy.js @@ -19,7 +19,7 @@ describe('Test in backend that the action logs', () => { cy.doAdministratorLogout(); cy.doAdministratorLogin(); cy.visit('/administrator/index.php?option=com_actionlogs&view=actionlogs'); - cy.contains('User ci-admin logged in to admin'); + cy.contains(`User ${Cypress.env('username')} logged in to admin`); cy.task('queryDB', 'TRUNCATE #__action_logs'); }); ```