diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 10ed100d9..0bde0ab9f 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,8 @@ 2005-09-29 Don Allingham + * src/docgen/AbiWord2Doc.py: fix latin encoding issues + * src/docgen/KwordDoc.py: fix latin encoding issues + * src/docgen/OpenSpreadSheet.py: fix latin encoding issues + * src/plugins/GraphViz.py: fix latin encoding issues * src/plugins/DetAncestralReport.py: Fixed generation string * src/plugins/DetDescendantReport.py: Fixed generation string diff --git a/gramps2/src/docgen/AbiWord2Doc.py b/gramps2/src/docgen/AbiWord2Doc.py index 4cdb4ef3c..cd2598fb9 100644 --- a/gramps2/src/docgen/AbiWord2Doc.py +++ b/gramps2/src/docgen/AbiWord2Doc.py @@ -38,7 +38,6 @@ import PluginMgr import ImgManip import GrampsMime -from latin_utf8 import latin_to_utf8 from gettext import gettext as _ #------------------------------------------------------------------------- diff --git a/gramps2/src/docgen/KwordDoc.py b/gramps2/src/docgen/KwordDoc.py index 6598679e3..6443248ea 100644 --- a/gramps2/src/docgen/KwordDoc.py +++ b/gramps2/src/docgen/KwordDoc.py @@ -298,7 +298,7 @@ class KwordDoc(BaseDoc.BaseDoc): self.f.write('\n') self.f.write('') - self.f.write(latin_to_utf8(self.text)) + self.f.write(unicode(self.text)) self.f.write('\n') self.f.write('\n') for format in self.format_list: diff --git a/gramps2/src/docgen/OpenSpreadSheet.py b/gramps2/src/docgen/OpenSpreadSheet.py index 258c4f9e9..3e0d5e309 100644 --- a/gramps2/src/docgen/OpenSpreadSheet.py +++ b/gramps2/src/docgen/OpenSpreadSheet.py @@ -38,7 +38,6 @@ from gettext import gettext as _ import BaseDoc from SpreadSheetDoc import * -from latin_utf8 import latin_to_utf8 import const import Errors @@ -393,7 +392,7 @@ class OpenSpreadSheet(SpreadSheetDoc): text = text.replace('>','>') text = text.replace('\t','') text = text.replace('\n','') - self.f.write(latin_to_utf8(text)) + self.f.write(unicode(text)) def _write_manifest(self): self.manifest_xml = tempfile.mktemp() @@ -439,7 +438,6 @@ class OpenSpreadSheet(SpreadSheetDoc): pass raise Errors.ReportError(_("Could not create %s") % self.meta_xml) - name = latin_to_utf8(self.name) self.f = open(self.meta_xml,"w") self.f.write('\n') self.f.write('