Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed date display in NarrativeWeb. Bug #3370.

Browse Source 
svn: r13637
This commit is contained in:
Rob G. Healey 2009-11-19 19:45:09 +00:00
parent f87bd00fa5
commit c227803a1b
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/webreport/NarrativeWeb.py
View File

@ -584,7 +584,7 @@ class BasePage(object):
# position 2 = data # position 2 = data
info = [ info = [
[_("Event"), "Event", evt_hyper], [_("Event"), "Event", evt_hyper],
[DHEAD, "Date", format_date(evt.get_date_object() )] ] [DHEAD, "Date", _dd.display(evt.get_date_object() )] ]
if showplc: if showplc:
info.append([PHEAD, "Place", place_hyper]) info.append([PHEAD, "Place", place_hyper])
@ -657,7 +657,7 @@ class BasePage(object):
# 0 = column class, 1 = ordinance data # 0 = column class, 1 = ordinance data
lds_ord_data = [ lds_ord_data = [
["LDSType", ord.type2xml()], ["LDSType", ord.type2xml()],
["LDSDate", format_date(ord.get_date_object() )], ["LDSDate", _dd.display(ord.get_date_object() )],
["LDSTemple", ord.get_temple()], ["LDSTemple", ord.get_temple()],
["LDSPlace", ReportUtils.place_name(db, ord.get_place_handle() )], ["LDSPlace", ReportUtils.place_name(db, ord.get_place_handle() )],
["LDSStatus", ord.get_status()], ["LDSStatus", ord.get_status()],
@ -786,7 +786,7 @@ class BasePage(object):
tbody += trow tbody += trow
addr_data_row = [ addr_data_row = [
["Date", format_date(address.get_date_object() )], ["Date", _dd.display(address.get_date_object() )],
["Streetaddress", address.get_street()], ["Streetaddress", address.get_street()],
["City", address.get_city()], ["City", address.get_city()],
["County", address.get_county()], ["County", address.get_county()],
@ -943,7 +943,7 @@ class BasePage(object):
# attach note # attach note
user_footer += note_text user_footer += note_text
value = format_date(date.Today()) value = _dd.display(date.Today())
msg = _('Generated by <a href = "%(homepage)s">' msg = _('Generated by <a href = "%(homepage)s">'
'Gramps</a> on %(date)s') % { 'Gramps</a> on %(date)s') % {
'date': value, 'homepage' : const.URL_HOMEPAGE 'date': value, 'homepage' : const.URL_HOMEPAGE
@ -1394,7 +1394,7 @@ class BasePage(object):
confidence = None confidence = None
tmp.extend("%s: %s" % (label, data) tmp.extend("%s: %s" % (label, data)
for (label, data) in [(DHEAD, format_date(sref.date)), for (label, data) in [(DHEAD, _dd.display(sref.date)),
(_PAGE, sref.page), (_PAGE, sref.page),
(_CONFIDENCE, confidence)] (_CONFIDENCE, confidence)]
if data) if data)
@ -1735,7 +1735,7 @@ class IndividualListPage(BasePage):
if birth_ref: if birth_ref:
birth = db.get_event_from_handle(birth_ref.ref) birth = db.get_event_from_handle(birth_ref.ref)
if birth: if birth:
birth_date = format_date(birth.get_date_object()) birth_date = _dd.display(birth.get_date_object())
if birth.get_type() == EventType.BIRTH: if birth.get_type() == EventType.BIRTH:
tcell += birth_date tcell += birth_date
else: else:
@ -1752,7 +1752,7 @@ class IndividualListPage(BasePage):
if death_ref: if death_ref:
death = db.get_event_from_handle(death_ref.ref) death = db.get_event_from_handle(death_ref.ref)
if death: if death:
death_date = format_date(death.get_date_object()) death_date = _dd.display(death.get_date_object())
if death.get_type() == EventType.DEATH: if death.get_type() == EventType.DEATH:
tcell += death_date tcell += death_date
else: else:
@ -1902,7 +1902,7 @@ class SurnamePage(BasePage):
if birth_ref: if birth_ref:
birth = db.get_event_from_handle(birth_ref.ref) birth = db.get_event_from_handle(birth_ref.ref)
if birth: if birth:
birth_date = format_date(birth.get_date_object()) birth_date = _dd.display(birth.get_date_object())
if birth.get_type() == EventType.BIRTH: if birth.get_type() == EventType.BIRTH:
tcell += birth_date tcell += birth_date
else: else:
@ -1918,7 +1918,7 @@ class SurnamePage(BasePage):
if death_ref: if death_ref:
death = db.get_event_from_handle(death_ref.ref) death = db.get_event_from_handle(death_ref.ref)
if death: if death:
death_date = format_date(death.get_date_object()) death_date = _dd.display(death.get_date_object())
if death.get_type() == EventType.DEATH: if death.get_type() == EventType.DEATH:
tcell += death_date tcell += death_date
else: else:
@ -2610,7 +2610,7 @@ class MediaPage(BasePage):
if date: if date:
trow = Html("tr") + ( trow = Html("tr") + (
Html("td", DHEAD, class_ = "ColumnAttribute", inline = True), Html("td", DHEAD, class_ = "ColumnAttribute", inline = True),
Html("td", format_date(date), class_ = "ColumnValue", inline = True) Html("td", _dd.display(date), class_ = "ColumnValue", inline = True)
) )
table += trow table += trow
@ -3125,7 +3125,7 @@ class MediaListPage(BasePage):
for handle in mlist: for handle in mlist:
media = db.get_object_from_handle(handle) media = db.get_object_from_handle(handle)
date = format_date(media.get_date_object() ) date = _dd.display(media.get_date_object() )
title = media.get_description() title = media.get_description()
if not title: if not title:
title = "[untitled]" title = "[untitled]"