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

* src/RelLib/_Name.py: default utf8 strings

Browse Source 
* src/RelLib/_MarkerType.py: default utf8 strings
	* src/RelLib/_Place.py: default utf8 strings
	* src/RelLib/_GrampsType.py: default utf8 strings
	* src/Filters/SideBar/_EventSidebarFilter.py: default utf8 strings
	* src/Filters/SideBar/_FamilySidebarFilter.py: default utf8 strings
	* src/Filters/SideBar/_PersonSidebarFilter.py: default utf8 strings
	as a fallback. (bug #779), convert string to unicode if needed (bug #604)


svn: r7883
This commit is contained in:
Don Allingham
2007-01-08 21:40:51 +00:00
parent de760c6c66
commit 610ee95aa9
9 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/RelLib/_GrampsType.py
View File

@@ -60,16 +60,16 @@ class GrampsType:
self.string = value[1]
elif type(value) == int:
self.val = value
self.string = ''
self.string = u''
elif type(value) in (str,unicode):
self.val = self._S2IMAP.get(value, self._CUSTOM)
if self.val == self._CUSTOM:
self.string = value
else:
self.string = ''
self.string = u''
else:
self.val = self._DEFAULT
self.string = ''
self.string = u''
def set_from_xml_str(self, value):
"""
@@ -78,7 +78,7 @@ class GrampsType:
"""
if self._E2IMAP.has_key(value):
self.val = self._E2IMAP[value]
self.string = ''
self.string = u''
else:
self.val = self._CUSTOM
self.string = value

14
src/RelLib/_MarkerType.py
View File

@@ -61,28 +61,28 @@ class MarkerType(GrampsType):
sets the marker value
"""
if isinstance(value, self.__class__):
if value.val == self.CUSTOM and value.string == '':
if value.val == self.CUSTOM and value.string == u'':
self.val = self.NONE
self.string = ''
self.string = u''
else:
self.val = value.val
self.string = value.string
elif type(value) == tuple:
if value[0] == self.CUSTOM and value[1] == '':
if value[0] == self.CUSTOM and value[1] == u'':
self.value = self.NONE
self.string = ''
self.string = u''
else:
self.val = value[0]
self.string = value[1]
elif type(value) == int:
self.val = value
self.string = ''
self.string = u''
elif type(value) == str:
self.val = self._S2IMAP.get(value, self._CUSTOM)
if self.val == self._CUSTOM:
self.string = value
else:
self.string = ''
self.string = u''
else:
self.val = self._DEFAULT
self.string = ''
self.string = u''

2
src/RelLib/_Name.py
View File

@@ -96,7 +96,7 @@ class Name(SecondaryObject, PrivacyBase, SourceBase, NoteBase, DateBase):
self.group_as = ""
self.sort_as = self.DEF
self.display_as = self.DEF
self.call = ''
self.call = u''
def serialize(self):
"""

4
src/RelLib/_Place.py
View File

@@ -304,5 +304,5 @@ class Place(PrimaryObject, SourceBase, NoteBase, MediaBase, UrlBase):
self.main_loc.city.upper(), self.main_loc.county.upper(),
self.main_loc.state.upper(), self.main_loc.country.upper()]
else:
return [self.title, self.gramps_id, '', '', '', '', '',
self.title.upper(), '', '', '', '', '']
return [self.title, self.gramps_id, u'', u'', u'', u'', u'',
self.title.upper(), u'', u'', u'', u'', u'']