kicad-developers team mailing list archive

[Marco Ciampa <ciampix@xxxxxxxxx>]

This patch should add i18n ability to the new add library wizard.

Please apply (and check it before!)

TIA

--


Marco Ciampa

I know a joke about UDP, but you might not get it.

+------------------------+
| GNU/Linux User  #78271 |
| FSFE fellow       #364 |
+------------------------+

=== modified file 'pcbnew/dialogs/wizard_add_fplib_base.cpp'
--- pcbnew/dialogs/wizard_add_fplib_base.cpp	2015-03-30 16:42:39 +0000
+++ pcbnew/dialogs/wizard_add_fplib_base.cpp	2015-03-31 09:54:29 +0000
@@ -28,14 +28,14 @@
 	fgSizer112->SetFlexibleDirection( wxBOTH );
 	fgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
-	m_staticText1 = new wxStaticText( m_wizPage1, wxID_ANY, wxT("Welcome to the Add Footprint Libraries Wizard!\n\nPlease select the source for the libraries to add:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1 = new wxStaticText( m_wizPage1, wxID_ANY, _( "Welcome to the Add Footprint Libraries Wizard!\n\nPlease select the source for the libraries to add:" ) , wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText1->Wrap( -1 );
 	fgSizer112->Add( m_staticText1, 1, wxALL|wxEXPAND, 5 );
 	
 	wxBoxSizer* bSizer19;
 	bSizer19 = new wxBoxSizer( wxVERTICAL );
 	
-	m_radioAddLocal = new wxRadioButton( m_wizPage1, wxID_ANY, wxT("Files on my computer"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_radioAddLocal = new wxRadioButton( m_wizPage1, wxID_ANY, _("Files on my computer"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizer19->Add( m_radioAddLocal, 0, wxALL|wxEXPAND, 5 );
 	
 	wxBoxSizer* m_sizerGithub;
@@ -55,10 +55,10 @@
 	m_githubSizer->SetFlexibleDirection( wxBOTH );
 	m_githubSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
-	m_radioAddGithub = new wxRadioButton( m_wizPage1, wxID_ANY, wxT("Github repository"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_radioAddGithub = new wxRadioButton( m_wizPage1, wxID_ANY, _("Github repository"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_githubSizer->Add( m_radioAddGithub, 0, wxALL|wxEXPAND, 5 );
 	
-	m_textCtrlGithubURL = new wxTextCtrl( m_wizPage1, wxID_ANY, wxT("http://github.com/KiCad";), wxDefaultPosition, wxDefaultSize, 0 );
+	m_textCtrlGithubURL = new wxTextCtrl( m_wizPage1, wxID_ANY, "http://github.com/KiCad";, wxDefaultPosition, wxDefaultSize, 0 );
 	m_textCtrlGithubURL->SetMinSize( wxSize( 300,-1 ) );
 	
 	m_githubSizer->Add( m_textCtrlGithubURL, 1, wxALL|wxEXPAND, 5 );
@@ -66,7 +66,7 @@
 	
 	m_githubSizer->Add( 0, 0, 1, wxEXPAND, 5 );
 	
-	m_downloadGithub = new wxCheckBox( m_wizPage1, wxID_ANY, wxT("Save a local copy to:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_downloadGithub = new wxCheckBox( m_wizPage1, wxID_ANY, _("Save a local copy to:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_downloadGithub->SetValue(true); 
 	m_githubSizer->Add( m_downloadGithub, 0, wxALL, 5 );
 	
@@ -82,7 +82,7 @@
 	
 	bSizer9->Add( m_downloadDir, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
-	m_btnBrowse = new wxButton( m_wizPage1, wxID_ANY, wxT("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_btnBrowse = new wxButton( m_wizPage1, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizer9->Add( m_btnBrowse, 0, wxALL, 5 );
 	
 	
@@ -91,7 +91,7 @@
 	
 	m_githubSizer->Add( 0, 0, 1, wxEXPAND, 5 );
 	
-	m_invalidDir = new wxStaticText( m_wizPage1, wxID_ANY, wxT("It is not possible to write in the selected directory.\nPlease choose another one."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_invalidDir = new wxStaticText( m_wizPage1, wxID_ANY, _("It is not possible to write in the selected directory.\nPlease choose another one."), wxDefaultPosition, wxDefaultSize, 0 );
 	m_invalidDir->Wrap( -1 );
 	m_invalidDir->SetForegroundColour( wxColour( 255, 0, 0 ) );
 	
@@ -108,14 +108,14 @@
 	fgSizer12->SetFlexibleDirection( wxBOTH );
 	fgSizer12->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
-	m_staticText8 = new wxStaticText( m_wizPage1, wxID_ANY, wxT("Visit the official"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText8 = new wxStaticText( m_wizPage1, wxID_ANY, _("Visit the official"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText8->Wrap( -1 );
 	fgSizer12->Add( m_staticText8, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 	
-	m_hyperlink1 = new wxHyperlinkCtrl( m_wizPage1, wxID_ANY, wxT("Kicad repository on Github"), wxT("https://github.com/KiCad";), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink1 = new wxHyperlinkCtrl( m_wizPage1, wxID_ANY, _("Kicad repository on Github"), "https://github.com/KiCad";, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
 	fgSizer12->Add( m_hyperlink1, 0, wxTOP|wxBOTTOM, 5 );
 	
-	m_staticText9 = new wxStaticText( m_wizPage1, wxID_ANY, wxT("to find numerous footprint libraries!"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText9 = new wxStaticText( m_wizPage1, wxID_ANY, _("to find numerous footprint libraries!"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText9->Wrap( -1 );
 	fgSizer12->Add( m_staticText9, 0, wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 5 );
 	
@@ -134,7 +134,7 @@
 	wxBoxSizer* bSizer8;
 	bSizer8 = new wxBoxSizer( wxVERTICAL );
 	
-	m_staticText7 = new wxStaticText( m_wizPage2_Local, wxID_ANY, wxT("Select files or folders to add:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText7 = new wxStaticText( m_wizPage2_Local, wxID_ANY, _("Select files or folders to add:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText7->Wrap( -1 );
 	bSizer8->Add( m_staticText7, 0, wxALL, 5 );
 	
@@ -153,7 +153,7 @@
 	wxBoxSizer* bSizer111;
 	bSizer111 = new wxBoxSizer( wxVERTICAL );
 	
-	m_staticText112 = new wxStaticText( m_wizPage2_Github, wxID_ANY, wxT("Select Github libraries to add:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText112 = new wxStaticText( m_wizPage2_Github, wxID_ANY, _("Select Github libraries to add:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText112->Wrap( -1 );
 	bSizer111->Add( m_staticText112, 0, wxALL|wxEXPAND, 5 );
 	
@@ -164,10 +164,10 @@
 	wxBoxSizer* bSizer7;
 	bSizer7 = new wxBoxSizer( wxHORIZONTAL );
 	
-	m_btnSelectAllGH = new wxButton( m_wizPage2_Github, wxID_ANY, wxT("Select all"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_btnSelectAllGH = new wxButton( m_wizPage2_Github, wxID_ANY, _("Select all"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizer7->Add( m_btnSelectAllGH, 1, wxALL, 5 );
 	
-	m_btnUnselectAllGH = new wxButton( m_wizPage2_Github, wxID_ANY, wxT("Unselect all"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_btnUnselectAllGH = new wxButton( m_wizPage2_Github, wxID_ANY, _("Unselect all"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizer7->Add( m_btnUnselectAllGH, 1, wxALL, 5 );
 	
 	
@@ -193,14 +193,14 @@
 	wxBoxSizer* bSizer1111;
 	bSizer1111 = new wxBoxSizer( wxVERTICAL );
 	
-	m_staticText1121 = new wxStaticText( m_wizPage3_Review, wxID_ANY, wxT("Review and confirm the changes to the libraries:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1121 = new wxStaticText( m_wizPage3_Review, wxID_ANY, _("Review and confirm the changes to the libraries:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText1121->Wrap( -1 );
 	bSizer1111->Add( m_staticText1121, 0, wxALL|wxEXPAND, 5 );
 	
 	m_listCtrlReview = new wxDataViewListCtrl( m_wizPage3_Review, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_HORIZ_RULES|wxDV_ROW_LINES|wxDV_VERT_RULES );
-	m_dvLibName = m_listCtrlReview->AppendTextColumn( wxT("Library") ); 
-	m_dvLibStatus = m_listCtrlReview->AppendTextColumn( wxT("Status") ); 
-	m_dvLibFormat = m_listCtrlReview->AppendTextColumn( wxT("Format") ); 
+	m_dvLibName = m_listCtrlReview->AppendTextColumn( _("Library") ); 
+	m_dvLibStatus = m_listCtrlReview->AppendTextColumn( _("Status") ); 
+	m_dvLibFormat = m_listCtrlReview->AppendTextColumn( _("Format") ); 
 	bSizer1111->Add( m_listCtrlReview, 1, wxALL|wxEXPAND, 5 );
 	
 	
@@ -213,14 +213,14 @@
 	wxBoxSizer* bSizer12;
 	bSizer12 = new wxBoxSizer( wxVERTICAL );
 	
-	m_staticText12 = new wxStaticText( m_wizPage4_SelectTarget, wxID_ANY, wxT("Where do you wish the new libraries to be added:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText12 = new wxStaticText( m_wizPage4_SelectTarget, wxID_ANY, _("Where do you wish the new libraries to be added:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText12->Wrap( -1 );
 	bSizer12->Add( m_staticText12, 0, wxALL|wxEXPAND, 5 );
 	
-	m_radioGlobal = new wxRadioButton( m_wizPage4_SelectTarget, wxID_ANY, wxT("To global library configuration (visible by all projects)"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_radioGlobal = new wxRadioButton( m_wizPage4_SelectTarget, wxID_ANY, _("To global library configuration (visible by all projects)"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizer12->Add( m_radioGlobal, 0, wxALL|wxEXPAND, 5 );
 	
-	m_radioProject = new wxRadioButton( m_wizPage4_SelectTarget, wxID_ANY, wxT("To the current project only"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_radioProject = new wxRadioButton( m_wizPage4_SelectTarget, wxID_ANY, _("To the current project only"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizer12->Add( m_radioProject, 0, wxALL|wxEXPAND, 5 );