Fix shop translations and unify untranslated message alerts.#5312
Merged
leggettc18 merged 4 commits intoHarbourMasters:develop-blairfrom Apr 7, 2025
Merged
Fix shop translations and unify untranslated message alerts.#5312leggettc18 merged 4 commits intoHarbourMasters:develop-blairfrom
leggettc18 merged 4 commits intoHarbourMasters:develop-blairfrom
Conversation
leggettc18
reviewed
Apr 4, 2025
leggettc18
reviewed
Apr 4, 2025
leggettc18
approved these changes
Apr 4, 2025
Contributor
leggettc18
left a comment
There was a problem hiding this comment.
Don't love the string compares, but doing anything different would require much larger changes so this is fine for now.
Varuuna
pushed a commit
to Varuuna/Shipwright
that referenced
this pull request
Apr 12, 2025
…Masters#5312) * try to fix messages, crashing on vanilla text * oops * adjust shop flavor translations to better fit on 2 lines * run clang format
krazyjakee
pushed a commit
to krazyjakee/OOT
that referenced
this pull request
Sep 6, 2025
…Masters#5312) * try to fix messages, crashing on vanilla text * oops * adjust shop flavor translations to better fit on 2 lines * run clang format
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
fixes #5305
Changes the randomised shop item translations to properly show prices, and for the flavor text to always show use 2 lines.
This is done with changes to how CustomMessage handles supplied languages, going from checking for an empty string to an explicit control message, and then changing the output of replace if that message exists. This message is defined as TODO_TRANSLATE.
Elsewhere in the code where translations were missing they were either removed completely with TODO_TRANSLATED added nearby as a comment, or had it explicitly declared.
I also added a cast to suppress a warning in CustomMessage::GetForCurrentLanguage.
Build Artifacts