From 94f51a5c8aae30d9f252938965bf0e0aa86fdc24 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 31 Jan 2023 21:03:22 +0100 Subject: [PATCH 1/2] use properly translated string when creating default window menu --- src/osx/cocoa/menu.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm index a213cfb958..8b49959874 100644 --- a/src/osx/cocoa/menu.mm +++ b/src/osx/cocoa/menu.mm @@ -271,7 +271,7 @@ public : } } - windowMenu = [[NSMenu alloc] initWithTitle:nsWindowMenuTitle]; + windowMenu = [[NSMenu alloc] initWithTitle:nsAlternateWindowMenuTitle]; NSMenuItem* windowMenuItem = [[NSMenuItem alloc] initWithTitle:nsWindowMenuTitle action:nil keyEquivalent:@""]; [windowMenuItem setSubmenu:windowMenu]; [windowMenu release]; From cb62721e24c03566f4142388d0809361fd8cb1d5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 6 Feb 2023 21:00:21 +0100 Subject: [PATCH 2/2] Rename variables containing translations of menu item text Use "Translated" prefix for them instead of much less clear "Alternate" one. No real changes. --- src/osx/cocoa/menu.mm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm index 8b49959874..f1f3122832 100644 --- a/src/osx/cocoa/menu.mm +++ b/src/osx/cocoa/menu.mm @@ -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:nsAlternateWindowMenuTitle]; + windowMenu = [[NSMenu alloc] initWithTitle:nsTranslatedWindowMenuTitle]; NSMenuItem* windowMenuItem = [[NSMenuItem alloc] initWithTitle:nsWindowMenuTitle action:nil keyEquivalent:@""]; [windowMenuItem setSubmenu:windowMenu]; [windowMenu release];