Fix incorrect string translation macros.

* Replace _T() with _() for translatable strings.

* Don't translate debug messages.

* Don't translate copyright symbol.
This commit is contained in:
Wayne Stambaugh 2016-09-03 12:10:49 -04:00
parent f477cc958c
commit cbcb3b896b
5 changed files with 8 additions and 8 deletions

View File

@ -140,8 +140,8 @@ DLG_SELECT_3DMODEL::DLG_SELECT_3DMODEL( wxWindow* aParent, S3D_CACHE* aCacheMana
hboxDirChoice->Add( dirChoices, 1, wxEXPAND | wxALL, 5 ); hboxDirChoice->Add( dirChoices, 1, wxEXPAND | wxALL, 5 );
hboxDirChoice->Add( cfgPaths, 0, wxALL, 5 ); hboxDirChoice->Add( cfgPaths, 0, wxALL, 5 );
wxButton* btn_OK = new wxButton( this, wxID_OK, _T( "OK" ) ); wxButton* btn_OK = new wxButton( this, wxID_OK, _( "OK" ) );
wxButton* btn_Cancel = new wxButton( this, wxID_CANCEL, _T( "Cancel" ) ); wxButton* btn_Cancel = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
wxStdDialogButtonSizer* hSizer1 = new wxStdDialogButtonSizer(); wxStdDialogButtonSizer* hSizer1 = new wxStdDialogButtonSizer();
hSizer1->AddButton( btn_OK ); hSizer1->AddButton( btn_OK );

View File

@ -94,8 +94,8 @@ public:
#if wxUSE_UNICODE #if wxUSE_UNICODE
const wxString utf8_copyrightSign = wxString::FromUTF8( "\xc2\xa9" ); const wxString utf8_copyrightSign = wxString::FromUTF8( "\xc2\xa9" );
copyrightText.Replace( _T( "(c)" ), utf8_copyrightSign ); copyrightText.Replace( "(c)", utf8_copyrightSign );
copyrightText.Replace( _T( "(C)" ), utf8_copyrightSign ); copyrightText.Replace( "(C)", utf8_copyrightSign );
#endif // wxUSE_UNICODE #endif // wxUSE_UNICODE
return copyrightText; return copyrightText;

View File

@ -498,7 +498,7 @@ void DIALOG_MODULE_BOARD_EDITOR::Edit3DShapeFileName()
{ {
wxString msg = _( "Invalid filename: " ); wxString msg = _( "Invalid filename: " );
msg.append( filename ); msg.append( filename );
wxMessageBox( msg, _T( "Edit 3D file name" ) ); wxMessageBox( msg, _( "Edit 3D file name" ) );
return; return;
} }

View File

@ -349,7 +349,7 @@ void DIALOG_MODULE_MODULE_EDITOR::Edit3DShapeFileName()
{ {
wxString msg = _( "Invalid filename: " ); wxString msg = _( "Invalid filename: " );
msg.append( filename ); msg.append( filename );
wxMessageBox( msg, _T( "Edit 3D file name" ) ); wxMessageBox( msg, _( "Edit 3D file name" ) );
return; return;
} }

View File

@ -287,10 +287,10 @@ wxWindow* CreatePythonShellWindow( wxWindow* parent, const wxString& aFramenameI
{ {
// Otherwise, get the returned window out of Python-land and // Otherwise, get the returned window out of Python-land and
// into C++-ville... // into C++-ville...
bool success = wxPyConvertSwigPtr( result, (void**) &window, _T( "wxWindow" ) ); bool success = wxPyConvertSwigPtr( result, (void**) &window, "wxWindow" );
(void) success; (void) success;
wxASSERT_MSG( success, _T( "Returned object was not a wxWindow!" ) ); wxASSERT_MSG( success, "Returned object was not a wxWindow!" );
Py_DECREF( result ); Py_DECREF( result );
window->SetName( aFramenameId ); window->SetName( aFramenameId );