Fix wxGETTEXT_IN_CONTEXT* failing with wxNO_IMPLICIT_WXSTRING_ENCODING #24925
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
The call to wxGetTranslation() was ambiguous. Fix this by using wxASCII_STR() for all string literal arguments in wxGETTEXT_IN_CONTEXT/_PLURAL, just as it is used for the argument of _(). Also test that all translation macros expand to compilable code when wxNO_IMPLICIT_WXSTRING_ENCODING is enabled. See also: PR wxWidgets#24916
|
Thanks, this looks good to me, but also cc'ing @ardovm just in case. I'll merge this soon, thanks again! |
|
Looks good to me. Thank you @vadz for calling me in! |
lanurmi
pushed a commit
to lanurmi/wxWidgets
that referenced
this pull request
Nov 7, 2024
The compilation fix in PR wxWidgets#24925 aimed for the wxNO_IMPLICIT_WXSTRING_ENCODING case presumably also has the side effect of preventing non-ASCII (non-English) msgids with wxGETTEXT_IN_CONTEXT_PLURAL, also in the regular case when implicit encoding is permitted. It is best to define wxGETTEXT_IN_CONTEXT_PLURAL separately for both wxNO_IMPLICIT_WXSTRING_ENCODING and without it, similarly to how wxGETTEXT_IN_CONTEXT is defined. For some reason it was defined only once until now.
lanurmi
pushed a commit
to lanurmi/wxWidgets
that referenced
this pull request
Nov 7, 2024
The compilation fix in PR wxWidgets#24925, a47b560 (Fix wxGETTEXT_IN_CONTEXT* with wxNO_IMPLICIT_WXSTRING_ENCODING, 2024-10-29) aimed for the wxNO_IMPLICIT_WXSTRING_ENCODING case presumably also has the side effect of preventing non-ASCII (non-English) msgids with wxGETTEXT_IN_CONTEXT_PLURAL, also in the regular case when implicit encoding is permitted. It is best to define wxGETTEXT_IN_CONTEXT_PLURAL separately for both wxNO_IMPLICIT_WXSTRING_ENCODING and without it, similarly to how wxGETTEXT_IN_CONTEXT is defined. For some reason it was defined only once until now. This commit reverts the definition of wxGETTEXT_IN_CONTEXT_PLURAL for the regular case to what it was before.
lanurmi
added a commit
to lanurmi/wxWidgets
that referenced
this pull request
Nov 7, 2024
The compilation fix in PR wxWidgets#24925, a47b560 (Fix wxGETTEXT_IN_CONTEXT* with wxNO_IMPLICIT_WXSTRING_ENCODING, 2024-10-29) aimed for the wxNO_IMPLICIT_WXSTRING_ENCODING case presumably also has the side effect of preventing non-ASCII (non-English) msgids with wxGETTEXT_IN_CONTEXT_PLURAL, also in the regular case when implicit encoding is permitted. It is best to define wxGETTEXT_IN_CONTEXT_PLURAL separately for both wxNO_IMPLICIT_WXSTRING_ENCODING and without it, similarly to how wxGETTEXT_IN_CONTEXT is defined. For some reason it was defined only once until now. This commit reverts the definition of wxGETTEXT_IN_CONTEXT_PLURAL for the regular case to what it was before.
vadz
pushed a commit
that referenced
this pull request
Nov 10, 2024
The compilation fix in PR #24925, a47b560 (Fix wxGETTEXT_IN_CONTEXT* with wxNO_IMPLICIT_WXSTRING_ENCODING, 2024-10-29) aimed for the wxNO_IMPLICIT_WXSTRING_ENCODING case presumably also has the side effect of preventing non-ASCII (non-English) msgids with wxGETTEXT_IN_CONTEXT_PLURAL, also in the regular case when implicit encoding is permitted. It is best to define wxGETTEXT_IN_CONTEXT_PLURAL separately for both wxNO_IMPLICIT_WXSTRING_ENCODING and without it, similarly to how wxGETTEXT_IN_CONTEXT is defined. For some reason it was defined only once until now. This commit reverts the definition of wxGETTEXT_IN_CONTEXT_PLURAL for the regular case to what it was before. Closes #24944.
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.
The call to
wxGetTranslation()was ambiguous. Fix this by usingwxASCII_STR()for all string literal arguments inwxGETTEXT_IN_CONTEXT/_PLURAL, just as it is used for the argument of_().Also test that all translation macros expand to compilable code when
wxNO_IMPLICIT_WXSTRING_ENCODINGis enabled.See also: PR #24916