Remove most wxFilepicker wildcards from translations

This prevents translation errors from preventing user actions such as
opening the correct file
This commit is contained in:
Seth Hillbrand 2021-08-20 12:56:47 -07:00
parent 93118100fa
commit 4cd9278041
5 changed files with 17 additions and 16 deletions

View File

@ -55,7 +55,7 @@
S3D_PLUGIN_MANAGER::S3D_PLUGIN_MANAGER() S3D_PLUGIN_MANAGER::S3D_PLUGIN_MANAGER()
{ {
// create the initial file filter list entry // create the initial file filter list entry
m_FileFilters.push_back( _( "All Files (*.*)|*.*" ) ); m_FileFilters.push_back( _( "All Files" ) + wxT( " (*.*)|*.*" ) );
// discover and load plugins // discover and load plugins
loadPlugins(); loadPlugins();

View File

@ -181,9 +181,9 @@ const wxString PGM_BASE::AskUserForPreferredEditor( const wxString& aDefaultEdit
{ {
// Create a mask representing the executable files in the current platform // Create a mask representing the executable files in the current platform
#ifdef __WINDOWS__ #ifdef __WINDOWS__
wxString mask( _( "Executable file (*.exe)|*.exe" ) ); wxString mask( _( "Executable file" ) + wxT( " (*.exe)|*.exe" ) );
#else #else
wxString mask( _( "Executable file (*)|*" ) ); wxString mask( _( "Executable file" ) + wxT( " (*)|*" ) );
#endif #endif
// Extract the path, name and extension from the default editor (even if the editor's // Extract the path, name and extension from the default editor (even if the editor's

View File

@ -141,18 +141,18 @@ bool GERBVIEW_FRAME::LoadGerberFiles( const wxString& aFullFileName )
filetypes << wxT("|"); filetypes << wxT("|");
/* Special gerber filetypes */ /* Special gerber filetypes */
filetypes += _( "Top layer (*.GTL)|*.GTL;*.gtl|" ); filetypes += _( "Top layer" ) + wxT( " (*.GTL)|*.GTL;*.gtl|" );
filetypes += _( "Bottom layer (*.GBL)|*.GBL;*.gbl|" ); filetypes += _( "Bottom layer" ) + wxT( " (*.GBL)|*.GBL;*.gbl|" );
filetypes += _( "Bottom solder resist (*.GBS)|*.GBS;*.gbs|" ); filetypes += _( "Bottom solder resist" ) + wxT( " (*.GBS)|*.GBS;*.gbs|" );
filetypes += _( "Top solder resist (*.GTS)|*.GTS;*.gts|" ); filetypes += _( "Top solder resist" ) + wxT( " (*.GTS)|*.GTS;*.gts|" );
filetypes += _( "Bottom overlay (*.GBO)|*.GBO;*.gbo|" ); filetypes += _( "Bottom overlay" ) + wxT( " (*.GBO)|*.GBO;*.gbo|" );
filetypes += _( "Top overlay (*.GTO)|*.GTO;*.gto|" ); filetypes += _( "Top overlay" ) + wxT( " (*.GTO)|*.GTO;*.gto|" );
filetypes += _( "Bottom paste (*.GBP)|*.GBP;*.gbp|" ); filetypes += _( "Bottom paste" ) + wxT( " (*.GBP)|*.GBP;*.gbp|" );
filetypes += _( "Top paste (*.GTP)|*.GTP;*.gtp|" ); filetypes += _( "Top paste" ) + wxT( " (*.GTP)|*.GTP;*.gtp|" );
filetypes += _( "Keep-out layer (*.GKO)|*.GKO;*.gko|" ); filetypes += _( "Keep-out layer" ) + wxT( " (*.GKO)|*.GKO;*.gko|" );
filetypes += _( "Mechanical layers (*.GMx)|*.GM1;*.gm1;*.GM2;*.gm2;*.GM3;*.gm3|" ); filetypes += _( "Mechanical layers" ) + wxT( " (*.GMx)|*.GM1;*.gm1;*.GM2;*.gm2;*.GM3;*.gm3|" );
filetypes += _( "Top Pad Master (*.GPT)|*.GPT;*.gpt|" ); filetypes += _( "Top Pad Master" ) + wxT( " (*.GPT)|*.GPT;*.gpt|" );
filetypes += _( "Bottom Pad Master (*.GPB)|*.GPB;*.gpb|" ); filetypes += _( "Bottom Pad Master" ) + wxT( " (*.GPB)|*.GPB;*.gpb|" );
// All filetypes // All filetypes
filetypes += AllFilesWildcard(); filetypes += AllFilesWildcard();

View File

@ -124,7 +124,7 @@ void PCB_CALCULATOR_FRAME::OnDataFileSelection( wxCommandEvent& event )
wxString fullfilename = GetDataFilename(); wxString fullfilename = GetDataFilename();
wxString wildcard; wxString wildcard;
wildcard.Printf( _("PCB Calculator data file (*.%s)|*.%s"), wildcard.Printf( _("PCB Calculator data file" ) + wxT( " (*.%s)|*.%s"),
DataFileNameExt, DataFileNameExt ); DataFileNameExt, DataFileNameExt );
wxFileDialog dlg( m_panelRegulators, _("Select PCB Calculator Data File"), wxFileDialog dlg( m_panelRegulators, _("Select PCB Calculator Data File"),

View File

@ -116,6 +116,7 @@ DIALOG_EXPORT_STEP::DIALOG_EXPORT_STEP( PCB_EDIT_FRAME* aParent, const wxString&
m_sdbSizerOK->SetLabel( _( "Export" ) ); m_sdbSizerOK->SetLabel( _( "Export" ) );
m_sdbSizer->Layout(); m_sdbSizer->Layout();
// Build default output file name // Build default output file name
wxString path = m_parent->GetLastPath( LAST_PATH_STEP ); wxString path = m_parent->GetLastPath( LAST_PATH_STEP );