Also accept wide string literals as translation macro arguments (PR #25063)
Lauri Nurmi
Not accepting them was an undeliberate regression introduced in PR #24957. There weren't any such calls in wx's own tests or samples, so now adding some to the internat sample to prevent a similar regression in the future.
Pointed out by @tobiolo.
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/25063
Commit Summary
- 9fa1a4d Also accept wide string literals as translation macro arguments
File Changes
(2 files)
- M include/wx/translation.h (28)
- M samples/internat/internat.cpp (6)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/25063.patch
- https://github.com/wxWidgets/wxWidgets/pull/25063.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
@vadz commented on this pull request.
In samples/internat/internat.cpp:
> @@ -320,6 +320,12 @@ MyFrame::MyFrame()
macro_menu->Append(INTERNAT_MACRO_8, wxGETTEXT_IN_CONTEXT_PLURAL("context_2", "sing", "plur", 1));
macro_menu->Append(INTERNAT_MACRO_9, wxGETTEXT_IN_CONTEXT_PLURAL("context_2", "sing", "plur", 2));
+ // Also wide strings can be used:
Shouldn't this rather go into tests/allheaders.cpp as the other checks you added there?
Or, perhaps, move all of these checks to tests/intl/intltest.cpp?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Lauri Nurmi
@lanurmi commented on this pull request.
In samples/internat/internat.cpp:
> @@ -320,6 +320,12 @@ MyFrame::MyFrame()
macro_menu->Append(INTERNAT_MACRO_8, wxGETTEXT_IN_CONTEXT_PLURAL("context_2", "sing", "plur", 1));
macro_menu->Append(INTERNAT_MACRO_9, wxGETTEXT_IN_CONTEXT_PLURAL("context_2", "sing", "plur", 2));
+ // Also wide strings can be used:
Shouldn't this rather go into
tests/allheaders.cppas the other checks you added there?
allheaders.cpp is special, because it defines wxNO_IMPLICIT_WXSTRING_ENCODING, and therefore doesn't test the regular use case. I also hypothesized that wide strings are inherently incompatible with wxASCII_STR, which the wrappers call in that case, but didn't test what actually happens.
Or, perhaps, move all of these checks to
tests/intl/intltest.cpp?
Yes, the new ones I added to the sample can be moved.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Lauri Nurmi
@lanurmi pushed 1 commit.
- e9ae3e6 fixup! Also accept wide string literals as translation macro arguments
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
@vadz pushed 1 commit.
- e3d210d fixup! Implement wxTextCtrl::SearchText() in wxQt
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
@vadz pushed 1 commit.
- 723b359 fixup! Also accept wide string literals as translation macro arguments
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
@vadz commented on this pull request.
In samples/internat/internat.cpp:
> @@ -320,6 +320,12 @@ MyFrame::MyFrame()
macro_menu->Append(INTERNAT_MACRO_8, wxGETTEXT_IN_CONTEXT_PLURAL("context_2", "sing", "plur", 1));
macro_menu->Append(INTERNAT_MACRO_9, wxGETTEXT_IN_CONTEXT_PLURAL("context_2", "sing", "plur", 2));
+ // Also wide strings can be used:
So actually it's important to have these tests in allheaders.cpp too because this should compile with wxNO_IMPLICIT_WXSTRING_ENCODING as well, isn't it?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Lauri Nurmi
@lanurmi commented on this pull request.
In samples/internat/internat.cpp:
> @@ -320,6 +320,12 @@ MyFrame::MyFrame()
macro_menu->Append(INTERNAT_MACRO_8, wxGETTEXT_IN_CONTEXT_PLURAL("context_2", "sing", "plur", 1));
macro_menu->Append(INTERNAT_MACRO_9, wxGETTEXT_IN_CONTEXT_PLURAL("context_2", "sing", "plur", 2));
+ // Also wide strings can be used:
When you put it that way, yes. I suppose this PR is complete now, after your latest changes.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.