Add descriptive error messages #1789
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
+ reuse message from #1762
davidbenque
reviewed
Feb 26, 2025
customize.dist/messages.js
Outdated
| @@ -118,6 +118,10 @@ define(req, function(AppConfig, Default, Language) { | |||
|
|
|||
| Messages._languages = map; | |||
| Messages._languageUsed = language; | |||
| Messages.admin_logoSize_error = "The logo size must be smaller than 200KB"; // XXX | |||
There was a problem hiding this comment.
The value "200KB" should be passed from the code as a value, with the placeholder "{0}" in the translated string
www/admin/inner.js
Outdated
| @@ -884,6 +884,11 @@ define([ | |||
| UI.warn(Messages.error); | |||
| return; | |||
| } | |||
| if (files[0].size > 200 * 1024) { | |||
There was a problem hiding this comment.
use a variable here, same one that should be passed to the message
customize.dist/messages.js
Outdated
Comment on lines
118
to
121
|
|
||
| Messages._languages = map; | ||
| Messages._languageUsed = language; | ||
| Messages.admin_logoSize_error = "The logo size must be smaller than 200KB"; // XXX |
There was a problem hiding this comment.
Suggested change
| Messages._languages = map; | |
| Messages._languageUsed = language; | |
| Messages.admin_logoSize_error = "The logo size must be smaller than 200KB"; // XXX | |
| let maxLogoSize = 200; | |
| Messages._languages = map; | |
| Messages._languageUsed = language; | |
| Messages.admin_logoSize_error = `The logo size must be smaller than ${maxLogoSize}KB`; // XXX |
www/admin/inner.js
Outdated
| @@ -884,6 +884,11 @@ define([ | |||
| UI.warn(Messages.error); | |||
| return; | |||
| } | |||
| if (files[0].size > 200 * 1024) { | |||
There was a problem hiding this comment.
Suggested change
| if (files[0].size > 200 * 1024) { | |
| let maxLogoSizeMb = 200 * 1024; | |
| if (files[0].size > maxLogoSizeMb) { |
yflory
approved these changes
Mar 12, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds descriptive error message in multiple areas: