From 27d3985fb93030dc09964b7f6f9720a4572d192d Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Fri, 28 Mar 2003 02:28:04 +0000 Subject: [PATCH] filename clean up svn: r1408 --- src/DbPrompter.py | 2 +- src/ReadXML.py | 2 +- src/gramps_main.py | 2 ++ src/po/nl.po | 6 +++--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/DbPrompter.py b/src/DbPrompter.py index 82042b57c..ba309d6d4 100644 --- a/src/DbPrompter.py +++ b/src/DbPrompter.py @@ -126,7 +126,7 @@ class DbPrompter: self.show() def ok_button_clicked(self,obj): - filename = self.dbname.get_full_path(0).encode('iso8859-1') + filename = self.dbname.get_full_path(0) if not filename: return diff --git a/src/ReadXML.py b/src/ReadXML.py index aa8020610..6d63bf4c7 100644 --- a/src/ReadXML.py +++ b/src/ReadXML.py @@ -56,7 +56,7 @@ except: #------------------------------------------------------------------------- def importData(database, filename, callback): - filename = os.path.normpath(filename).encode('iso8859-1') + filename = os.path.normpath(filename) basefile = os.path.dirname(filename) database.smap = {} database.pmap = {} diff --git a/src/gramps_main.py b/src/gramps_main.py index adf0e68ed..327b92585 100755 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -701,6 +701,8 @@ class Gramps: dbname = obj.get_data("dbname") getoldrev = obj.get_data("getoldrev") filename = dbname.get_full_path(0) + print filename + Utils.destroy_passed_object(obj) if filename == "" or filename == None: diff --git a/src/po/nl.po b/src/po/nl.po index 7e19c3ca2..202378ce9 100644 --- a/src/po/nl.po +++ b/src/po/nl.po @@ -261,7 +261,7 @@ msgstr "(en|tot|-)" #: Date.py:228 Date.py:241 msgid "from %(start_date)s to %(stop_date)s" -msgstr "van %(begin_datum)s tot %(eind_datum)s" +msgstr "van %(start_date)s tot %(stop_date)s" #: DbPrompter.py:65 DbPrompter.py:117 gramps_main.py:987 revision.glade:131 msgid "Open a database" @@ -349,7 +349,7 @@ msgstr "Geen" #: EditPerson.py:413 EditSource.py:141 msgid "%(father)s and %(mother)s" -msgstr "%(vader)s en %(moeder)s" +msgstr "%(father)s en %(mother)s" #: EditPerson.py:421 const.py:144 plugins/FamilyGroup.py:385 #: plugins/IndivComplete.py:259 plugins/IndivSummary.py:155 @@ -4344,7 +4344,7 @@ msgstr "Genereert relatiegrafieken, momenteel alleen in GraphViz-formaat. GraphV #: plugins/IndivComplete.py:117 msgid "%(date)s in %(place)s." -msgstr "%(datum)s in %(plaats)en" +msgstr "%(date)s in %(place)en" #: plugins/IndivComplete.py:149 plugins/WebPage.py:463 msgid "Notes"