From 88f4a669dea8bf5bbce0dd1afb87e4d6006ef31d Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Mon, 10 Oct 2005 03:30:07 +0000 Subject: [PATCH] * src/Spell.py: give more intelligent error message if spelling checker is not found. * src/plugins/DescendChart.py: fixed type detection to handle both unicode and str. svn: r5297 --- gramps2/ChangeLog | 4 ++++ gramps2/src/Spell.py | 2 +- gramps2/src/plugins/DesGraph.py | 1 - gramps2/src/plugins/DescendChart.py | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index b3cb66b28..bf1c15f18 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,8 @@ 2005-10-09 Don Allingham + * src/Spell.py: give more intelligent error message if spelling + checker is not found. + * src/plugins/DescendChart.py: fixed type detection to handle both + unicode and str. * src/plugins/NavWebPage.py: fixed typo in Creative Commons messages 2005-10-08 Don Allingham diff --git a/gramps2/src/Spell.py b/gramps2/src/Spell.py index eadccfb55..44bb9530c 100644 --- a/gramps2/src/Spell.py +++ b/gramps2/src/Spell.py @@ -48,7 +48,7 @@ try: success = True except ImportError, msg: - print "Spell.py: ", msg + print _("Spelling checker is not installed") except RuntimeError,msg: print "Spell.py: ", msg except SystemError,msg: diff --git a/gramps2/src/plugins/DesGraph.py b/gramps2/src/plugins/DesGraph.py index ecf1110ab..659470cf9 100644 --- a/gramps2/src/plugins/DesGraph.py +++ b/gramps2/src/plugins/DesGraph.py @@ -269,7 +269,6 @@ class DescendantGraph(Report.Report): ny2 = (y2-1)*(self.height+_sep) + top + self.height/2.0 if y1 < 0 and y2 < 0: half = (nx1+nx2)/2.0 - print x1,x2,y1,y2,nx1,nx2,half self.doc.draw_line("line",half,ny1,half,ny2) elif ny1 != ny2: if x1 == -x2: diff --git a/gramps2/src/plugins/DescendChart.py b/gramps2/src/plugins/DescendChart.py index 7585f22ed..390e4dd22 100644 --- a/gramps2/src/plugins/DescendChart.py +++ b/gramps2/src/plugins/DescendChart.py @@ -331,7 +331,7 @@ class DescendChart(Report.Report): phys_x = 0 for x in range(startx,stopx): value = self.genchart.get_xy(x,y) - if type(value) == str: + if type(value) == str or type(value) == unicode: text = '\n'.join(self.text[(x,y)]) xbegin = phys_x*self.delta yend = phys_y*bh+self.offset