solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'mac-menu-i18n'

Browse source 
Fix "Window" menu item translation under macOS.

Closes #23204.
This commit is contained in:
Vadim Zeitlin 2023-02-06 21:04:14 +01:00
commit f1b38c2500
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/osx/cocoa/menu.mm
View file

@ -240,14 +240,14 @@ public :
virtual NSMenu* MacCreateOrFindWindowMenu()
{
NSString* nsWindowMenuTitle = wxNSStringWithWxString(wxStripMenuCodes(wxApp::s_macWindowMenuTitleName, wxStrip_Menu));
NSString* nsAlternateWindowMenuTitle = wxNSStringWithWxString(wxGETTEXT_IN_CONTEXT("macOS menu name", "Window"));
NSString* nsTranslatedWindowMenuTitle = wxNSStringWithWxString(wxGETTEXT_IN_CONTEXT("macOS menu name", "Window"));
NSMenu* windowMenu = nil;
for (NSMenuItem* topmenu in [m_osxMenu itemArray])
{
if ([[topmenu title] isEqualToString:nsWindowMenuTitle] ||
[[topmenu title] isEqualToString:nsAlternateWindowMenuTitle])
[[topmenu title] isEqualToString:nsTranslatedWindowMenuTitle])
{
windowMenu = [topmenu submenu];
break;
@ -257,7 +257,7 @@ public :
if ( windowMenu == nil )
{
NSString* nsHelpMenuTitle = wxNSStringWithWxString(wxStripMenuCodes(wxApp::s_macHelpMenuTitleName, wxStrip_Menu));
NSString* nsAlternateHelpTitle = wxNSStringWithWxString(wxGETTEXT_IN_CONTEXT("macOS menu name", "Help"));
NSString* nsTranslatedHelpTitle = wxNSStringWithWxString(wxGETTEXT_IN_CONTEXT("macOS menu name", "Help"));
NSMenuItem* helpMenu = nil;
NSInteger numberOfMenus = [m_osxMenu numberOfItems];
@ -265,13 +265,13 @@ public :
{
NSMenuItem* lastMenu = [m_osxMenu itemAtIndex:numberOfMenus-1];
if ([[lastMenu title] isEqualToString:nsHelpMenuTitle] ||
[[lastMenu title] isEqualToString:nsAlternateHelpTitle])
[[lastMenu title] isEqualToString:nsTranslatedHelpTitle])
{
helpMenu = lastMenu;
}
}
windowMenu = [[NSMenu alloc] initWithTitle:nsWindowMenuTitle];
windowMenu = [[NSMenu alloc] initWithTitle:nsTranslatedWindowMenuTitle];
NSMenuItem* windowMenuItem = [[NSMenuItem alloc] initWithTitle:nsWindowMenuTitle action:nil keyEquivalent:@""];
[windowMenuItem setSubmenu:windowMenu];
[windowMenu release];