Browse Source

Fix incorrect string translation macros.

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

* Don't translate debug messages.

* Don't translate copyright symbol.
pull/3/merge
Wayne Stambaugh 9 years ago
parent
commit
cbcb3b896b
  1. 4
      3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp
  2. 4
      common/dialog_about/aboutinfo.h
  3. 2
      pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
  4. 2
      pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
  5. 4
      scripting/python_scripting.cpp

4
3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp

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

4
common/dialog_about/aboutinfo.h

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

2
pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp

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

2
pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp

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

4
scripting/python_scripting.cpp

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

Loading…
Cancel
Save