proper fix so evens work within the display format
svn: r19437
This commit is contained in:
parent
8c4af875fb
commit
0aa97cd674
@ -921,13 +921,9 @@ class VariableParse(object):
|
|||||||
else:
|
else:
|
||||||
return ""
|
return ""
|
||||||
|
|
||||||
def __parse_event(self, person):
|
def __parse_event(self, person, attrib_parse):
|
||||||
#TODO; this try to avoid a key issue
|
|
||||||
try:
|
|
||||||
event = self.get_event_by_name(person, attrib_parse.get_name())
|
event = self.get_event_by_name(person, attrib_parse.get_name())
|
||||||
event_f = EventFormat(self.database, self._in)
|
event_f = EventFormat(self.database, self._in)
|
||||||
except:
|
|
||||||
return ""
|
|
||||||
if event:
|
if event:
|
||||||
return event_f.parse_format(event)
|
return event_f.parse_format(event)
|
||||||
else:
|
else:
|
||||||
@ -1047,11 +1043,11 @@ class VariableParse(object):
|
|||||||
elif next_char == "e":
|
elif next_char == "e":
|
||||||
#person event
|
#person event
|
||||||
_out.add_variable(
|
_out.add_variable(
|
||||||
self.__parse_event(self.friend.person))
|
self.__parse_event(self.friend.person, attrib_parse))
|
||||||
elif next_char == "t":
|
elif next_char == "t":
|
||||||
#person event
|
#person event
|
||||||
_out.add_variable(
|
_out.add_variable(
|
||||||
self.__parse_event(self.friend.family))
|
self.__parse_event(self.friend.family, attrib_parse))
|
||||||
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
|
Loading…
Reference in New Issue
Block a user