[4.2] Fix sampledata processed and message

[joomlapl-bot]

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

Click to expand the diff!

```diff diff --git a/administrator/language/en-GB/mod_sampledata.ini b/administrator/language/en-GB/mod_sampledata.ini index a0d5f217c537..9f253ff9de6e 100644 --- a/administrator/language/en-GB/mod_sampledata.ini +++ b/administrator/language/en-GB/mod_sampledata.ini @@ -6,6 +6,7 @@ MOD_SAMPLEDATA="Sample Data" MOD_SAMPLEDATA_COMPLETED="Sample data installed." MOD_SAMPLEDATA_CONFIRM_START="Proceeding will install a sample data set into your Joomla website. This process can't be reverted once done." +MOD_SAMPLEDATA_ERROR_RESPONSE="Something went wrong! Please close and reopen the browser and try again!" MOD_SAMPLEDATA_INVALID_RESPONSE="There is an error in a sample data plugin. Response is invalid." MOD_SAMPLEDATA_ITEM_ALREADY_PROCESSED="This sample data set is already installed." MOD_SAMPLEDATA_MANAGE_SAMPLEDATA="Manage" diff --git a/administrator/modules/mod_sampledata/tmpl/default.php b/administrator/modules/mod_sampledata/tmpl/default.php index f11599975f1b..b75b6fda9915 100644 --- a/administrator/modules/mod_sampledata/tmpl/default.php +++ b/administrator/modules/mod_sampledata/tmpl/default.php @@ -18,8 +18,9 @@ Text::script('MOD_SAMPLEDATA_COMPLETED'); Text::script('MOD_SAMPLEDATA_CONFIRM_START'); -Text::script('MOD_SAMPLEDATA_ITEM_ALREADY_PROCESSED'); +Text::script('MOD_SAMPLEDATA_ERROR_RESPONSE'); Text::script('MOD_SAMPLEDATA_INVALID_RESPONSE'); +Text::script('MOD_SAMPLEDATA_ITEM_ALREADY_PROCESSED'); $app->getDocument()->addScriptOptions( 'sample-data', diff --git a/build/media_source/mod_sampledata/js/sampledata-process.es6.js b/build/media_source/mod_sampledata/js/sampledata-process.es6.js index 78ef23ee41a3..29b6a0013a76 100644 --- a/build/media_source/mod_sampledata/js/sampledata-process.es6.js +++ b/build/media_source/mod_sampledata/js/sampledata-process.es6.js @@ -115,7 +115,7 @@ const sampledataAjax = (type, steps, step) => { } }, onError: () => { - Joomla.renderMessages({ error: ['Something went wrong! Please close and reopen the browser and try again!'] }); + Joomla.renderMessages({ error: [Joomla.Text._('MOD_SAMPLEDATA_ERROR_RESPONSE')] }); window.scroll({ top: 0, left: 0, @@ -155,7 +155,7 @@ const sampledataApply = (element) => { progressElement.classList.remove('d-none'); }); - element.getAttribute('data-processed', true); + element.setAttribute('data-processed', true); SampleData.inProgress = true; sampledataAjax(type, steps, 1); ```