From 54cad55630f0bb3305ec98f857c5d54adfcba7e9 Mon Sep 17 00:00:00 2001
From: Erik De Richter <erikdrgm@users.sourceforge.net>
Date: Wed, 20 Feb 2008 19:04:53 +0000
Subject: [PATCH] links to wiki manual

svn: r10081
---
 ChangeLog                 |  5 +++++
 src/Merge/_MergePerson.py | 14 +++++++++++---
 src/Merge/_MergePlace.py  | 12 ++++++++++--
 src/Merge/_MergeSource.py | 11 +++++++++--
 4 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3fe581162..44dad2f18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-20 Frederik De Richter <frederik.de.richter@pandora.be>
+    * src/Merge/_MergePerson.py
+    * src/Merge/_MergeSource.py
+    * src/Merge/_MergePlace.py
+    links to wiki manual
 
 2008-02-20  Peter Landgren <peter.talken@telia.com>
     * src/plugins/rel_sv.py: pylint clean up
diff --git a/src/Merge/_MergePerson.py b/src/Merge/_MergePerson.py
index 2a709181d..6e84d42f8 100644
--- a/src/Merge/_MergePerson.py
+++ b/src/Merge/_MergePerson.py
@@ -25,7 +25,7 @@
 # Standard python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #
@@ -36,6 +36,14 @@ import gtk
 from gtk import glade
 import pango
 
+#-------------------------------------------------------------------------
+#
+# GRAMPS constants
+#
+#-------------------------------------------------------------------------
+WIKI_HELP_PAGE = 'Gramps_3.0_Wiki_Manual_-_Entering_and_Editing_Data:_Detailed'
+WIKI_HELP_SEC = _('manual|Merge_People')
+
 #-------------------------------------------------------------------------
 #
 # GRAMPS modules
@@ -80,7 +88,7 @@ class PersonCompare(ManagedWindow.ManagedWindow):
 
     def help(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('adv-merge-people')
+        GrampsDisplay.help('adv-merge-people', webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
 
     def merge(self, obj):
         if check_for_spouse(self.p1, self.p2):
@@ -324,7 +332,7 @@ class MergePeopleUI(ManagedWindow.ManagedWindow):
 
     def help(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('adv-merge-people')
+        GrampsDisplay.help('adv-merge-people', webpage=WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
 
 
 def name_of(p):
diff --git a/src/Merge/_MergePlace.py b/src/Merge/_MergePlace.py
index f404458fd..c42f0acc0 100644
--- a/src/Merge/_MergePlace.py
+++ b/src/Merge/_MergePlace.py
@@ -25,7 +25,8 @@
 # Standard python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #
@@ -41,6 +42,13 @@ from gtk import glade
 import const
 import GrampsDisplay
 import ManagedWindow
+#-------------------------------------------------------------------------
+#
+# GRAMPS constants
+#
+#-------------------------------------------------------------------------
+WIKI_HELP_PAGE = 'Gramps_3.0_Wiki_Manual_-_Entering_and_Editing_Data:_Detailed'
+WIKI_HELP_SEC = _('manual|Merge_Places')
 
 #-------------------------------------------------------------------------
 #
@@ -89,7 +97,7 @@ class MergePlaces(ManagedWindow.ManagedWindow):
 
     def help(self,obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('adv-merge-places')
+        GrampsDisplay.help('adv-merge-places', webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
 
     def merge(self,obj):
         """
diff --git a/src/Merge/_MergeSource.py b/src/Merge/_MergeSource.py
index 5a1c4e50b..ba99a36f3 100644
--- a/src/Merge/_MergeSource.py
+++ b/src/Merge/_MergeSource.py
@@ -25,7 +25,7 @@
 # Standard python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #
@@ -34,6 +34,13 @@ from gettext import gettext as _
 #-------------------------------------------------------------------------
 from gtk import glade
 
+#-------------------------------------------------------------------------
+#
+# GRAMPS constants
+#
+#-------------------------------------------------------------------------
+WIKI_HELP_PAGE = 'Gramps_3.0_Wiki_Manual_-_Entering_and_Editing_Data:_Detailed'
+WIKI_HELP_SEC = _('manual|Merge_Sources')
 #-------------------------------------------------------------------------
 #
 # GRAMPS modules
@@ -105,7 +112,7 @@ class MergeSources(ManagedWindow.ManagedWindow):
 
     def help(self,obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('adv-merge-sources')
+        GrampsDisplay.help('adv-merge-sources', webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
 
     def merge(self,obj):
         """