From 1cb6f2f3c8d7801296ac719a5897442fb63e69f8 Mon Sep 17 00:00:00 2001 From: Peter Landgren Date: Fri, 15 Oct 2010 17:55:14 +0000 Subject: [PATCH] Issue 4293, problems with LagecyGedcom and empty events. svn: r15996 --- src/gen/ggettext.py | 6 +++++- src/plugins/lib/libgedcom.py | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/gen/ggettext.py b/src/gen/ggettext.py index c3f3d471f..89287b7c4 100644 --- a/src/gen/ggettext.py +++ b/src/gen/ggettext.py @@ -41,6 +41,10 @@ def gettext(msgid): :returns: Translation or the original. :rtype: unicode """ + # If msgid =="" then gettext will return po file header + # and that's not what we want. + if len(msgid.strip()) == 0: + return msgid return unicode(pgettext.gettext(msgid)) def ngettext(singular, plural, n): @@ -82,4 +86,4 @@ def sgettext(msgid, sep='|'): if msgval == msgid: sep_idx = msgid.rfind(sep) msgval = msgid[sep_idx+1:] - return unicode(msgval) \ No newline at end of file + return unicode(msgval) diff --git a/src/plugins/lib/libgedcom.py b/src/plugins/lib/libgedcom.py index 28b70a454..4c56c241e 100644 --- a/src/plugins/lib/libgedcom.py +++ b/src/plugins/lib/libgedcom.py @@ -118,6 +118,7 @@ import LdsUtils import Utils from DateHandler._DateParser import DateParser from gen.db.dbconst import EVENT_KEY +from QuestionDialog import WarningDialog #------------------------------------------------------------------------- # @@ -5433,7 +5434,12 @@ class GedcomParser(UpdateCallback): """ if state.genby == "GRAMPS": self.gedsource = self.gedmap.get_from_source_tag(line.data) - + + if state.genby.upper() == "LEGACY": + fname = os.path.basename(self.filename) + WarningDialog(_("Import of GEDCOM file %s with DEST=%s, could cause errors in the resulting database!") % \ + (fname, state.genby), _("Look for nameless events.")) + def __header_plac(self, line, state): """ @param line: The current line in GedLine format