From f022597545e9b810940e5466d3ea4b200b5a2e05 Mon Sep 17 00:00:00 2001 From: kulath Date: Tue, 31 Mar 2015 10:48:44 +0100 Subject: [PATCH] 0008355: Gramps can't [GEDCOM] import estim. date period exported by itself Changed output format to DATE EST FROM TO and DATE CALC FROM TO. Also changed in Narrative Web (which uses the same functions). --- gramps/plugins/export/exportgedcom.py | 18 ++++++++++++------ gramps/plugins/webreport/narrativeweb.py | 20 +++++++++++++------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/gramps/plugins/export/exportgedcom.py b/gramps/plugins/export/exportgedcom.py index 7c4514a96..a91feaab2 100644 --- a/gramps/plugins/export/exportgedcom.py +++ b/gramps/plugins/export/exportgedcom.py @@ -1170,16 +1170,22 @@ class GedcomWriter(UpdateCallback): cal = date.get_calendar() mod = date.get_modifier() quality = date.get_quality() + if quality in libgedcom.DATE_QUALITY: + qual_text = libgedcom.DATE_QUALITY[quality] + " " + else: + qual_text = "" if mod == Date.MOD_SPAN: - val = "FROM %s TO %s" % ( - libgedcom.make_gedcom_date(start, cal, mod, quality), + val = "%sFROM %s TO %s" % ( + qual_text, + libgedcom.make_gedcom_date(start, cal, mod, None), libgedcom.make_gedcom_date(date.get_stop_date(), - cal, mod, quality)) + cal, mod, None)) elif mod == Date.MOD_RANGE: - val = "BET %s AND %s" % ( - libgedcom.make_gedcom_date(start, cal, mod, quality), + val = "%sBET %s AND %s" % ( + qual_text, + libgedcom.make_gedcom_date(start, cal, mod, None), libgedcom.make_gedcom_date(date.get_stop_date(), - cal, mod, quality)) + cal, mod, None)) else: val = libgedcom.make_gedcom_date(start, cal, mod, quality) self._writeln(level, 'DATE', val) diff --git a/gramps/plugins/webreport/narrativeweb.py b/gramps/plugins/webreport/narrativeweb.py index f8e46114b..758567224 100644 --- a/gramps/plugins/webreport/narrativeweb.py +++ b/gramps/plugins/webreport/narrativeweb.py @@ -142,7 +142,7 @@ from gramps.plugins.lib.libhtml import Html, xml_lang # import styled notes from src/plugins/lib/libhtmlbackend.py from gramps.plugins.lib.libhtmlbackend import HtmlBackend, process_spaces -from gramps.plugins.lib.libgedcom import make_gedcom_date +from gramps.plugins.lib.libgedcom import make_gedcom_date, DATE_QUALITY from gramps.gen.utils.place import conv_lat_lon from gramps.gui.pluginmanager import GuiPluginManager @@ -517,14 +517,20 @@ def format_date(date): cal = date.get_calendar() mod = date.get_modifier() quality = date.get_quality() + if quality in libgedcom.DATE_QUALITY: + qual_text = libgedcom.DATE_QUALITY[quality] + " " + else: + qual_text = "" if mod == Date.MOD_SPAN: - val = "FROM %s TO %s" % ( - make_gedcom_date(start, cal, mod, quality), - make_gedcom_date(date.get_stop_date(), cal, mod, quality)) + val = "%sFROM %s TO %s" % ( + qual_text, + make_gedcom_date(start, cal, mod, None), + make_gedcom_date(date.get_stop_date(), cal, mod, None)) elif mod == Date.MOD_RANGE: - val = "BET %s AND %s" % ( - make_gedcom_date(start, cal, mod, quality), - make_gedcom_date(date.get_stop_date(), cal, mod, quality)) + val = "%sBET %s AND %s" % ( + qual_text, + make_gedcom_date(start, cal, mod, None), + make_gedcom_date(date.get_stop_date(), cal, mod, None)) else: val = make_gedcom_date(start, cal, mod, quality) return val