Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use translatable strings as format template for menu lines

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2012-01-28 13:37:04 +00:00
parent 1c415bab65
commit 48d43515c2
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osx/menu_osx.cpp
View File

@@ -552,21 +552,17 @@ void wxMenuBar::Init()
} }
// standard menu items, handled in wxMenu::HandleCommandProcess(), see above: // standard menu items, handled in wxMenu::HandleCommandProcess(), see above:
wxString hideLabel(_("Hide")); wxString hideLabel;
if ( wxTheApp ) hideLabel = wxString::Format(_("Hide %s"), wxTheApp ? wxTheApp->GetAppDisplayName() : _("Application"));
hideLabel << ' ' << wxTheApp->GetAppDisplayName(); m_appleMenu->Append( wxID_OSX_HIDE, hideLabel + "\tCtrl+H" );
hideLabel << "\tCtrl+H";
m_appleMenu->Append( wxID_OSX_HIDE, hideLabel );
m_appleMenu->Append( wxID_OSX_HIDEOTHERS, _("Hide Others")+"\tAlt+Ctrl+H" ); m_appleMenu->Append( wxID_OSX_HIDEOTHERS, _("Hide Others")+"\tAlt+Ctrl+H" );
m_appleMenu->Append( wxID_OSX_SHOWALL, _("Show All") ); m_appleMenu->Append( wxID_OSX_SHOWALL, _("Show All") );
m_appleMenu->AppendSeparator(); m_appleMenu->AppendSeparator();
// Do always add "Quit" item unconditionally however, it can't be disabled. // Do always add "Quit" item unconditionally however, it can't be disabled.
wxString quitLabel(_("Quit")); wxString quitLabel;
if ( wxTheApp ) quitLabel = wxString::Format(_("Quit %s"), wxTheApp ? wxTheApp->GetAppDisplayName() : _("Application"));
quitLabel << ' ' << wxTheApp->GetAppDisplayName(); m_appleMenu->Append( wxApp::s_macExitMenuItemId, quitLabel + "\tCtrl+Q" );
quitLabel << "\tCtrl+Q";
m_appleMenu->Append( wxApp::s_macExitMenuItemId, quitLabel );
#endif // !wxOSX_USE_CARBON #endif // !wxOSX_USE_CARBON
m_rootMenu->AppendSubMenu(m_appleMenu, "\x14") ; m_rootMenu->AppendSubMenu(m_appleMenu, "\x14") ;