AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't replace non default wxMessageDialog labels with default translations.

Browse Source 
The code translating the button labels of wxMessageBox to the application
language was overeager and replaced even the custom labels with the
translations of the default ones.

This shouldn't be done, of course, so simply check that no custom labels had
been set before translating.

See #10962.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2011-10-30 16:22:30 +00:00
parent 9a29fe70bc
commit c22ce32199
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/msw/msgdlg.cpp
View File

@ -454,12 +454,16 @@ int wxMessageDialog::ShowMessageBox()
#if wxUSE_INTL
// native message box always uses the current user locale but the program
// may be using a different one and in this case we need to manually
// translate the button labels to avoid mismatch between the language of
// the message box text and its buttons
// translate the default button labels (if they're non default we have no
// way to translate them and so we must assume they were already
// translated) to avoid mismatch between the language of the message box
// text and its buttons
wxLocale * const loc = wxGetLocale();
if ( loc && loc->GetLanguage() != wxLocale::GetSystemLanguage() )
{
if ( m_dialogStyle & wxYES_NO )
if ( m_dialogStyle & wxYES_NO &&
(GetCustomYesLabel().empty() && GetCustomNoLabel().empty()) )
{
// use the strings with mnemonics here as the native message box
// does
@ -475,7 +479,8 @@ int wxMessageDialog::ShowMessageBox()
// native message box (which probably doesn't use them because
// Enter/Esc keys can be already used to dismiss the message box
// using keyboard)
SetOKCancelLabels(_("OK"), _("Cancel"));
if ( GetCustomOKLabel().empty() && GetCustomCancelLabel().empty() )
SetOKCancelLabels(_("OK"), _("Cancel"));
}
#endif // wxUSE_INTL