From fb4f85bf8f40a88412524229154119d7c5e38b51 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 8 Oct 2006 14:23:39 +0000
Subject: [PATCH] use translators if explicitely specified, fall back to the
 standard translator-credits from message catalog otherwise

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/dialogs/dialogs.cpp |  2 ++
 src/gtk/aboutdlg.cpp        | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 70eb2b3488..8f39a054ab 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -1227,6 +1227,8 @@ static void InitAboutInfoAll(wxAboutDialogInfo& info)
 "\n"
 "                    ...and so on and so forth...\n"
     ));
+
+    info.AddTranslator(_T("Wun Ngo Wen (Martian)"));
 }
 
 void MyFrame::ShowSimpleAboutDialog(wxCommandEvent& WXUNUSED(event))
diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp
index 9c00eb3f57..7c0c374076 100644
--- a/src/gtk/aboutdlg.cpp
+++ b/src/gtk/aboutdlg.cpp
@@ -116,14 +116,24 @@ void wxAboutBox(const wxAboutDialogInfo& info)
             gtk_about_dialog_set_documenters(dlg, GtkArray(info.GetDocWriters()));
         if ( info.HasArtists() )
             gtk_about_dialog_set_artists(dlg, GtkArray(info.GetArtists()));
+
+        wxString transCredits;
         if ( info.HasTranslators() )
         {
-            gtk_about_dialog_set_translator_credits
-            (
-                dlg,
-                GtkStr(_("translator-credits"))
-            );
+            const wxArrayString& translators = info.GetTranslators();
+            const size_t count = translators.size();
+            for ( size_t n = 0; n < count; n++ )
+            {
+                transCredits << translators[n] << _T('\n');
+            }
         }
+        else // no translators explicitely specified
+        {
+            // maybe we have translator credits in the message catalog?
+            transCredits = _("translator-credits");
+        }
+
+        gtk_about_dialog_set_translator_credits(dlg, GtkStr(transCredits));
 
         gtk_widget_show(GTK_WIDGET(dlg));
         return;
-- 
2.45.2