From ea1e1c2fc10801596a4ee5e837e4fad8d50a356a Mon Sep 17 00:00:00 2001 From: Serge Noiraud Date: Tue, 26 Apr 2011 14:16:03 +0000 Subject: [PATCH] geography : avoid multiple translation and fix a bug with variable referenced before assignment svn: r17274 --- src/plugins/lib/maps/geography.py | 2 +- src/plugins/view/geoevents.py | 6 +++--- src/plugins/view/geofamily.py | 7 ++++--- src/plugins/view/geoperson.py | 6 +++--- src/plugins/view/geoplaces.py | 4 ++-- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/plugins/lib/maps/geography.py b/src/plugins/lib/maps/geography.py index 6c74a5e4f..69f9102a2 100644 --- a/src/plugins/lib/maps/geography.py +++ b/src/plugins/lib/maps/geography.py @@ -583,7 +583,7 @@ class GeoGraphyView(osmGpsMap, NavigationView): itemoption.set_title(message) itemoption.show() add_item.set_submenu(itemoption) - modify = gtk.MenuItem(_("Edit place")) + modify = gtk.MenuItem(_("Edit Place")) modify.show() modify.connect("activate", self.edit_place, event, lat, lon, mark) itemoption.append(modify) diff --git a/src/plugins/view/geoevents.py b/src/plugins/view/geoevents.py index 5a5b71fd6..b0898a315 100644 --- a/src/plugins/view/geoevents.py +++ b/src/plugins/view/geoevents.py @@ -315,7 +315,7 @@ class GeoEvents(GeoGraphyView): itemoption.set_title(message) itemoption.show() add_item.set_submenu(itemoption) - modify = gtk.MenuItem(_("Edit event")) + modify = gtk.MenuItem(_("Edit Event")) modify.show() modify.connect("activate", self.edit_event, event, lat, lon, prevmark) @@ -334,7 +334,7 @@ class GeoEvents(GeoGraphyView): itemoption.set_title(message) itemoption.show() add_item.set_submenu(itemoption) - modify = gtk.MenuItem(_("Edit event")) + modify = gtk.MenuItem(_("Edit Event")) modify.show() modify.connect("activate", self.edit_event, event, lat, lon, mark) @@ -357,7 +357,7 @@ class GeoEvents(GeoGraphyView): itemoption.set_title(message) itemoption.show() add_item.set_submenu(itemoption) - modify = gtk.MenuItem(_("Edit event")) + modify = gtk.MenuItem(_("Edit Event")) modify.show() modify.connect("activate", self.edit_event, event, lat, lon, prevmark) itemoption.append(modify) diff --git a/src/plugins/view/geofamily.py b/src/plugins/view/geofamily.py index 25f193b73..fc5f7099c 100644 --- a/src/plugins/view/geofamily.py +++ b/src/plugins/view/geofamily.py @@ -199,6 +199,7 @@ class GeoFamily(GeoGraphyView): dbstate.db.find_backlink_handles(event.handle) if ref_type == 'Family' ] + fnam = mnam = "" if family_list: for family in family_list: handle = family.get_father_handle() @@ -378,15 +379,15 @@ class GeoFamily(GeoGraphyView): itemoption = gtk.Menu() itemoption.show() menu.set_submenu(itemoption) - modify = gtk.MenuItem(_("Edit family")) + modify = gtk.MenuItem(_("Edit Family")) modify.show() modify.connect("activate", self.edit_family, event, lat, lon, mark) itemoption.append(modify) - modify = gtk.MenuItem(_("Edit person")) + modify = gtk.MenuItem(_("Edit Person")) modify.show() modify.connect("activate", self.edit_person, event, lat, lon, mark) itemoption.append(modify) - modify = gtk.MenuItem(_("Edit event")) + modify = gtk.MenuItem(_("Edit Event")) modify.show() modify.connect("activate", self.edit_event, event, lat, lon, mark) itemoption.append(modify) diff --git a/src/plugins/view/geoperson.py b/src/plugins/view/geoperson.py index fa01a831a..b83d3be0b 100644 --- a/src/plugins/view/geoperson.py +++ b/src/plugins/view/geoperson.py @@ -363,7 +363,7 @@ class GeoPerson(GeoGraphyView): itemoption.set_title(message) itemoption.show() add_item.set_submenu(itemoption) - modify = gtk.MenuItem(_("Edit event")) + modify = gtk.MenuItem(_("Edit Event")) modify.show() modify.connect("activate", self.edit_event, event, lat, lon, prevmark) @@ -382,7 +382,7 @@ class GeoPerson(GeoGraphyView): itemoption.set_title(message) itemoption.show() add_item.set_submenu(itemoption) - modify = gtk.MenuItem(_("Edit event")) + modify = gtk.MenuItem(_("Edit Event")) modify.show() modify.connect("activate", self.edit_event, event, lat, lon, mark) @@ -405,7 +405,7 @@ class GeoPerson(GeoGraphyView): itemoption.set_title(message) itemoption.show() add_item.set_submenu(itemoption) - modify = gtk.MenuItem(_("Edit event")) + modify = gtk.MenuItem(_("Edit Event")) modify.show() modify.connect("activate", self.edit_event, event, lat, lon, prevmark) itemoption.append(modify) diff --git a/src/plugins/view/geoplaces.py b/src/plugins/view/geoplaces.py index f2c7342ed..b729812c7 100644 --- a/src/plugins/view/geoplaces.py +++ b/src/plugins/view/geoplaces.py @@ -282,7 +282,7 @@ class GeoPlaces(GeoGraphyView): itemoption.set_title(message) itemoption.show() add_item.set_submenu(itemoption) - modify = gtk.MenuItem(_("Edit place")) + modify = gtk.MenuItem(_("Edit Place")) modify.show() modify.connect("activate", self.edit_place, event, lat, lon, prevmark) @@ -301,7 +301,7 @@ class GeoPlaces(GeoGraphyView): itemoption.set_title(message) itemoption.show() add_item.set_submenu(itemoption) - modify = gtk.MenuItem(_("Edit place")) + modify = gtk.MenuItem(_("Edit Place")) modify.show() modify.connect("activate", self.edit_place, event, lat, lon, prevmark) itemoption.append(modify)