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

Use format string for composed strings 

Some translations may need this.
This commit is contained in:
Simon Richter 2019-04-15 21:52:49 +02:00 committed by John Beard
parent dffd1179c5
commit ed4c9f7ddb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/netlist_object.cpp
View File

@ -256,7 +256,7 @@ void NETLIST_OBJECT::ConvertBusToNetListItems( NETLIST_OBJECT_LIST& aNetListItem
else else
{ {
wxCHECK_RET( conn.ParseBusGroup( m_Label, &group_name, bus_contents_vec ), wxCHECK_RET( conn.ParseBusGroup( m_Label, &group_name, bus_contents_vec ),
_( "Failed to parse bus group " ) + m_Label ); wxString::Format( _( "Failed to parse bus group %s" ), m_Label ) );
} }
// For named bus groups, like "USB{DP DM}" // For named bus groups, like "USB{DP DM}"

4
eeschema/tools/sch_editor_control.cpp
View File

@ -137,7 +137,7 @@ static bool highlightNet( TOOL_MANAGER* aToolMgr, const VECTOR2D& aPosition )
if( item->Connection( *g_CurrentSheet ) ) if( item->Connection( *g_CurrentSheet ) )
{ {
netName = item->Connection( *g_CurrentSheet )->Name(); netName = item->Connection( *g_CurrentSheet )->Name();
editFrame->SetStatusText( _( "Highlighted net: " ) + UnescapeString( netName ) ); editFrame->SetStatusText( wxString::Format( _( "Highlighted net: %s" ), UnescapeString( netName ) ) );
} }
} }
} }
@ -145,7 +145,7 @@ static bool highlightNet( TOOL_MANAGER* aToolMgr, const VECTOR2D& aPosition )
editFrame->SetSelectedNetName( netName ); editFrame->SetSelectedNetName( netName );
editFrame->SendCrossProbeNetName( netName ); editFrame->SendCrossProbeNetName( netName );
editFrame->SetStatusText( _( "Selected net: " ) + UnescapeString( netName ) ); editFrame->SetStatusText( wxString::Format( _( "Selected net: %s" ), UnescapeString( netName ) ) );
aToolMgr->RunAction( SCH_ACTIONS::highlightNetSelection, true ); aToolMgr->RunAction( SCH_ACTIONS::highlightNetSelection, true );