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

* src/AttrEdit.py: escape xml-specialchars because of use_markup

Browse Source 
* src/EditPerson.py: escape xml-specialchars because of use_markup
* src/EventEdit.py: escape xml-specialchars because of use_markup
* src/Marriage.py: escape xml-specialchars because of use_markup
* src/NameEdit.py: escape xml-specialchars because of use_markup
* src/PedView.py: escape xml-specialchars because of use_markup
* src/UrlEdit.py: escape xml-specialchars because of use_markup


svn: r5336
This commit is contained in:
Martin Hawlisch 2005-10-19 10:38:45 +00:00
parent 8a52407a00
commit 86cdf6e0a8
8 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gramps2/ChangeLog
View File

@ -1,6 +1,14 @@
2005-10-19 Martin Hawlisch <Martin.Hawlisch@gmx.de> 2005-10-19 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/plugins/TestcaseGenerator.py: More randomisation; new test options * src/plugins/TestcaseGenerator.py: More randomisation; new test options
* src/RelLib.py (Source.get_text_data_list): Add missing fields * src/RelLib.py (Source.get_text_data_list): Add missing fields
* src/AttrEdit.py: escape xml-specialchars because of use_markup
* src/EditPerson.py: escape xml-specialchars because of use_markup
* src/EventEdit.py: escape xml-specialchars because of use_markup
* src/Marriage.py: escape xml-specialchars because of use_markup
* src/NameEdit.py: escape xml-specialchars because of use_markup
* src/PedView.py: escape xml-specialchars because of use_markup
* src/UrlEdit.py: escape xml-specialchars because of use_markup
2005-10-18 Don Allingham <don@gramps-project.org> 2005-10-18 Don Allingham <don@gramps-project.org>
* src/Report.py: bumped the maximum generations to 999 from 31 * src/Report.py: bumped the maximum generations to 999 from 31

3
gramps2/src/AttrEdit.py
View File

@ -35,6 +35,7 @@ __version__ = "$Revision$"
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gettext import gettext as _ from gettext import gettext as _
import gc import gc
from cgi import escape
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -122,7 +123,7 @@ class AttributeEditor:
if title == ", ": if title == ", ":
title = _("Attribute Editor") title = _("Attribute Editor")
else: else:
title = _("Attribute Editor for %s") % title title = _("Attribute Editor for %s") % escape(title)
l = self.top.get_widget("title") l = self.top.get_widget("title")
Utils.set_titles(self.window,l,title,_('Attribute Editor')) Utils.set_titles(self.window,l,title,_('Attribute Editor'))

9
gramps2/src/EditPerson.py
View File

