* src/FamilyView.py (load_family): Enable translation for family
relation. * src/const.py.in: Add new functions: display_event(), save_event(), display_attr(), and save_attr() which work for either personal or family events/attributes. Correct silly typo. * src/WriteXML.py (dump_my_event): Call const.save_event() before saving; (write_family_id): Call const.save_frel() before saving; (write_attribute_list): Call const.save_attr() before saving. * src/Marriage.py (redraw_event_list): Call const.display_fevent() before saving; (on_add_clicked): change const.save_fevent() to const.display_fevent(); (on_event_update_clicked): Likewise. * src/EventEdit.py (EventEditor.__init__): Call self.trans() before displaying event name. svn: r1964
This commit is contained in:
@@ -348,6 +348,28 @@ def save_pevent(st):
|
||||
else:
|
||||
return st
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
# Merged functions for events: personal, family, whatever else
|
||||
# there might be in the future.
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
def display_event(st):
|
||||
if _pe_e2l.has_key(st):
|
||||
return _pe_e2l[st]
|
||||
elif _fe_e2l.has_key(st):
|
||||
return _fe_e2l[st]
|
||||
else:
|
||||
return st
|
||||
|
||||
def save_event(st):
|
||||
if _pe_l2e.has_key(st):
|
||||
return _pe_l2e[st]
|
||||
elif _fe_l2e.has_key(st):
|
||||
return _fe_l2e[st]
|
||||
else:
|
||||
return st
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
#
|
||||
@@ -434,6 +456,28 @@ def save_fattr(st):
|
||||
else:
|
||||
return st
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
# Merged functions for attributes: personal, family, whatever else
|
||||
# there might be in the future.
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
def display_attr(st):
|
||||
if _pa_e2l.has_key(st):
|
||||
return _pa_e2l[st]
|
||||
elif _fa_e2l.has_key(st):
|
||||
return _fa_e2l[st]
|
||||
else:
|
||||
return st
|
||||
|
||||
def save_attr(st):
|
||||
if _pa_l2e.has_key(st):
|
||||
return _pa_l2e[st]
|
||||
elif _fa_l2e.has_key(st):
|
||||
return _fa_l2e[st]
|
||||
else:
|
||||
return st
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
#
|
||||
@@ -457,8 +501,8 @@ _fr_e2l = {
|
||||
}
|
||||
|
||||
_fr_l2e = {}
|
||||
for a in _fa_e2l.keys():
|
||||
_fa_l2e[_fa_e2l[a]] = a
|
||||
for r in _fr_e2l.keys():
|
||||
_fr_l2e[_fr_e2l[r]] = r
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
|
Reference in New Issue
Block a user