diff --git a/gramps/src/GenericFilter.py b/gramps/src/GenericFilter.py index c1c3cc118..5cbfe6a31 100644 --- a/gramps/src/GenericFilter.py +++ b/gramps/src/GenericFilter.py @@ -760,7 +760,7 @@ class FilterParser(handler.ContentHandler): pass self.gfilter_list.add(self.f) elif tag == "rule": - name = attrs['class'] + name = _(attrs['class']) self.a = [] self.cname = tasks[name] elif tag == "arg": @@ -774,6 +774,12 @@ class FilterParser(handler.ContentHandler): def characters(self, data): pass + +#------------------------------------------------------------------------- +# +# +# +#------------------------------------------------------------------------- SystemFilters = None CustomFilters = None diff --git a/gramps/src/Plugins.py b/gramps/src/Plugins.py index d9b84a115..cd642aad6 100644 --- a/gramps/src/Plugins.py +++ b/gramps/src/Plugins.py @@ -35,12 +35,12 @@ filters, importer, exporters, and document generators. import GdkImlib import gtk import libglade - #------------------------------------------------------------------------- # # Standard Python modules # #------------------------------------------------------------------------- +import traceback import os import sys from re import compile @@ -245,9 +245,9 @@ class PluginStatus: error = str(msgs[0]) if error[0:11] == "exceptions.": error = error[11:] - msg = msgs[1] - info.write("%s\n\t%s: %s\n\n" % (file,error,msg) ) - + info.write("%s\t%s\n" % (file,error) ) + traceback.print_exception(msgs[0],msgs[1],msgs[2],None,info) + info.write('\n') info.seek(0) window.show_string(info.read()) self.top.run_and_close() diff --git a/gramps/src/Report.py b/gramps/src/Report.py index 8f1c36e5a..1d6e99ef3 100644 --- a/gramps/src/Report.py +++ b/gramps/src/Report.py @@ -1019,10 +1019,10 @@ class DrawReportDialog(ReportDialog): self.doc = self.format(self.selected_style,self.paper,self.orien) class TemplateParser(handler.ContentHandler): - def __init__(self,data,path): + def __init__(self,data,fpath): handler.ContentHandler.__init__(self) self.data = data - self.path = path + self.path = fpath def setDocumentLocator(self,locator): self.locator = locator diff --git a/gramps/src/plugins/FilterEditor.py b/gramps/src/plugins/FilterEditor.py index e615f9ba8..daeba4ebe 100644 --- a/gramps/src/plugins/FilterEditor.py +++ b/gramps/src/plugins/FilterEditor.py @@ -381,7 +381,7 @@ register_tool( category=_("Utilities"), description=_("The Custom Filter Editor builds custom " "filters that can be used to select people " - "included reports, exports, and other utilities.") + "included in reports, exports, and other utilities.") ) if ((os.path.exists(const.system_filters) and