Log Message:
-----------
fix translatable object name
Modified Files:
--------------
pgadmin3/src/include:
pgObject.h (r1.57 -> r1.58)
pgadmin3/src/schema:
pgObject.cpp (r1.69 -> r1.70)
pgadmin3/src/ui:
events.cpp (r1.95 -> r1.96)
frmBackup.cpp (r1.3 -> r1.4)
frmGrantWizard.cpp (r1.2 -> r1.3)
frmIndexcheck.cpp (r1.7 -> r1.8)
frmMain.cpp (r1.95 -> r1.96)
frmMaintenance.cpp (r1.10 -> r1.11)
frmRestore.cpp (r1.5 -> r1.6)
pgadmin3/src/ui/de_DE:
pgadmin3.mo (r1.31 -> r1.32)
pgadmin3.po (r1.36 -> r1.37)
Index: pgObject.h
===================================================================
RCS file: /projects/pgadmin3/src/include/pgObject.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -Lsrc/include/pgObject.h -Lsrc/include/pgObject.h -u -w -r1.57 -r1.58
--- src/include/pgObject.h
+++ src/include/pgObject.h
@@ -94,6 +94,7 @@
virtual pgDatabase *GetDatabase() const { return 0; }
int GetType() const { return type; }
wxString GetTypeName() const { return typesList[type].typName; }
+ wxString GetTranslatedTypeName() const { return
wxString(wxGetTranslation(typesList[type].typName)); }
void iSetName(const wxString& newVal) { name = newVal; }
wxString GetName() const { return name; }
OID GetOid() const { return oid; }
Index: pgObject.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgObject.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -Lsrc/schema/pgObject.cpp -Lsrc/schema/pgObject.cpp -u -w -r1.69 -r1.70
--- src/schema/pgObject.cpp
+++ src/schema/pgObject.cpp
@@ -389,7 +389,7 @@
wxLogInfo(wxT("Displaying properties for ") + GetTypeName() + wxT("
")+GetIdentifier());
if (form)
{
- form->StartMsg(wxString::Format(_("Retrieving %s details"),
wxGetTranslation(GetTypeName())));
+ form->StartMsg(wxString::Format(_("Retrieving %s details"),
GetTranslatedTypeName().c_str()));
form->SetButtons(this);
SetContextInfo(form);
Index: frmGrantWizard.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmGrantWizard.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/ui/frmGrantWizard.cpp -Lsrc/ui/frmGrantWizard.cpp -u -w -r1.2 -r1.3
--- src/ui/frmGrantWizard.cpp
+++ src/ui/frmGrantWizard.cpp
@@ -47,7 +47,7 @@
LoadResource(wxT("frmGrantWizard"));
RestorePosition();
- SetTitle(wxString::Format(_("Privileges for %s %s"),
object->GetTypeName().c_str(), object->GetFullIdentifier().c_str()));
+ SetTitle(wxString::Format(_("Privileges for %s %s"),
object->GetTranslatedTypeName().c_str(), object->GetFullIdentifier().c_str()));
// Icon
SetIcon(wxIcon(index_xpm));
@@ -129,7 +129,7 @@
else
{
objectArray.Add(obj);
- chkList->Append(obj->GetTypeName() + wxT(" ") +
obj->GetFullIdentifier());
+ chkList->Append(obj->GetTypeName() + wxT(" ") +
obj->GetFullIdentifier()); // no translation!
}
}
item=mainForm->GetBrowser()->GetNextChild(collection->GetId(), cookie);
Index: frmBackup.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmBackup.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/ui/frmBackup.cpp -Lsrc/ui/frmBackup.cpp -u -w -r1.3 -r1.4
--- src/ui/frmBackup.cpp
+++ src/ui/frmBackup.cpp
@@ -64,7 +64,7 @@
LoadResource(wxT("frmBackup"));
RestorePosition();
- SetTitle(wxString::Format(_("Backup %s %s"),
wxGetTranslation(object->GetTypeName()), object->GetFullIdentifier().c_str()));
+ SetTitle(wxString::Format(_("Backup %s %s"),
object->GetTranslatedTypeName().c_str(), object->GetFullIdentifier().c_str()));
canBlob = (obj->GetType() == PG_DATABASE);
chkBlobs->SetValue(canBlob);
Index: frmRestore.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmRestore.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/ui/frmRestore.cpp -Lsrc/ui/frmRestore.cpp -u -w -r1.5 -r1.6
--- src/ui/frmRestore.cpp
+++ src/ui/frmRestore.cpp
@@ -64,7 +64,7 @@
LoadResource(wxT("frmRestore"));
RestorePosition();
- SetTitle(wxString::Format(_("Restore %s %s"),
wxGetTranslation(object->GetTypeName()), object->GetFullIdentifier().c_str()));
+ SetTitle(wxString::Format(_("Restore %s %s"),
object->GetTranslatedTypeName().c_str(), object->GetFullIdentifier().c_str()));
// Icon
Index: frmMaintenance.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmMaintenance.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/ui/frmMaintenance.cpp -Lsrc/ui/frmMaintenance.cpp -u -w -r1.10 -r1.11
--- src/ui/frmMaintenance.cpp
+++ src/ui/frmMaintenance.cpp
@@ -52,7 +52,7 @@
LoadResource(wxT("frmMaintenance"));
RestorePosition();
- SetTitle(wxString::Format(_("Maintain %s %s"), object->GetTypeName().c_str(),
object->GetFullIdentifier().c_str()));
+ SetTitle(wxString::Format(_("Maintain %s %s"),
object->GetTranslatedTypeName().c_str(), object->GetFullIdentifier().c_str()));
txtMessages = CTRL_TEXT("txtMessages");
Index: frmIndexcheck.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmIndexcheck.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/ui/frmIndexcheck.cpp -Lsrc/ui/frmIndexcheck.cpp -u -w -r1.7 -r1.8
--- src/ui/frmIndexcheck.cpp
+++ src/ui/frmIndexcheck.cpp
@@ -46,7 +46,7 @@
LoadResource(wxT("frmIndexCheck"));
RestorePosition();
- SetTitle(wxString::Format(_("Check Foreign Key indexes on %s %s"),
object->GetTypeName().c_str(), object->GetFullIdentifier().c_str()));
+ SetTitle(wxString::Format(_("Check Foreign Key indexes on %s %s"),
object->GetTranslatedTypeName().c_str(), object->GetFullIdentifier().c_str()));
nbNotebook = CTRL_NOTEBOOK("nbNotebook");
Index: events.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/events.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -Lsrc/ui/events.cpp -Lsrc/ui/events.cpp -u -w -r1.95 -r1.96
--- src/ui/events.cpp
+++ src/ui/events.cpp
@@ -1021,7 +1021,7 @@
if (data->GetSystemObject())
{
wxMessageDialog msg(this, wxString::Format(_("Cannot drop system %s %s."),
- wxGetTranslation(data->GetTypeName()),
data->GetFullIdentifier().c_str()),
+ data->GetTranslatedTypeName().c_str(),
data->GetFullIdentifier().c_str()),
_("Trying to drop system object"), wxICON_EXCLAMATION);
msg.ShowModal();
return;
@@ -1030,8 +1030,8 @@
if (data->RequireDropConfirm() || settings->GetConfirmDelete())
{
wxMessageDialog msg(this, wxString::Format(_("Are you sure you wish to drop
%s %s?"),
- wxGetTranslation(data->GetTypeName()),
data->GetFullIdentifier().c_str()),
- wxString::Format(_("Drop %s?"),
wxGetTranslation(data->GetTypeName())), wxYES_NO | wxICON_QUESTION);
+ data->GetTranslatedTypeName().c_str(),
data->GetFullIdentifier().c_str()),
+ wxString::Format(_("Drop %s?"),
data->GetTranslatedTypeName().c_str()), wxYES_NO | wxICON_QUESTION);
if (msg.ShowModal() != wxID_YES)
{
return;
Index: frmMain.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmMain.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -Lsrc/ui/frmMain.cpp -Lsrc/ui/frmMain.cpp -u -w -r1.95 -r1.96
--- src/ui/frmMain.cpp
+++ src/ui/frmMain.cpp
@@ -405,7 +405,7 @@
void frmMain::Refresh(pgObject *data)
{
- StartMsg(wxString::Format(_("Refreshing %s..."), data->GetTypeName().c_str()));
+ StartMsg(wxString::Format(_("Refreshing %s..."),
data->GetTranslatedTypeName().c_str()));
browser->Freeze();
wxTreeItemId currentItem=data->GetId();
Index: pgadmin3.po
===================================================================
RCS file: /projects/pgadmin3/src/ui/de_DE/pgadmin3.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -Lsrc/ui/de_DE/pgadmin3.po -Lsrc/ui/de_DE/pgadmin3.po -u -w -r1.36 -r1.37
--- src/ui/de_DE/pgadmin3.po
+++ src/ui/de_DE/pgadmin3.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: pgAdmin3\n"
"POT-Creation-Date: 2003-09-09 16:16+0200\n"
-"PO-Revision-Date: 2004-06-23 09:23+0100\n"
+"PO-Revision-Date: 2004-06-23 12:06+0100\n"
"Last-Translator: Andreas Pflug <[EMAIL PROTECTED]>\n"
"Language-Team: pgAdmin Developers <[EMAIL PROTECTED]>\n"
"MIME-Version: 1.0\n"
@@ -4451,7 +4451,7 @@
#: src/ui/frmRestore.cpp:67
#, c-format
msgid "Restore %s %s"
-msgstr "%d %d wiederherstellen"
+msgstr "%s %s wiederherstellen"
#: src/ui/frmMain.cpp:183
msgid "Restores a backup from a local file"
---------------------------(end of broadcast)---------------------------
TIP 3: if posting/reading through Usenet, please send an appropriate
subscribe-nomail command to [EMAIL PROTECTED] so that your
message can get through to the mailing list cleanly
