* 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
This commit is contained in:
parent
a9fd2073f2
commit
61d9aaf017
@ -1,3 +1,11 @@
|
|||||||
|
2005-07-22 Julio Sanchez <jsanchez@users.sourceforge.net>
|
||||||
|
* 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 <Martin.Hawlisch@gmx.de>
|
2005-07-22 Martin Hawlisch <Martin.Hawlisch@gmx.de>
|
||||||
* src/plugins/NavWebPage.py: fix typos
|
* src/plugins/NavWebPage.py: fix typos
|
||||||
|
|
||||||
|
@ -119,7 +119,7 @@ class DateDisplayES(DateDisplay):
|
|||||||
|
|
||||||
_mod_str = ("",u"antes de ",u"después de ",u"hacia ","","","")
|
_mod_str = ("",u"antes de ",u"después de ",u"hacia ","","","")
|
||||||
|
|
||||||
_qual_str = ("","calculado ","estimado ")
|
_qual_str = ("","estimado ","calculado ")
|
||||||
|
|
||||||
formats = (
|
formats = (
|
||||||
"AAAA-MM-DD (ISO)", "Numérica", "Mes Día, Año",
|
"AAAA-MM-DD (ISO)", "Numérica", "Mes Día, Año",
|
||||||
|
@ -113,7 +113,7 @@ class DateDisplayFR(DateDisplay):
|
|||||||
|
|
||||||
_mod_str = ("",u"avant ",u"après ",u"vers ","","","")
|
_mod_str = ("",u"avant ",u"après ",u"vers ","","","")
|
||||||
|
|
||||||
_qual_str = ("","calculated ","estimated ")
|
_qual_str = ("","estimated ","calculated ")
|
||||||
|
|
||||||
formats = (
|
formats = (
|
||||||
"AAAA-MM-DD (ISO)", "Numérique", "Mois Jour, Année",
|
"AAAA-MM-DD (ISO)", "Numérique", "Mois Jour, Année",
|
||||||
|
@ -292,8 +292,6 @@ class DetAncestorReport(Report.Report):
|
|||||||
else:
|
else:
|
||||||
place = u''
|
place = u''
|
||||||
|
|
||||||
if not date and not place_handle:
|
|
||||||
continue
|
|
||||||
if first:
|
if first:
|
||||||
self.doc.start_paragraph('DAR-MoreHeader')
|
self.doc.start_paragraph('DAR-MoreHeader')
|
||||||
self.doc.write_text(_('More about %(person_name)s:') % {
|
self.doc.write_text(_('More about %(person_name)s:') % {
|
||||||
@ -314,11 +312,14 @@ class DetAncestorReport(Report.Report):
|
|||||||
'event_name' : _(event.get_name()),
|
'event_name' : _(event.get_name()),
|
||||||
'endnotes' : self.endnotes(event),
|
'endnotes' : self.endnotes(event),
|
||||||
'date' : date})
|
'date' : date})
|
||||||
else:
|
elif place:
|
||||||
self.doc.write_text(_('%(event_name)s: %(place)s%(endnotes)s. ') % {
|
self.doc.write_text(_('%(event_name)s: %(place)s%(endnotes)s. ') % {
|
||||||
'event_name' : _(event.get_name()),
|
'event_name' : _(event.get_name()),
|
||||||
'endnotes' : self.endnotes(event),
|
'endnotes' : self.endnotes(event),
|
||||||
'place' : place })
|
'place' : place })
|
||||||
|
else:
|
||||||
|
self.doc.write_text(_('%(event_name)s: ') % {
|
||||||
|
'event_name' : _(event.get_name())})
|
||||||
if event.get_description():
|
if event.get_description():
|
||||||
self.doc.write_text(event.get_description())
|
self.doc.write_text(event.get_description())
|
||||||
self.doc.end_paragraph()
|
self.doc.end_paragraph()
|
||||||
|
@ -315,8 +315,6 @@ class DetDescendantReport(Report.Report):
|
|||||||
else:
|
else:
|
||||||
place = u''
|
place = u''
|
||||||
|
|
||||||
if not date and not place_handle:
|
|
||||||
continue
|
|
||||||
if first:
|
if first:
|
||||||
self.doc.start_paragraph('DDR-MoreHeader')
|
self.doc.start_paragraph('DDR-MoreHeader')
|
||||||
self.doc.write_text(_('More about %(person_name)s:') % {
|
self.doc.write_text(_('More about %(person_name)s:') % {
|
||||||
@ -337,11 +335,14 @@ class DetDescendantReport(Report.Report):
|
|||||||
'event_name' : _(event.get_name()),
|
'event_name' : _(event.get_name()),
|
||||||
'endnotes' : self.endnotes(event),
|
'endnotes' : self.endnotes(event),
|
||||||
'date' : date})
|
'date' : date})
|
||||||
else:
|
elif place:
|
||||||
self.doc.write_text(_('%(event_name)s: %(place)s%(endnotes)s. ') % {
|
self.doc.write_text(_('%(event_name)s: %(place)s%(endnotes)s. ') % {
|
||||||
'event_name' : _(event.get_name()),
|
'event_name' : _(event.get_name()),
|
||||||
'endnotes' : self.endnotes(event),
|
'endnotes' : self.endnotes(event),
|
||||||
'place' : place })
|
'place' : place })
|
||||||
|
else:
|
||||||
|
self.doc.write_text(_('%(event_name)s: ') % {
|
||||||
|
'event_name' : _(event.get_name())})
|
||||||
if event.get_description():
|
if event.get_description():
|
||||||
self.doc.write_text(event.get_description())
|
self.doc.write_text(event.get_description())
|
||||||
self.doc.end_paragraph()
|
self.doc.end_paragraph()
|
||||||
|
Loading…
Reference in New Issue
Block a user