From 8abcd6e233efd34a3e88bd804cb63d856b3dd5c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julio=20S=C3=A1nchez?= <julio.sanchez@gmail.com>
Date: Thu, 10 Nov 2005 09:51:31 +0000
Subject: [PATCH] * src/plugins/rel_es.py: More detail for some relationships

svn: r5391
---
 gramps2/ChangeLog             |  3 +++
 gramps2/src/plugins/rel_es.py | 29 ++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 1d04fe567..4ed077b7f 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,6 @@
+2005-11-10  Julio Sanchez  <jsanchez@users.sourceforge.net>
+	* src/plugins/rel_es.py: More detail for some relationships
+
 2005-11-09  Don Allingham  <don@gramps-project.org>
 	* src/plugins/DetAncestralReport.py: fix spacing
 	* src/Report.py: use filechooser for report dialog
diff --git a/gramps2/src/plugins/rel_es.py b/gramps2/src/plugins/rel_es.py
index d18ac6117..87494ebe9 100644
--- a/gramps2/src/plugins/rel_es.py
+++ b/gramps2/src/plugins/rel_es.py
@@ -158,17 +158,24 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         else:
             return "sobrina %d-ésima" % level 
 
-    def get_male_relative(self,level):
-        if level<len(_level_name_male_a):
-            return "pariente en %s grado" % (_level_name_male_a[level])
+    def get_male_relative(self,level1,level2):
+        if level1<len(_level_name_male_a):
+            level1_str = _level_name_male_a[level1]
         else:
-            return "pariente en %d-ésimo grado" % level
+            level1_str = "%d-ésimo" % level1
+        if level2<len(_level_name_male_a):
+            level2_str = _level_name_male_a[level2]
+        else:
+            level2_str = "%d-ésimo" % level2
+        level = level1 + level2
+        if level<len(_level_name_male_a):
+            level_str = _level_name_male_a[level]
+        else:
+            level_str = "%d-ésimo" % level
+        return "pariente en %s grado (%s con %s)" % (level_str,level1_str,level2_str)
 
-    def get_female_relative(self,level):
-        if level<len(_level_name_male_a):
-            return "pariente en %s grado" % (_level_name_male_a[level])
-        else:
-            return "pariente en %d-ésimo grado" % level
+    def get_female_relative(self,level1,level2):
+        return self.get_male_relative(level1,level2)
 
     def get_parents(self,level):
         if level<len(_parents_level):
@@ -314,9 +321,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
                 return (self.get_distant_aunt(firstRel),common)
         else:
             if other_person.get_gender() == RelLib.Person.MALE:
-                return (self.get_male_relative(firstRel+secondRel),common)
+                return (self.get_male_relative(firstRel,secondRel),common)
             else:
-                return (self.get_female_relative(firstRel+secondRel),common)
+                return (self.get_female_relative(firstRel,secondRel),common)
 
 #-------------------------------------------------------------------------
 #