haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix wxT overzealous replacements 

A couple of regex mistakes slipped through and need to be reverted here
This commit is contained in:
Seth Hillbrand 2022-02-16 17:19:01 -08:00
parent 71eefc8322
commit 470d7d228d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/filename_resolver.cpp
View File

@ -465,10 +465,10 @@ bool FILENAME_RESOLVER::addPath( const SEARCH_PATH& aPath )
wxString msg = _( "Alias: " ); wxString msg = _( "Alias: " );
msg.append( tpath.m_Alias ); msg.append( tpath.m_Alias );
msg.append( wxT( "\n" ) ); msg.append( wxT( "\n" ) );
msg.append( _( "This path:wxT( " ) + wxS( " ) " ) ); msg.append( _( "This path:" ) + wxS( " " ) );
msg.append( tpath.m_Pathvar ); msg.append( tpath.m_Pathvar );
msg.append( wxT( "\n" ) ); msg.append( wxT( "\n" ) );
msg.append( _( "Existing path:wxT( " ) + wxS( " ) " ) ); msg.append( _( "Existing path:" ) + wxS( " " ) );
msg.append( sPL->m_Pathvar ); msg.append( sPL->m_Pathvar );
wxMessageBox( msg, _( "Bad alias (duplicate name)" ) ); wxMessageBox( msg, _( "Bad alias (duplicate name)" ) );

4
eeschema/sch_connection.cpp
View File

@ -412,7 +412,7 @@ void SCH_CONNECTION::AppendInfoToMsgPanel( std::vector<MSG_PANEL_ITEM>& aList )
// CONNECTION_GRAPH entirely in the future, as they are mostly only useful for netlist exports. // CONNECTION_GRAPH entirely in the future, as they are mostly only useful for netlist exports.
#if 0 #if 0
if( !IsBus() ) if( !IsBus() )
aList.emplace_back( _( "Net CodewxT( " ), wxString::Format( " )%d", m_net_code ) ); aList.emplace_back( _( "Net Code" ), wxString::Format( "%d", m_net_code ) );
#endif #endif
if( auto alias = m_graph->GetBusAlias( m_name ) ) if( auto alias = m_graph->GetBusAlias( m_name ) )
@ -474,7 +474,7 @@ bool SCH_CONNECTION::MightBeBusLabel( const wxString& aLabel )
// Weak heuristic for performance reasons. Stronger test will be used for connectivity // Weak heuristic for performance reasons. Stronger test will be used for connectivity
wxString label = UnescapeString( aLabel ); wxString label = UnescapeString( aLabel );
return label.Contains( wxT( "[wxT( " ) ) || label.Contains( wxT( " ){" ) ); return label.Contains( wxT( "[" ) ) || label.Contains( wxT( "{" ) );
} }

2
eeschema/tools/symbol_editor_edit_tool.cpp
View File

@ -445,7 +445,7 @@ int SYMBOL_EDITOR_EDIT_TOOL::Properties( const TOOL_EVENT& aEvent )
break; break;
default: default:
wxFAIL_MSG( wxT( "Unhandled item <wxT( " ) + item->GetClass() + wxT( " )>" ) ); wxFAIL_MSG( wxT( "Unhandled item <" ) + item->GetClass() + wxT( ">" ) );
break; break;
} }
} }