Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/EditPlace.py (on_add_url_clicked,on_update_url_clicked):

Browse Source 
Use empty name when not available.
* src/UrlEdit.py (__init__): Work with empty names.


svn: r4443
This commit is contained in:
Alex Roitman 2005-04-28 23:06:58 +00:00
parent b55636be8f
commit 8e25a95bf4
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gramps2/ChangeLog
View File

@ -1,3 +1,8 @@
2005-04-28 Alex Roitman <shura@gramps-project.org>
* src/EditPlace.py (on_add_url_clicked,on_update_url_clicked):
Use empty name when not available.
* src/UrlEdit.py (__init__): Work with empty names.
2005-04-29 Eero Tamminen <eerot@sf> 2005-04-29 Eero Tamminen <eerot@sf>
* src/dates/Date_fi.py: initial Finnish date parser, doesn't yet * src/dates/Date_fi.py: initial Finnish date parser, doesn't yet
work correctly work correctly

12
gramps2/src/EditPlace.py
View File

@ -418,10 +418,9 @@ class EditPlace:
if node: if node:
row = store.get_path(node) row = store.get_path(node)
url = self.ulist[row[0]] url = self.ulist[row[0]]
if url: name = ""
name = _("Internet Address Editor for %s") % self.place.get_title() if self.place:
else: name = self.place.get_title()
name = _("Internet Address Editor")
UrlEdit.UrlEditor(self,name,url,self.url_edit_callback) UrlEdit.UrlEditor(self,name,url,self.url_edit_callback)
def on_update_loc_clicked(self,obj): def on_update_loc_clicked(self,obj):
@ -445,10 +444,9 @@ class EditPlace:
def on_add_url_clicked(self,obj): def on_add_url_clicked(self,obj):
import UrlEdit import UrlEdit
name = ""
if self.place: if self.place:
name = _("Internet Address Editor for %s") % self.place.get_title() name = self.place.get_title()
else:
name = _("Internet Address Editor")
UrlEdit.UrlEditor(self,name,None,self.url_edit_callback) UrlEdit.UrlEditor(self,name,None,self.url_edit_callback)
def url_edit_callback(self,url): def url_edit_callback(self,url):

12
gramps2/src/UrlEdit.py
View File

@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2000-2004 Donald N. Allingham # Copyright (C) 2000-2005 Donald N. Allingham
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -20,6 +20,13 @@
# $Id$ # $Id$
#-------------------------------------------------------------------------
#
# python modules
#
#-------------------------------------------------------------------------
from gettext import gettext as _
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# GTK/Gnome modules # GTK/Gnome modules
@ -36,7 +43,6 @@ import gnome
import const import const
import Utils import Utils
import RelLib import RelLib
from gettext import gettext as _
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -64,7 +70,7 @@ class UrlEditor:
self.priv = self.top.get_widget("priv") self.priv = self.top.get_widget("priv")
title_label = self.top.get_widget("title") title_label = self.top.get_widget("title")
if name == ", ": if not name or name == ", ":
etitle =_('Internet Address Editor') etitle =_('Internet Address Editor')
else: else:
etitle =_('Internet Address Editor for %s') % name, etitle =_('Internet Address Editor for %s') % name,