From 61d9aaf0171fe01d4ae72f297d8618938416cabd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20S=C3=A1nchez?= Date: Fri, 22 Jul 2005 18:23:18 +0000 Subject: [PATCH] * src/dates/Date_es.py: fix translation table for date qualifiers * src/dates/Date_fr.py: fix translation table for date qualifiers * src/plugins/DetAncestralReport.py: show events even if they have neither date nor place * src/plugins/DetDescendantReport.py: show events even if they have neither date nor place svn: r4962 --- gramps2/ChangeLog | 8 ++++++++ gramps2/src/dates/Date_es.py | 2 +- gramps2/src/dates/Date_fr.py | 2 +- gramps2/src/plugins/DetAncestralReport.py | 7 ++++--- gramps2/src/plugins/DetDescendantReport.py | 7 ++++--- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 262fa4f87..d738e9dab 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,11 @@ +2005-07-22 Julio Sanchez + * src/dates/Date_es.py: fix translation table for date qualifiers + * src/dates/Date_fr.py: fix translation table for date qualifiers + * src/plugins/DetAncestralReport.py: show events even if they have + neither date nor place + * src/plugins/DetDescendantReport.py: show events even if they have + neither date nor place + 2005-07-22 Martin Hawlisch * src/plugins/NavWebPage.py: fix typos diff --git a/gramps2/src/dates/Date_es.py b/gramps2/src/dates/Date_es.py index 101794101..17d6bbec8 100644 --- a/gramps2/src/dates/Date_es.py +++ b/gramps2/src/dates/Date_es.py @@ -119,7 +119,7 @@ class DateDisplayES(DateDisplay): _mod_str = ("",u"antes de ",u"después de ",u"hacia ","","","") - _qual_str = ("","calculado ","estimado ") + _qual_str = ("","estimado ","calculado ") formats = ( "AAAA-MM-DD (ISO)", "Numérica", "Mes Día, Año", diff --git a/gramps2/src/dates/Date_fr.py b/gramps2/src/dates/Date_fr.py index cbef84b22..6c3a49f89 100644 --- a/gramps2/src/dates/Date_fr.py +++ b/gramps2/src/dates/Date_fr.py @@ -113,7 +113,7 @@ class DateDisplayFR(DateDisplay): _mod_str = ("",u"avant ",u"après ",u"vers ","","","") - _qual_str = ("","calculated ","estimated ") + _qual_str = ("","estimated ","calculated ") formats = ( "AAAA-MM-DD (ISO)", "Numérique", "Mois Jour, Année", diff --git a/gramps2/src/plugins/DetAncestralReport.py b/gramps2/src/plugins/DetAncestralReport.py index 2056c4d24..dc8c756b0 100644 --- a/gramps2/src/plugins/DetAncestralReport.py +++ b/gramps2/src/plugins/DetAncestralReport.py @@ -292,8 +292,6 @@ class DetAncestorReport(Report.Report): else: place = u'' - if not date and not place_handle: - continue if first: self.doc.start_paragraph('DAR-MoreHeader') self.doc.write_text(_('More about %(person_name)s:') % { @@ -314,11 +312,14 @@ class DetAncestorReport(Report.Report): 'event_name' : _(event.get_name()), 'endnotes' : self.endnotes(event), 'date' : date}) - else: + elif place: self.doc.write_text(_('%(event_name)s: %(place)s%(endnotes)s. ') % { 'event_name' : _(event.get_name()), 'endnotes' : self.endnotes(event), 'place' : place }) + else: + self.doc.write_text(_('%(event_name)s: ') % { + 'event_name' : _(event.get_name())}) if event.get_description(): self.doc.write_text(event.get_description()) self.doc.end_paragraph() diff --git a/gramps2/src/plugins/DetDescendantReport.py b/gramps2/src/plugins/DetDescendantReport.py index 03bb3c295..ca7b06119 100644 --- a/gramps2/src/plugins/DetDescendantReport.py +++ b/gramps2/src/plugins/DetDescendantReport.py @@ -315,8 +315,6 @@ class DetDescendantReport(Report.Report): else: place = u'' - if not date and not place_handle: - continue if first: self.doc.start_paragraph('DDR-MoreHeader') self.doc.write_text(_('More about %(person_name)s:') % { @@ -337,11 +335,14 @@ class DetDescendantReport(Report.Report): 'event_name' : _(event.get_name()), 'endnotes' : self.endnotes(event), 'date' : date}) - else: + elif place: self.doc.write_text(_('%(event_name)s: %(place)s%(endnotes)s. ') % { 'event_name' : _(event.get_name()), 'endnotes' : self.endnotes(event), 'place' : place }) + else: + self.doc.write_text(_('%(event_name)s: ') % { + 'event_name' : _(event.get_name())}) if event.get_description(): self.doc.write_text(event.get_description()) self.doc.end_paragraph()