svn: r6378

This commit is contained in:
Alex Roitman 2006-04-20 04:59:04 +00:00
parent 91fd96968e
commit 2e60bbe16e
3 changed files with 10 additions and 7 deletions

View File

@ -369,8 +369,11 @@ class EditFamily(EditPrimary):
self.update_mother(mhandle) self.update_mother(mhandle)
self.child_list.rebuild() self.child_list.rebuild()
def build_menu_names(self,obj): def build_menu_names(self,family):
return ('Edit Family','Undefined Submenu') win_menu_label = Utils.family_name(family,self.db,_("New Family"))
if not win_menu_label.strip():
win_menu_label = _("New Family")
return (_('Edit Family'), win_menu_label)
def build_interface(self): def build_interface(self):

View File

@ -82,7 +82,7 @@ class EditPrimary(ManagedWindow.ManagedWindow):
pass pass
def build_window_key(self,obj): def build_window_key(self,obj):
if obj: if obj and obj.get_handle():
return obj.get_handle() return obj.get_handle()
else: else:
return id(self) return id(self)

View File

@ -261,7 +261,7 @@ def wasHistory_broken():
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
def family_name(family,db): def family_name(family,db,noname=_("unknown")):
"""Builds a name for the family from the parents names""" """Builds a name for the family from the parents names"""
father_handle = family.get_father_handle() father_handle = family.get_father_handle()
mother_handle = family.get_mother_handle() mother_handle = family.get_mother_handle()
@ -278,7 +278,7 @@ def family_name(family,db):
elif mother: elif mother:
name = NameDisplay.displayer.display(mother) name = NameDisplay.displayer.display(mother)
else: else:
name = _("unknown") name = noname
return name return name
def family_upper_name(family,db): def family_upper_name(family,db):