Merge changes made between 2.0.3 and 2.0.5

svn: r4911

src/plugins/rel_no.py

@@ -2,7 +2,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2003-2004  Donald N. Allingham
+# Copyright (C) 2003-2005  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -232,15 +232,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
-        if self.is_spouse(orig_person,other_person):
-            return ('spouse', [])
-#    FIXME: need Norwegian term for spouse. If gender-specific, use the code below.
-#    UPDATE by Frode: unsure about how it's included in the finished code, so I need 
-#    to see this running to know if it is the right words to use.
-#            if other_person.get_gender() == RelLib.Person.MALE:
-#                return ("ektemann",[])
-#            else:
-#                return ("hustru",[])
+        is_spouse = self.is_spouse(orig_person,other_person)
+        if is_spouse:
+            return (is_spouse,[])
 
         (firstRel,secondRel,common) = self.get_relationship_distance(orig_person,other_person)