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

Extend the message to explain what is happening #16246

Closed
wants to merge 12 commits into from
Closed

Extend the message to explain what is happening #16246

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
821ef18
extend the message
zero-24 May 24, 2017
9b1f156
better messages
zero-24 May 24, 2017
deecbab
even better texts thanks
zero-24 May 24, 2017
11a71e9
fixes
zero-24 May 24, 2017
d8d8fc2
Merge branch 'master' of github.com:joomla/joomla-cms into better_mim…
zero-24 Jun 14, 2017
08868e4
Merge branch 'staging' of github.com:joomla/joomla-cms into better_mi…
zero-24 Jun 14, 2017
0f9e5b7
Merge branch 'staging' of github.com:joomla/joomla-cms into better_mi…
zero-24 Jul 11, 2017
510abe9
Merge branch 'staging' of github.com:joomla/joomla-cms into better_mi…
zero-24 Jul 12, 2017
ee01851
Merge branch 'staging' of github.com:joomla/joomla-cms into better_mi…
zero-24 Jul 13, 2017
8b52c0e
Merge branch 'staging' of github.com:joomla/joomla-cms into better_mi…
zero-24 Jul 17, 2017
7346c6c
Merge branch 'staging' of github.com:joomla/joomla-cms into better_mi…
zero-24 Jul 18, 2017
f801ea2
Merge branch 'staging' of github.com:joomla/joomla-cms into better_mi…
zero-24 Jul 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion administrator/language/en-GB/en-GB.lib_joomla.ini
View file
Open in desktop
Expand Up @@ -670,7 +670,8 @@ JLIB_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload."
JLIB_MEDIA_ERROR_WARNFILETYPE="This file type is not supported."
JLIB_MEDIA_ERROR_WARNIEXSS="Possible IE XSS Attack found."
JLIB_MEDIA_ERROR_WARNINVALID_IMG="Not a valid image."
JLIB_MEDIA_ERROR_WARNINVALID_MIME="Invalid mime type detected."
; Do not sync that line with the frontend! This is expected to be different from the frontend string.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the next line instead of that line
please

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

JLIB_MEDIA_ERROR_WARNINVALID_MIME="Unable to detect the mime type for this file. For security purposes this file has not been uploaded . Please contact your host and check that the mime_content_type or the fileinfo extension is enabled in PHP."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extra space after uploaded

sorry

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed. np.

JLIB_MEDIA_ERROR_WARNINVALID_MIMETYPE="Illegal mime type detected: %s"
JLIB_MEDIA_ERROR_WARNNOTADMIN="Uploaded file is not an image file and you do not have permission."

Expand Down
3 changes: 2 additions & 1 deletion language/en-GB/en-GB.lib_joomla.ini
View file
Open in desktop
Expand Up @@ -670,7 +670,8 @@ JLIB_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload."
JLIB_MEDIA_ERROR_WARNFILETYPE="This file type is not supported."
JLIB_MEDIA_ERROR_WARNIEXSS="Possible IE XSS Attack found."
JLIB_MEDIA_ERROR_WARNINVALID_IMG="Not a valid image."
JLIB_MEDIA_ERROR_WARNINVALID_MIME="Invalid mime type detected."
; Do not sync that line with the backend! This is expected to be different from the backend string.
JLIB_MEDIA_ERROR_WARNINVALID_MIME="Unable to upload this file."
JLIB_MEDIA_ERROR_WARNINVALID_MIMETYPE="Illegal mime type detected: %s"
JLIB_MEDIA_ERROR_WARNNOTADMIN="Uploaded file is not an image file and you do not have permission."

Expand Down