From 8d809438c079d45fbc5f77b0b6612c1593ac216f Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Mon, 8 Jan 2007 21:40:51 +0000 Subject: [PATCH] * src/RelLib/_Name.py: default utf8 strings * 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 --- gramps2/ChangeLog | 9 ++++++- .../Filters/SideBar/_EventSidebarFilter.py | 14 +++++------ .../Filters/SideBar/_FamilySidebarFilter.py | 24 +++++++++---------- .../Filters/SideBar/_PersonSidebarFilter.py | 24 +++++++++---------- gramps2/src/RelLib/_GrampsType.py | 8 +++---- gramps2/src/RelLib/_MarkerType.py | 14 +++++------ gramps2/src/RelLib/_Name.py | 2 +- gramps2/src/RelLib/_Place.py | 4 ++-- gramps2/src/ansel_utf8.py | 4 +++- 9 files changed, 56 insertions(+), 47 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index ad6693f58..9a7ba309c 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,6 +1,13 @@ 2007-01-08 Don Allingham + * src/RelLib/_Name.py: default utf8 strings + * 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 * src/ansel_utf8.py (utf8_to_ansel): handle single character indexes - as a fallback. (bug #779) + as a fallback. (bug #779), convert string to unicode if needed (bug #604) * src/StartupDialog.py: removed - no longer used * src/Makefile.am: remove StartupDialog.py installation * po/POTFILES.in: removed StartupDialog.py diff --git a/gramps2/src/Filters/SideBar/_EventSidebarFilter.py b/gramps2/src/Filters/SideBar/_EventSidebarFilter.py index b7a5636b8..5266b8af6 100644 --- a/gramps2/src/Filters/SideBar/_EventSidebarFilter.py +++ b/gramps2/src/Filters/SideBar/_EventSidebarFilter.py @@ -62,7 +62,7 @@ class EventSidebarFilter(SidebarFilter): self.filter_id = gtk.Entry() self.filter_desc = gtk.Entry() self.filter_event = RelLib.Event() - self.filter_event.set_type((RelLib.EventType.CUSTOM,'')) + self.filter_event.set_type((RelLib.EventType.CUSTOM,u'')) self.etype = gtk.ComboBoxEntry() self.event_menu = GrampsWidgets.MonitoredDataType( @@ -92,12 +92,12 @@ class EventSidebarFilter(SidebarFilter): self.add_entry(None, self.filter_regex) def clear(self, obj): - self.filter_id.set_text('') - self.filter_desc.set_text('') - self.filter_date.set_text('') - self.filter_place.set_text('') - self.filter_note.set_text('') - self.etype.child.set_text('') + self.filter_id.set_text(u'') + self.filter_desc.set_text(u'') + self.filter_date.set_text(u'') + self.filter_place.set_text(u'') + self.filter_note.set_text(u'') + self.etype.child.set_text(u'') self.generic.set_active(0) def get_filter(self): diff --git a/gramps2/src/Filters/SideBar/_FamilySidebarFilter.py b/gramps2/src/Filters/SideBar/_FamilySidebarFilter.py index 81a71b115..4310aa782 100644 --- a/gramps2/src/Filters/SideBar/_FamilySidebarFilter.py +++ b/gramps2/src/Filters/SideBar/_FamilySidebarFilter.py @@ -65,11 +65,11 @@ class FamilySidebarFilter(SidebarFilter): self.filter_child = gtk.Entry() self.filter_event = RelLib.Event() - self.filter_event.set_type((RelLib.EventType.CUSTOM,'')) + self.filter_event.set_type((RelLib.EventType.CUSTOM,u'')) self.etype = gtk.ComboBoxEntry() self.family_stub = RelLib.Family() - self.family_stub.set_relationship((RelLib.FamilyRelType.CUSTOM,'')) + self.family_stub.set_relationship((RelLib.FamilyRelType.CUSTOM,u'')) self.rtype = gtk.ComboBoxEntry() self.event_menu = GrampsWidgets.MonitoredDataType( @@ -83,7 +83,7 @@ class FamilySidebarFilter(SidebarFilter): self.family_stub.get_relationship) self.filter_marker = RelLib.Family() - self.filter_marker.set_marker((RelLib.MarkerType.CUSTOM,'')) + self.filter_marker.set_marker((RelLib.MarkerType.CUSTOM,u'')) self.mtype = gtk.ComboBoxEntry() self.marker_menu = GrampsWidgets.MonitoredDataType( self.mtype, @@ -112,14 +112,14 @@ class FamilySidebarFilter(SidebarFilter): self.add_entry(None, self.filter_regex) def clear(self, obj): - self.filter_id.set_text('') - self.filter_father.set_text('') - self.filter_mother.set_text('') - self.filter_child.set_text('') - self.filter_note.set_text('') - self.etype.child.set_text('') - self.rtype.child.set_text('') - self.mtype.child.set_text('') + self.filter_id.set_text(u'') + self.filter_father.set_text(u'') + self.filter_mother.set_text(u'') + self.filter_child.set_text(u'') + self.filter_note.set_text(u'') + self.etype.child.set_text(u'') + self.rtype.child.set_text(u'') + self.mtype.child.set_text(u'') self.generic.set_active(0) def get_filter(self): @@ -169,7 +169,7 @@ class FamilySidebarFilter(SidebarFilter): generic_filter.add_rule(rule) if etype: - rule = HasEvent([etype, '', '', '']) + rule = HasEvent([etype, u'', u'', u'']) generic_filter.add_rule(rule) if rtype: diff --git a/gramps2/src/Filters/SideBar/_PersonSidebarFilter.py b/gramps2/src/Filters/SideBar/_PersonSidebarFilter.py index 1671ab4cd..04a1e7e21 100644 --- a/gramps2/src/Filters/SideBar/_PersonSidebarFilter.py +++ b/gramps2/src/Filters/SideBar/_PersonSidebarFilter.py @@ -63,7 +63,7 @@ class PersonSidebarFilter(SidebarFilter): self.filter_birth = gtk.Entry() self.filter_death = gtk.Entry() self.filter_event = RelLib.Event() - self.filter_event.set_type((RelLib.EventType.CUSTOM,'')) + self.filter_event.set_type((RelLib.EventType.CUSTOM,u'')) self.etype = gtk.ComboBoxEntry() self.event_menu = GrampsWidgets.MonitoredDataType( self.etype, @@ -71,7 +71,7 @@ class PersonSidebarFilter(SidebarFilter): self.filter_event.get_type) self.filter_marker = RelLib.Person() - self.filter_marker.set_marker((RelLib.MarkerType.CUSTOM,'')) + self.filter_marker.set_marker((RelLib.MarkerType.CUSTOM,u'')) self.mtype = gtk.ComboBoxEntry() self.marker_menu = GrampsWidgets.MonitoredDataType( self.mtype, @@ -104,14 +104,14 @@ class PersonSidebarFilter(SidebarFilter): self.add_entry(None, self.filter_regex) def clear(self, obj): - self.filter_name.set_text('') - self.filter_id.set_text('') - self.filter_birth.set_text('') - self.filter_death.set_text('') - self.filter_note.set_text('') + self.filter_name.set_text(u'') + self.filter_id.set_text(u'') + self.filter_birth.set_text(u'') + self.filter_death.set_text(u'') + self.filter_note.set_text(u'') self.filter_gender.set_active(0) - self.etype.child.set_text('') - self.mtype.child.set_text('') + self.etype.child.set_text(u'') + self.mtype.child.set_text(u'') self.generic.set_active(0) def get_filter(self): @@ -158,14 +158,14 @@ class PersonSidebarFilter(SidebarFilter): generic_filter.add_rule(rule) if etype: - rule = HasEvent([etype, '', '', '']) + rule = HasEvent([etype, u'', u'', u'']) generic_filter.add_rule(rule) if birth: - rule = HasBirth([birth,'','']) + rule = HasBirth([birth,u'',u'']) generic_filter.add_rule(rule) if death: - rule = HasDeath([death,'','']) + rule = HasDeath([death,u'',u'']) generic_filter.add_rule(rule) if note: if regex: diff --git a/gramps2/src/RelLib/_GrampsType.py b/gramps2/src/RelLib/_GrampsType.py index 22e663c09..3d7faf5cb 100644 --- a/gramps2/src/RelLib/_GrampsType.py +++ b/gramps2/src/RelLib/_GrampsType.py @@ -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 diff --git a/gramps2/src/RelLib/_MarkerType.py b/gramps2/src/RelLib/_MarkerType.py index 04df467aa..9b64e79cb 100644 --- a/gramps2/src/RelLib/_MarkerType.py +++ b/gramps2/src/RelLib/_MarkerType.py @@ -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'' diff --git a/gramps2/src/RelLib/_Name.py b/gramps2/src/RelLib/_Name.py index f34804e95..a6682fa86 100644 --- a/gramps2/src/RelLib/_Name.py +++ b/gramps2/src/RelLib/_Name.py @@ -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): """ diff --git a/gramps2/src/RelLib/_Place.py b/gramps2/src/RelLib/_Place.py index b7b97d490..a45229c25 100644 --- a/gramps2/src/RelLib/_Place.py +++ b/gramps2/src/RelLib/_Place.py @@ -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''] diff --git a/gramps2/src/ansel_utf8.py b/gramps2/src/ansel_utf8.py index 628e080cd..327dc548d 100644 --- a/gramps2/src/ansel_utf8.py +++ b/gramps2/src/ansel_utf8.py @@ -308,7 +308,9 @@ def ansel_to_utf8(s): def utf8_to_ansel(s): """Converts an UTF8 encoded string to ANSEL""" - + + if type(s) != unicode: + s = unicode(s) buff = cStringIO.StringIO() while s: c0 = ord(s[0])