From 279882c853be5f288f34c7b5aa3d0455670d5b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= <romjerome@yahoo.fr>
Date: Thu, 26 Feb 2009 10:02:00 +0000
Subject: [PATCH] 2748: Some URLs still point user to wiki manual version 3.0

svn: r12132
---
 src/FilterEditor/_EditFilter.py |  2 +-
 src/GrampsLogger/_ErrorView.py  |  3 ++-
 src/Merge/_MergePerson.py       | 23 ++++++++---------------
 src/Merge/_MergePlace.py        |  2 +-
 src/Merge/_MergeSource.py       | 15 ++++++++-------
 5 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/FilterEditor/_EditFilter.py b/src/FilterEditor/_EditFilter.py
index 0fdb76f8f..2cf8bda07 100644
--- a/src/FilterEditor/_EditFilter.py
+++ b/src/FilterEditor/_EditFilter.py
@@ -55,7 +55,7 @@ from TransUtils import sgettext as _
 # Constants
 #
 #-------------------------------------------------------------------------
-WIKI_HELP_PAGE = 'Gramps_3.0_Wiki_Manual_-_Filters'
+WIKI_HELP_PAGE = WIKI_HELP_PAGE = '%s_-_Filters' % const.URL_MANUAL_PAGE
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/GrampsLogger/_ErrorView.py b/src/GrampsLogger/_ErrorView.py
index ab92f9fb5..cc9f0c1a1 100644
--- a/src/GrampsLogger/_ErrorView.py
+++ b/src/GrampsLogger/_ErrorView.py
@@ -10,6 +10,7 @@ import gtk
 # gramps modules
 #
 #-------------------------------------------------------------------------
+import const
 from TransUtils import sgettext as _
 from _ErrorReportAssistant import ErrorReportAssistant
 import GrampsDisplay
@@ -19,7 +20,7 @@ import GrampsDisplay
 # Constants
 #
 #-------------------------------------------------------------------------
-WIKI_HELP_PAGE = 'Gramps_3.0_Wiki_Manual_-_FAQ'
+WIKI_HELP_PAGE = '%s_-_FAQ' % const.URL_MANUAL_PAGE
 WIKI_HELP_SEC = _('manual|General')
 
 class ErrorView(object):
diff --git a/src/Merge/_MergePerson.py b/src/Merge/_MergePerson.py
index 65b9fefba..51b9f458b 100644
--- a/src/Merge/_MergePerson.py
+++ b/src/Merge/_MergePerson.py
@@ -20,13 +20,6 @@
 
 # $Id:_MergePerson.py 9912 2008-01-22 09:17:46Z acraphae $
 
-#-------------------------------------------------------------------------
-#
-# Standard python modules
-#
-#-------------------------------------------------------------------------
-
-
 #-------------------------------------------------------------------------
 #
 # GTK/Gnome modules
@@ -36,14 +29,6 @@ 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
@@ -60,6 +45,14 @@ import GrampsDisplay
 import ManagedWindow
 import gen.utils
 
+#-------------------------------------------------------------------------
+#
+# GRAMPS constants
+#
+#-------------------------------------------------------------------------
+WIKI_HELP_PAGE = '%s_-_Entering_and_Editing_Data:_Detailed_-_part_3' % const.URL_MANUAL_PAGE
+WIKI_HELP_SEC = _('manual|Merge_People')
+
 sex = ( _("female"), _("male"), _("unknown"))
 
 class PersonCompare(ManagedWindow.ManagedWindow):
diff --git a/src/Merge/_MergePlace.py b/src/Merge/_MergePlace.py
index d3ab4ce77..b1607830b 100644
--- a/src/Merge/_MergePlace.py
+++ b/src/Merge/_MergePlace.py
@@ -48,7 +48,7 @@ import ManagedWindow
 # GRAMPS constants
 #
 #-------------------------------------------------------------------------
-WIKI_HELP_PAGE = 'Gramps_3.0_Wiki_Manual_-_Entering_and_Editing_Data:_Detailed'
+WIKI_HELP_PAGE = '%s_-_Entering_and_Editing_Data:_Detailed_-_part_3' % const.URL_MANUAL_PAGE
 WIKI_HELP_SEC = _('manual|Merge_Places')
 
 #-------------------------------------------------------------------------
diff --git a/src/Merge/_MergeSource.py b/src/Merge/_MergeSource.py
index a423cd926..272182614 100644
--- a/src/Merge/_MergeSource.py
+++ b/src/Merge/_MergeSource.py
@@ -33,13 +33,6 @@
 #-------------------------------------------------------------------------
 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
@@ -50,6 +43,14 @@ import const
 import GrampsDisplay
 import ManagedWindow
 
+#-------------------------------------------------------------------------
+#
+# GRAMPS constants
+#
+#-------------------------------------------------------------------------
+WIKI_HELP_PAGE = '%s_-_Entering_and_Editing_Data:_Detailed_-_part_3' % const.URL_MANUAL_PAGE
+WIKI_HELP_SEC = _('manual|Merge_Sources')
+
 #-------------------------------------------------------------------------
 #
 # Merge Sources