Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve issue 25896: Cannot create folder using only letters #25904

Merged
merged 3 commits into from
Dec 12, 2019
Merged

Resolve issue 25896: Cannot create folder using only letters #25904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4d57b9
Resolve issue 25896: Cannot create folder using only letters
edenduong Dec 4, 2019
721f8ce
Update .csv for issue 25896
edenduong Dec 10, 2019
17a575a
Restore the translatable phrase for backward compatibility
dmytro-ch Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ public function createDirectory($name, $path)
{
if (!preg_match(self::DIRECTORY_NAME_REGEXP, $name)) {
throw new \Magento\Framework\Exception\LocalizedException(
__('Please rename the folder using only letters, numbers, underscores and dashes.')
__('Please rename the folder using only Latin letters, numbers, underscores and dashes.')
dmytro-ch marked this conversation as resolved.
Show resolved Hide resolved
);
}

Expand Down
15 changes: 15 additions & 0 deletions app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

use Magento\Cms\Model\Wysiwyg\Images\Storage\Collection as StorageCollection;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Exception\LocalizedException;

/**
* @SuppressWarnings(PHPMD.LongVariable)
Expand Down Expand Up @@ -539,4 +540,18 @@ public function testUploadFile()

$this->assertEquals($result, $this->imagesStorage->uploadFile($targetPath, $type));
}

/**
* Test create directory with invalid name
*/
public function testCreateDirectoryWithInvalidName()
{
$name = 'папка';
$path = '/tmp/path';
$this->expectException(LocalizedException::class);
$this->expectExceptionMessage(
(string)__('Please rename the folder using only Latin letters, numbers, underscores and dashes.')
);
$this->imagesStorage->createDirectory($name, $path);
}
}
1 change: 1 addition & 0 deletions app/code/Magento/Cms/i18n/en_US.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ Pages,Pages
"The page URL key contains capital letters or disallowed symbols.","The page URL key contains capital letters or disallowed symbols."
"The page URL key cannot be made of only numbers.","The page URL key cannot be made of only numbers."
"Please rename the folder using only letters, numbers, underscores and dashes.","Please rename the folder using only letters, numbers, underscores and dashes."
"Please rename the folder using only Latin letters, numbers, underscores and dashes.","Please rename the folder using only Latin letters, numbers, underscores and dashes."
"We found a directory with the same name. Please try another folder name.","We found a directory with the same name. Please try another folder name."
"We cannot create a new directory.","We cannot create a new directory."
"We cannot delete directory %1.","We cannot delete directory %1."
Expand Down