Re: [pgadmin-hackers] A bunch of minor issues

[Heikki Linnakangas]

Euler Taveira de Oliveira wrote:
> Heikki Linnakangas wrote:
>> Attached is a patch to change a few string constructions to be more
>> localization-friendly. There's still a lot of troublesome constructs
> where is the patch?

Oh crap. Here..

-- 
  Heikki Linnakangas
  EnterpriseDB   http://www.enterprisedb.com

Index: pgadmin/frm/frmQuery.cpp
===================================================================
--- pgadmin/frm/frmQuery.cpp	(revision 6657)
+++ pgadmin/frm/frmQuery.cpp	(working copy)
@@ -1146,8 +1146,10 @@
     {
         wxString fn;
         if (!lastPath.IsNull())
-            fn = wxT(" in file ") + lastPath;
-        wxMessageDialog msg(this, wxString::Format(_("The text %s has changed.\nDo you want to save changes?"), fn.c_str()), _("Query"), 
+			fn = wxString::Format(_("The text in file %s has changed.\nDo you want to save changes?"), lastPath.c_str());
+		else
+			fn = _("The text has changed.\nDo you want to save changes?");
+        wxMessageDialog msg(this, fn, _("Query"), 
                     wxYES_NO|wxICON_EXCLAMATION|
                     (canVeto ? wxCANCEL : 0));
 
Index: pgadmin/debugger/dbgPgConn.cpp
===================================================================
--- pgadmin/debugger/dbgPgConn.cpp	(revision 6657)
+++ pgadmin/debugger/dbgPgConn.cpp	(working copy)
@@ -123,12 +123,12 @@
     connectParams.Trim( true );
     connectParams.Trim( false );
 
-    m_frame->getStatusBar()->SetStatusText( wxString(_( "Connecting to " )) + msg, 1 );	
+    m_frame->getStatusBar()->SetStatusText( wxString::Format(_( "Connecting to %s" ), msg.c_str()), 1 );	
     m_pgConn = PQconnectdb( connectParams.ToAscii());
 
     if( PQstatus( m_pgConn ) == CONNECTION_OK )
     {
-    	m_frame->getStatusBar()->SetStatusText( wxString(_( "Connected to " )) + msg, 1 );	
+    	m_frame->getStatusBar()->SetStatusText( wxString::Format(_( "Connected to %s" ), msg.c_str()), 1 );
 
     	PQsetClientEncoding( m_pgConn, "UNICODE" );
     }
Index: pgadmin/dlg/dlgManageFavourites.cpp
===================================================================
--- pgadmin/dlg/dlgManageFavourites.cpp	(revision 6657)
+++ pgadmin/dlg/dlgManageFavourites.cpp	(working copy)
@@ -149,6 +149,8 @@
 
 void dlgManageFavourites::OnDelete(wxCommandEvent &ev)
 {
+	wxString msg;
+
 	if (!trLocation->GetSelection().IsOk() ||
 		trLocation->GetSelection() == trLocation->GetRootItem())
 		return;
@@ -157,7 +159,11 @@
 	if (!item)
 		return;
 
-	if (wxMessageDialog(this, wxString(_("Are you sure you want to delete the ")) + ((item->GetId()!=-2)?_("favourite"):_("folder")) + wxT(" '") + item->GetTitle() + wxT("'?"), _("Confirm delete"), wxYES_NO | wxICON_QUESTION).ShowModal() != wxID_YES)
+	if (item->GetId() != -2)
+		msg = wxString::Format(_("Are you sure you want to delete the favourite '%s'?"), item->GetTitle().c_str());
+	else
+		msg = wxString::Format(_("Are you sure you want to delete the folder '%s'?"), item->GetTitle().c_str());
+	if (wxMessageDialog(this, msg, _("Confirm delete"), wxYES_NO | wxICON_QUESTION).ShowModal() != wxID_YES)
 		return;
 
 	if (favourites->DeleteTreeItem(trLocation->GetSelection()))
Index: pgadmin/ui/frmOptions.xrc
===================================================================
--- pgadmin/ui/frmOptions.xrc	(revision 6657)
+++ pgadmin/ui/frmOptions.xrc	(working copy)
@@ -354,7 +354,6 @@
     <object class="wxButton" name="wxID_HELP">
       <label>&amp;Help</label>
       <pos>2,216d</pos>
-      <tooltip>Accept the current settings and close the dialogue.</tooltip>
     </object>
     <object class="wxButton" name="wxID_OK">
       <label>&amp;OK</label>
@@ -369,4 +368,4 @@
       <tooltip>Cancel any changes and close the dialogue.</tooltip>
     </object>
   </object>
-</resource>
\ No newline at end of file
+</resource>

---------------------------(end of broadcast)---------------------------
TIP 6: explain analyze is your friend