search

JoomlaPolska / jezyk-J4

Język polski dla Joomla 4
GNU General Public License v2.0
3 stars 5 forks source link

[5.2] Upmerge 2024-07-02 #530

Open joomlapl-bot opened 2 months ago

joomlapl-bot commented 2 months ago

PR w związku ze zmianą oryginału https://github.com/joomla/joomla-cms/pull/43730 Poniżej zmiany w oryginale:

Click to expand the diff! ```diff diff --git a/README.md b/README.md index 849ec8d5bf07e..02afa95cda298 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ The Joomla! 5.2 branch is under heavy development and not all links in this docu ------------------------------------------------------------------------------------------------------ Build Status ---------------------- + | Drone-CI | AppVeyor | PHP | Node | npm | |------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|---------------------------------------------------------------------------------| | [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=5.2-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/5.2-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.1.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V18.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v9.6.7-green)](https://nodejs.org/en/) | diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index 069e72afbf3ec..55bb1b7cd2b36 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 5.2.0 - 2024-06 + 2024-07 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml index a44ea3bd1aad0..39ec51daf5e26 100644 --- a/administrator/language/en-GB/langmetadata.xml +++ b/administrator/language/en-GB/langmetadata.xml @@ -2,7 +2,7 @@ English (en-GB) 5.2.0 - 2024-06 + 2024-07 Joomla! Project admin@joomla.org www.joomla.org diff --git a/administrator/language/en-GB/plg_editors_tinymce.ini b/administrator/language/en-GB/plg_editors_tinymce.ini index 162458329c143..88033c39615ca 100644 --- a/administrator/language/en-GB/plg_editors_tinymce.ini +++ b/administrator/language/en-GB/plg_editors_tinymce.ini @@ -101,4 +101,6 @@ PLG_TINY_TOOLBAR_BUTTON_FONTSIZESELECT="Font Size Select" PLG_TINY_TOOLBAR_BUTTON_FORMATSELECT="Format Select" PLG_TINY_TOOLBAR_BUTTON_SEPARATOR="Separator" PLG_TINY_TOOLBAR_BUTTON_STYLESELECT="Style Select" +PLG_TINY_FIELD_SANDBOX_IFRAMES_LABEL="Sandbox Iframes" +PLG_TINY_FIELD_SANDBOX_IFRAMES_DESC="This is a security feature that restricts what the iframe can do by setting a sandbox attribute for each iframe. It is recommended to enable this feature for security reasons. Only disable if the iframe is not loading and you're sure that the iframed content is safe." PLG_TINY_XML_DESCRIPTION="TinyMCE is a platform independent web based JavaScript HTML WYSIWYG Editor. Using sets you can configure and customise the editor for every user group." diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 1b34ce09b7bc4..6354e746c2b45 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -7,7 +7,7 @@ (C) 2019 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt 5.2.0-alpha3-dev - 2024-06 + 2024-07 FILES_JOOMLA_XML_DESCRIPTION administrator/components/com_admin/script.php diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 4d94f875a41bf..85ea7088e3982 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -3,7 +3,7 @@ English (en-GB) Language Pack en-GB 5.2.0.1 - 2024-06 + 2024-07 Joomla! Project admin@joomla.org www.joomla.org diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml index bc03765a9c86a..4f4c20bedd2a1 100644 --- a/api/language/en-GB/install.xml +++ b/api/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 5.2.0 - 2024-06 + 2024-07 Joomla! Project admin@joomla.org www.joomla.org diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml index 3020821fa417c..bad52dcf01a69 100644 --- a/api/language/en-GB/langmetadata.xml +++ b/api/language/en-GB/langmetadata.xml @@ -2,7 +2,7 @@ English (en-GB) 5.2.0 - 2024-06 + 2024-07 Joomla! Project admin@joomla.org www.joomla.org diff --git a/installation/language/af-ZA/langmetadata.xml b/installation/language/af-ZA/langmetadata.xml index db31b80ced7bb..d4f9bf4828a36 100644 --- a/installation/language/af-ZA/langmetadata.xml +++ b/installation/language/af-ZA/langmetadata.xml @@ -1,7 +1,7 @@ Afrikaans (Suid-Afrika) - 5.1.1 + 5.1.2 2024-05 Afrikaans Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ar-AA/langmetadata.xml b/installation/language/ar-AA/langmetadata.xml index 2031ad0312c56..5b33d0f3a65fb 100644 --- a/installation/language/ar-AA/langmetadata.xml +++ b/installation/language/ar-AA/langmetadata.xml @@ -1,7 +1,7 @@ Arabic (اللغة العربية) - 5.1.1 + 5.1.2 2024-05 Dr. Ashraf Damra (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/be-BY/langmetadata.xml b/installation/language/be-BY/langmetadata.xml index d535ce72e5734..0fe818bea8e52 100644 --- a/installation/language/be-BY/langmetadata.xml +++ b/installation/language/be-BY/langmetadata.xml @@ -1,7 +1,7 @@ Belarusian (Belarus) - 5.1.1 + 5.1.2 2024-05 Joomla Belarus Community (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/bg-BG/langmetadata.xml b/installation/language/bg-BG/langmetadata.xml index 90e55f29004d8..934487ebb9f6b 100644 --- a/installation/language/bg-BG/langmetadata.xml +++ b/installation/language/bg-BG/langmetadata.xml @@ -1,7 +1,7 @@ Bulgarian (bg-BG) - 5.1.1 + 5.1.2 2024-05 Joomla! Bulgaria (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ca-ES/langmetadata.xml b/installation/language/ca-ES/langmetadata.xml index 5d39fc58bda8f..6a4a1e500084e 100644 --- a/installation/language/ca-ES/langmetadata.xml +++ b/installation/language/ca-ES/langmetadata.xml @@ -1,7 +1,7 @@ Catalan (ca-ES) - 5.1.1 + 5.1.2 2024-05 Catalan [ca-ES] Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/cs-CZ/joomla.ini b/installation/language/cs-CZ/joomla.ini index c7dc32ddefbed..2309c56a4baae 100644 --- a/installation/language/cs-CZ/joomla.ini +++ b/installation/language/cs-CZ/joomla.ini @@ -81,11 +81,13 @@ INSTL_DATABASE_NAME_LABEL="Název databáze" INSTL_DATABASE_NAME_MSG_MYSQL="Název databáze je neplatný, nesmí obsahovat následující znaky: \ / ." INSTL_DATABASE_NAME_MSG_POSTGRES="Název databáze je neplatný. Musí začínat písmenem, po kterém následují alfanumerické znaky." INSTL_DATABASE_NO_SCHEMA="Pro tento typ databáze neexistuje žádné schéma databáze." +INSTL_DATABASE_PASSWORD_DESC="Zadejte heslo k databázi, které jste vytvořili, nebo heslo poskytnuté hostitelem." INSTL_DATABASE_PREFIX_DESC="Zadejte prefix tabulky nebo použijte náhodně vygenerovaný prefix tabulky." INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Pokud používáte existující databázi s tabulkami se stejnou předponou, Joomla tyto existující tabulky přejmenuje přidáním předpony \"bak_\"." INSTL_DATABASE_PREFIX_MSG="Předpona tabulky musí začínat písmenem, volitelně následují alfanumerické znaky a podtržítko" INSTL_DATABASE_RESPONSE_ERROR="Instalační proces selhal." INSTL_DATABASE_TYPE_DESC="Vyberte typ databáze." +INSTL_DATABASE_USER_DESC="Zadejte uživatelské jméno databáze, které jste vytvořili, nebo uživatelské jméno poskytnuté vaším hostitelem." INSTL_DATABASE_VALIDATION_ERROR="Zkontrolujte přihlašovací údaje k databázi, typ databáze, název databáze nebo název hostitele. Pokud máte nainstalován MySQL 8, přečtěte si prosím dokumentaci Workaround to get Joomla working with MySQL 8 pro více informací." INSTL_CONNECT_DB="Nastavení databázového připojení" diff --git a/installation/language/cs-CZ/langmetadata.xml b/installation/language/cs-CZ/langmetadata.xml index d83eb07a376fc..5aa1058cffdbf 100644 --- a/installation/language/cs-CZ/langmetadata.xml +++ b/installation/language/cs-CZ/langmetadata.xml @@ -1,7 +1,7 @@ Czech (Čeština) - 5.1.1 + 5.1.2 2024-05 Czech Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/cy-GB/langmetadata.xml b/installation/language/cy-GB/langmetadata.xml index 5cfa29227dcb0..ab24c61926b19 100644 --- a/installation/language/cy-GB/langmetadata.xml +++ b/installation/language/cy-GB/langmetadata.xml @@ -1,7 +1,7 @@ Welsh (United Kingdom) - 5.1.1 + 5.1.2 2024-05 Joomla! Project - Welsh Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/da-DK/langmetadata.xml b/installation/language/da-DK/langmetadata.xml index a81118f1429ac..ce726490fdf34 100644 --- a/installation/language/da-DK/langmetadata.xml +++ b/installation/language/da-DK/langmetadata.xml @@ -1,7 +1,7 @@ Danish (Danmark) - 5.1.1 + 5.1.2 2024-05 Danish Translation Team (Transl.: Ronny Buelund) (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/de-AT/langmetadata.xml b/installation/language/de-AT/langmetadata.xml index 48ee89587bd4a..f657dfdf27142 100644 --- a/installation/language/de-AT/langmetadata.xml +++ b/installation/language/de-AT/langmetadata.xml @@ -1,8 +1,8 @@ German (Austria) - 5.1.0 - 2024-04 + 5.1.1 + 2024-05 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/langmetadata.xml b/installation/language/de-CH/langmetadata.xml index 3f6bf061e6340..dc7885dab3e45 100644 --- a/installation/language/de-CH/langmetadata.xml +++ b/installation/language/de-CH/langmetadata.xml @@ -1,8 +1,8 @@ German (Switzerland) - 5.1.0 - 2024-04 + 5.1.1 + 2024-05 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/langmetadata.xml b/installation/language/de-DE/langmetadata.xml index f56f4fb69b25e..092e7f45cf8a3 100644 --- a/installation/language/de-DE/langmetadata.xml +++ b/installation/language/de-DE/langmetadata.xml @@ -1,8 +1,8 @@ German (Germany) - 5.1.0 - 2024-04 + 5.1.1 + 2024-05 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/langmetadata.xml b/installation/language/de-LI/langmetadata.xml index 40e88386024d6..6108e4a6f058c 100644 --- a/installation/language/de-LI/langmetadata.xml +++ b/installation/language/de-LI/langmetadata.xml @@ -1,8 +1,8 @@ German (Liechtenstein) - 5.1.0 - 2024-04 + 5.1.1 + 2024-05 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/langmetadata.xml b/installation/language/de-LU/langmetadata.xml index 91afbd4ed199a..7de0832c63efd 100644 --- a/installation/language/de-LU/langmetadata.xml +++ b/installation/language/de-LU/langmetadata.xml @@ -1,8 +1,8 @@ German (Luxembourg) - 5.1.0 - 2024-04 + 5.1.1 + 2024-05 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 9799c46193905..5983a85b5665c 100644 --- a/installation/language/el-GR/langmetadata.xml +++ b/installation/language/el-GR/langmetadata.xml @@ -1,7 +1,7 @@ Greek (el-GR) - 5.1.1 + 5.1.2 2024-05 Ομάδα Μετάφρασης: joomla. gr (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/en-AU/langmetadata.xml b/installation/language/en-AU/langmetadata.xml index 6826a22c064af..22c8bbc7a63fa 100644 --- a/installation/language/en-AU/langmetadata.xml +++ b/installation/language/en-AU/langmetadata.xml @@ -1,7 +1,7 @@ English (Australia) - 5.1.1 + 5.1.2 2024-05 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/en-CA/langmetadata.xml b/installation/language/en-CA/langmetadata.xml index 7b77793bfda51..279535067c053 100644 --- a/installation/language/en-CA/langmetadata.xml +++ b/installation/language/en-CA/langmetadata.xml @@ -1,7 +1,7 @@ English (Canada) - 5.1.1 + 5.1.2 2024-05 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml index e141f0b0ef906..474a090e5a136 100644 --- a/installation/language/en-GB/langmetadata.xml +++ b/installation/language/en-GB/langmetadata.xml @@ -2,7 +2,7 @@ English (United Kingdom) 5.2.0 - 2024-06 + 2024-07 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 f8b4016490ab8..8e3538be28f9f 100644 --- a/installation/language/en-NZ/langmetadata.xml +++ b/installation/language/en-NZ/langmetadata.xml @@ -1,7 +1,7 @@ English (New Zealand) - 5.1.1 + 5.1.2 2024-05 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/en-US/langmetadata.xml b/installation/language/en-US/langmetadata.xml index 92778f25ddee8..414d0362035d0 100644 --- a/installation/language/en-US/langmetadata.xml +++ b/installation/language/en-US/langmetadata.xml @@ -1,7 +1,7 @@ English (United States) - 5.1.1 + 5.1.2 2024-05 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/es-ES/langmetadata.xml b/installation/language/es-ES/langmetadata.xml index 97e4887433158..39fbc706b6746 100644 --- a/installation/language/es-ES/langmetadata.xml +++ b/installation/language/es-ES/langmetadata.xml @@ -1,7 +1,7 @@ Spanish (es-ES) - 5.1.1 + 5.1.2 2024-05 Spanish [es-ES] Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/et-EE/langmetadata.xml b/installation/language/et-EE/langmetadata.xml index 9d1783512d8f7..014c54398fe38 100644 --- a/installation/language/et-EE/langmetadata.xml +++ b/installation/language/et-EE/langmetadata.xml @@ -1,7 +1,7 @@ Estonian - 5.1.1 + 5.1.2 2024-05 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/eu-ES/langmetadata.xml b/installation/language/eu-ES/langmetadata.xml index 65e2045eb0604..1c8382e614ec8 100644 --- a/installation/language/eu-ES/langmetadata.xml +++ b/installation/language/eu-ES/langmetadata.xml @@ -1,7 +1,7 @@ Basque - 5.1.1 + 5.1.2 2024-05 Joomla! Basque Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/fa-AF/langmetadata.xml b/installation/language/fa-AF/langmetadata.xml index 08b6b8fbbd6fe..a5553c449a0ee 100644 --- a/installation/language/fa-AF/langmetadata.xml +++ b/installation/language/fa-AF/langmetadata.xml @@ -1,7 +1,7 @@ فارسی (دری) - 5.1.1 + 5.1.2 2024-05 JoomlaPersian Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/fa-IR/langmetadata.xml b/installation/language/fa-IR/langmetadata.xml index c43179848acb3..a8a1ada620207 100644 --- a/installation/language/fa-IR/langmetadata.xml +++ b/installation/language/fa-IR/langmetadata.xml @@ -1,7 +1,7 @@ Persian (fa-IR) - 5.1.1 + 5.1.2 2024-05 Persian Translation Team: joomlafarsi.com (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/fi-FI/langmetadata.xml b/installation/language/fi-FI/langmetadata.xml index a7e04d088359d..d4d8b6b8e0270 100644 --- a/installation/language/fi-FI/langmetadata.xml +++ b/installation/language/fi-FI/langmetadata.xml @@ -1,7 +1,7 @@ Finnish (Finland) - 5.1.1 + 5.1.2 2024-05 Finnish translation team: Joomla.fi (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/fr-CA/langmetadata.xml b/installation/language/fr-CA/langmetadata.xml index 404b4c5f21342..b9ee09a403f4d 100644 --- a/installation/language/fr-CA/langmetadata.xml +++ b/installation/language/fr-CA/langmetadata.xml @@ -1,7 +1,7 @@ French (Canada) - 5.1.1 + 5.1.2 2024-05 Joomla! Project - French translation team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/fr-FR/langmetadata.xml b/installation/language/fr-FR/langmetadata.xml index 647c61f26f2c1..dbae79bb5f1d3 100644 --- a/installation/language/fr-FR/langmetadata.xml +++ b/installation/language/fr-FR/langmetadata.xml @@ -1,7 +1,7 @@ French (fr-FR) - 5.1.1 + 5.1.2 2024-05 Joomla! Project - French translation team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/he-IL/langmetadata.xml b/installation/language/he-IL/langmetadata.xml index 024f829d404ab..29498025458d6 100644 --- a/installation/language/he-IL/langmetadata.xml +++ b/installation/language/he-IL/langmetadata.xml @@ -1,7 +1,7 @@ Hebrew (Israel) - 5.1.1 + 5.1.2 2024-05 פרוייקט ג'ומלה (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/hr-HR/langmetadata.xml b/installation/language/hr-HR/langmetadata.xml index 9ffa1fa97e304..9a4b08b5a337d 100644 --- a/installation/language/hr-HR/langmetadata.xml +++ b/installation/language/hr-HR/langmetadata.xml @@ -1,7 +1,7 @@ Croatian (Croatia) - 5.1.1 + 5.1.2 2024-05 Joomla! Hrvatska team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/hu-HU/langmetadata.xml b/installation/language/hu-HU/langmetadata.xml index c5f66e32d2189..77f12ff716bae 100644 --- a/installation/language/hu-HU/langmetadata.xml +++ b/installation/language/hu-HU/langmetadata.xml @@ -1,7 +1,7 @@ Hungarian (Magyar) - 5.1.1 + 5.1.2 2024-05 Joomla! Magyarország (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/id-ID/langmetadata.xml b/installation/language/id-ID/langmetadata.xml index cdfae7c5764ca..3914050426383 100644 --- a/installation/language/id-ID/langmetadata.xml +++ b/installation/language/id-ID/langmetadata.xml @@ -1,7 +1,7 @@ Bahasa Indonesia (id-ID) - 5.1.1 + 5.1.2 2024-05 Joomla! Indonesia (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/it-IT/langmetadata.xml b/installation/language/it-IT/langmetadata.xml index 31471f73e8aee..f1eb07a223848 100644 --- a/installation/language/it-IT/langmetadata.xml +++ b/installation/language/it-IT/langmetadata.xml @@ -1,7 +1,7 @@ Italiano (it-IT) - 5.1.1 + 5.1.2 2024-05 Joomla! Project (Italian Translation Team) (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ja-JP/langmetadata.xml b/installation/language/ja-JP/langmetadata.xml index 9575653866702..dd1f67fab6bab 100644 --- a/installation/language/ja-JP/langmetadata.xml +++ b/installation/language/ja-JP/langmetadata.xml @@ -1,7 +1,7 @@ Japanese (Japan) - 5.1.1 + 5.1.2 2024-05 Joomla!じゃぱん (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ka-GE/langmetadata.xml b/installation/language/ka-GE/langmetadata.xml index df349cb50ad35..595f6adbd345c 100644 --- a/installation/language/ka-GE/langmetadata.xml +++ b/installation/language/ka-GE/langmetadata.xml @@ -1,7 +1,7 @@ Georgian (Georgia) - 5.1.1 + 5.1.2 2024-05 Georgian Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/kk-KZ/langmetadata.xml b/installation/language/kk-KZ/langmetadata.xml index 2e1215598e08a..f158e72edc004 100644 --- a/installation/language/kk-KZ/langmetadata.xml +++ b/installation/language/kk-KZ/langmetadata.xml @@ -1,7 +1,7 @@ Kazakh (Kazakhstan) - 5.1.1 + 5.1.2 2024-05 Sarvarov Akylkerey (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ko-KR/langmetadata.xml b/installation/language/ko-KR/langmetadata.xml index edc823e75e2c2..5e4a1b5bc6672 100644 --- a/installation/language/ko-KR/langmetadata.xml +++ b/installation/language/ko-KR/langmetadata.xml @@ -1,7 +1,7 @@ Korean (Republic of Korea) - 5.1.1 + 5.1.2 2024-05 Joomla! 프로젝트 (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/lt-LT/langmetadata.xml b/installation/language/lt-LT/langmetadata.xml index ec0d8855363d6..4672f476b039d 100644 --- a/installation/language/lt-LT/langmetadata.xml +++ b/installation/language/lt-LT/langmetadata.xml @@ -1,7 +1,7 @@ Lietuvių (lt-LT) - 5.1.1 + 5.1.2 2024-05 Oskaras Jankauskas (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/lv-LV/langmetadata.xml b/installation/language/lv-LV/langmetadata.xml index 65bb1a14fd8eb..2246a31f65b6e 100644 --- a/installation/language/lv-LV/langmetadata.xml +++ b/installation/language/lv-LV/langmetadata.xml @@ -1,7 +1,7 @@ Latvian (Latvia) - 5.1.1 + 5.1.2 2024-05 Joomla! Projekts (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/mk-MK/langmetadata.xml b/installation/language/mk-MK/langmetadata.xml index a7033ddc70376..8441a648b3262 100644 --- a/installation/language/mk-MK/langmetadata.xml +++ b/installation/language/mk-MK/langmetadata.xml @@ -1,7 +1,7 @@ Macedonian (mk-MK) - 5.1.1 + 5.1.2 2024-05 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/nl-BE/langmetadata.xml b/installation/language/nl-BE/langmetadata.xml index 75500392a5d52..79d90d17abf2f 100644 --- a/installation/language/nl-BE/langmetadata.xml +++ b/installation/language/nl-BE/langmetadata.xml @@ -1,7 +1,7 @@ Dutch (Belgium) - 5.1.1 + 5.1.2 2024-05 Dutch (BE) translation team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/nl-NL/langmetadata.xml b/installation/language/nl-NL/langmetadata.xml index 3cea787434b2e..3ef59af286418 100644 --- a/installation/language/nl-NL/langmetadata.xml +++ b/installation/language/nl-NL/langmetadata.xml @@ -1,7 +1,7 @@ Dutch (nl-NL) - 5.1.1 + 5.1.2 2024-05 Dutch Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/pl-PL/langmetadata.xml b/installation/language/pl-PL/langmetadata.xml index 5333fde47cf7b..dd6a2972574e1 100644 --- a/installation/language/pl-PL/langmetadata.xml +++ b/installation/language/pl-PL/langmetadata.xml @@ -1,7 +1,7 @@ Polski (PL) - 5.1.1 + 5.1.2 2024-05 Projekt Joomla! (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/pt-BR/langmetadata.xml b/installation/language/pt-BR/langmetadata.xml index ce8b89b185c5e..90a4c766bf1cb 100644 --- a/installation/language/pt-BR/langmetadata.xml +++ b/installation/language/pt-BR/langmetadata.xml @@ -1,7 +1,7 @@ Português do Brasil (pt-BR) - 5.1.1 + 5.1.2 2024-05 Projeto Joomla! (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/pt-PT/langmetadata.xml b/installation/language/pt-PT/langmetadata.xml index d56927fa9d8c9..5f6b12ba73362 100644 --- a/installation/language/pt-PT/langmetadata.xml +++ b/installation/language/pt-PT/langmetadata.xml @@ -1,7 +1,7 @@ Português (Portugal) - 5.1.1 + 5.1.2 2024-05 Comunidade JoomlaPortugal (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ro-RO/joomla.ini b/installation/language/ro-RO/joomla.ini index 3b8576d155d22..ec3f87fae1e79 100644 --- a/installation/language/ro-RO/joomla.ini +++ b/installation/language/ro-RO/joomla.ini @@ -285,4 +285,7 @@ JLIB_FORM_FIELD_REQUIRED_CHECK="Trebuie selectată una dintre opțiuni." JLIB_FORM_FIELD_REQUIRED_VALUE="Vă rugăm să completați acest câmp." ; Installation progress screen INSTL="Instalare" +INSTL_FINISHED="Instalarea s-a încheiat" +INSTL_IN_PROGRESS="Se execută instalarea" +INSTL_PROGRESS="Progres de instalare" diff --git a/installation/language/ro-RO/langmetadata.xml b/installation/language/ro-RO/langmetadata.xml index a6343d81e5126..470128d750b8e 100644 --- a/installation/language/ro-RO/langmetadata.xml +++ b/installation/language/ro-RO/langmetadata.xml @@ -1,7 +1,7 @@ Română (România) - 5.1.1 + 5.1.2 2024-05 Horia Negura - Quanta (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/sk-SK/langmetadata.xml b/installation/language/sk-SK/langmetadata.xml index 8109d42fed512..b235cce37c330 100644 --- a/installation/language/sk-SK/langmetadata.xml +++ b/installation/language/sk-SK/langmetadata.xml @@ -1,7 +1,7 @@ Slovak (Slovakia) - 5.1.1 + 5.1.2 2024-05 Slovak translation team : Peter Michnica (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/sl-SI/langmetadata.xml b/installation/language/sl-SI/langmetadata.xml index 76cefa166f2a0..d270b28ffc042 100644 --- a/installation/language/sl-SI/langmetadata.xml +++ b/installation/language/sl-SI/langmetadata.xml @@ -1,7 +1,7 @@ Slovenščina (Slovenija) - 5.1.1 + 5.1.2 2024-05 Slovenska prevajalska ekipa (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/sr-YU/langmetadata.xml b/installation/language/sr-YU/langmetadata.xml index 9577dd1e8bcd9..bed4a7bf7609d 100644 --- a/installation/language/sr-YU/langmetadata.xml +++ b/installation/language/sr-YU/langmetadata.xml @@ -1,7 +1,7 @@ Srpski (Republika Srbija) - 5.1.1 + 5.1.2 2024-05 Goran Nešić - UIX Web Design & Saša Matić Bardak.RS (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/sv-SE/langmetadata.xml b/installation/language/sv-SE/langmetadata.xml index e222ed947bd94..51ff7cf87634e 100644 --- a/installation/language/sv-SE/langmetadata.xml +++ b/installation/language/sv-SE/langmetadata.xml @@ -1,7 +1,7 @@ Swedish (Sweden) - 5.1.1 + 5.1.2 2024-05 Swedish Translation Team - SvenskJoomla (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ta-IN/langmetadata.xml b/installation/language/ta-IN/langmetadata.xml index b38c363757f92..174549b64dc03 100644 --- a/installation/language/ta-IN/langmetadata.xml +++ b/installation/language/ta-IN/langmetadata.xml @@ -1,7 +1,7 @@ Tamil (India) - 5.1.1 + 5.1.2 2024-05 Ilagnayeru 'MIG' Manickam, Elango Samy Manim (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/th-TH/langmetadata.xml b/installation/language/th-TH/langmetadata.xml index 3efb407a52926..eb26443ddf415 100644 --- a/installation/language/th-TH/langmetadata.xml +++ b/installation/language/th-TH/langmetadata.xml @@ -1,7 +1,7 @@ Thai (ภาษาไทย) - 5.1.1 + 5.1.2 2024-05 Thai Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/tr-TR/langmetadata.xml b/installation/language/tr-TR/langmetadata.xml index 1bafd0e98ff47..4d16c49962b99 100644 --- a/installation/language/tr-TR/langmetadata.xml +++ b/installation/language/tr-TR/langmetadata.xml @@ -1,7 +1,7 @@ Turkish (Turkey) - 5.1.1 + 5.1.2 2024-05 Joomla! Türkiye (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/uk-UA/langmetadata.xml b/installation/language/uk-UA/langmetadata.xml index 06e6487ac0045..cda0dbd26209c 100644 --- a/installation/language/uk-UA/langmetadata.xml +++ b/installation/language/uk-UA/langmetadata.xml @@ -1,7 +1,7 @@ Ukrainian (uk-UA) - 5.1.1 + 5.1.2 2024-05 Denys Nosov (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ur-PK/langmetadata.xml b/installation/language/ur-PK/langmetadata.xml index 806c5306cbd9c..cd5a8b0b596b2 100644 --- a/installation/language/ur-PK/langmetadata.xml +++ b/installation/language/ur-PK/langmetadata.xml @@ -1,7 +1,7 @@ انگریزی (برطانیہ) - 5.1.1 + 5.1.2 2024-05 عبدالوحید (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/vi-VN/langmetadata.xml b/installation/language/vi-VN/langmetadata.xml index d9382a8420140..c6c5d29519450 100644 --- a/installation/language/vi-VN/langmetadata.xml +++ b/installation/language/vi-VN/langmetadata.xml @@ -1,7 +1,7 @@ Vietnamese (Vietnam) - 5.1.1 + 5.1.2 2024-05 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/zh-CN/joomla.ini b/installation/language/zh-CN/joomla.ini index 2372550b91c64..3faba9bfc8402 100644 --- a/installation/language/zh-CN/joomla.ini +++ b/installation/language/zh-CN/joomla.ini @@ -81,10 +81,13 @@ INSTL_DATABASE_NAME_LABEL="数据库名称" INSTL_DATABASE_NAME_MSG_MYSQL="数据库名无效。不能包含以下字符: \ / " INSTL_DATABASE_NAME_MSG_POSTGRES="数据库名无效。它必须以字母开头，然后是字母数字字符。" INSTL_DATABASE_NO_SCHEMA="该数据库类型不存在数据库模式" +INSTL_DATABASE_PASSWORD_DESC="请输入数据库密码" INSTL_DATABASE_PREFIX_DESC="输入表前缀或使用随机生成的表前缀" +INSTL_DATABASE_PREFIX_DUPLICATE_DESC="如果您正在使用一个带有相同前缀的表格的现有数据库，Joomla将通过添加前缀\"bak_\"重命名这些现有表格。" INSTL_DATABASE_PREFIX_MSG="表前缀必须以字母开头，可选择以字母数字字符和下划线跟随" INSTL_DATABASE_RESPONSE_ERROR="安装过程失败" INSTL_DATABASE_TYPE_DESC="选择数据库类型" +INSTL_DATABASE_USER_DESC="请输入数据库用户名" INSTL_DATABASE_VALIDATION_ERROR="检查你的数据库凭证、数据库类型、数据库名称或主机名。如果使用的是 MySQL 8，请阅读这个 wiki 了解更多信息。" INSTL_CONNECT_DB="设置数据库连接" @@ -100,6 +103,9 @@ INSTL_SETUP_SITE_NAME="网站名称" INSTL_SITE="主配置" INSTL_SITE_DEVMODE_LABEL="检测到开发模式" INSTL_SITE_NAME_DESC="网站名称" +; Expert View +INSTL_PUBLIC_FOLDER_DESC="公共文件夹的相对路径或绝对路径" +INSTL_PUBLIC_FOLDER_DESC_SHORT="公共文件夹的相对路径或绝对路径" ; Complete view INSTL_COMPLETE_ERROR_FOLDER_DELETE="无法删除 \"%s\" 目录。请手动删除该文件夹。" INSTL_COMPLETE_REMOVE_FOLDER="删除 %s 目录" @@ -117,6 +123,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="语言" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="选择安装语言" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="语言标签" INSTL_LANGUAGES_COLUMN_HEADER_VERSION="版本" +INSTL_LANGUAGES_DESC="通过选择复选框选择你喜欢的语言，然后选择 \"下一步 \" 按钮安装。
注意：下载和安装每种语言需要大约 10 秒钟。为避免超时，请安装不要超过 3 种语言" +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="下载和安装每种语言需要大约 10 秒钟
请等待，我们将下载并安装语言..." INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="没有选择要安装的语言。" INSTL_LANGUAGES_SELECTED="安装选择的语言" INSTL_LANGUAGES_WARNING_NO_INTERNET="无法连接到语言服务器。请完成安装过程。" @@ -187,6 +195,7 @@ INSTL_NOTICE_NEEDSTOBEWRITABLE="如果你修复了权限或者提供了 FTP 连 INSTL_OUTPUT_BUFFERING="输出缓冲(Output Buffering)" INSTL_PHP_VERSION="PHP 版本" INSTL_PHP_VERSION_NEWER="PHP 版本 >= %s" +INSTL_PROCESS_BUSY="安装正在进行，请稍候……" INSTL_SESSION_AUTO_START="会话自启动(Session Auto Start)" INSTL_WRITABLE="没有足够的权限创建 %s" INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP 支持并启用" @@ -202,7 +211,9 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="未找到匹配的内容" JGLOBAL_SELECT_SOME_OPTIONS="可以选择一个或多个" JHIDEPASSWORD="不显示密码" JINVALID_TOKEN="提交的表单中包含无效安全令牌数据被拒绝。请刷新页面，再试一次。" +JINVALID_TOKEN_NOTICE="安全令牌(token)不匹配. 为了预防安全了漏洞造成破坏，请求被中止. 请重试." JNEXT="下一页" +JNO="从不发送" JNOTICE="注意" JOFF="关" JON="开" @@ -222,6 +233,7 @@ JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: 路径不是一个文件夹。 JLIB_FORM_FIELD_INVALID="无效字段： " JLIB_FORM_VALIDATE_FIELD_INVALID="无效字段: %s " JLIB_FORM_VALIDATE_FIELD_REQUIRED="必填字段 %s " +JLIB_INSTALLER_ABORT="语言安装异常中止: %s" JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="扩展 %1$s: 创建 %2$s 目录失败" JLIB_INSTALLER_ABORT_NOINSTALLPATH="安装路径不存在" JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="安装包 %1$s 安装扩展时出现错误：%2$s." @@ -234,6 +246,7 @@ JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="无法为 %s 语言 JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP 设置中 allow_url_fopen 参数已设置为关闭. 升级程序正常工作必须开启此项设置" JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: 不能打开 %s" JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: 不能解析 %s" +JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="升级: 无法打开升级网站 #%d "%s", URL: %s." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase::getInstance: 无法连接到数据库
joomla.library: %1$s - %2$s." ; Strings for the language debugger JDEBUG_LANGUAGE_FILES_IN_ERROR="语言文件解析错误" @@ -256,6 +269,7 @@ MESSAGE="消息" NOTICE="注意" WARNING="警告" ; Javascript ajax error messages +JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="在获取JSON数据时发生了连接中止。" JLIB_JS_AJAX_ERROR_NO_CONTENT="没有返回内容." JLIB_JS_AJAX_ERROR_OTHER="在获取 JSON 数据时发生了错误。HTTP %d 状态码" JLIB_JS_AJAX_ERROR_PARSE="处理下列 JSON 数据时出现解析错误:
%s" @@ -271,4 +285,9 @@ JLIB_FORM_CONTAINS_INVALID_FIELDS="由于缺少必要的数据，该表格无法 JLIB_FORM_FIELD_INVALID_VALUE="此值无效。" JLIB_FORM_FIELD_REQUIRED_CHECK="必须选择一个选项。" JLIB_FORM_FIELD_REQUIRED_VALUE="请填写此字段。" +; Installation progress screen +INSTL="安装" +INSTL_FINISHED="安装完成" +INSTL_IN_PROGRESS="正在安装中" +INSTL_PROGRESS="安装进度" diff --git a/installation/language/zh-CN/langmetadata.xml b/installation/language/zh-CN/langmetadata.xml index 0fff070a85d5f..ab80bf513d877 100644 --- a/installation/language/zh-CN/langmetadata.xml +++ b/installation/language/zh-CN/langmetadata.xml @@ -1,7 +1,7 @@ Chinese Simplified (China) - 5.1.1 + 5.1.2 2024-05 Joomla!中文官网 www.joomlachina.org.cn 周永建 (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/zh-TW/langmetadata.xml b/installation/language/zh-TW/langmetadata.xml index 0660edb619742..69b62d3c42d7a 100644 --- a/installation/language/zh-TW/langmetadata.xml +++ b/installation/language/zh-TW/langmetadata.xml @@ -1,7 +1,7 @@ 正體中文 - 5.1.1 + 5.1.2 2024-05 正體中文 Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index b0e7c198eef30..a609c088ad6ae 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -3,7 +3,7 @@ English (en-GB) en-GB 5.2.0 - 2024-06 + 2024-07 Joomla! Project admin@joomla.org www.joomla.org diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml index 4219f5256794f..91aa6ce0d6efc 100644 --- a/language/en-GB/langmetadata.xml +++ b/language/en-GB/langmetadata.xml @@ -2,7 +2,7 @@ English (en-GB) 5.2.0 - 2024-06 + 2024-07 Joomla! Project admin@joomla.org www.joomla.org diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 0950e5e2776d0..bb8ae65a12d8a 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -90,7 +90,7 @@ final class Version * @var string * @since 3.5 */ - public const RELDATE = '25-June-2024'; + public const RELDATE = '2-July-2024'; /** * Release time. @@ -98,7 +98,7 @@ final class Version * @var string * @since 3.5 */ - public const RELTIME = '17:01'; + public const RELTIME = '07:45'; /** * Release timezone. diff --git a/plugins/editors/tinymce/forms/setoptions.xml b/plugins/editors/tinymce/forms/setoptions.xml index 5ac9971c11688..8830ace3f7723 100644 --- a/plugins/editors/tinymce/forms/setoptions.xml +++ b/plugins/editors/tinymce/forms/setoptions.xml @@ -225,6 +225,18 @@ showon="use_config_textfilters:0" /> + + + + + false, // Hardened security - 'sandbox_iframes' => true, + // @todo enable with TinyMCE 7 using https://www.tiny.cloud/docs/tinymce/latest/content-filtering/#sandbox-iframes-exclusions otherwise all embed PDFs are broken + 'sandbox_iframes' => (bool) $levelParams->get('sandbox_iframes', true), 'convert_unsafe_embeds' => true, // Specify the attributes to be used when previewing a style. This prevents white text on a white background making the preview invisible. diff --git a/tests/System/README.md b/tests/System/README.md index 5fd93723cc1c9..65790212d9cf1 100644 --- a/tests/System/README.md +++ b/tests/System/README.md @@ -165,15 +165,15 @@ The Joomla System Tests come with some convenient [Cypress Tasks](https://docs.c - **queryDB** – Executes a query on the database - **cleanupDB** – Deletes the inserted items from the database -- **writeFile** – Writes a file relative to the CMS root folder -- **deleteFolder** – Deletes a folder relative to the CMS root folder +- **writeRelativeFile** – Writes a file relative to the CMS root folder +- **deleteRelativePath** – Deletes a file or folder relative to the CMS root folder - **startMailServer** – Starts the smtp-tester SMTP server - **getMails** – Get received mails from smtp-tester - **clearEmails** – Clear all smtp-tester received mails The following code in a test executes the writing file task with parameters: ```JavaScript - cy.task('writeFile', { path: 'images/dummy.text', content: '1' }).then(() => { ... }) + cy.task('writeRelativeFile', { path: 'images/dummy.text', content: '1' }).then(() => { ... }) ``` :point_right: As each task is asynchronous and must be chained, the result includes `.then()`. @@ -273,7 +273,7 @@ If the Cypress installation step or the entire test suite is executed by a non-r ``` 1) Install Joomla Install Joomla: - CypressError: `cy.task('writeFile')` failed with the following error: + CypressError: `cy.task('writeRelativeFile')` failed with the following error: > EACCES: permission denied, open './configuration.php' ``` Or on Microsoft Windows you will see: diff --git a/tests/System/integration/administrator/components/com_cache/Default.cy.js b/tests/System/integration/administrator/components/com_cache/Default.cy.js new file mode 100644 index 0000000000000..218fa196780e4 --- /dev/null +++ b/tests/System/integration/administrator/components/com_cache/Default.cy.js @@ -0,0 +1,33 @@ +describe('Test in backend that the cache', () => { + beforeEach(() => { + cy.doAdministratorLogin(); + cy.visit('/administrator/index.php?option=com_cache&view=cache'); + }); + + it('have a title', () => { + cy.get('h1.page-title').should('contain.text', 'Maintenance: Clear Cache'); + }); + + it('can display message', () => { + cy.get('div.alert.alert-info').should('contain.text', 'Select the Clear Expired Cache button'); + }); + + it('can display a list of chached items', () => { + cy.get('tr.row0').should('contain.text', '_media_version'); + }); + + it('can clear expired cache', () => { + cy.get('#toolbar-delete2').click(); + cy.get('body').then(($body) => { + if ($body.find('div.buttons-holder button[data-button-ok]').length > 0) { + cy.get('div.buttons-holder button[data-button-ok]').click(); + } + }); + cy.get('#system-message-container').contains('Expired cached items have been cleared').should('exist'); + }); + + it('can delete all', () => { + cy.get('#toolbar-delete1').click(); + cy.get('#system-message-container').contains('All cache group(s) have been cleared').should('exist'); + }); +}); diff --git a/tests/System/integration/administrator/components/com_checkin/Default.cy.js b/tests/System/integration/administrator/components/com_checkin/Default.cy.js new file mode 100644 index 0000000000000..c426e9b3f73fb --- /dev/null +++ b/tests/System/integration/administrator/components/com_checkin/Default.cy.js @@ -0,0 +1,31 @@ +describe('Test in backend that the checkin', () => { + beforeEach(() => { + cy.doAdministratorLogin(); + cy.visit('/administrator/index.php?option=com_checkin'); + }); + + it('has a title', () => { + cy.get('h1.page-title').should('contain.text', 'Maintenance: Global Check-in'); + }); + + it('can display message', () => { + cy.get('p.lead').should('contain.text', 'There are no tables with checked out items'); + }); + + it('can display a list of checked out', () => { + cy.db_createArticle({ title: 'Test article', checked_out: '1', checked_out_time: '2024-01-01 20:00:00' }).then(() => { + cy.visit('/administrator/index.php?option=com_checkin'); + cy.get('tr.row0').should('contain.text', 'content'); + }); + }); + + it('can check in items', () => { + cy.db_createArticle({ title: 'Test article', checked_out: '1', checked_out_time: '2024-01-01 20:00:00' }).then(() => { + cy.visit('/administrator/index.php?option=com_checkin'); + cy.searchForItem('content'); + cy.checkAllResults(); + cy.get('#toolbar-checkin').click(); + cy.get('#system-message-container').contains('Item checked in').should('exist'); + }); + }); +}); diff --git a/tests/System/integration/api/com_media/Files.cy.js b/tests/System/integration/api/com_media/Files.cy.js index a0217613f281c..ef639200fdb65 100644 --- a/tests/System/integration/api/com_media/Files.cy.js +++ b/tests/System/integration/api/com_media/Files.cy.js @@ -1,7 +1,8 @@ describe('Test that media files API endpoint', () => { - // Ensure test dir is available and has correct permissions - beforeEach(() => cy.task('writeFile', { path: 'images/test-dir/dummy.txt', content: '1' })); - afterEach(() => cy.task('deleteFolder', 'images/test-dir')); + // Ensure 'test-dir' (relative to cmsPath) is available and has correct permissions + beforeEach(() => cy.task('writeRelativeFile', { path: 'images/test-dir/dummy.txt', content: '1' })); + // If it exists, delete the 'test-dir' (relative to cmsPath) and its contents + afterEach(() => cy.task('deleteRelativePath', 'images/test-dir')); it('can deliver a list of files', () => { cy.api_get('/media/files') @@ -101,7 +102,7 @@ describe('Test that media files API endpoint', () => { }); it('can update a file without adapter', () => { - cy.task('writeFile', { path: 'images/test-dir/override.jpg', content: '1' }) + cy.task('writeRelativeFile', { path: 'images/test-dir/override.jpg', content: '1' }) .then(() => cy.readFile('tests/System/data/com_media/test-image-1.jpg', 'binary')) .then((data) => cy.api_patch( '/media/files/test-dir/override.jpg', @@ -117,7 +118,7 @@ describe('Test that media files API endpoint', () => { }); it('can update a folder without adapter', () => { - cy.task('writeFile', { path: 'images/test-dir/override/test.jpg', content: '1' }) + cy.task('writeRelativeFile', { path: 'images/test-dir/override/test.jpg', content: '1' }) .then(() => cy.api_patch('/media/files/test-dir/override', { path: 'test-dir/override-new' })) .then((response) => { cy.wrap(response).its('body').its('data').its('attributes') @@ -130,7 +131,7 @@ describe('Test that media files API endpoint', () => { }); it('can update a file with adapter', () => { - cy.task('writeFile', { path: 'images/test-dir/override.jpg', content: '1' }) + cy.task('writeRelativeFile', { path: 'images/test-dir/override.jpg', content: '1' }) .then(() => cy.readFile('tests/System/data/com_media/test-image-1.jpg', 'binary')) .then((data) => cy.api_patch( '/media/files/local-images:/test-dir/override.jpg', @@ -146,7 +147,7 @@ describe('Test that media files API endpoint', () => { }); it('can update a folder with adapter', () => { - cy.task('writeFile', { path: 'images/test-dir/override/test.jpg', content: '1' }) + cy.task('writeRelativeFile', { path: 'images/test-dir/override/test.jpg', content: '1' }) .then(() => cy.api_patch('/media/files/local-images:/test-dir/override', { path: 'local-images:/test-dir/override-new' })) .then((response) => { cy.wrap(response).its('body').its('data').its('attributes') @@ -159,22 +160,22 @@ describe('Test that media files API endpoint', () => { }); it('can delete a file without adapter', () => { - cy.task('writeFile', { path: 'images/test-dir/todelete.jpg', content: '1' }) + cy.task('writeRelativeFile', { path: 'images/test-dir/todelete.jpg', content: '1' }) .then(() => cy.api_delete('/media/files/test-dir/todelete.jpg')); }); it('can delete a folder without adapter', () => { - cy.task('writeFile', { path: 'images/test-dir/todelete/dummy.txt', content: '1' }) + cy.task('writeRelativeFile', { path: 'images/test-dir/todelete/dummy.txt', content: '1' }) .then(() => cy.api_delete('/media/files/test-dir/todelete')); }); it('can delete a file with adapter', () => { - cy.task('writeFile', { path: 'images/test-dir/todelete.jpg', content: '1' }) + cy.task('writeRelativeFile', { path: 'images/test-dir/todelete.jpg', content: '1' }) .then(() => cy.api_delete('/media/files/local-images:/test-dir/todelete.jpg')); }); it('can delete a folder with adapter', () => { - cy.task('writeFile', { path: 'images/test-dir/todelete/dummy.txt', content: '1' }) + cy.task('writeRelativeFile', { path: 'images/test-dir/todelete/dummy.txt', content: '1' }) .then(() => cy.api_delete('/media/files/local-images:/test-dir/todelete')); }); }); diff --git a/tests/System/integration/install/Installation.cy.js b/tests/System/integration/install/Installation.cy.js index 6f079c68aed73..cc00e3b19e61c 100644 --- a/tests/System/integration/install/Installation.cy.js +++ b/tests/System/integration/install/Installation.cy.js @@ -1,7 +1,5 @@ describe('Install Joomla', () => { it('Install Joomla', () => { - cy.exec('rm configuration.php', { failOnNonZeroExit: false }); - const config = { sitename: Cypress.env('sitename'), name: Cypress.env('name'), @@ -16,6 +14,8 @@ describe('Install Joomla', () => { db_prefix: Cypress.env('db_prefix'), }; + // If exists, delete PHP configuration file to force a new installation + cy.task('deleteRelativePath', 'configuration.php'); cy.installJoomla(config); cy.doAdministratorLogin(config.username, config.password, false); diff --git a/tests/System/plugins/fs.js b/tests/System/plugins/fs.js index 0b3b37227c2e9..4461e80e2c010 100644 --- a/tests/System/plugins/fs.js +++ b/tests/System/plugins/fs.js @@ -1,17 +1,20 @@ const fs = require('fs'); -const fspath = require('path'); +const path = require('path'); const { umask } = require('node:process'); /** - * Deletes a folder with the given path recursive. + * Synchronously deletes a file or folder, relative to cmsPath. + * If it is a folder and contains content, the content is deleted recursively. + * It ignores if the path doesn't exist. * - * @param {string} path The path - * @param {object} config The config + * @param {string} relativePath - File or folder, relative to cmsPath + * @param {object} config - The Cypress configuration object * * @returns null */ -function deleteFolder(path, config) { - fs.rmSync(`${config.env.cmsPath}/${path}`, { recursive: true, force: true }); +function deleteRelativePath(relativePath, config) { + const fullPath = path.join(config.env.cmsPath, relativePath); + fs.rmSync(fullPath, { recursive: true, force: true }); return null; } @@ -23,19 +26,19 @@ function deleteFolder(path, config) { * If the file already exists, it will be overwritten. * Finally, the given file mode or the default 0o444 is set for the given file. * - * @param {string} path The relative file path (e.g. 'images/test-dir/override.jpg') - * @param {mixed} content The file content - * @param {object} config The Cypress configuration - * @param {number} [mode=0o444] The file mode to be used (in octal) + * @param {string} relativePath - The relative file path (e.g. 'images/test-dir/override.jpg') + * @param {mixed} content - The file content + * @param {object} config - The Cypress configuration object + * @param {number} [mode=0o444] - The file mode to be used (in octal) * * @returns null */ -function writeFile(path, content, config, mode = 0o444) { - const fullPath = fspath.join(config.env.cmsPath, path); +function writeRelativeFile(relativePath, content, config, mode = 0o444) { + const fullPath = path.join(config.env.cmsPath, relativePath); // Prologue: Reset process file mode creation mask to ensure the umask value is not subtracted const oldmask = umask(0); // Create missing parent directories with 'rwxrwxrwx' - fs.mkdirSync(fspath.dirname(fullPath), { recursive: true, mode: 0o777 }); + fs.mkdirSync(path.dirname(fullPath), { recursive: true, mode: 0o777 }); // Check if the file exists if (fs.existsSync(fullPath)) { // Set 'rw-rw-rw-' to be able to overwrite the file @@ -51,4 +54,4 @@ function writeFile(path, content, config, mode = 0o444) { return null; } -module.exports = { writeFile, deleteFolder }; +module.exports = { writeRelativeFile, deleteRelativePath }; diff --git a/tests/System/plugins/index.js b/tests/System/plugins/index.js index 771335eb69a13..2c76e48f5ac9e 100644 --- a/tests/System/plugins/index.js +++ b/tests/System/plugins/index.js @@ -14,8 +14,8 @@ function setupPlugins(on, config) { on('task', { queryDB: (query) => db.queryTestDB(query, config), cleanupDB: () => db.deleteInsertedItems(config), - writeFile: ({ path, content, mode }) => fs.writeFile(path, content, config, mode), - deleteFolder: (path) => fs.deleteFolder(path, config), + writeRelativeFile: ({ path, content, mode }) => fs.writeRelativeFile(path, content, config, mode), + deleteRelativePath: (path) => fs.deleteRelativePath(path, config), getMails: () => mail.getMails(), clearEmails: () => mail.clearEmails(), startMailServer: () => mail.startMailServer(config), diff --git a/tests/System/support/commands/config.js b/tests/System/support/commands/config.js index a7ae850b8f6ab..4987273e8ee49 100644 --- a/tests/System/support/commands/config.js +++ b/tests/System/support/commands/config.js @@ -12,6 +12,6 @@ Cypress.Commands.add('config_setParameter', (parameter, value) => { const content = fileContent.replace(regex, `public $${parameter} = ${newValue};`); // Write the modified content back to the configuration file relative to the CMS root folder - cy.task('writeFile', { path: 'configuration.php', content }); + cy.task('writeRelativeFile', { path: 'configuration.php', content }); }); }); ```