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

5752: Store tag names as unicode

Browse Source 
svn: r19631
This commit is contained in:
Nick Hall 2012-05-23 13:21:36 +00:00
parent 7af7459eb2
commit 50773ebd51
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gen/db/upgrade.py
View File

@ -740,7 +740,7 @@ def convert_marker(self, marker_field):
"""Convert a marker into a tag.""" """Convert a marker into a tag."""
marker = MarkerType() marker = MarkerType()
marker.unserialize(marker_field) marker.unserialize(marker_field)
tag_name = str(marker) tag_name = unicode(marker)
if tag_name != '': if tag_name != '':
if tag_name not in self.tags: if tag_name not in self.tags:

2
src/gui/views/tags.py
View File

@ -550,7 +550,7 @@ class EditTag(object):
""" """
Save the changes made to the tag. Save the changes made to the tag.
""" """
self.tag.set_name(self.entry.get_text()) self.tag.set_name(unicode(self.entry.get_text()))
self.tag.set_color(self.color.get_color().to_string()) self.tag.set_color(self.color.get_color().to_string())
if not self.tag.get_name(): if not self.tag.get_name():

2
src/plugins/tool/NotRelated.py
View File

@ -241,7 +241,7 @@ class NotRelated(tool.ActivePersonTool, ManagedWindow.ManagedWindow) :
def applyTagClicked(self, button) : def applyTagClicked(self, button) :
progress = None progress = None
rows = self.treeSelection.count_selected_rows() rows = self.treeSelection.count_selected_rows()
tag_name = self.tagcombo.get_active_text() tag_name = unicode(self.tagcombo.get_active_text())
# start the db transaction # start the db transaction
with DbTxn("Tag not related", self.db) as transaction: with DbTxn("Tag not related", self.db) as transaction:

12
src/plugins/tool/TestcaseGenerator.py
View File

@ -1804,12 +1804,12 @@ class TestcaseGenerator(tool.BatchTool):
else: else:
result = "" result = ""
if type <> self.TAG: if self.options.handler.options_dict['specialchars']:
if self.options.handler.options_dict['specialchars']: result = result + u"ä<ö&ü%ß'\""
result = result + u"ä<ö&ü%ß'\""
if self.options.handler.options_dict['add_serial']: if self.options.handler.options_dict['add_serial'] and type <> self.TAG:
result = result + "#+#%06d#-#" % self.text_serial_number result = result + "#+#%06d#-#" % self.text_serial_number
self.text_serial_number = self.text_serial_number + 1 self.text_serial_number = self.text_serial_number + 1
if not type: if not type:
type = self.SHORT type = self.SHORT