From d1de8e22cc006d914a3de7de758250f37730374a Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sun, 18 Nov 2001 23:39:34 +0000 Subject: [PATCH] Fix date handling with "ABT" in non-english languages svn: r571 --- gramps/src/Date.py | 5 ++++- gramps/src/gramps_main.py | 6 ++++-- gramps/src/plugins/WriteGedcom.py | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gramps/src/Date.py b/gramps/src/Date.py index 4bc30259b..af7b910e9 100644 --- a/gramps/src/Date.py +++ b/gramps/src/Date.py @@ -314,7 +314,10 @@ class SingleDate: _("aft") + '|' + \ _("aft\.") + '|' + \ _("bef\.") + '|' + \ - _("bef") + ')' + _("bef") + '|' + \ + "abt" + '|' + \ + "aft" + '|' + \ + "bef" + ')' start = "^\s*" + modifiers + "?\s*" diff --git a/gramps/src/gramps_main.py b/gramps/src/gramps_main.py index 82e557f8c..84aa0896b 100755 --- a/gramps/src/gramps_main.py +++ b/gramps/src/gramps_main.py @@ -488,12 +488,14 @@ def on_ok_button1_clicked(obj): filename = dbname.get_full_path(1) utils.destroy_passed_object(obj) + if filename == "" or filename == None: + return + if getoldrev.get_active(): vc = VersionControl.RcsVersionControl(filename) VersionControl.RevisionSelect(database,filename,vc,load_revision) else: - if filename != "": - read_file(filename) + read_file(filename) #------------------------------------------------------------------------- # diff --git a/gramps/src/plugins/WriteGedcom.py b/gramps/src/plugins/WriteGedcom.py index a461f68dc..7cafd0af8 100644 --- a/gramps/src/plugins/WriteGedcom.py +++ b/gramps/src/plugins/WriteGedcom.py @@ -567,12 +567,12 @@ def exportData(database, filename, progress, pbar, fbar, sbar): try: g = open(filename,"w") except IOError,msg: - msg = "%s\n%s" % (_("%s could not be opened\n") % filename,str(msg)) + msg = "%s\n%s" % (_("Could not create %s") % filename,str(msg)) GnomeErrorDialog(msg) progress.destroy() return except: - GnomeErrorDialog(_("%s could not be opened\n") % filename) + GnomeErrorDialog(_("Could not create %s") % filename) progress.destroy() return