From 13b5680692546e622104a890f5985ad95d09a592 Mon Sep 17 00:00:00 2001 From: Paul Franklin Date: Sat, 17 Jun 2017 19:07:43 -0700 Subject: [PATCH] make error report versions closer to Help=>About ones --- gramps/gui/logger/_errorreportassistant.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/gramps/gui/logger/_errorreportassistant.py b/gramps/gui/logger/_errorreportassistant.py index 80a6d2a3a..74c28c5a2 100644 --- a/gramps/gui/logger/_errorreportassistant.py +++ b/gramps/gui/logger/_errorreportassistant.py @@ -174,26 +174,31 @@ class ErrorReportAssistant(ManagedWindow, Gtk.Assistant): operatingsystem = sys.platform distribution = " " - return "Python version: %s \n"\ + sqlite = '' + if __debug__: + sqlite = "sqlite version: %s (%s) \n" % (sqlite3_version_str, + sqlite3_py_version_str) + + return "Gramps version: %s \n"\ + "Python version: %s \n"\ "BSDDB version: %s \n"\ - "sqlite version: %s (%s) \n"\ - "Gramps version: %s \n"\ + "%s"\ "LANG: %s\n"\ "OS: %s\n"\ "Distribution: %s\n\n"\ "GTK version : %s\n"\ "gobject version: %s\n"\ "cairo version : %s"\ - % (str(sys.version).replace('\n',''), + % (str(VERSION), + str(sys.version).replace('\n',''), BSDDB_STR, - sqlite3_version_str, - sqlite3_py_version_str, - str(VERSION), + sqlite, get_env_var('LANG',''), operatingsystem, distribution, '%d.%d.%d' % (Gtk.get_major_version(), - Gtk.get_minor_version(), Gtk.get_micro_version()), + Gtk.get_minor_version(), + Gtk.get_micro_version()), '%d.%d.%d' % GObject.pygobject_version, cairo.version_info)