diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 32e34f654da80..4954021a38ac0 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -16,5 +16,10 @@ Pull Request for Issue # . -### Documentation Changes Required +### Link to documentations +Please select: +- [ ] Documentation link for docs.joomla.org: +- [ ] No documentation changes for docs.joomla.org needed +- [ ] Pull Request link for manual.joomla.org: +- [ ] No documentation changes for manual.joomla.org needed diff --git a/administrator/components/com_finder/src/Controller/DisplayController.php b/administrator/components/com_finder/src/Controller/DisplayController.php index 820f6b65f36ba..ec4905231e7d2 100644 --- a/administrator/components/com_finder/src/Controller/DisplayController.php +++ b/administrator/components/com_finder/src/Controller/DisplayController.php @@ -71,7 +71,7 @@ public function display($cachable = false, $urlparams = array()) if ($view === 'filter' && $layout === 'edit' && !$this->checkEditId('com_finder.edit.filter', $filterId)) { // Somehow the person just went to the form - we don't allow that. if (!\count($this->app->getMessageQueue())) { - $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $f_id), 'error'); + $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $filterId), 'error'); } $this->setRedirect(Route::_('index.php?option=com_finder&view=filters', false)); diff --git a/administrator/language/en-GB/com_media.ini b/administrator/language/en-GB/com_media.ini index 598ac5a0c1a42..0fd7852dc7cb9 100644 --- a/administrator/language/en-GB/com_media.ini +++ b/administrator/language/en-GB/com_media.ini @@ -26,14 +26,17 @@ COM_MEDIA_EDIT="Media Edit" COM_MEDIA_ERROR="An error occurred." COM_MEDIA_ERROR_ACCOUNT_NOT_FOUND="The account was not found" COM_MEDIA_ERROR_ACCOUNT_NOT_SET="Account was not set." +COM_MEDIA_ERROR_MAKESAFE="Could not make the file name safe. If it contains non ASCII chars please ensure you have the INTL and ICONV PHP Extensions installed." COM_MEDIA_ERROR_MEDIA_PROVIDER_NOT_FOUND="Media Provider not found." -COM_MEDIA_ERROR_NO_ADAPTER_FOUND="No adapter found." -COM_MEDIA_ERROR_NO_CONTENT_AVAILABLE="No content available!" -COM_MEDIA_ERROR_NO_PROVIDERS="No filesystem providers have been found. Please enable at least one filesystem plugin." +COM_MEDIA_ERROR_MISSING_DIR="One or more of the directories defined in the FileSystem - Local plugin does not exist." COM_MEDIA_ERROR_NOT_AUTHENTICATED="You are not authenticated. Please login." COM_MEDIA_ERROR_NOT_AUTHORIZED="You are not authorised" COM_MEDIA_ERROR_NOT_FOUND="File or Folder not found" +COM_MEDIA_ERROR_NO_ADAPTER_FOUND="No adapter found." +COM_MEDIA_ERROR_NO_CONTENT_AVAILABLE="No content available!" +COM_MEDIA_ERROR_NO_PROVIDERS="No filesystem providers have been found. Please enable at least one filesystem plugin." COM_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload. You can change the limits for your site in the component options." +COM_MEDIA_FIELDSET_OPTIONS_LABEL="Media" COM_MEDIA_FIELD_CHECK_MIME_DESC="Use MIME Magic or Fileinfo to attempt to verify files. Try disabling this if you get invalid mime type errors." COM_MEDIA_FIELD_CHECK_MIME_LABEL="Check MIME Types" COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC="Ignored file extensions for MIME type checking and restricted uploads." @@ -46,10 +49,10 @@ COM_MEDIA_FIELD_LEGAL_DOCUMENT_EXTENSIONS_DESC="Document extensions (file types) COM_MEDIA_FIELD_LEGAL_DOCUMENT_EXTENSIONS_LABEL="Legal Document Extensions (File Types)" COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC="Image extensions (file types) you are allowed to upload (comma separated). These are used to check for valid image headers." COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_LABEL="Legal Image Extensions (File Types)" -COM_MEDIA_FIELD_LEGAL_VIDEO_EXTENSIONS_DESC="Video extensions (file types) you are allowed to upload (comma separated). These are used to check for valid video headers." -COM_MEDIA_FIELD_LEGAL_VIDEO_EXTENSIONS_LABEL="Legal Video Extensions (File Types)" COM_MEDIA_FIELD_LEGAL_MIME_TYPES_DESC="A comma separated list of legal MIME types to upload." COM_MEDIA_FIELD_LEGAL_MIME_TYPES_LABEL="Legal MIME Types" +COM_MEDIA_FIELD_LEGAL_VIDEO_EXTENSIONS_DESC="Video extensions (file types) you are allowed to upload (comma separated). These are used to check for valid video headers." +COM_MEDIA_FIELD_LEGAL_VIDEO_EXTENSIONS_LABEL="Legal Video Extensions (File Types)" COM_MEDIA_FIELD_MAXIMUM_SIZE_DESC="Use zero for no limit. Note: your server has a maximum limit." COM_MEDIA_FIELD_MAXIMUM_SIZE_LABEL="Maximum Size (in MB)" COM_MEDIA_FIELD_PATH_FILE_FOLDER_DESC="Enter the path to the files folder relative to the root of your webspace. Warning! Changing to another path than the default 'images' may break your links. Note: Do not start the path with a slash!" @@ -60,12 +63,11 @@ COM_MEDIA_FIELD_RESTRICT_UPLOADS_DESC="Restrict uploads for lower than manager u COM_MEDIA_FIELD_RESTRICT_UPLOADS_EXTENSIONS_DESC="Restrict uploads for lower than manager users to files in the list." COM_MEDIA_FIELD_RESTRICT_UPLOADS_EXTENSIONS_LABEL="Allowed Extensions" COM_MEDIA_FIELD_RESTRICT_UPLOADS_LABEL="Restrict Uploads" -COM_MEDIA_FIELDSET_OPTIONS_LABEL="Media" COM_MEDIA_FILE="File" COM_MEDIA_FILE_EXISTS_AND_OVERRIDE="%s already exists. Do you want to replace it?" COM_MEDIA_FOLDER="Folder" -COM_MEDIA_FOLDER_NAME="Folder Name" COM_MEDIA_FOLDERS="Media Folders" +COM_MEDIA_FOLDER_NAME="Folder Name" COM_MEDIA_INCREASE_GRID="Increase grid size" COM_MEDIA_MEDIA_DATE_CREATED="Date Created" COM_MEDIA_MEDIA_DATE_MODIFIED="Date Modified" @@ -80,7 +82,6 @@ COM_MEDIA_OPEN_ITEM_ACTIONS="Open item actions" COM_MEDIA_PLEASE_SELECT_ITEM="Please select item." COM_MEDIA_RENAME="Rename" COM_MEDIA_RENAME_ERROR="Error renaming item." -COM_MEDIA_ERROR_MAKESAFE="Could not make the file name safe. If it contains non ASCII chars please ensure you have the INTL and ICONV PHP Extensions installed." COM_MEDIA_RENAME_SUCCESS="Item renamed." COM_MEDIA_RESET="Reset" COM_MEDIA_SEARCH="Search" diff --git a/build/media_source/com_scheduler/js/admin-view-run-test-task.es6.js b/build/media_source/com_scheduler/js/admin-view-run-test-task.es6.js index 53c06e11bc1e0..6981c9786f975 100644 --- a/build/media_source/com_scheduler/js/admin-view-run-test-task.es6.js +++ b/build/media_source/com_scheduler/js/admin-view-run-test-task.es6.js @@ -85,8 +85,10 @@ const initRunner = () => { window.location.href = `${paths ? `${paths.base}/index.php` : window.location.pathname}?option=com_scheduler&view=tasks`; }; - modal.addEventListener('show.bs.modal', triggerTaskAndShowOutput); - modal.addEventListener('hidden.bs.modal', reloadOnClose); + if (modal) { + modal.addEventListener('show.bs.modal', triggerTaskAndShowOutput); + modal.addEventListener('hidden.bs.modal', reloadOnClose); + } document.removeEventListener('DOMContentLoaded', initRunner); }; diff --git a/installation/language/af-ZA/langmetadata.xml b/installation/language/af-ZA/langmetadata.xml index 5dea6f31efdb0..9cf32ddf25fef 100644 --- a/installation/language/af-ZA/langmetadata.xml +++ b/installation/language/af-ZA/langmetadata.xml @@ -1,7 +1,7 @@ Afrikaans (Suid-Afrika) - 4.2.3 + 4.2.4 2022-09 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 5109319a59874..d721cd234869b 100644 --- a/installation/language/ar-AA/langmetadata.xml +++ b/installation/language/ar-AA/langmetadata.xml @@ -1,7 +1,7 @@ Arabic (اللغة العربية) - 4.2.3 + 4.2.4 2022-09 Dr. Ashraf Damra (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/bg-BG/langmetadata.xml b/installation/language/bg-BG/langmetadata.xml index e79773f045e9d..42986a9b9ac47 100644 --- a/installation/language/bg-BG/langmetadata.xml +++ b/installation/language/bg-BG/langmetadata.xml @@ -1,7 +1,7 @@ Bulgarian (bg-BG) - 4.2.3 + 4.2.4 2022-09 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 b9a1a1b90a043..3161522894080 100644 --- a/installation/language/ca-ES/langmetadata.xml +++ b/installation/language/ca-ES/langmetadata.xml @@ -1,7 +1,7 @@ Catalan (ca-ES) - 4.2.3 + 4.2.4 2022-09 Catalan Translation Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/cs-CZ/langmetadata.xml b/installation/language/cs-CZ/langmetadata.xml index 60549dad82516..0647ba5a81bce 100644 --- a/installation/language/cs-CZ/langmetadata.xml +++ b/installation/language/cs-CZ/langmetadata.xml @@ -1,7 +1,7 @@ Czech (Čeština) - 4.2.3 + 4.2.4 2022-09 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 09dc3af7e85f0..db8dbb63b6cc5 100644 --- a/installation/language/cy-GB/langmetadata.xml +++ b/installation/language/cy-GB/langmetadata.xml @@ -1,7 +1,7 @@ Welsh (United Kingdom) - 4.2.3 + 4.2.4 2022-09 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 401fd878c61f5..c4595e83c29d9 100644 --- a/installation/language/da-DK/langmetadata.xml +++ b/installation/language/da-DK/langmetadata.xml @@ -1,7 +1,7 @@ Danish (Danmark) - 4.2.3 + 4.2.4 2022-09 Danish Translation Team (Transl.: Ronny Buelund) (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/el-GR/langmetadata.xml b/installation/language/el-GR/langmetadata.xml index cdf39b3efd332..2a9f3b8e96296 100644 --- a/installation/language/el-GR/langmetadata.xml +++ b/installation/language/el-GR/langmetadata.xml @@ -1,7 +1,7 @@ Greek (el-GR) - 4.2.3 + 4.2.4 2022-09 Ομάδα Μετάφρασης: 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 d96d8023ad701..09cc6b4db45b1 100644 --- a/installation/language/en-AU/langmetadata.xml +++ b/installation/language/en-AU/langmetadata.xml @@ -1,7 +1,7 @@ English (Australia) - 4.2.3 + 4.2.4 2022-09 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 3b83f5999cf46..06040c271ddae 100644 --- a/installation/language/en-CA/langmetadata.xml +++ b/installation/language/en-CA/langmetadata.xml @@ -1,7 +1,7 @@ English (Canada) - 4.2.3 + 4.2.4 2022-09 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/en-NZ/langmetadata.xml b/installation/language/en-NZ/langmetadata.xml index 2bd4669e5f108..7fcc7d168c0a4 100644 --- a/installation/language/en-NZ/langmetadata.xml +++ b/installation/language/en-NZ/langmetadata.xml @@ -1,7 +1,7 @@ English (New Zealand) - 4.2.3 + 4.2.4 2022-09 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 7028c6974df46..abaeb165c6e6d 100644 --- a/installation/language/en-US/langmetadata.xml +++ b/installation/language/en-US/langmetadata.xml @@ -1,7 +1,7 @@ English (United States) - 4.2.3 + 4.2.4 2022-09 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 c24998d9d47cc..8223704acca15 100644 --- a/installation/language/es-ES/langmetadata.xml +++ b/installation/language/es-ES/langmetadata.xml @@ -1,7 +1,7 @@ Spanish (Spain) - 4.2.3 + 4.2.4 2022-09 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 9b6f4ee58e93f..96c3a265fdd23 100644 --- a/installation/language/et-EE/langmetadata.xml +++ b/installation/language/et-EE/langmetadata.xml @@ -1,7 +1,7 @@ Estonian - 4.2.3 + 4.2.4 2022-09 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 99270c8628d36..f33fffd1be62f 100644 --- a/installation/language/eu-ES/langmetadata.xml +++ b/installation/language/eu-ES/langmetadata.xml @@ -1,7 +1,7 @@ Basque - 4.2.3 + 4.2.4 2022-09 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 8e2af66dfd37a..54ac5909cb53f 100644 --- a/installation/language/fa-AF/langmetadata.xml +++ b/installation/language/fa-AF/langmetadata.xml @@ -1,7 +1,7 @@ فارسی (دری) - 4.2.3 + 4.2.4 2022-09 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 6aef83f78092f..85a30a37ec449 100644 --- a/installation/language/fa-IR/langmetadata.xml +++ b/installation/language/fa-IR/langmetadata.xml @@ -1,7 +1,7 @@ Persian (پارسی) - 4.2.3 + 4.2.4 2022-09 JoomlaFarsi.Com Team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/fi-FI/langmetadata.xml b/installation/language/fi-FI/langmetadata.xml index 3eeef578a3ff5..8e005aa45405c 100644 --- a/installation/language/fi-FI/langmetadata.xml +++ b/installation/language/fi-FI/langmetadata.xml @@ -1,7 +1,7 @@ Finnish (Suomi) - 4.2.3 + 4.2.4 2022-09 Finnish translation team: Joomla.fi (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/fr-FR/langmetadata.xml b/installation/language/fr-FR/langmetadata.xml index 2726cb484dcd1..aeacab0c8ca86 100644 --- a/installation/language/fr-FR/langmetadata.xml +++ b/installation/language/fr-FR/langmetadata.xml @@ -1,7 +1,7 @@ French (fr-FR) - 4.2.3 + 4.2.4 2022-09 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 aa0af622e50ac..fcab170981803 100644 --- a/installation/language/he-IL/langmetadata.xml +++ b/installation/language/he-IL/langmetadata.xml @@ -1,7 +1,7 @@ Hebrew (Israel) - 4.2.3 + 4.2.4 2022-09 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/hu-HU/langmetadata.xml b/installation/language/hu-HU/langmetadata.xml index a30eef8fd9c49..936c5fefc791d 100644 --- a/installation/language/hu-HU/langmetadata.xml +++ b/installation/language/hu-HU/langmetadata.xml @@ -1,7 +1,7 @@ Hungarian (Magyar) - 4.2.3 + 4.2.4 2022-09 Joomla! Magyarország (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/it-IT/langmetadata.xml b/installation/language/it-IT/langmetadata.xml index 959aade70b9d0..19739155fdd96 100644 --- a/installation/language/it-IT/langmetadata.xml +++ b/installation/language/it-IT/langmetadata.xml @@ -1,7 +1,7 @@ Italiano (it-IT) - 4.2.3 + 4.2.4 2022-09 Progetto Joomla! (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ja-JP/langmetadata.xml b/installation/language/ja-JP/langmetadata.xml index 9019d7731529d..36019d74d8654 100644 --- a/installation/language/ja-JP/langmetadata.xml +++ b/installation/language/ja-JP/langmetadata.xml @@ -1,7 +1,7 @@ Japanese (ja-JP) - 4.2.3 + 4.2.4 2022-09 Joomla!じゃぱん (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ka-GE/langmetadata.xml b/installation/language/ka-GE/langmetadata.xml index 1cc4c7c83a108..d8e57d0105d44 100644 --- a/installation/language/ka-GE/langmetadata.xml +++ b/installation/language/ka-GE/langmetadata.xml @@ -1,7 +1,7 @@ Georgian (Georgia) - 4.2.3 + 4.2.4 2022-09 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 b7d0df6be5067..b20824390bdb4 100644 --- a/installation/language/kk-KZ/langmetadata.xml +++ b/installation/language/kk-KZ/langmetadata.xml @@ -1,7 +1,7 @@ Kazakh (Kazakhstan) - 4.2.3 + 4.2.4 2022-09 Sarvarov Akylkerey (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/lt-LT/langmetadata.xml b/installation/language/lt-LT/langmetadata.xml index a69627c39521a..c47239342bc51 100644 --- a/installation/language/lt-LT/langmetadata.xml +++ b/installation/language/lt-LT/langmetadata.xml @@ -1,7 +1,7 @@ Lithuanian (Lithuania) - 4.2.3 + 4.2.4 2022-09 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 73fedc029091f..c0a9205bb483b 100644 --- a/installation/language/lv-LV/langmetadata.xml +++ b/installation/language/lv-LV/langmetadata.xml @@ -1,7 +1,7 @@ Latvian (Latvia) - 4.2.3 + 4.2.4 2022-09 Joomla! Projekts (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/nl-BE/langmetadata.xml b/installation/language/nl-BE/langmetadata.xml index 7e030507e6ee1..e8974eabfb86e 100644 --- a/installation/language/nl-BE/langmetadata.xml +++ b/installation/language/nl-BE/langmetadata.xml @@ -1,7 +1,7 @@ Dutch (Belgium) - 4.2.3 + 4.2.4 2022-09 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 fb67a91b9b35b..fa43af4501a3b 100644 --- a/installation/language/nl-NL/langmetadata.xml +++ b/installation/language/nl-NL/langmetadata.xml @@ -1,7 +1,7 @@ Dutch (nl-NL) - 4.2.3 + 4.2.4 2022-09 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 a651c79df9381..94e4fa85b8a72 100644 --- a/installation/language/pl-PL/langmetadata.xml +++ b/installation/language/pl-PL/langmetadata.xml @@ -1,7 +1,7 @@ Polish (Poland) - 4.2.3 + 4.2.4 2022-09 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 da462da7e1ff5..cd634069e038c 100644 --- a/installation/language/pt-BR/langmetadata.xml +++ b/installation/language/pt-BR/langmetadata.xml @@ -1,7 +1,7 @@ Português Brasil (pt-BR) - 4.2.3 + 4.2.4 2022-09 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 b4ab7b9203cca..c92688c596068 100644 --- a/installation/language/pt-PT/langmetadata.xml +++ b/installation/language/pt-PT/langmetadata.xml @@ -1,7 +1,7 @@ Português (Portugal) - 4.2.3 + 4.2.4 2022-09 Comunidade JoomlaPortugal (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/ro-RO/langmetadata.xml b/installation/language/ro-RO/langmetadata.xml index 9070852036992..2d924030f2ee0 100644 --- a/installation/language/ro-RO/langmetadata.xml +++ b/installation/language/ro-RO/langmetadata.xml @@ -1,7 +1,7 @@ Română (România) - 4.2.3 + 4.2.4 2022-09 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 d3a9a3dcd5896..748b4ca31ee09 100644 --- a/installation/language/sk-SK/langmetadata.xml +++ b/installation/language/sk-SK/langmetadata.xml @@ -1,7 +1,7 @@ Slovak (Slovakia) - 4.2.3 + 4.2.4 2022-09 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 f126c8afa1dd2..1deec76d062d8 100644 --- a/installation/language/sl-SI/langmetadata.xml +++ b/installation/language/sl-SI/langmetadata.xml @@ -1,7 +1,7 @@ Slovenščina (Slovenija) - 4.2.3 + 4.2.4 2022-09 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 fe53bc86d750d..2534164c514ca 100644 --- a/installation/language/sr-YU/langmetadata.xml +++ b/installation/language/sr-YU/langmetadata.xml @@ -1,7 +1,7 @@ Srpski Latinica (Republika Srbija) - 4.2.3 + 4.2.4 2022-09 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 62988c3aed935..e9b88db347fb2 100644 --- a/installation/language/sv-SE/langmetadata.xml +++ b/installation/language/sv-SE/langmetadata.xml @@ -1,7 +1,7 @@ Swedish (Sweden) - 4.2.3 + 4.2.4 2022-09 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 c213bd6b73413..6e668b0b854d7 100644 --- a/installation/language/ta-IN/langmetadata.xml +++ b/installation/language/ta-IN/langmetadata.xml @@ -1,7 +1,7 @@ Tamil (India) - 4.2.3 + 4.2.4 2022-09 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 eb9b0e2590cbb..71a5ffeb39138 100644 --- a/installation/language/th-TH/langmetadata.xml +++ b/installation/language/th-TH/langmetadata.xml @@ -1,7 +1,7 @@ Thai (ภาษาไทย) - 4.2.3 + 4.2.4 2022-09 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 3e56d56c2cda5..8ebe072afac25 100644 --- a/installation/language/tr-TR/langmetadata.xml +++ b/installation/language/tr-TR/langmetadata.xml @@ -1,7 +1,7 @@ Turkish (Turkey) - 4.2.3 + 4.2.4 2022-09 Joomla! Turkey (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/uk-UA/langmetadata.xml b/installation/language/uk-UA/langmetadata.xml index 0510db1926f3e..26c9ff1098a19 100644 --- a/installation/language/uk-UA/langmetadata.xml +++ b/installation/language/uk-UA/langmetadata.xml @@ -1,7 +1,7 @@ Ukrainian (uk-UA) - 4.2.3 + 4.2.4 2022-09 Joomla! Project - Ukrainian translation team (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/vi-VN/langmetadata.xml b/installation/language/vi-VN/langmetadata.xml index d64609af9ebcd..477bbbb135206 100644 --- a/installation/language/vi-VN/langmetadata.xml +++ b/installation/language/vi-VN/langmetadata.xml @@ -1,7 +1,7 @@ Tiếng Việt (Việt Nam) - 4.2.3 + 4.2.4 2022-09 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/installation/language/zh-CN/langmetadata.xml b/installation/language/zh-CN/langmetadata.xml index 23a34f8e42897..5636dad200a35 100644 --- a/installation/language/zh-CN/langmetadata.xml +++ b/installation/language/zh-CN/langmetadata.xml @@ -1,7 +1,7 @@ 简体中文(中国) - 4.2.3 + 4.2.4 2022-09 逐浪中文网 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 1498a903ca5ad..f03dc4efa990e 100644 --- a/installation/language/zh-TW/langmetadata.xml +++ b/installation/language/zh-TW/langmetadata.xml @@ -1,7 +1,7 @@ 正體中文 (臺灣) - 4.2.3 + 4.2.4 2022-09 Joomla! 專案 (C) 2005 Open Source Matters, Inc. diff --git a/modules/mod_menu/mod_menu.xml b/modules/mod_menu/mod_menu.xml index 2268dc837bef4..b1261b0ce77a0 100644 --- a/modules/mod_menu/mod_menu.xml +++ b/modules/mod_menu/mod_menu.xml @@ -123,6 +123,7 @@ type="modulelayout" label="JFIELD_ALT_LAYOUT_LABEL" class="form-select" + default="_:default" validate="moduleLayout" /> diff --git a/plugins/editors/codemirror/layouts/editors/codemirror/element.php b/plugins/editors/codemirror/layouts/editors/codemirror/element.php index 77e99ec5af411..831582ba72f7c 100644 --- a/plugins/editors/codemirror/layouts/editors/codemirror/element.php +++ b/plugins/editors/codemirror/layouts/editors/codemirror/element.php @@ -37,6 +37,11 @@ $editor = 'editor="' . ltrim(HTMLHelper::_('script', $basePath . 'lib/codemirror' . $extJS, ['version' => 'auto', 'pathOnly' => true]), '/') . '?' . $mediaVersion . '"'; $addons = 'addons="' . ltrim(HTMLHelper::_('script', $basePath . 'lib/addons' . $extJS, ['version' => 'auto', 'pathOnly' => true]), '/') . '?' . $mediaVersion . '"'; +// Remove the fullscreen message and option if readonly not null. +if ($options->readOnly !== null) { + $fsCombo = ''; +} + Factory::getDocument()->getWebAssetManager() ->registerAndUseStyle('codemirror.lib.main', $basePath . 'lib/codemirror.css') ->registerAndUseStyle('codemirror.lib.addons', $basePath . 'lib/addons.css', [], [], ['codemirror.lib.main']) @@ -57,8 +62,10 @@ ?> > ', $content, ''; ?> -

- -

+ +

+ +

+ buttons; ?> diff --git a/plugins/filesystem/local/src/Adapter/LocalAdapter.php b/plugins/filesystem/local/src/Adapter/LocalAdapter.php index df8c86bcc9f05..d17498c609fab 100644 --- a/plugins/filesystem/local/src/Adapter/LocalAdapter.php +++ b/plugins/filesystem/local/src/Adapter/LocalAdapter.php @@ -66,7 +66,7 @@ class LocalAdapter implements AdapterInterface public function __construct(string $rootPath, string $filePath) { if (!file_exists($rootPath)) { - throw new \InvalidArgumentException(); + throw new \InvalidArgumentException(Text::_('COM_MEDIA_ERROR_MISSING_DIR')); } $this->rootPath = Path::clean(realpath($rootPath), '/');