search

JoomlaPolska / jezyk-J4

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

[5.0] Upmerge 2023-12-30 #444

Closed joomlapl-bot closed 5 months ago

joomlapl-bot commented 8 months ago

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

Click to expand the diff! ```diff diff --git a/.drone.yml b/.drone.yml index 731dca24dbb5f..0cdae9bcc8d30 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,7 +6,7 @@ clone: steps: - name: setup - image: joomlaprojects/docker-images:php8.2 + image: joomlaprojects/docker-images:php8.3 volumes: - name: certificates path: /certificates @@ -14,7 +14,7 @@ steps: - cp -v tests/certs/* /certificates/ - name: composer - image: joomlaprojects/docker-images:php8.2 + image: joomlaprojects/docker-images:php8.3 volumes: - name: composer-cache path: /tmp/composer-cache @@ -63,6 +63,13 @@ steps: - php -v - ./libraries/vendor/bin/phpunit --testsuite Unit + - name: php83-unit + depends_on: [ phpcs ] + image: joomlaprojects/docker-images:php8.3 + commands: + - php -v + - ./libraries/vendor/bin/phpunit --testsuite Unit + - name: php81-integration depends_on: [ npm ] image: joomlaprojects/docker-images:php8.1 @@ -77,6 +84,13 @@ steps: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration + - name: php83-integration + depends_on: [ npm ] + image: joomlaprojects/docker-images:php8.3 + commands: + - php -v + - ./libraries/vendor/bin/phpunit --testsuite Integration + - name: php81-integration-pgsql depends_on: [ npm ] image: joomlaprojects/docker-images:php8.1 @@ -91,6 +105,13 @@ steps: - php -v - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist + - name: php83-integration-pgsql + depends_on: [ npm ] + image: joomlaprojects/docker-images:php8.3 + commands: + - php -v + - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist + - name: scss-cs depends_on: [ npm ] image: node:current-alpine @@ -145,7 +166,7 @@ steps: - name: phpnext-system-mysql depends_on: - phpmax-system-mysql - image: joomlaprojects/docker-images:cypress8.2 + image: joomlaprojects/docker-images:cypress8.3 volumes: - name: cypress-cache path: /root/.cache/Cypress @@ -160,7 +181,7 @@ steps: - name: phpmin-system-postgres depends_on: - prepare_system_tests - image: joomlaprojects/docker-images:cypress8.1 + image: joomlaprojects/docker-images:cypress8.3 volumes: - name: cypress-cache path: /root/.cache/Cypress @@ -184,7 +205,7 @@ steps: - name: phpnext-system-postgres depends_on: - phpmax-system-postgres - image: joomlaprojects/docker-images:cypress8.2 + image: joomlaprojects/docker-images:cypress8.3 volumes: - name: cypress-cache path: /root/.cache/Cypress @@ -382,6 +403,6 @@ trigger: --- kind: signature -hmac: 250f08652884d60218c5b280b139d3ff05c068d010791d159993cf87ecbbac0f +hmac: fe941dd88b45e7314424a0138348a21573e6c57990ce4449e0cf1278b04e4f42 ... diff --git a/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php b/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php index 89ea4eee38785..2e9506cdc1a29 100644 --- a/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php +++ b/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php @@ -324,6 +324,12 @@ public static function loadActionLogPluginsLanguage() // Load plg_system_actionlogs too $lang->load('plg_system_actionlogs', JPATH_ADMINISTRATOR); + // Load plg_system_privacyconsent too + $lang->load('plg_system_privacyconsent', JPATH_ADMINISTRATOR); + + // Load plg_user_terms too + $lang->load('plg_user_terms', JPATH_ADMINISTRATOR); + // Load com_privacy too. $lang->load('com_privacy', JPATH_ADMINISTRATOR); } diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php index 5a4c9bc3d552a..f61c771241e33 100644 --- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php +++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php @@ -19,14 +19,14 @@ $reasonNoDownload = ''; if (!empty($this->reasonNoDownload)) { - $reasonNoDownload = Text::_($this->reasonNoDownload); + $reasonNoDownload = Text::_($this->reasonNoDownload) . '
'; if (isset($this->detailsNoDownload->php)) { $reasonNoDownload .= Text::sprintf( 'COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON_PHP', $this->detailsNoDownload->php->used, $this->detailsNoDownload->php->required - ); + ) . '
'; } if (isset($this->detailsNoDownload->db)) { @@ -35,10 +35,10 @@ Text::_('JLIB_DB_SERVER_TYPE_' . $this->detailsNoDownload->db->type), $this->detailsNoDownload->db->used, $this->detailsNoDownload->db->required - ); + ) . '
'; } - $reasonNoDownload .= Text::_('COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON_ACTION'); + $reasonNoDownload .= Text::_('COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON_ACTION') . '
'; } $displayData = [ diff --git a/administrator/language/en-GB/com_joomlaupdate.ini b/administrator/language/en-GB/com_joomlaupdate.ini index 17fca2758a9b6..cbfd490950582 100644 --- a/administrator/language/en-GB/com_joomlaupdate.ini +++ b/administrator/language/en-GB/com_joomlaupdate.ini @@ -44,10 +44,10 @@ COM_JOOMLAUPDATE_MINIMUM_STABILITY_STABLE="Stable" COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_APPEND="Upload and Update" COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_BUTTON_ADD="Retry check for update" COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_CONTENT="An update to Joomla %1$s was found, but it wasn't possible to fetch the download URL for that update. Either the update to Joomla %1$s is not available for your stability level or there is a problem with the Joomla Update Server.
Please try to download the update package from the official Joomla download page and use the Upload and Update function." -COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON="An update to Joomla %1$s was found but your web server doesn't meet the minimum requirements.
" -COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON_ACTION="Please contact your web host to update your server.
" -COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON_DATABASE="Your %1$s version \"%2$s\" is lower than \"%3$s\".
" -COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON_PHP="Your PHP version \"%1$s\" is lower than \"%2$s\".
" +COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON="An update to Joomla %1$s was found but your web server doesn't meet the minimum requirements." +COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON_ACTION="Please contact your web host to update your server." +COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON_DATABASE="Your %1$s version \"%2$s\" is lower than \"%3$s\"." +COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON_PHP="Your PHP version \"%1$s\" is lower than \"%2$s\"." COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_TITLE="This site can't be updated to Joomla %1$s" COM_JOOMLAUPDATE_OVERVIEW="Joomla Update" COM_JOOMLAUPDATE_PREUPDATE_CHECK_CAPTION="Server settings to check before update." diff --git a/administrator/language/en-GB/lib_joomla.ini b/administrator/language/en-GB/lib_joomla.ini index 1aa443ca2f114..49fc03701d6b9 100644 --- a/administrator/language/en-GB/lib_joomla.ini +++ b/administrator/language/en-GB/lib_joomla.ini @@ -612,8 +612,10 @@ JLIB_INSTALLER_ERROR_PACK_UNINSTALL_INVALID_MANIFEST="Package Uninstall: Invalid JLIB_INSTALLER_ERROR_PACK_UNINSTALL_INVALID_NOTFOUND_MANIFEST="Package Uninstall: Manifest file invalid or not found: %s" JLIB_INSTALLER_ERROR_PACK_UNINSTALL_LOAD_MANIFEST="Package Uninstall: Could not load manifest file." JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MANIFEST_NOT_REMOVED="Package Uninstall: Errors were detected, manifest file not removed!" +JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSING_EXTENSION="Package Uninstall: This extension is missing or has already been uninstalled: %s" JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSINGMANIFEST="Package Uninstall: Missing manifest file." JLIB_INSTALLER_ERROR_PACK_UNINSTALL_NOT_PROPER="Package Uninstall: This extension may have already been uninstalled or might not have been uninstalled properly: %s" +; The following string is deprecated and will be removed with 6.0 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_UNKNOWN_EXTENSION="Trying to uninstall unknown extension from package. This extension may have already been removed earlier." JLIB_INSTALLER_ERROR_PACK_UNINSTALL_WARNCOREPACK="Package Uninstall: Trying to uninstall core package." JLIB_INSTALLER_ERROR_PLG_DISCOVER_STORE_DETAILS="Plugin Discover install: Failed to store plugin details." diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_footer.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_footer.scss index 4aa0ad776c95d..2ad8727c176a9 100644 --- a/build/media_source/templates/site/cassiopeia/scss/blocks/_footer.scss +++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_footer.scss @@ -12,8 +12,13 @@ padding: 2.5rem ($cassiopeia-grid-gutter * .5); } - a { + a:not(.btn), .btn-link { color: currentColor; + + &:hover, + &:focus { + color: var(--gray-200); + } } .mod-menu { diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss index 091c61db051eb..0591114c5f42e 100644 --- a/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss +++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss @@ -60,11 +60,6 @@ a { text-decoration: underline; } - &:not(.btn):hover, - &:not(.btn):focus { - color: var(--cassiopeia-color-hover); - } - &.navbar-brand { color: var(--cassiopeia-color-brand); } diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_header.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_header.scss index 19f6ccf2b6326..ece7792b12ba3 100644 --- a/build/media_source/templates/site/cassiopeia/scss/blocks/_header.scss +++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_header.scss @@ -213,7 +213,7 @@ .mod-finder { color: $white; - a { + a:not(.jmodedit) { color: $white; &:hover, &:focus { diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_layout.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_layout.scss index ca9419b0cf57c..4162e96444b1f 100644 --- a/build/media_source/templates/site/cassiopeia/scss/blocks/_layout.scss +++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_layout.scss @@ -15,8 +15,14 @@ .container-topbar, .container-below-top { color: $white; - a { + + a:not(.btn), .btn-link { color: currentColor; + + &:hover, + &:focus { + color: var(--gray-200); + } } } diff --git a/language/en-GB/lib_joomla.ini b/language/en-GB/lib_joomla.ini index 254264554b6ff..e31571e9b846d 100644 --- a/language/en-GB/lib_joomla.ini +++ b/language/en-GB/lib_joomla.ini @@ -609,8 +609,10 @@ JLIB_INSTALLER_ERROR_PACK_UNINSTALL_INVALID_MANIFEST="Package Uninstall: Invalid JLIB_INSTALLER_ERROR_PACK_UNINSTALL_INVALID_NOTFOUND_MANIFEST="Package Uninstall: Manifest file invalid or not found: %s" JLIB_INSTALLER_ERROR_PACK_UNINSTALL_LOAD_MANIFEST="Package Uninstall: Could not load manifest file." JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MANIFEST_NOT_REMOVED="Package Uninstall: Errors were detected, manifest file not removed!" +JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSING_EXTENSION="Package Uninstall: This extension is missing or has already been uninstalled: %s" JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSINGMANIFEST="Package Uninstall: Missing manifest file." JLIB_INSTALLER_ERROR_PACK_UNINSTALL_NOT_PROPER="Package Uninstall: This extension may have already been uninstalled or might not have been uninstalled properly: %s" +; The following string is deprecated and will be removed with 6.0 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_UNKNOWN_EXTENSION="Trying to uninstall unknown extension from package. This extension may have already been removed earlier." JLIB_INSTALLER_ERROR_PACK_UNINSTALL_WARNCOREPACK="Package Uninstall: Trying to uninstall core package." JLIB_INSTALLER_ERROR_PLG_DISCOVER_STORE_DETAILS="Plugin Discover install: Failed to store plugin details." diff --git a/libraries/src/Form/Form.php b/libraries/src/Form/Form.php index 6680c8f7052f1..4ee6bc74e4cd6 100644 --- a/libraries/src/Form/Form.php +++ b/libraries/src/Form/Form.php @@ -182,9 +182,9 @@ protected function bindLevel($group, $data) } /** - * Return all errors, if any. + * Return Exceptions thrown during the form validation process. * - * @return \Exception[] Array of error messages or RuntimeException objects. + * @return \Exception[] * * @since 1.7.0 */ @@ -1055,8 +1055,8 @@ public function filter($data, $group = null) /** * Method to validate form data. * - * Validation warnings will be pushed into JForm::errors and should be - * retrieved with JForm::getErrors() when validate returns boolean false. + * Validation warnings will be pushed into Form::$errors and should be + * retrieved with Form::getErrors() when validate returns boolean false. * * @param array $data An array of field values to validate. * @param string $group The optional dot-separated form group path on which to filter the @@ -1134,6 +1134,7 @@ public function validate($data, $group = null) // The field returned false from setup and shouldn't be included in the page body - yet we received // a value for it. This is probably some sort of injection attack and should be rejected $this->errors[] = new \RuntimeException(Text::sprintf('JLIB_FORM_VALIDATE_FIELD_INVALID', $key)); + $return = false; } } diff --git a/libraries/src/Installer/Adapter/PackageAdapter.php b/libraries/src/Installer/Adapter/PackageAdapter.php index eb7875212dd89..2957b44787369 100644 --- a/libraries/src/Installer/Adapter/PackageAdapter.php +++ b/libraries/src/Installer/Adapter/PackageAdapter.php @@ -435,7 +435,7 @@ protected function removeExtensionFiles() Log::add(Text::sprintf('JLIB_INSTALLER_ERROR_PACK_UNINSTALL_NOT_PROPER', basename($extension->filename)), Log::WARNING, 'jerror'); } } else { - Log::add(Text::_('JLIB_INSTALLER_ERROR_PACK_UNINSTALL_UNKNOWN_EXTENSION'), Log::WARNING, 'jerror'); + Log::add(Text::sprintf('JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSING_EXTENSION', basename($extension->filename)), Log::WARNING, 'jerror'); } } diff --git a/tests/System/integration/administrator/components/com_privacy/Consent.cy.js b/tests/System/integration/administrator/components/com_privacy/Consent.cy.js index d3cc7b3bc6884..a5dc6b1ce8c39 100644 --- a/tests/System/integration/administrator/components/com_privacy/Consent.cy.js +++ b/tests/System/integration/administrator/components/com_privacy/Consent.cy.js @@ -2,6 +2,7 @@ describe('Test in backend that privacy consent component', () => { beforeEach(() => cy.doAdministratorLogin()); afterEach(() => { cy.task('queryDB', 'DELETE FROM #__privacy_consents'); + cy.task('queryDB', "DELETE FROM #__users WHERE name = 'test user'"); cy.get('.js-stools-btn-clear').click({ force: true }); }); ```