Clarify Windows export warnings for File and Product Version #106007
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
A proposed fix for godotengine#104814 - See the comment there Does the following - Fixes the File Version warning to be more specific - Fixes the Product Version warning to be more specific - Edits the file warning logic to match the new "any string starting with a number" req
AThousandShips
changed the title
akien-mga
reviewed
May 2, 2025
| !version_array[1].is_valid_int() || !version_array[2].is_valid_int() || | ||
| !version_array[3].is_valid_int() || product_version.contains_char('-')) { | ||
| return TTR("Invalid product version."); | ||
| if (product_version[0].is_valid_int()) { |
There was a problem hiding this comment.
This doesn't compile:
no member named 'is_valid_int' in 'CharProxy<char32_t>'
I'm not sure how CharProxy<char32_t> works, but is_digit(production_version[0]) (from core/string/char_utils.h) may work.
akien-mga
reviewed
May 2, 2025
| @@ -388,17 +388,14 @@ String EditorExportPlatformWindows::get_export_option_warning(const EditorExport | |||
| if (version_array.size() != 4 || !version_array[0].is_valid_int() || | |||
| !version_array[1].is_valid_int() || !version_array[2].is_valid_int() || | |||
| !version_array[3].is_valid_int() || file_version.contains_char('-')) { | |||
| return TTR("Invalid file version."); | |||
| return TTR("Invalid file version. Proper format is x.x.x.x where x is any int."); | |||
There was a problem hiding this comment.
Suggested change
| return TTR("Invalid file version. Proper format is x.x.x.x where x is any int."); | |
| return TTR("Invalid file version. The expected format is `n.n.n.n` where `n` is any integer."); |
akien-mga
reviewed
May 2, 2025
| !version_array[3].is_valid_int() || product_version.contains_char('-')) { | ||
| return TTR("Invalid product version."); | ||
| if (product_version[0].is_valid_int()) { | ||
| return TTR("Invalid product version. Allowable format is any string beginning with a number"); |
There was a problem hiding this comment.
Suggested change
| return TTR("Invalid product version. Allowable format is any string beginning with a number"); | |
| return TTR("Invalid product version. The expected format is any string starting with a number."); |
akien-mga
changed the title
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.
A proposed fix for #104814 - See the comment there
Does the following
Bugsquad edit: