Skip to content

Commit 2211297

Browse files
committed
Fixes accroding to code review comments
1 parent 1214059 commit 2211297

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/SourceIconProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function prepareDataSource(array $dataSource): array
8484
*
8585
* @return string|null
8686
*/
87-
public function getSourceIconUrl(string $sourceName): ?string
87+
private function getSourceIconUrl(string $sourceName): ?string
8888
{
8989
return isset($this->sourceIcons[$sourceName])
9090
? $this->assetRepository->getUrlWithParams(

app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/Store.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Store extends StoreOptions
1717
/**
1818
* All Store Views value
1919
*/
20-
const ALL_STORE_VIEWS = '0';
20+
private const ALL_STORE_VIEWS = '0';
2121

2222
/**
2323
* Get options

app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ define([
2222
*/
2323
deleteImageAction: function (recordsIds, imageDetailsUrl, deleteImageUrl) {
2424
var imagesCount = Object.keys(recordsIds).length,
25-
confirmationContent = $t('%1 Are you sure you want to delete "%2" image%3?')
26-
.replace('%2', Object.keys(recordsIds).length).replace('%3', imagesCount > 1 ? 's' : ''),
25+
confirmationContent = $t('%1 Are you sure you want to delete "%2" image(s)?')
26+
.replace('%2', Object.keys(recordsIds).length),
2727
deferred = $.Deferred();
2828

2929
getDetails(imageDetailsUrl, recordsIds)

app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image-uploader.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,17 @@ define([
8585

8686
add: function (e, data) {
8787
if (!this.isSizeExceeded(data.files[0]).passed) {
88-
this.addValidationErrorMessage('Cannot upload "' + data.files[0].name +
89-
'". File exceeds maximum file size limit.');
88+
this.addValidationErrorMessage(
89+
$t('Cannot upload "%1". File exceeds maximum file size limit.')
90+
.replace('%1', data.files[0].name)
91+
);
9092

9193
return;
9294
} else if (!this.isFileNameLengthExceeded(data.files[0]).passed) {
93-
this.addValidationErrorMessage('Cannot upload "' + data.files[0].name +
94-
'". Filename is too long, must be 90 characters or less.');
95+
this.addValidationErrorMessage(
96+
$t('Cannot upload "%1". Filename is too long, must be 90 characters or less.')
97+
.replace('%1', data.files[0].name)
98+
);
9599

96100
return;
97101
}
@@ -137,10 +141,7 @@ define([
137141
* @param {String} message
138142
*/
139143
addValidationErrorMessage: function (message) {
140-
this.mediaGridMessages().add(
141-
'error',
142-
$t(message)
143-
);
144+
this.mediaGridMessages().add('error', message);
144145

145146
this.count() < 2 || this.mediaGridMessages().scheduleCleanup();
146147
},
@@ -203,12 +204,10 @@ define([
203204
* Show success message, and files counts
204205
*/
205206
showSuccessMessage: function () {
206-
var prefix = this.count() === 1 ? 'an image' : this.count() + ' images';
207-
208207
this.mediaGridMessages().messages.remove(function (item) {
209208
return item.code === 'success';
210209
});
211-
this.mediaGridMessages().add('success', $t('Successfully uploaded ' + prefix));
210+
this.mediaGridMessages().add('success', $t('Assets have been successfully uploaded!'));
212211
this.count(this.count() + 1);
213212

214213
},

0 commit comments

Comments
 (0)