geography : avoid multiple translation and fix a bug with variable referenced before assignment

svn: r17274
This commit is contained in:
Serge Noiraud 2011-04-26 14:16:03 +00:00
parent a2822d3fdf
commit ea1e1c2fc1
5 changed files with 13 additions and 12 deletions

View File

@ -583,7 +583,7 @@ class GeoGraphyView(osmGpsMap, NavigationView):
itemoption.set_title(message) itemoption.set_title(message)
itemoption.show() itemoption.show()
add_item.set_submenu(itemoption) add_item.set_submenu(itemoption)
modify = gtk.MenuItem(_("Edit place")) modify = gtk.MenuItem(_("Edit Place"))
modify.show() modify.show()
modify.connect("activate", self.edit_place, event, lat, lon, mark) modify.connect("activate", self.edit_place, event, lat, lon, mark)
itemoption.append(modify) itemoption.append(modify)

View File

@ -315,7 +315,7 @@ class GeoEvents(GeoGraphyView):
itemoption.set_title(message) itemoption.set_title(message)
itemoption.show() itemoption.show()
add_item.set_submenu(itemoption) add_item.set_submenu(itemoption)
modify = gtk.MenuItem(_("Edit event")) modify = gtk.MenuItem(_("Edit Event"))
modify.show() modify.show()
modify.connect("activate", self.edit_event, modify.connect("activate", self.edit_event,
event, lat, lon, prevmark) event, lat, lon, prevmark)
@ -334,7 +334,7 @@ class GeoEvents(GeoGraphyView):
itemoption.set_title(message) itemoption.set_title(message)
itemoption.show() itemoption.show()
add_item.set_submenu(itemoption) add_item.set_submenu(itemoption)
modify = gtk.MenuItem(_("Edit event")) modify = gtk.MenuItem(_("Edit Event"))
modify.show() modify.show()
modify.connect("activate", self.edit_event, modify.connect("activate", self.edit_event,
event, lat, lon, mark) event, lat, lon, mark)
@ -357,7 +357,7 @@ class GeoEvents(GeoGraphyView):
itemoption.set_title(message) itemoption.set_title(message)
itemoption.show() itemoption.show()
add_item.set_submenu(itemoption) add_item.set_submenu(itemoption)
modify = gtk.MenuItem(_("Edit event")) modify = gtk.MenuItem(_("Edit Event"))
modify.show() modify.show()
modify.connect("activate", self.edit_event, event, lat, lon, prevmark) modify.connect("activate", self.edit_event, event, lat, lon, prevmark)
itemoption.append(modify) itemoption.append(modify)

View File

@ -199,6 +199,7 @@ class GeoFamily(GeoGraphyView):
dbstate.db.find_backlink_handles(event.handle) dbstate.db.find_backlink_handles(event.handle)
if ref_type == 'Family' if ref_type == 'Family'
] ]
fnam = mnam = ""
if family_list: if family_list:
for family in family_list: for family in family_list:
handle = family.get_father_handle() handle = family.get_father_handle()
@ -378,15 +379,15 @@ class GeoFamily(GeoGraphyView):
itemoption = gtk.Menu() itemoption = gtk.Menu()
itemoption.show() itemoption.show()
menu.set_submenu(itemoption) menu.set_submenu(itemoption)
modify = gtk.MenuItem(_("Edit family")) modify = gtk.MenuItem(_("Edit Family"))
modify.show() modify.show()
modify.connect("activate", self.edit_family, event, lat, lon, mark) modify.connect("activate", self.edit_family, event, lat, lon, mark)
itemoption.append(modify) itemoption.append(modify)
modify = gtk.MenuItem(_("Edit person")) modify = gtk.MenuItem(_("Edit Person"))
modify.show() modify.show()
modify.connect("activate", self.edit_person, event, lat, lon, mark) modify.connect("activate", self.edit_person, event, lat, lon, mark)
itemoption.append(modify) itemoption.append(modify)
modify = gtk.MenuItem(_("Edit event")) modify = gtk.MenuItem(_("Edit Event"))
modify.show() modify.show()
modify.connect("activate", self.edit_event, event, lat, lon, mark) modify.connect("activate", self.edit_event, event, lat, lon, mark)
itemoption.append(modify) itemoption.append(modify)

View File

@ -363,7 +363,7 @@ class GeoPerson(GeoGraphyView):
itemoption.set_title(message) itemoption.set_title(message)
itemoption.show() itemoption.show()
add_item.set_submenu(itemoption) add_item.set_submenu(itemoption)
modify = gtk.MenuItem(_("Edit event")) modify = gtk.MenuItem(_("Edit Event"))
modify.show() modify.show()
modify.connect("activate", self.edit_event, modify.connect("activate", self.edit_event,
event, lat, lon, prevmark) event, lat, lon, prevmark)
@ -382,7 +382,7 @@ class GeoPerson(GeoGraphyView):
itemoption.set_title(message) itemoption.set_title(message)
itemoption.show() itemoption.show()
add_item.set_submenu(itemoption) add_item.set_submenu(itemoption)
modify = gtk.MenuItem(_("Edit event")) modify = gtk.MenuItem(_("Edit Event"))
modify.show() modify.show()
modify.connect("activate", self.edit_event, modify.connect("activate", self.edit_event,
event, lat, lon, mark) event, lat, lon, mark)
@ -405,7 +405,7 @@ class GeoPerson(GeoGraphyView):
itemoption.set_title(message) itemoption.set_title(message)
itemoption.show() itemoption.show()
add_item.set_submenu(itemoption) add_item.set_submenu(itemoption)
modify = gtk.MenuItem(_("Edit event")) modify = gtk.MenuItem(_("Edit Event"))
modify.show() modify.show()
modify.connect("activate", self.edit_event, event, lat, lon, prevmark) modify.connect("activate", self.edit_event, event, lat, lon, prevmark)
itemoption.append(modify) itemoption.append(modify)

View File

@ -282,7 +282,7 @@ class GeoPlaces(GeoGraphyView):
itemoption.set_title(message) itemoption.set_title(message)
itemoption.show() itemoption.show()
add_item.set_submenu(itemoption) add_item.set_submenu(itemoption)
modify = gtk.MenuItem(_("Edit place")) modify = gtk.MenuItem(_("Edit Place"))
modify.show() modify.show()
modify.connect("activate", self.edit_place, modify.connect("activate", self.edit_place,
event, lat, lon, prevmark) event, lat, lon, prevmark)
@ -301,7 +301,7 @@ class GeoPlaces(GeoGraphyView):
itemoption.set_title(message) itemoption.set_title(message)
itemoption.show() itemoption.show()
add_item.set_submenu(itemoption) add_item.set_submenu(itemoption)
modify = gtk.MenuItem(_("Edit place")) modify = gtk.MenuItem(_("Edit Place"))
modify.show() modify.show()
modify.connect("activate", self.edit_place, event, lat, lon, prevmark) modify.connect("activate", self.edit_place, event, lat, lon, prevmark)
itemoption.append(modify) itemoption.append(modify)