i18n: Remove our awkward &-escape support, except in [DesktopUI] #19218
Conversation
This file contains 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
hrydgard
added
the
Code Cleanup
hrydgard
force-pushed
the
text-remove-ampersand-replacement
branch
from
b2da337 to
e23a026
Compare
hrydgard
force-pushed
the
text-remove-ampersand-replacement
branch
from
e23a026 to
5999690
Compare
oltolm
reviewed
May 31, 2024
| @@ -268,8 +268,7 @@ UI::EventReturn SavedataPopupScreen::OnDeleteButtonClick(UI::EventParams &e) { | |||
| } | |||
|
|
|||
| static std::string CleanSaveString(const std::string &str) { | |||
| std::string s = ReplaceAll(str, "&", "&&"); | |||
| s = ReplaceAll(s, "\n", " "); | |||
| std::string s = ReplaceAll(s, "\n", " "); | |||
There was a problem hiding this comment.
This probably should look like this
std::string s = ReplaceAll(str, "\n", " ");
5 tasks
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.
Windows supports adding "&" before a text character in a string, and using that as an accelerator key. To actually produce a "&", you need to use "&&". This is mainly used in window menus and in classic win32 dialog boxes. Elsewhere in the app, it's not used. The Win32 "DrawText" API supports discarding & for drawing, and we've stuck to that standard for all the text backends, leading to awkward workarounds.
So, to simplify the code (before improving our text rendering code in other ways) let's get rid of it almost everywhere (except in win32 menus).