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

Sch validator: make error messages translatable. 

The fix avoid ridiculous sentences, once translated.
This commit is contained in:
jean-pierre charras 2019-12-14 11:40:37 +01:00
parent 962baf8b6c
commit 74caf3b7cb
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
eeschema/sch_validators.cpp
View File

@ -79,18 +79,31 @@ bool SCH_FIELD_VALIDATOR::Validate( wxWindow *aParent )
return false; return false;
wxString val( text->GetValue() ); wxString val( text->GetValue() );
wxString tmp = val.Clone(); // For trailing and leading white space tests.
wxString fieldName; // The format of the error message for not allowed chars
wxString fieldCharError;
switch( m_fieldId ) switch( m_fieldId )
{ {
case FIELD_NAME: fieldName = _( "field name" ); break; case REFERENCE:
case FIELD_VALUE: fieldName = _( "field value" ); break; fieldCharError = _( "The reference field cannot contain %s character(s)." );
case REFERENCE: fieldName = _( "reference field" ); break; break;
case VALUE: fieldName = _( "value field" ); break;
case FOOTPRINT: fieldName = _( "footprint field" ); break; case VALUE:
case DATASHEET: fieldName = _( "datasheet field" ); break; fieldCharError = _( "The value field cannot contain %s character(s)." );
default: fieldName = _( "user defined field" ); break; break;
case FOOTPRINT:
fieldCharError = _( "The footprint field cannot contain %s character(s)." );
break;
case DATASHEET:
fieldCharError = _( "The datasheet field cannot contain %s character(s)." );
break;
default:
fieldCharError = _( "The field cannot contain %s character(s)." );
break;
}; };
wxString msg; wxString msg;
@ -98,7 +111,13 @@ bool SCH_FIELD_VALIDATOR::Validate( wxWindow *aParent )
// We can only do some kinds of validation once the input is complete, so // We can only do some kinds of validation once the input is complete, so
// check for them here: // check for them here:
if( HasFlag( wxFILTER_EMPTY ) && val.empty() ) if( HasFlag( wxFILTER_EMPTY ) && val.empty() )
msg.Printf( _( "The %s cannot be empty." ), fieldName ); {
// Some fields cannot have an empty value, and user fields require a name:
if( m_fieldId == FIELD_NAME )
msg.Printf( _( "The name of the field cannot be empty." ) );
else // the FIELD_VALUE id or REFERENCE or VALUE
msg.Printf( _( "The value of the field cannot be empty." ) );
}
else if( HasFlag( wxFILTER_EXCLUDE_CHAR_LIST ) && ContainsExcludedCharacters( val ) ) else if( HasFlag( wxFILTER_EXCLUDE_CHAR_LIST ) && ContainsExcludedCharacters( val ) )
{ {
wxArrayString whiteSpace; wxArrayString whiteSpace;
@ -126,9 +145,9 @@ bool SCH_FIELD_VALIDATOR::Validate( wxWindow *aParent )
badChars.Printf( _( "%s, %s, %s, or %s" ), badChars.Printf( _( "%s, %s, %s, or %s" ),
whiteSpace[0], whiteSpace[1], whiteSpace[2], whiteSpace[3] ); whiteSpace[0], whiteSpace[1], whiteSpace[2], whiteSpace[3] );
else else
wxCHECK_MSG( false, true, wxT( "Invalid illegal character in field validator." ) ); wxCHECK_MSG( false, true, "Invalid illegal character in field validator." );
msg.Printf( _( "The %s cannot contain %s characters." ), fieldName, badChars ); msg.Printf( fieldCharError, badChars );
} }
if ( !msg.empty() ) if ( !msg.empty() )