Skip to content

Commit 32ae2b4

Browse files
authored
[5.0] Added missing "items" text to the Joomla update view (#40742)
* Updated joomla update view to show files unit * Added new text key * Fixed lint error * Changed translatable text
1 parent 83b3053 commit 32ae2b4

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

administrator/components/com_joomlaupdate/tmpl/update/default.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
Text::script('COM_JOOMLAUPDATE_ERRORMODAL_BODY_INVALIDLOGIN');
3131
Text::script('COM_JOOMLAUPDATE_UPDATING_FAIL');
3232
Text::script('COM_JOOMLAUPDATE_UPDATING_COMPLETE');
33+
Text::script('COM_JOOMLAUPDATE_VIEW_UPDATE_ITEMS');
3334
Text::script('JLIB_SIZE_BYTES');
3435
Text::script('JLIB_SIZE_KB');
3536
Text::script('JLIB_SIZE_MB');

administrator/language/en-GB/com_joomlaupdate.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ COM_JOOMLAUPDATE_VIEW_UPDATE_BYTESEXTRACTED="Bytes extracted"
165165
COM_JOOMLAUPDATE_VIEW_UPDATE_BYTESREAD="Bytes read"
166166
COM_JOOMLAUPDATE_VIEW_UPDATE_CHECKSUM_WRONG="File Checksum Failed"
167167
COM_JOOMLAUPDATE_VIEW_UPDATE_DOWNLOADFAILED="Download of update package failed."
168+
COM_JOOMLAUPDATE_VIEW_UPDATE_ITEMS="items"
168169
COM_JOOMLAUPDATE_VIEW_UPDATE_FILESEXTRACTED="Files extracted"
169170
COM_JOOMLAUPDATE_VIEW_UPDATE_FINALISE_CONFIRM_AND_CONTINUE="Confirm & Continue"
170171
COM_JOOMLAUPDATE_VIEW_UPDATE_FINALISE_HEAD="Joomla Update is finishing and cleaning up"

build/media_source/com_joomlaupdate/js/admin-update-default.es6.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Joomla.Update = window.Joomla.Update || {
6161

6262
document.getElementById('extbytesin').innerText = Joomla.Update.formatBytes(Joomla.Update.stat_inbytes);
6363
document.getElementById('extbytesout').innerText = Joomla.Update.formatBytes(Joomla.Update.stat_outbytes);
64-
document.getElementById('extfiles').innerText = Joomla.Update.stat_files;
64+
document.getElementById('extfiles').innerText = Joomla.Update.formatFiles(Joomla.Update.stat_files);
6565

6666
const postData = new FormData();
6767
postData.append('task', 'startExtract');
@@ -121,7 +121,7 @@ Joomla.Update = window.Joomla.Update || {
121121

122122
document.getElementById('extbytesin').innerText = Joomla.Update.formatBytes(Joomla.Update.stat_inbytes);
123123
document.getElementById('extbytesout').innerText = Joomla.Update.formatBytes(Joomla.Update.stat_outbytes);
124-
document.getElementById('extfiles').innerText = Joomla.Update.stat_files;
124+
document.getElementById('extfiles').innerText = Joomla.Update.formatFiles(Joomla.Update.stat_files);
125125

126126
// Are we done extracting?
127127
if (data.done) {
@@ -203,6 +203,7 @@ Joomla.Update = window.Joomla.Update || {
203203

204204
return `${parseFloat((bytes / (k ** i)).toFixed(dm))} ${sizes[i]}`;
205205
},
206+
formatFiles: (files) => `${files} ${Joomla.Text._('COM_JOOMLAUPDATE_VIEW_UPDATE_ITEMS')}`,
206207
resumeButtonHandler: (e) => {
207208
e.preventDefault();
208209

0 commit comments

Comments
 (0)