Fix typo of transposed semi-colon and comma.

Also eases translation of strings while we're here.

Fixes https://gitlab.com/kicad/code/kicad/issues/5933
This commit is contained in:
Jeff Young 2020-10-10 12:24:31 +01:00
parent c5f01501c1
commit 90baed7e82
1 changed files with 16 additions and 7 deletions

View File

@ -106,17 +106,26 @@ bool DRC_TEST_PROVIDER_VIA_DIAMETER::Run()
constraintDiameter = constraint.Value().Max(); constraintDiameter = constraint.Value().Max();
} }
if( fail_min )
{
m_msg.Printf( _( " (%s min diameter %s; actual %s)" ),
constraint.GetName(),
MessageTextFromValue( userUnits(), constraintDiameter ),
MessageTextFromValue( userUnits(), actual ) );
}
else if( fail_max )
{
m_msg.Printf( _( " (%s max diameter %s; actual %s)" ),
constraint.GetName(),
MessageTextFromValue( userUnits(), constraintDiameter ),
MessageTextFromValue( userUnits(), actual ) );
}
if( fail_min || fail_max ) if( fail_min || fail_max )
{ {
std::shared_ptr<DRC_ITEM> drcItem = DRC_ITEM::Create( DRCE_VIA_DIAMETER ); std::shared_ptr<DRC_ITEM> drcItem = DRC_ITEM::Create( DRCE_VIA_DIAMETER );
m_msg.Printf( drcItem->GetErrorText() + _( " (%s %s diameter %s; actual %s)" ), drcItem->SetErrorMessage( drcItem->GetErrorText() + m_msg );
constraint.GetName(),
fail_min ? _( "min" ) : _( "max" ),
MessageTextFromValue( userUnits(), constraintDiameter ) );
MessageTextFromValue( userUnits(), actual ),
drcItem->SetErrorMessage( m_msg );
drcItem->SetItems( item ); drcItem->SetItems( item );
drcItem->SetViolatingRule( constraint.GetParentRule() ); drcItem->SetViolatingRule( constraint.GetParentRule() );