@ -31,6 +31,7 @@ import gc
import locale import locale
import sets import sets
from gettext import gettext as _ from gettext import gettext as _
from cgi import escape
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -1247,7 +1248,7 @@ class EditPerson:
the close window""" the close window"""
if self.did_data_change() and not GrampsKeys.get_dont_ask(): if self.did_data_change() and not GrampsKeys.get_dont_ask():
n = "<i>%s</i>" % self.nd.display(self.person) n = "<i>%s</i>" % escape(self.nd.display(self.person))
SaveDialog(_('Save changes to %s?') % n, SaveDialog(_('Save changes to %s?') % n,
_('If you close without saving, the changes you ' _('If you close without saving, the changes you '
'have made will be lost'), 'have made will be lost'),
@ -1263,7 +1264,7 @@ class EditPerson:
"""If the data has changed, give the user a chance to cancel """If the data has changed, give the user a chance to cancel
the close window""" the close window"""
if self.did_data_change() and not GrampsKeys.get_dont_ask(): if self.did_data_change() and not GrampsKeys.get_dont_ask():
n = "<i>%s</i>" % self.nd.display(self.person) n = "<i>%s</i>" % escape(self.nd.display(self.person))
SaveDialog(_('Save Changes to %s?') % n, SaveDialog(_('Save Changes to %s?') % n,
_('If you close without saving, the changes you ' _('If you close without saving, the changes you '
'have made will be lost'), 'have made will be lost'),
@ -2000,8 +2001,8 @@ class EditPerson:
def write_primary_name(self): def write_primary_name(self):
# initial values # initial values
name = '<span size="larger" weight="bold">%s</span>' % self.nd.display(self.person) name = '<span size="larger" weight="bold">%s</span>' % escape(self.nd.display(self.person))
self.top.get_widget("activepersonTitle").set_text(name) self.top.get_widget("activepersonTitle").set_text( name)
self.top.get_widget("activepersonTitle").set_use_markup(True) self.top.get_widget("activepersonTitle").set_use_markup(True)
self.suffix.set_text(self.pname.get_suffix()) self.suffix.set_text(self.pname.get_suffix())
if self.use_patronymic: if self.use_patronymic:

3
gramps2/src/EventEdit.py
View File

@ -28,6 +28,7 @@
from gettext import gettext as _ from gettext import gettext as _
import sets import sets
import gc import gc
from cgi import escape
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -117,7 +118,7 @@ class EventEditor:
if name == ", ": if name == ", ":
etitle = _('Event Editor') etitle = _('Event Editor')
else: else:
etitle = _('Event Editor for %s') % name etitle = _('Event Editor for %s') % escape(name)
Utils.set_titles(self.window,title_label, etitle, Utils.set_titles(self.window,title_label, etitle,
_('Event Editor')) _('Event Editor'))

5
gramps2/src/Marriage.py
View File

@ -28,6 +28,7 @@
import cPickle as pickle import cPickle as pickle
from gettext import gettext as _ from gettext import gettext as _
import sets import sets
from cgi import escape
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -147,8 +148,8 @@ class Marriage:
father = self.db.get_person_from_handle(fid) father = self.db.get_person_from_handle(fid)
mother = self.db.get_person_from_handle(mid) mother = self.db.get_person_from_handle(mid)
self.title = _("%s and %s") % (NameDisplay.displayer.display(father), self.title = _("%s and %s") % (escape(NameDisplay.displayer.display(father)),
NameDisplay.displayer.display(mother)) escape(NameDisplay.displayer.display(mother)))
Utils.set_title_label(self.top,self.title) Utils.set_title_label(self.top,self.title)

3
gramps2/src/NameEdit.py
View File

@ -27,6 +27,7 @@
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gettext import gettext as _ from gettext import gettext as _
import gc import gc
from cgi import escape
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -127,7 +128,7 @@ class NameEditor:
if full_name == "": if full_name == "":
tmsg = _("Name Editor") tmsg = _("Name Editor")
else: else:
tmsg = _("Name Editor for %s") % full_name tmsg = _("Name Editor for %s") % escape(full_name)
Utils.set_titles(self.window, alt_title, tmsg, _('Name Editor')) Utils.set_titles(self.window, alt_title, tmsg, _('Name Editor'))

9
gramps2/src/PedView.py
View File

@ -26,6 +26,7 @@
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gettext import gettext as _ from gettext import gettext as _
from cgi import escape
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -678,9 +679,9 @@ class PedigreeView:
child_menu = item.get_submenu() child_menu = item.get_submenu()
if find_children(self.db,child): if find_children(self.db,child):
label = gtk.Label('<b><i>%s</i></b>' % NameDisplay.displayer.display(child)) label = gtk.Label('<b><i>%s</i></b>' % escape(NameDisplay.displayer.display(child)))
else: else:
label = gtk.Label(NameDisplay.displayer.display(child)) label = gtk.Label(escape(NameDisplay.displayer.display(child)))
child_item = gtk.MenuItem(None) child_item = gtk.MenuItem(None)
label.set_use_markup(True) label.set_use_markup(True)
@ -712,9 +713,9 @@ class PedigreeView:
par_menu = item.get_submenu() par_menu = item.get_submenu()
if find_parents(self.db,par): if find_parents(self.db,par):
label = gtk.Label('<b><i>%s</i></b>' % NameDisplay.displayer.display(par)) label = gtk.Label('<b><i>%s</i></b>' % escape(NameDisplay.displayer.display(par)))
else: else:
label = gtk.Label(NameDisplay.displayer.display(par)) label = gtk.Label(escape(NameDisplay.displayer.display(par)))
par_item = gtk.MenuItem(None) par_item = gtk.MenuItem(None)
label.set_use_markup(True) label.set_use_markup(True)

3
gramps2/src/UrlEdit.py
View File

@ -27,6 +27,7 @@
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gettext import gettext as _ from gettext import gettext as _
import gc import gc
from cgi import escape
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -74,7 +75,7 @@ class UrlEditor:
if not name or 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') % escape(name),
Utils.set_titles(self.window,title_label, etitle, Utils.set_titles(self.window,title_label, etitle,