From 976edfbf1d7f7fc0d1bd26019d8a3121364be549 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Mon, 7 Jan 2019 19:25:08 +0000 Subject: [PATCH] Remove extraneous whitespace before assignment --- gramps/gen/datehandler/_date_de.py | 20 +-- gramps/gen/datehandler/_date_hu.py | 74 +++++------ gramps/gen/datehandler/_date_nl.py | 42 +++---- gramps/gen/datehandler/_date_pl.py | 64 +++++----- gramps/gen/datehandler/_date_sr.py | 116 +++++++++--------- gramps/gen/datehandler/_dateparser.py | 14 +-- gramps/gen/db/dbconst.py | 40 +++--- gramps/gen/db/txn.py | 2 +- gramps/gen/display/name.py | 72 +++++------ gramps/gen/filters/rules/_changedsincebase.py | 6 +- gramps/gen/filters/rules/_everything.py | 4 +- gramps/gen/filters/rules/_hasattributebase.py | 6 +- gramps/gen/filters/rules/_hascitationbase.py | 6 +- gramps/gen/filters/rules/_haseventbase.py | 6 +- gramps/gen/filters/rules/_hasgallerybase.py | 6 +- gramps/gen/filters/rules/_hasgrampsid.py | 6 +- gramps/gen/filters/rules/_hasldsbase.py | 6 +- gramps/gen/filters/rules/_hasnotebase.py | 6 +- gramps/gen/filters/rules/_hasnoteregexbase.py | 6 +- .../gen/filters/rules/_hasnotesubstrbase.py | 6 +- .../filters/rules/_hasreferencecountbase.py | 6 +- gramps/gen/filters/rules/_hassourcebase.py | 6 +- .../gen/filters/rules/_hassourcecountbase.py | 6 +- gramps/gen/filters/rules/_hassourceofbase.py | 6 +- gramps/gen/filters/rules/_hastagbase.py | 6 +- .../rules/_hastextmatchingsubstringof.py | 6 +- gramps/gen/filters/rules/_isprivate.py | 4 +- gramps/gen/filters/rules/_ispublic.py | 4 +- .../filters/rules/_matcheseventfilterbase.py | 8 +- .../gen/filters/rules/_matchesfilterbase.py | 6 +- .../rules/_matchessourceconfidencebase.py | 6 +- .../filters/rules/_matchessourcefilterbase.py | 8 +- gramps/gen/filters/rules/_regexpidbase.py | 6 +- gramps/gen/filters/rules/_rule.py | 6 +- .../filters/rules/citation/_allcitations.py | 2 +- .../filters/rules/citation/_changedsince.py | 4 +- .../rules/citation/_citationprivate.py | 2 +- .../filters/rules/citation/_hascitation.py | 6 +- .../gen/filters/rules/citation/_hasgallery.py | 2 +- gramps/gen/filters/rules/citation/_hasidof.py | 2 +- gramps/gen/filters/rules/citation/_hasnote.py | 2 +- .../citation/_hasnotematchingsubstringof.py | 2 +- .../filters/rules/citation/_hasnoteregexp.py | 2 +- .../rules/citation/_hasreferencecountof.py | 2 +- .../gen/filters/rules/citation/_hassource.py | 6 +- .../filters/rules/citation/_hassourceidof.py | 4 +- .../rules/citation/_hassourcenoteregexp.py | 4 +- gramps/gen/filters/rules/citation/_hastag.py | 4 +- .../filters/rules/citation/_matchesfilter.py | 4 +- .../rules/citation/_matchespagesubstringof.py | 6 +- .../citation/_matchesrepositoryfilter.py | 6 +- .../rules/citation/_matchessourcefilter.py | 8 +- .../gen/filters/rules/citation/_regexpidof.py | 2 +- .../rules/citation/_regexpsourceidof.py | 4 +- gramps/gen/filters/rules/event/_allevents.py | 2 +- .../gen/filters/rules/event/_changedsince.py | 4 +- .../gen/filters/rules/event/_eventprivate.py | 2 +- .../gen/filters/rules/event/_hasattribute.py | 4 +- .../gen/filters/rules/event/_hascitation.py | 4 +- gramps/gen/filters/rules/event/_hasdata.py | 6 +- .../gen/filters/rules/event/_hasdayofweek.py | 6 +- gramps/gen/filters/rules/event/_hasgallery.py | 2 +- gramps/gen/filters/rules/event/_hasidof.py | 2 +- gramps/gen/filters/rules/event/_hasnote.py | 2 +- .../event/_hasnotematchingsubstringof.py | 2 +- .../gen/filters/rules/event/_hasnoteregexp.py | 2 +- .../rules/event/_hasreferencecountof.py | 2 +- .../filters/rules/event/_hassourcecount.py | 2 +- gramps/gen/filters/rules/event/_hastag.py | 4 +- gramps/gen/filters/rules/event/_hastype.py | 6 +- .../gen/filters/rules/event/_matchesfilter.py | 4 +- .../rules/event/_matchespersonfilter.py | 8 +- .../rules/event/_matchesplacefilter.py | 8 +- .../rules/event/_matchessourceconfidence.py | 4 +- .../rules/event/_matchessourcefilter.py | 8 +- gramps/gen/filters/rules/event/_regexpidof.py | 2 +- .../gen/filters/rules/family/_allfamilies.py | 2 +- .../gen/filters/rules/family/_changedsince.py | 4 +- .../gen/filters/rules/family/_childhasidof.py | 6 +- .../filters/rules/family/_childhasnameof.py | 4 +- .../filters/rules/family/_familyprivate.py | 2 +- .../filters/rules/family/_fatherhasidof.py | 6 +- .../filters/rules/family/_fatherhasnameof.py | 4 +- .../gen/filters/rules/family/_hasattribute.py | 4 +- .../gen/filters/rules/family/_hascitation.py | 4 +- gramps/gen/filters/rules/family/_hasevent.py | 4 +- .../gen/filters/rules/family/_hasgallery.py | 2 +- gramps/gen/filters/rules/family/_hasidof.py | 2 +- gramps/gen/filters/rules/family/_haslds.py | 2 +- gramps/gen/filters/rules/family/_hasnote.py | 2 +- .../family/_hasnotematchingsubstringof.py | 2 +- .../filters/rules/family/_hasnoteregexp.py | 2 +- .../rules/family/_hasreferencecountof.py | 2 +- .../gen/filters/rules/family/_hasreltype.py | 6 +- .../filters/rules/family/_hassourcecount.py | 2 +- .../gen/filters/rules/family/_hassourceof.py | 6 +- gramps/gen/filters/rules/family/_hastag.py | 4 +- gramps/gen/filters/rules/family/_hastwins.py | 4 +- .../gen/filters/rules/family/_isbookmarked.py | 4 +- .../filters/rules/family/_matchesfilter.py | 4 +- .../rules/family/_matchessourceconfidence.py | 4 +- .../filters/rules/family/_motherhasidof.py | 6 +- .../filters/rules/family/_motherhasnameof.py | 4 +- .../filters/rules/family/_regexpchildname.py | 4 +- .../filters/rules/family/_regexpfathername.py | 4 +- .../gen/filters/rules/family/_regexpidof.py | 2 +- .../filters/rules/family/_regexpmothername.py | 4 +- .../filters/rules/family/_searchchildname.py | 4 +- .../filters/rules/family/_searchfathername.py | 4 +- .../filters/rules/family/_searchmothername.py | 4 +- gramps/gen/filters/rules/media/_allmedia.py | 2 +- .../gen/filters/rules/media/_changedsince.py | 4 +- .../gen/filters/rules/media/_hasattribute.py | 4 +- .../gen/filters/rules/media/_hascitation.py | 4 +- gramps/gen/filters/rules/media/_hasidof.py | 2 +- gramps/gen/filters/rules/media/_hasmedia.py | 6 +- .../media/_hasnotematchingsubstringof.py | 2 +- .../gen/filters/rules/media/_hasnoteregexp.py | 2 +- .../rules/media/_hasreferencecountof.py | 2 +- .../filters/rules/media/_hassourcecount.py | 2 +- .../gen/filters/rules/media/_hassourceof.py | 6 +- gramps/gen/filters/rules/media/_hastag.py | 4 +- .../gen/filters/rules/media/_matchesfilter.py | 4 +- .../rules/media/_matchessourceconfidence.py | 4 +- .../gen/filters/rules/media/_mediaprivate.py | 2 +- gramps/gen/filters/rules/media/_regexpidof.py | 2 +- gramps/gen/filters/rules/note/_allnotes.py | 2 +- .../gen/filters/rules/note/_changedsince.py | 4 +- gramps/gen/filters/rules/note/_hasidof.py | 2 +- gramps/gen/filters/rules/note/_hasnote.py | 6 +- .../rules/note/_hasreferencecountof.py | 2 +- gramps/gen/filters/rules/note/_hastag.py | 4 +- gramps/gen/filters/rules/note/_hastype.py | 6 +- .../gen/filters/rules/note/_matchesfilter.py | 4 +- .../filters/rules/note/_matchesregexpof.py | 6 +- .../filters/rules/note/_matchessubstringof.py | 6 +- gramps/gen/filters/rules/note/_noteprivate.py | 2 +- gramps/gen/filters/rules/note/_regexpidof.py | 2 +- .../gen/filters/rules/person/_changedsince.py | 2 +- .../gen/filters/rules/person/_disconnected.py | 4 +- gramps/gen/filters/rules/person/_everyone.py | 4 +- .../person/_familywithincompleteevent.py | 4 +- .../gen/filters/rules/person/_hasaddress.py | 6 +- .../filters/rules/person/_hasalternatename.py | 4 +- .../filters/rules/person/_hasassociation.py | 6 +- .../gen/filters/rules/person/_hasattribute.py | 4 +- gramps/gen/filters/rules/person/_hasbirth.py | 6 +- .../gen/filters/rules/person/_hascitation.py | 4 +- .../rules/person/_hascommonancestorwith.py | 6 +- .../_hascommonancestorwithfiltermatch.py | 6 +- gramps/gen/filters/rules/person/_hasdeath.py | 6 +- gramps/gen/filters/rules/person/_hasevent.py | 4 +- .../rules/person/_hasfamilyattribute.py | 6 +- .../filters/rules/person/_hasfamilyevent.py | 6 +- .../gen/filters/rules/person/_hasgallery.py | 2 +- gramps/gen/filters/rules/person/_hasidof.py | 2 +- gramps/gen/filters/rules/person/_haslds.py | 2 +- gramps/gen/filters/rules/person/_hasnameof.py | 6 +- .../rules/person/_hasnameorigintype.py | 6 +- .../gen/filters/rules/person/_hasnametype.py | 6 +- .../gen/filters/rules/person/_hasnickname.py | 4 +- gramps/gen/filters/rules/person/_hasnote.py | 2 +- .../person/_hasnotematchingsubstringof.py | 2 +- .../filters/rules/person/_hasnoteregexp.py | 2 +- .../filters/rules/person/_hasrelationship.py | 6 +- .../filters/rules/person/_hassoundexname.py | 6 +- .../filters/rules/person/_hassourcecount.py | 2 +- .../gen/filters/rules/person/_hassourceof.py | 6 +- gramps/gen/filters/rules/person/_hastag.py | 4 +- .../person/_hastextmatchingsubstringof.py | 6 +- .../filters/rules/person/_hasunknowngender.py | 4 +- .../filters/rules/person/_havealtfamilies.py | 4 +- .../gen/filters/rules/person/_havechildren.py | 4 +- .../filters/rules/person/_incompletenames.py | 4 +- .../gen/filters/rules/person/_isancestorof.py | 6 +- .../rules/person/_isancestoroffiltermatch.py | 6 +- .../gen/filters/rules/person/_isbookmarked.py | 4 +- .../rules/person/_ischildoffiltermatch.py | 6 +- .../filters/rules/person/_isdefaultperson.py | 4 +- .../rules/person/_isdescendantfamilyof.py | 6 +- .../_isdescendantfamilyoffiltermatch.py | 6 +- .../filters/rules/person/_isdescendantof.py | 6 +- .../person/_isdescendantoffiltermatch.py | 6 +- .../rules/person/_isduplicatedancestorof.py | 6 +- gramps/gen/filters/rules/person/_isfemale.py | 4 +- .../_islessthannthgenerationancestorof.py | 6 +- ...ssthannthgenerationancestorofbookmarked.py | 6 +- ...hannthgenerationancestorofdefaultperson.py | 6 +- .../_islessthannthgenerationdescendantof.py | 6 +- gramps/gen/filters/rules/person/_ismale.py | 4 +- .../_ismorethannthgenerationancestorof.py | 6 +- .../_ismorethannthgenerationdescendantof.py | 6 +- .../rules/person/_isparentoffiltermatch.py | 6 +- .../filters/rules/person/_isrelatedwith.py | 6 +- .../rules/person/_issiblingoffiltermatch.py | 6 +- .../rules/person/_isspouseoffiltermatch.py | 6 +- gramps/gen/filters/rules/person/_iswitness.py | 6 +- .../rules/person/_matcheseventfilter.py | 8 +- .../filters/rules/person/_matchesfilter.py | 4 +- .../rules/person/_matchessourceconfidence.py | 4 +- gramps/gen/filters/rules/person/_matchidof.py | 6 +- .../filters/rules/person/_missingparent.py | 4 +- .../rules/person/_multiplemarriages.py | 4 +- .../gen/filters/rules/person/_nevermarried.py | 4 +- .../gen/filters/rules/person/_nobirthdate.py | 4 +- .../gen/filters/rules/person/_nodeathdate.py | 4 +- .../filters/rules/person/_peopleprivate.py | 4 +- .../gen/filters/rules/person/_peoplepublic.py | 4 +- .../person/_personwithincompleteevent.py | 4 +- .../filters/rules/person/_probablyalive.py | 6 +- .../gen/filters/rules/person/_regexpidof.py | 2 +- .../gen/filters/rules/person/_regexpname.py | 6 +- .../rules/person/_relationshippathbetween.py | 6 +- .../_relationshippathbetweenbookmarks.py | 4 +- .../gen/filters/rules/person/_searchname.py | 6 +- gramps/gen/filters/rules/place/_allplaces.py | 2 +- .../gen/filters/rules/place/_changedsince.py | 4 +- .../gen/filters/rules/place/_hascitation.py | 4 +- gramps/gen/filters/rules/place/_hasdata.py | 6 +- gramps/gen/filters/rules/place/_hasgallery.py | 2 +- gramps/gen/filters/rules/place/_hasidof.py | 2 +- .../gen/filters/rules/place/_hasnolatorlon.py | 6 +- gramps/gen/filters/rules/place/_hasnote.py | 2 +- .../place/_hasnotematchingsubstringof.py | 2 +- .../gen/filters/rules/place/_hasnoteregexp.py | 2 +- gramps/gen/filters/rules/place/_hasplace.py | 6 +- .../rules/place/_hasreferencecountof.py | 2 +- .../filters/rules/place/_hassourcecount.py | 2 +- .../gen/filters/rules/place/_hassourceof.py | 6 +- gramps/gen/filters/rules/place/_hastag.py | 4 +- gramps/gen/filters/rules/place/_hastitle.py | 6 +- .../rules/place/_inlatlonneighborhood.py | 10 +- .../gen/filters/rules/place/_isenclosedby.py | 6 +- .../rules/place/_matcheseventfilter.py | 8 +- .../gen/filters/rules/place/_matchesfilter.py | 4 +- .../rules/place/_matchessourceconfidence.py | 4 +- .../gen/filters/rules/place/_placeprivate.py | 2 +- gramps/gen/filters/rules/place/_regexpidof.py | 2 +- gramps/gen/filters/rules/place/_withinarea.py | 6 +- .../gen/filters/rules/repository/_allrepos.py | 2 +- .../filters/rules/repository/_changedsince.py | 4 +- .../gen/filters/rules/repository/_hasidof.py | 2 +- .../repository/_hasnotematchingsubstringof.py | 2 +- .../rules/repository/_hasnoteregexp.py | 2 +- .../rules/repository/_hasreferencecountof.py | 2 +- .../gen/filters/rules/repository/_hasrepo.py | 6 +- .../gen/filters/rules/repository/_hastag.py | 4 +- .../rules/repository/_matchesfilter.py | 4 +- .../repository/_matchesnamesubstringof.py | 6 +- .../filters/rules/repository/_regexpidof.py | 2 +- .../filters/rules/repository/_repoprivate.py | 2 +- .../gen/filters/rules/source/_allsources.py | 2 +- .../gen/filters/rules/source/_changedsince.py | 4 +- .../gen/filters/rules/source/_hasgallery.py | 2 +- gramps/gen/filters/rules/source/_hasidof.py | 2 +- gramps/gen/filters/rules/source/_hasnote.py | 2 +- .../source/_hasnotematchingsubstringof.py | 2 +- .../filters/rules/source/_hasnoteregexp.py | 2 +- .../rules/source/_hasreferencecountof.py | 2 +- .../filters/rules/source/_hasrepository.py | 6 +- .../source/_hasrepositorycallnumberref.py | 6 +- gramps/gen/filters/rules/source/_hastag.py | 4 +- .../filters/rules/source/_matchesfilter.py | 4 +- .../rules/source/_matchesrepositoryfilter.py | 6 +- .../rules/source/_matchestitlesubstringof.py | 6 +- .../gen/filters/rules/source/_regexpidof.py | 2 +- .../filters/rules/source/_sourceprivate.py | 2 +- gramps/gen/lib/date.py | 2 +- gramps/gen/lib/test/grampstype_test.py | 2 +- gramps/gen/plug/_manager.py | 44 +++---- gramps/gen/plug/_pluginreg.py | 94 +++++++------- gramps/gen/plug/docbackend/docbackend.py | 16 +-- gramps/gen/plug/docgen/fontstyle.py | 24 ++-- gramps/gen/plug/docgen/graphicstyle.py | 2 +- gramps/gen/plug/docgen/paperstyle.py | 2 +- gramps/gen/plug/docgen/paragraphstyle.py | 6 +- gramps/gen/plug/docgen/tablestyle.py | 2 +- gramps/gen/proxy/living.py | 2 +- gramps/gen/utils/alive.py | 18 +-- gramps/gen/utils/config.py | 14 +-- gramps/gui/configure.py | 4 +- gramps/gui/ddtargets.py | 76 ++++++------ gramps/gui/editors/addmedia.py | 6 +- .../gui/editors/displaytabs/addrembedlist.py | 2 +- .../gui/editors/displaytabs/attrembedlist.py | 2 +- gramps/gui/editors/displaytabs/buttontab.py | 4 +- .../gui/editors/displaytabs/embeddedlist.py | 4 +- .../gui/editors/displaytabs/eventembedlist.py | 4 +- .../gui/editors/displaytabs/eventrefmodel.py | 2 +- .../editors/displaytabs/familyldsembedlist.py | 2 +- gramps/gui/editors/displaytabs/gallerytab.py | 4 +- .../gui/editors/displaytabs/ldsembedlist.py | 2 +- .../editors/displaytabs/locationembedlist.py | 2 +- .../gui/editors/displaytabs/nameembedlist.py | 2 +- .../editors/displaytabs/personrefembedlist.py | 2 +- .../editors/displaytabs/placenameembedlist.py | 2 +- .../editors/displaytabs/placerefembedlist.py | 2 +- .../editors/displaytabs/srcattrembedlist.py | 2 +- gramps/gui/editors/displaytabs/surnametab.py | 2 +- .../gui/editors/displaytabs/webembedlist.py | 2 +- gramps/gui/editors/editfamily.py | 12 +- gramps/gui/editors/editlocation.py | 4 +- gramps/gui/editors/editplace.py | 2 +- gramps/gui/editors/editprimary.py | 6 +- gramps/gui/editors/editurl.py | 4 +- gramps/gui/editors/filtereditor.py | 2 +- gramps/gui/listmodel.py | 10 +- gramps/gui/plug/_dialogs.py | 2 +- gramps/gui/plug/export/_exportoptions.py | 6 +- gramps/gui/plug/report/_papermenu.py | 4 +- gramps/gui/selectors/baseselector.py | 6 +- gramps/gui/views/treemodels/basemodel.py | 2 +- .../gui/views/treemodels/citationbasemodel.py | 36 +++--- gramps/gui/views/treemodels/eventmodel.py | 16 +-- gramps/gui/views/treemodels/peoplemodel.py | 16 +-- gramps/gui/widgets/fanchartdesc.py | 4 +- gramps/gui/widgets/grampletpane.py | 2 +- gramps/plugins/db/bsddb/bsddb.gpr.py | 6 +- gramps/plugins/db/bsddb/cursor.py | 8 +- gramps/plugins/db/bsddb/read.py | 58 ++++----- gramps/plugins/db/bsddb/test/cursor_test.py | 4 +- gramps/plugins/db/bsddb/undoredo.py | 14 +-- gramps/plugins/db/bsddb/write.py | 86 ++++++------- gramps/plugins/docgen/docgen.gpr.py | 36 +++--- gramps/plugins/drawreport/drawplugins.gpr.py | 40 +++--- gramps/plugins/export/export.gpr.py | 48 ++++---- gramps/plugins/export/exportcsv.py | 2 +- gramps/plugins/graph/graphplugins.gpr.py | 12 +- gramps/plugins/importer/import.gpr.py | 32 ++--- gramps/plugins/importer/importcsv.py | 70 +++++------ gramps/plugins/importer/importxml.py | 4 +- gramps/plugins/lib/libpersonview.py | 8 +- gramps/plugins/lib/libplaceview.py | 8 +- gramps/plugins/lib/libplugins.gpr.py | 60 ++++----- gramps/plugins/lib/libsubstkeyword.py | 2 +- gramps/plugins/lib/libtreebase.py | 2 +- gramps/plugins/lib/maps/constants.py | 30 ++--- gramps/plugins/mapservices/mapservice.gpr.py | 12 +- gramps/plugins/quickview/all_relations.py | 4 +- gramps/plugins/quickview/lineage.py | 2 +- gramps/plugins/quickview/quickview.gpr.py | 64 +++++----- gramps/plugins/quickview/references.py | 8 +- gramps/plugins/quickview/samesurnames.py | 20 +-- gramps/plugins/rel/rel_ca.py | 36 +++--- gramps/plugins/rel/relplugins.gpr.py | 80 ++++++------ gramps/plugins/sidebar/sidebar.gpr.py | 12 +- gramps/plugins/textreport/textplugins.gpr.py | 60 ++++----- gramps/plugins/tool/mediamanager.py | 10 +- gramps/plugins/tool/notrelated.py | 56 ++++----- gramps/plugins/tool/patchnames.py | 4 +- gramps/plugins/tool/tools.gpr.py | 80 ++++++------ gramps/plugins/tool/toolsdebug.gpr.py | 16 +-- gramps/plugins/view/citationlistview.py | 28 ++--- gramps/plugins/view/citationtreeview.py | 20 +-- gramps/plugins/view/eventview.py | 8 +- gramps/plugins/view/familyview.py | 8 +- gramps/plugins/view/geoplaces.py | 2 +- gramps/plugins/view/mediaview.py | 8 +- gramps/plugins/view/noteview.py | 8 +- gramps/plugins/view/relview.py | 44 +++---- gramps/plugins/view/view.gpr.py | 64 +++++----- gramps/plugins/webreport/webplugins.gpr.py | 8 +- gramps/plugins/webstuff/webstuff.gpr.py | 4 +- gramps/version.py | 2 +- 364 files changed, 1613 insertions(+), 1613 deletions(-) diff --git a/gramps/gen/datehandler/_date_de.py b/gramps/gen/datehandler/_date_de.py index 88ac155e4..d1d4aea7b 100644 --- a/gramps/gen/datehandler/_date_de.py +++ b/gramps/gen/datehandler/_date_de.py @@ -51,9 +51,9 @@ class DateParserDE(DateParser): # Always add german and austrian name variants no matter what the current # locale is month_to_int["januar"] = 1 - month_to_int["jan"] = 1 + month_to_int["jan"] = 1 month_to_int["jänner"] = 1 - month_to_int["jän"] = 1 + month_to_int["jän"] = 1 # Add other common latin, @@ -121,14 +121,14 @@ class DateParserDE(DateParser): # local and historical variants month_to_int["jenner"] = 1 - month_to_int["feber"] = 2 - month_to_int["merz"] = 3 - month_to_int["augst"] = 8 - month_to_int["7ber"] = 9 - month_to_int["8ber"] = 10 - month_to_int["9ber"] = 11 - month_to_int["10ber"] = 12 - month_to_int["xber"] = 12 + month_to_int["feber"] = 2 + month_to_int["merz"] = 3 + month_to_int["augst"] = 8 + month_to_int["7ber"] = 9 + month_to_int["8ber"] = 10 + month_to_int["9ber"] = 11 + month_to_int["10ber"] = 12 + month_to_int["xber"] = 12 # old german names diff --git a/gramps/gen/datehandler/_date_hu.py b/gramps/gen/datehandler/_date_hu.py index c601aa7a0..ab17f3ab8 100644 --- a/gramps/gen/datehandler/_date_hu.py +++ b/gramps/gen/datehandler/_date_hu.py @@ -55,7 +55,7 @@ class DateParserHU(DateParser): month_to_int["-"]=0 #to make the Zero month to work month_to_int["január"] = 1 - month_to_int["jan"] = 1 + month_to_int["jan"] = 1 month_to_int["jan."] = 1 month_to_int["I"] = 1 # month_to_int["i"] = 1 @@ -64,67 +64,67 @@ class DateParserHU(DateParser): month_to_int["feb"] = 2 month_to_int["feb."] = 2 month_to_int["II"] = 2 -# month_to_int["ii"] = 2 +# month_to_int["ii"] = 2 month_to_int["március"] = 3 month_to_int["márc"] = 3 month_to_int["márc."] = 3 month_to_int["III"] = 3 -# month_to_int["iii"] = 3 +# month_to_int["iii"] = 3 month_to_int["április"] = 4 month_to_int["ápr"] = 4 month_to_int["ápr."] = 4 - month_to_int["IV"] = 4 -# month_to_int["iv"] = 4 + month_to_int["IV"] = 4 +# month_to_int["iv"] = 4 month_to_int["május"] = 5 month_to_int["máj"] = 5 month_to_int["máj."] = 5 - month_to_int["V"] = 5 -# month_to_int["v"] = 5 + month_to_int["V"] = 5 +# month_to_int["v"] = 5 month_to_int["június"] = 6 month_to_int["jún"] = 6 month_to_int["jún."] = 6 - month_to_int["VI"] = 6 -# month_to_int["vi"] = 6 + month_to_int["VI"] = 6 +# month_to_int["vi"] = 6 - month_to_int["július"] = 7 - month_to_int["júl"] = 7 - month_to_int["júl."] = 7 - month_to_int["VII"] = 7 -# month_to_int["vii"] = 7 + month_to_int["július"] = 7 + month_to_int["júl"] = 7 + month_to_int["júl."] = 7 + month_to_int["VII"] = 7 +# month_to_int["vii"] = 7 - month_to_int["augusztus"] = 8 - month_to_int["aug"] = 8 - month_to_int["aug."] = 8 - month_to_int["VIII"] = 8 -# month_to_int["viii"] = 8 + month_to_int["augusztus"] = 8 + month_to_int["aug"] = 8 + month_to_int["aug."] = 8 + month_to_int["VIII"] = 8 +# month_to_int["viii"] = 8 - month_to_int["szeptember"] = 9 - month_to_int["szept"] = 9 + month_to_int["szeptember"] = 9 + month_to_int["szept"] = 9 month_to_int["szept."] = 9 - month_to_int["IX"] = 9 -# month_to_int["ix"] = 9 + month_to_int["IX"] = 9 +# month_to_int["ix"] = 9 - month_to_int["október"] = 10 - month_to_int["okt"] = 10 - month_to_int["okt."] = 10 - month_to_int["X"] = 10 -# month_to_int["x"] = 10 + month_to_int["október"] = 10 + month_to_int["okt"] = 10 + month_to_int["okt."] = 10 + month_to_int["X"] = 10 +# month_to_int["x"] = 10 - month_to_int["november"] = 11 - month_to_int["nov"] = 11 + month_to_int["november"] = 11 + month_to_int["nov"] = 11 month_to_int["nov."] = 11 - month_to_int["XI"] = 11 -# month_to_int["xi"] = 11 + month_to_int["XI"] = 11 +# month_to_int["xi"] = 11 - month_to_int["december"] = 12 - month_to_int["dec"] = 12 - month_to_int["dec."] = 12 - month_to_int["XII"] = 12 -# month_to_int["xii"] = 12 + month_to_int["december"] = 12 + month_to_int["dec"] = 12 + month_to_int["dec."] = 12 + month_to_int["XII"] = 12 +# month_to_int["xii"] = 12 #----------------------------------------------------------------------- diff --git a/gramps/gen/datehandler/_date_nl.py b/gramps/gen/datehandler/_date_nl.py index 0c3a8beb1..add9a14cc 100644 --- a/gramps/gen/datehandler/_date_nl.py +++ b/gramps/gen/datehandler/_date_nl.py @@ -57,30 +57,30 @@ class DateParserNL(DateParser): # Always add dutch and flemish name variants # no matter what the current locale is month_to_int["januari"] = 1 - month_to_int["jan"] = 1 + month_to_int["jan"] = 1 # Add other common latin, local and historical variants month_to_int["januaris"] = 1 - month_to_int["feber"] = 2 - month_to_int["februaris"] = 2 - month_to_int["merz"] = 3 + month_to_int["feber"] = 2 + month_to_int["februaris"] = 2 + month_to_int["merz"] = 3 #make sure on all distro mrt and maa are accepted - month_to_int["maa"] = 3 - month_to_int["mrt"] = 3 - month_to_int["aprilis"] = 4 - month_to_int["maius"] = 5 - month_to_int["junius"] = 6 - month_to_int["julius"] = 7 - month_to_int["augst"] = 8 - month_to_int["7ber"] = 9 - month_to_int["7bris"] = 9 - month_to_int["8ber"] = 10 - month_to_int["8bris"] = 10 - month_to_int["9ber"] = 11 - month_to_int["9bris"] = 11 - month_to_int["10ber"] = 12 - month_to_int["10bris"] = 12 - month_to_int["xber"] = 12 - month_to_int["xbris"] = 12 + month_to_int["maa"] = 3 + month_to_int["mrt"] = 3 + month_to_int["aprilis"] = 4 + month_to_int["maius"] = 5 + month_to_int["junius"] = 6 + month_to_int["julius"] = 7 + month_to_int["augst"] = 8 + month_to_int["7ber"] = 9 + month_to_int["7bris"] = 9 + month_to_int["8ber"] = 10 + month_to_int["8bris"] = 10 + month_to_int["9ber"] = 11 + month_to_int["9bris"] = 11 + month_to_int["10ber"] = 12 + month_to_int["10bris"] = 12 + month_to_int["xber"] = 12 + month_to_int["xbris"] = 12 modifier_to_int = { 'voor' : Date.MOD_BEFORE, diff --git a/gramps/gen/datehandler/_date_pl.py b/gramps/gen/datehandler/_date_pl.py index a41179ace..11d475029 100644 --- a/gramps/gen/datehandler/_date_pl.py +++ b/gramps/gen/datehandler/_date_pl.py @@ -54,38 +54,38 @@ class DateParserPL(DateParser): month_to_int["styczeń"] = 1 month_to_int["sty"] = 1 month_to_int["I"] = 1 - month_to_int["luty"] = 2 - month_to_int["lut"] = 2 - month_to_int["II"] = 2 - month_to_int["marzec"] = 3 - month_to_int["mar"] = 3 - month_to_int["III"] = 3 - month_to_int["kwiecień"] = 4 - month_to_int["kwi"] = 4 - month_to_int["IV"] = 4 - month_to_int["maj"] = 5 - month_to_int["V"] = 5 - month_to_int["czerwiec"] = 6 - month_to_int["cze"] = 6 - month_to_int["VI"] = 6 - month_to_int["lipiec"] = 7 - month_to_int["lip"] = 7 - month_to_int["VII"] = 7 - month_to_int["sierpień"] = 8 - month_to_int["sie"] = 8 - month_to_int["VIII"] = 8 - month_to_int["wrzesień"] = 9 - month_to_int["wrz"] = 9 - month_to_int["IX"] = 9 - month_to_int["październik"] = 10 - month_to_int["paź"] = 10 - month_to_int["X"] = 10 - month_to_int["listopad"] = 11 - month_to_int["lis"] = 11 - month_to_int["XI"] = 11 - month_to_int["grudzień"] = 12 - month_to_int["gru"] = 12 - month_to_int["XII"] = 12 + month_to_int["luty"] = 2 + month_to_int["lut"] = 2 + month_to_int["II"] = 2 + month_to_int["marzec"] = 3 + month_to_int["mar"] = 3 + month_to_int["III"] = 3 + month_to_int["kwiecień"] = 4 + month_to_int["kwi"] = 4 + month_to_int["IV"] = 4 + month_to_int["maj"] = 5 + month_to_int["V"] = 5 + month_to_int["czerwiec"] = 6 + month_to_int["cze"] = 6 + month_to_int["VI"] = 6 + month_to_int["lipiec"] = 7 + month_to_int["lip"] = 7 + month_to_int["VII"] = 7 + month_to_int["sierpień"] = 8 + month_to_int["sie"] = 8 + month_to_int["VIII"] = 8 + month_to_int["wrzesień"] = 9 + month_to_int["wrz"] = 9 + month_to_int["IX"] = 9 + month_to_int["październik"] = 10 + month_to_int["paź"] = 10 + month_to_int["X"] = 10 + month_to_int["listopad"] = 11 + month_to_int["lis"] = 11 + month_to_int["XI"] = 11 + month_to_int["grudzień"] = 12 + month_to_int["gru"] = 12 + month_to_int["XII"] = 12 # Alternative forms: declined nouns month_to_int["stycznia"] = 1 month_to_int["lutego"] = 2 diff --git a/gramps/gen/datehandler/_date_sr.py b/gramps/gen/datehandler/_date_sr.py index d348a9580..c134601d7 100644 --- a/gramps/gen/datehandler/_date_sr.py +++ b/gramps/gen/datehandler/_date_sr.py @@ -54,95 +54,95 @@ class DateParserSR(DateParser): """ month_to_int = DateParser.month_to_int - month_to_int["januar"] = 1 + month_to_int["januar"] = 1 month_to_int["januara"] = 1 - month_to_int["jan"] = 1 - month_to_int["јан"] = 1 + month_to_int["jan"] = 1 + month_to_int["јан"] = 1 month_to_int["јануара"] = 1 - month_to_int["јануар"] = 1 - month_to_int["i"] = 1 + month_to_int["јануар"] = 1 + month_to_int["i"] = 1 - month_to_int["februar"] = 2 + month_to_int["februar"] = 2 month_to_int["februara"] = 2 - month_to_int["feb"] = 2 - month_to_int["феб"] = 2 - month_to_int["фебруар"] = 2 + month_to_int["feb"] = 2 + month_to_int["феб"] = 2 + month_to_int["фебруар"] = 2 month_to_int["фебруара"] = 2 - month_to_int["ii"] = 2 + month_to_int["ii"] = 2 - month_to_int["mart"] = 3 + month_to_int["mart"] = 3 month_to_int["marta"] = 3 - month_to_int["mar"] = 3 - month_to_int["мар"] = 3 - month_to_int["март"] = 3 + month_to_int["mar"] = 3 + month_to_int["мар"] = 3 + month_to_int["март"] = 3 month_to_int["марта"] = 3 - month_to_int["iii"] = 3 + month_to_int["iii"] = 3 - month_to_int["april"] = 4 + month_to_int["april"] = 4 month_to_int["aprila"] = 4 - month_to_int["apr"] = 4 - month_to_int["апр"] = 4 - month_to_int["април"] = 4 + month_to_int["apr"] = 4 + month_to_int["апр"] = 4 + month_to_int["април"] = 4 month_to_int["априла"] = 4 - month_to_int["iv"] = 4 + month_to_int["iv"] = 4 - month_to_int["maj"] = 5 + month_to_int["maj"] = 5 month_to_int["maja"] = 5 - month_to_int["мај"] = 5 + month_to_int["мај"] = 5 month_to_int["маја"] = 5 - month_to_int["v"] = 5 + month_to_int["v"] = 5 - month_to_int["jun"] = 6 + month_to_int["jun"] = 6 month_to_int["juna"] = 6 - month_to_int["јун"] = 6 + month_to_int["јун"] = 6 month_to_int["јуна"] = 6 - month_to_int["vi"] = 6 + month_to_int["vi"] = 6 - month_to_int["jul"] = 7 + month_to_int["jul"] = 7 month_to_int["jula"] = 7 - month_to_int["јул"] = 7 + month_to_int["јул"] = 7 month_to_int["јула"] = 7 - month_to_int["vii"] = 7 + month_to_int["vii"] = 7 - month_to_int["avgust"] = 8 + month_to_int["avgust"] = 8 month_to_int["avgusta"] = 8 - month_to_int["avg"] = 8 - month_to_int["авг"] = 8 - month_to_int["август"] = 8 + month_to_int["avg"] = 8 + month_to_int["авг"] = 8 + month_to_int["август"] = 8 month_to_int["августа"] = 8 - month_to_int["viii"] = 8 + month_to_int["viii"] = 8 month_to_int["septembar"] = 9 month_to_int["septembra"] = 9 - month_to_int["sep"] = 9 - month_to_int["сеп"] = 9 + month_to_int["sep"] = 9 + month_to_int["сеп"] = 9 month_to_int["септембар"] = 9 month_to_int["септембра"] = 9 - month_to_int["ix"] = 9 + month_to_int["ix"] = 9 - month_to_int["oktobar"] = 10 - month_to_int["oktobra"] = 10 - month_to_int["okt"] = 10 - month_to_int["окт"] = 10 - month_to_int["октобар"] = 10 - month_to_int["октобра"] = 10 - month_to_int["x"] = 10 + month_to_int["oktobar"] = 10 + month_to_int["oktobra"] = 10 + month_to_int["okt"] = 10 + month_to_int["окт"] = 10 + month_to_int["октобар"] = 10 + month_to_int["октобра"] = 10 + month_to_int["x"] = 10 - month_to_int["novembar"] = 11 - month_to_int["novembra"] = 11 - month_to_int["nov"] = 11 - month_to_int["нов"] = 11 - month_to_int["новембар"] = 11 - month_to_int["новембра"] = 11 - month_to_int["xi"] = 11 + month_to_int["novembar"] = 11 + month_to_int["novembra"] = 11 + month_to_int["nov"] = 11 + month_to_int["нов"] = 11 + month_to_int["новембар"] = 11 + month_to_int["новембра"] = 11 + month_to_int["xi"] = 11 - month_to_int["decembar"] = 12 - month_to_int["decembra"] = 12 - month_to_int["dec"] = 12 - month_to_int["дец"] = 12 - month_to_int["децембар"] = 12 - month_to_int["децембра"] = 12 - month_to_int["xii"] = 12 + month_to_int["decembar"] = 12 + month_to_int["decembra"] = 12 + month_to_int["dec"] = 12 + month_to_int["дец"] = 12 + month_to_int["децембар"] = 12 + month_to_int["децембра"] = 12 + month_to_int["xii"] = 12 modifier_to_int = { 'pre' : Date.MOD_BEFORE, diff --git a/gramps/gen/datehandler/_dateparser.py b/gramps/gen/datehandler/_dateparser.py index 74e5dfd12..d123279d5 100644 --- a/gramps/gen/datehandler/_dateparser.py +++ b/gramps/gen/datehandler/_dateparser.py @@ -56,7 +56,7 @@ from ._datestrings import DateStrings # Top-level module functions # #------------------------------------------------------------------------- -_max_days = [ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ] +_max_days = [ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ] _leap_days = [ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ] def gregorian_valid(date_tuple): @@ -400,8 +400,8 @@ class DateParser: _ = self._locale.translation.gettext self.__init_prefix_tables() - self._rfc_mon_str = '(' + '|'.join(list(self._rfc_mons_to_int.keys())) + ')' - self._rfc_day_str = '(' + '|'.join(self._rfc_days) + ')' + self._rfc_mon_str = '(' + '|'.join(list(self._rfc_mons_to_int.keys())) + ')' + self._rfc_day_str = '(' + '|'.join(self._rfc_days) + ')' self._bce_str = self.re_longest_first(self.bce) self._qual_str = self.re_longest_first(list(self.quality_to_int.keys())) @@ -409,14 +409,14 @@ class DateParser: self._mod_after_str = self.re_longest_first( list(self.modifier_after_to_int.keys())) - self._mon_str = self.re_longest_first(list(self.month_to_int.keys())) + self._mon_str = self.re_longest_first(list(self.month_to_int.keys())) self._jmon_str = self.re_longest_first(list(self.hebrew_to_int.keys())) self._fmon_str = self.re_longest_first(list(self.french_to_int.keys())) self._pmon_str = self.re_longest_first(list(self.persian_to_int.keys())) self._imon_str = self.re_longest_first(list(self.islamic_to_int.keys())) self._smon_str = self.re_longest_first(list(self.swedish_to_int.keys())) - self._cal_str = self.re_longest_first(list(self.calendar_to_int.keys())) - self._ny_str = self.re_longest_first(list(self.newyear_to_int.keys())) + self._cal_str = self.re_longest_first(list(self.calendar_to_int.keys())) + self._ny_str = self.re_longest_first(list(self.newyear_to_int.keys())) self._today_str = self.re_longest_first(self.today + [_("today"),]) @@ -911,7 +911,7 @@ class DateParser: text = text.strip() # otherwise spaces can make it a bad date date.set_text_value(text) qual = Date.QUAL_NONE - cal = Date.CAL_GREGORIAN + cal = Date.CAL_GREGORIAN newyear = Date.NEWYEAR_JAN1 (text, cal, newyear) = self.match_calendar_newyear(text, cal, newyear) diff --git a/gramps/gen/db/dbconst.py b/gramps/gen/db/dbconst.py index 8aa3d0044..2300160c3 100644 --- a/gramps/gen/db/dbconst.py +++ b/gramps/gen/db/dbconst.py @@ -39,36 +39,36 @@ __all__ = ( 'DBPAGE', 'DBMODE', 'DBCACHE', 'DBLOCKS', 'DBOBJECTS', 'DBUNDO', "CLASS_TO_KEY_MAP", "KEY_TO_CLASS_MAP", "KEY_TO_NAME_MAP" ) -DBEXT = ".db" # File extension to be used for database files -DBUNDOFN = "undo.db" # File name of 'undo' database -DBLOCKFN = "lock" # File name of lock file +DBEXT = ".db" # File extension to be used for database files +DBUNDOFN = "undo.db" # File name of 'undo' database +DBLOCKFN = "lock" # File name of lock file DBRECOVFN = "need_recover" # File name of recovery file BDBVERSFN = "bdbversion.txt"# File name of Berkeley DB version file DBBACKEND = "database.txt" # File name of Database backend file SCHVERSFN = "schemaversion.txt"# File name of schema version file PCKVERSFN = "pickleupgrade.txt" # Indicator that pickle has been upgrade t Python3 DBLOGNAME = ".Db" # Name of logger -DBMODE_R = "r" # Read-only access -DBMODE_W = "w" # Full Read/Write access -DBPAGE = 16384 # Size of the pages used to hold items in the database -DBMODE = 0o666 # Unix mode for database creation -DBCACHE = 0x4000000 # Size of the shared memory buffer pool -DBLOCKS = 100000 # Maximum number of locks supported +DBMODE_R = "r" # Read-only access +DBMODE_W = "w" # Full Read/Write access +DBPAGE = 16384 # Size of the pages used to hold items in the database +DBMODE = 0o666 # Unix mode for database creation +DBCACHE = 0x4000000 # Size of the shared memory buffer pool +DBLOCKS = 100000 # Maximum number of locks supported DBOBJECTS = 100000 # Maximum number of simultaneously locked objects -DBUNDO = 1000 # Maximum size of undo buffer +DBUNDO = 1000 # Maximum size of undo buffer ARRAYSIZE = 1000 # The arraysize for a SQL cursor -PERSON_KEY = 0 -FAMILY_KEY = 1 -SOURCE_KEY = 2 -EVENT_KEY = 3 -MEDIA_KEY = 4 -PLACE_KEY = 5 +PERSON_KEY = 0 +FAMILY_KEY = 1 +SOURCE_KEY = 2 +EVENT_KEY = 3 +MEDIA_KEY = 4 +PLACE_KEY = 5 REPOSITORY_KEY = 6 -REFERENCE_KEY = 7 -NOTE_KEY = 8 -TAG_KEY = 9 -CITATION_KEY = 10 +REFERENCE_KEY = 7 +NOTE_KEY = 8 +TAG_KEY = 9 +CITATION_KEY = 10 TXNADD, TXNUPD, TXNDEL = 0, 1, 2 diff --git a/gramps/gen/db/txn.py b/gramps/gen/db/txn.py index 9162397c4..52620c6dd 100644 --- a/gramps/gen/db/txn.py +++ b/gramps/gen/db/txn.py @@ -120,7 +120,7 @@ class DbTxn(defaultdict): data = Python list where: list element = (handle, data) where: handle = handle (database key) of the object in the transaction - data = pickled representation of the object + data = pickled representation of the object """ # Conditional on __debug__ because all that frame stuff may be slow diff --git a/gramps/gen/display/name.py b/gramps/gen/display/name.py index 8cb274e0e..1555a2dcb 100644 --- a/gramps/gen/display/name.py +++ b/gramps/gen/display/name.py @@ -83,21 +83,21 @@ except ImportError: # Constants # #------------------------------------------------------------------------- -_FIRSTNAME = 4 +_FIRSTNAME = 4 _SURNAME_LIST = 5 -_SUFFIX = 6 -_TITLE = 7 -_TYPE = 8 -_GROUP = 9 -_SORT = 10 -_DISPLAY = 11 -_CALL = 12 -_NICK = 13 -_FAMNICK = 14 -_SURNAME_IN_LIST = 0 -_PREFIX_IN_LIST = 1 -_PRIMARY_IN_LIST = 2 -_TYPE_IN_LIST = 3 +_SUFFIX = 6 +_TITLE = 7 +_TYPE = 8 +_GROUP = 9 +_SORT = 10 +_DISPLAY = 11 +_CALL = 12 +_NICK = 13 +_FAMNICK = 14 +_SURNAME_IN_LIST = 0 +_PREFIX_IN_LIST = 1 +_PRIMARY_IN_LIST = 2 +_TYPE_IN_LIST = 3 _CONNECTOR_IN_LIST = 4 _ORIGINPATRO = NameOriginType.PATRONYMIC _ORIGINMATRO = NameOriginType.MATRONYMIC @@ -570,13 +570,13 @@ class NameDisplay: raw_data[_SUFFIX]) Specific symbols for parts of a name are defined (keywords given): - 't' : title = title - 'f' : given = given (first names) - 'l' : surname = full surname (lastname) - 'c' : call = callname - 'x' : common = nick name, call, otherwise first first name (common name) - 'i' : initials = initials of the first names - 'm' : primary = primary surname (main) + 't' : title = title + 'f' : given = given (first names) + 'l' : surname = full surname (lastname) + 'c' : call = callname + 'x' : common = nick name, call, otherwise first first name (common name) + 'i' : initials = initials of the first names + 'm' : primary = primary surname (main) '0m': primary[pre]= prefix primary surname (main) '1m': primary[sur]= surname primary surname (main) '2m': primary[con]= connector primary surname (main) @@ -585,11 +585,11 @@ class NameDisplay: '1y': patronymic[sur] = surname " '2y': patronymic[con] = connector " 'o' : notpatronymic = surnames without pa/matronymic and primary - 'r' : rest = non primary surnames - 'p' : prefix = list of all prefixes + 'r' : rest = non primary surnames + 'p' : prefix = list of all prefixes 'q' : rawsurnames = surnames without prefixes and connectors - 's' : suffix = suffix - 'n' : nickname = nick name + 's' : suffix = suffix + 'n' : nickname = nick name 'g' : familynick = family nick name @@ -671,13 +671,13 @@ class NameDisplay: return "%s %s" % (first,suffix) Specific symbols for parts of a name are defined (keywords given): - 't' : title = title - 'f' : given = given (first names) - 'l' : surname = full surname (lastname) - 'c' : call = callname - 'x' : common = nick name, call, or otherwise first first name (common name) - 'i' : initials = initials of the first names - 'm' : primary = primary surname (main) + 't' : title = title + 'f' : given = given (first names) + 'l' : surname = full surname (lastname) + 'c' : call = callname + 'x' : common = nick name, call, or otherwise first first name (common name) + 'i' : initials = initials of the first names + 'm' : primary = primary surname (main) '0m': primary[pre]= prefix primary surname (main) '1m': primary[sur]= surname primary surname (main) '2m': primary[con]= connector primary surname (main) @@ -686,11 +686,11 @@ class NameDisplay: '1y': patronymic[sur] = surname " '2y': patronymic[con] = connector " 'o' : notpatronymic = surnames without pa/matronymic and primary - 'r' : rest = non primary surnames - 'p' : prefix = list of all prefixes + 'r' : rest = non primary surnames + 'p' : prefix = list of all prefixes 'q' : rawsurnames = surnames without prefixes and connectors - 's' : suffix = suffix - 'n' : nickname = nick name + 's' : suffix = suffix + 'n' : nickname = nick name 'g' : familynick = family nick name """ diff --git a/gramps/gen/filters/rules/_changedsincebase.py b/gramps/gen/filters/rules/_changedsincebase.py index b8af93df4..426aa76a8 100644 --- a/gramps/gen/filters/rules/_changedsincebase.py +++ b/gramps/gen/filters/rules/_changedsincebase.py @@ -48,12 +48,12 @@ class ChangedSinceBase(Rule): Rule that checks for primary objects changed since a specific time. """ - labels = [ 'Changed after:', 'but before:' ] - name = 'Objects changed after ' + labels = [ 'Changed after:', 'but before:' ] + name = 'Objects changed after ' description = "Matches object records changed after a specified " \ "date/time (yyyy-mm-dd hh:mm:ss) or in range, if a second " \ "date/time is given." - category = _('General filters') + category = _('General filters') def add_time(self, date): if re.search(r"\d.*\s+\d{1,2}:\d{2}:\d{2}", date): diff --git a/gramps/gen/filters/rules/_everything.py b/gramps/gen/filters/rules/_everything.py index 7634b59ac..abf6be825 100644 --- a/gramps/gen/filters/rules/_everything.py +++ b/gramps/gen/filters/rules/_everything.py @@ -41,8 +41,8 @@ from . import Rule class Everything(Rule): """Match Everyone.""" - name = 'Every object' - category = _('General filters') + name = 'Every object' + category = _('General filters') description = 'Matches every object in the database' def is_empty(self): diff --git a/gramps/gen/filters/rules/_hasattributebase.py b/gramps/gen/filters/rules/_hasattributebase.py index 5bb7090e2..4bc25a730 100644 --- a/gramps/gen/filters/rules/_hasattributebase.py +++ b/gramps/gen/filters/rules/_hasattributebase.py @@ -44,11 +44,11 @@ class HasAttributeBase(Rule): Rule that checks for an object with a particular attribute. """ - labels = [ 'Attribute:', 'Value:' ] - name = 'Objects with the ' + labels = [ 'Attribute:', 'Value:' ] + name = 'Objects with the ' description = "Matches objects with the given attribute " \ "of a particular value" - category = _('General filters') + category = _('General filters') allow_regex = True def apply(self, db, obj): diff --git a/gramps/gen/filters/rules/_hascitationbase.py b/gramps/gen/filters/rules/_hascitationbase.py index 8cb6bb038..14455512e 100644 --- a/gramps/gen/filters/rules/_hascitationbase.py +++ b/gramps/gen/filters/rules/_hascitationbase.py @@ -46,12 +46,12 @@ class HasCitationBase(Rule): First parameter is [Volume/page, Date, Confidence] """ - labels = [ _('Volume/Page:'), + labels = [ _('Volume/Page:'), _('Date:'), _('Confidence:') ] - name = _('Citations matching parameters') + name = _('Citations matching parameters') description = _("Matches citations with particular parameters") - category = _('Citation/source filters') + category = _('Citation/source filters') allow_regex = True def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/_haseventbase.py b/gramps/gen/filters/rules/_haseventbase.py index 13845a82b..0bd3b27c5 100644 --- a/gramps/gen/filters/rules/_haseventbase.py +++ b/gramps/gen/filters/rules/_haseventbase.py @@ -46,14 +46,14 @@ class HasEventBase(Rule): """Rule that checks for an event with a particular value.""" - labels = [ 'Event type:', + labels = [ 'Event type:', 'Date:', 'Place:', 'Description:', 'Main Participants:' ] - name = 'Events matching parameters' + name = 'Events matching parameters' description = "Matches events with particular parameters" - category = _('Event filters') + category = _('Event filters') allow_regex = True def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/_hasgallerybase.py b/gramps/gen/filters/rules/_hasgallerybase.py index 11ae4829e..d384e82a8 100644 --- a/gramps/gen/filters/rules/_hasgallerybase.py +++ b/gramps/gen/filters/rules/_hasgallerybase.py @@ -42,10 +42,10 @@ from . import Rule class HasGalleryBase(Rule): """Objects who have Media Object""" - labels = [ _('Number of instances:'), _('Number must be:')] - name = 'Object with Media references' + labels = [ _('Number of instances:'), _('Number must be:')] + name = 'Object with Media references' description = "Matches objects with certain number of items in the gallery" - category = _('General filters') + category = _('General filters') def prepare(self, db, user): # things we want to do just once, not for every handle diff --git a/gramps/gen/filters/rules/_hasgrampsid.py b/gramps/gen/filters/rules/_hasgrampsid.py index 706515020..cb2a97ea2 100644 --- a/gramps/gen/filters/rules/_hasgrampsid.py +++ b/gramps/gen/filters/rules/_hasgrampsid.py @@ -42,10 +42,10 @@ from . import Rule class HasGrampsId(Rule): """Rule that checks for an object with a specific Gramps ID.""" - labels = [ _('ID:') ] - name = 'Object with ' + labels = [ _('ID:') ] + name = 'Object with ' description = "Matches objects with a specified Gramps ID" - category = _('General filters') + category = _('General filters') def apply(self, db, obj): """ diff --git a/gramps/gen/filters/rules/_hasldsbase.py b/gramps/gen/filters/rules/_hasldsbase.py index b9088c095..d7aa77d74 100644 --- a/gramps/gen/filters/rules/_hasldsbase.py +++ b/gramps/gen/filters/rules/_hasldsbase.py @@ -45,10 +45,10 @@ from . import Rule class HasLDSBase(Rule): """Rule that checks for object with a LDS event""" - labels = [ _('Number of instances:'), _('Number must be:')] - name = 'Objects with LDS events' + labels = [ _('Number of instances:'), _('Number must be:')] + name = 'Objects with LDS events' description = "Matches objects with LDS events" - category = _('General filters') + category = _('General filters') def prepare(self, db, user): # things we want to do just once, not for every handle diff --git a/gramps/gen/filters/rules/_hasnotebase.py b/gramps/gen/filters/rules/_hasnotebase.py index 5e99ad630..4118bf8df 100644 --- a/gramps/gen/filters/rules/_hasnotebase.py +++ b/gramps/gen/filters/rules/_hasnotebase.py @@ -43,10 +43,10 @@ from . import Rule class HasNoteBase(Rule): """Objects having notes""" - labels = [ _('Number of instances:'), _('Number must be:')] - name = 'Object with notes' + labels = [ _('Number of instances:'), _('Number must be:')] + name = 'Object with notes' description = "Matches objects that have a certain number of notes" - category = _('General filters') + category = _('General filters') def __init__(self, arg, use_regex=False): # Upgrade from pre 3.1 HasNote filter, use defaults that correspond diff --git a/gramps/gen/filters/rules/_hasnoteregexbase.py b/gramps/gen/filters/rules/_hasnoteregexbase.py index 87cf43d60..3736a5b55 100644 --- a/gramps/gen/filters/rules/_hasnoteregexbase.py +++ b/gramps/gen/filters/rules/_hasnoteregexbase.py @@ -40,11 +40,11 @@ from . import Rule class HasNoteRegexBase(Rule): """Objects having notes containing .""" - labels = [ _('Text:')] - name = 'Objects having notes containing ' + labels = [ _('Text:')] + name = 'Objects having notes containing ' description = ("Matches objects whose notes contain a substring " "or match a regular expression") - category = _('General filters') + category = _('General filters') allow_regex = True def apply(self, db, person): diff --git a/gramps/gen/filters/rules/_hasnotesubstrbase.py b/gramps/gen/filters/rules/_hasnotesubstrbase.py index 11e83da16..affe5cb6f 100644 --- a/gramps/gen/filters/rules/_hasnotesubstrbase.py +++ b/gramps/gen/filters/rules/_hasnotesubstrbase.py @@ -39,11 +39,11 @@ from . import Rule class HasNoteSubstrBase(Rule): """People having notes containing .""" - labels = [ _('Substring:')] - name = 'Objects having notes containing ' + labels = [ _('Substring:')] + name = 'Objects having notes containing ' description = "Matches objects whose notes contain text matching a " \ "substring" - category = _('General filters') + category = _('General filters') def apply(self, db, person): notelist = person.get_note_list() diff --git a/gramps/gen/filters/rules/_hasreferencecountbase.py b/gramps/gen/filters/rules/_hasreferencecountbase.py index 7840ddabf..3db48fa95 100644 --- a/gramps/gen/filters/rules/_hasreferencecountbase.py +++ b/gramps/gen/filters/rules/_hasreferencecountbase.py @@ -39,10 +39,10 @@ from . import Rule class HasReferenceCountBase(Rule): """Objects with a reference count of .""" - labels = [ _('Reference count must be:'), _('Reference count:')] - name = 'Objects with a reference count of ' + labels = [ _('Reference count must be:'), _('Reference count:')] + name = 'Objects with a reference count of ' description = "Matches objects with a certain reference count" - category = _('General filters') + category = _('General filters') def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/_hassourcebase.py b/gramps/gen/filters/rules/_hassourcebase.py index ebd66a1fe..8300c2076 100644 --- a/gramps/gen/filters/rules/_hassourcebase.py +++ b/gramps/gen/filters/rules/_hassourcebase.py @@ -43,13 +43,13 @@ class HasSourceBase(Rule): """Rule that checks for a source with a particular value""" - labels = [ 'Title:', + labels = [ 'Title:', 'Author:', 'Abbreviation:', 'Publication:' ] - name = 'Sources matching parameters' + name = 'Sources matching parameters' description = "Matches sources with particular parameters" - category = _('Citation/source filters') + category = _('Citation/source filters') allow_regex = True def apply(self,db,source): diff --git a/gramps/gen/filters/rules/_hassourcecountbase.py b/gramps/gen/filters/rules/_hassourcecountbase.py index e03210cec..943c08665 100644 --- a/gramps/gen/filters/rules/_hassourcecountbase.py +++ b/gramps/gen/filters/rules/_hassourcecountbase.py @@ -42,11 +42,11 @@ from . import Rule class HasSourceCountBase(Rule): """Objects having sources""" - labels = [ _('Number of instances:'), _('Number must be:')] - name = 'Objects with sources' + labels = [ _('Number of instances:'), _('Number must be:')] + name = 'Objects with sources' description = "Matches objects that have a certain number of sources " \ "connected to it (actually citations are counted)" - category = _('Citation/source filters') + category = _('Citation/source filters') def prepare(self, db, user): # things we want to do just once, not for every handle diff --git a/gramps/gen/filters/rules/_hassourceofbase.py b/gramps/gen/filters/rules/_hassourceofbase.py index 213c3c017..afbd9f2bf 100644 --- a/gramps/gen/filters/rules/_hassourceofbase.py +++ b/gramps/gen/filters/rules/_hassourceofbase.py @@ -42,9 +42,9 @@ from . import Rule class HasSourceOfBase(Rule): """Rule that checks for objects that have a particular source.""" - labels = [ _('Source ID:') ] - name = 'Object with the ' - category = _('Citation/source filters') + labels = [ _('Source ID:') ] + name = 'Object with the ' + category = _('Citation/source filters') description = 'Matches objects who have a particular source' def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/_hastagbase.py b/gramps/gen/filters/rules/_hastagbase.py index 7a2709623..9a84ac2ca 100644 --- a/gramps/gen/filters/rules/_hastagbase.py +++ b/gramps/gen/filters/rules/_hastagbase.py @@ -46,10 +46,10 @@ class HasTagBase(Rule): Rule that checks for an object with a particular tag. """ - labels = [ 'Tag:' ] - name = 'Objects with the ' + labels = [ 'Tag:' ] + name = 'Objects with the ' description = "Matches objects with the given tag" - category = _('General filters') + category = _('General filters') def prepare(self, db, user): """ diff --git a/gramps/gen/filters/rules/_hastextmatchingsubstringof.py b/gramps/gen/filters/rules/_hastextmatchingsubstringof.py index 1a74d41bf..5d5d85fe5 100644 --- a/gramps/gen/filters/rules/_hastextmatchingsubstringof.py +++ b/gramps/gen/filters/rules/_hastextmatchingsubstringof.py @@ -39,13 +39,13 @@ from . import Rule class HasTextMatchingSubstringOf(Rule): """Rule that checks for string matches in any textual information.""" - labels = [ 'Substring:', + labels = [ 'Substring:', 'Case sensitive:', 'Regular-Expression matching:'] - name = 'Objects with records containing ' + name = 'Objects with records containing ' description = "Matches objects whose records contain text " \ "matching a substring" - category = _('General filters') + category = _('General filters') # FIXME: This needs to be written for an arbitrary object # if possible diff --git a/gramps/gen/filters/rules/_isprivate.py b/gramps/gen/filters/rules/_isprivate.py index c8c4c9d8a..807dc85d8 100644 --- a/gramps/gen/filters/rules/_isprivate.py +++ b/gramps/gen/filters/rules/_isprivate.py @@ -37,9 +37,9 @@ from . import Rule class IsPrivate(Rule): """Objects marked private.""" - name = 'Objects marked private' + name = 'Objects marked private' description = "Matches objects that are indicated as private" - category = _('General filters') + category = _('General filters') def apply(self, db, obj): return obj.get_privacy() diff --git a/gramps/gen/filters/rules/_ispublic.py b/gramps/gen/filters/rules/_ispublic.py index f06d18503..c0a99185c 100644 --- a/gramps/gen/filters/rules/_ispublic.py +++ b/gramps/gen/filters/rules/_ispublic.py @@ -34,9 +34,9 @@ _ = glocale.translation.gettext class IsPublic(Rule): """Objects not marked private.""" - name = 'Objects not marked private' + name = 'Objects not marked private' description = "Matches objects that are not indicated as private" - category = _('General filters') + category = _('General filters') def apply(self, db, obj): return not obj.get_privacy() diff --git a/gramps/gen/filters/rules/_matcheseventfilterbase.py b/gramps/gen/filters/rules/_matcheseventfilterbase.py index ddfe73251..56f9f7f1a 100644 --- a/gramps/gen/filters/rules/_matcheseventfilterbase.py +++ b/gramps/gen/filters/rules/_matcheseventfilterbase.py @@ -47,14 +47,14 @@ class MatchesEventFilterBase(MatchesFilterBase): """ - labels = ['Event filter name:'] - name = 'Objects with events matching the ' + labels = ['Event filter name:'] + name = 'Objects with events matching the ' description = "Matches objects who have events that match a certain" \ " event filter" - category = _('General filters') + category = _('General filters') # we want to have this filter show event filters - namespace = 'Event' + namespace = 'Event' def prepare(self, db, user): MatchesFilterBase.prepare(self, db, user) diff --git a/gramps/gen/filters/rules/_matchesfilterbase.py b/gramps/gen/filters/rules/_matchesfilterbase.py index 57aaa48d1..24876b324 100644 --- a/gramps/gen/filters/rules/_matchesfilterbase.py +++ b/gramps/gen/filters/rules/_matchesfilterbase.py @@ -51,10 +51,10 @@ class MatchesFilterBase(Rule): Subclasses need to define the namespace class attribute. """ - labels = [_('Filter name:')] - name = 'Objects matching the ' + labels = [_('Filter name:')] + name = 'Objects matching the ' description = "Matches objects matched by the specified filter name" - category = _('General filters') + category = _('General filters') def prepare(self, db, user): if gramps.gen.filters.CustomFilters: diff --git a/gramps/gen/filters/rules/_matchessourceconfidencebase.py b/gramps/gen/filters/rules/_matchessourceconfidencebase.py index 4207a0f30..2b4927800 100644 --- a/gramps/gen/filters/rules/_matchessourceconfidencebase.py +++ b/gramps/gen/filters/rules/_matchessourceconfidencebase.py @@ -44,10 +44,10 @@ from . import Rule class MatchesSourceConfidenceBase(Rule): """Objects with a specific confidence level on 'direct' Source references""" - labels = ['Confidence level:'] - name = 'Object with at least one direct source >= ' + labels = ['Confidence level:'] + name = 'Object with at least one direct source >= ' description = "Matches objects with at least one direct source with confidence level(s)" - category = _('Citation/source filters') + category = _('Citation/source filters') def apply(self, db, obj): required_conf = int(self.list[0]) diff --git a/gramps/gen/filters/rules/_matchessourcefilterbase.py b/gramps/gen/filters/rules/_matchessourcefilterbase.py index 7299b1f0a..e61731312 100644 --- a/gramps/gen/filters/rules/_matchessourcefilterbase.py +++ b/gramps/gen/filters/rules/_matchessourcefilterbase.py @@ -44,14 +44,14 @@ class MatchesSourceFilterBase(MatchesFilterBase): Rule that checks against another filter. """ - labels = [_('Source filter name:')] - name = 'Objects with source matching the ' + labels = [_('Source filter name:')] + name = 'Objects with source matching the ' description = "Matches objects with sources that match the " \ "specified source filter name" - category = _('Citation/source filters') + category = _('Citation/source filters') # we want to have this filter show source filters - namespace = 'Source' + namespace = 'Source' def prepare(self, db, user): MatchesFilterBase.prepare(self, db, user) diff --git a/gramps/gen/filters/rules/_regexpidbase.py b/gramps/gen/filters/rules/_regexpidbase.py index 1fb457313..ab892a328 100644 --- a/gramps/gen/filters/rules/_regexpidbase.py +++ b/gramps/gen/filters/rules/_regexpidbase.py @@ -45,11 +45,11 @@ class RegExpIdBase(Rule): regular expression. """ - labels = [ _('Text:') ] - name = 'Objects with ' + labels = [ _('Text:') ] + name = 'Objects with ' description = "Matches objects whose Gramps ID contains a substring " \ "or matches a regular expression" - category = _('General filters') + category = _('General filters') allow_regex = True def apply(self, db, obj): diff --git a/gramps/gen/filters/rules/_rule.py b/gramps/gen/filters/rules/_rule.py index 675ef3ec8..f8d5859b6 100644 --- a/gramps/gen/filters/rules/_rule.py +++ b/gramps/gen/filters/rules/_rule.py @@ -50,9 +50,9 @@ LOG = logging.getLogger(".") class Rule: """Base rule class.""" - labels = [] - name = '' - category = _('Miscellaneous filters') + labels = [] + name = '' + category = _('Miscellaneous filters') description = _('No description') allow_regex = False diff --git a/gramps/gen/filters/rules/citation/_allcitations.py b/gramps/gen/filters/rules/citation/_allcitations.py index 4fab04c89..92b74f7ba 100644 --- a/gramps/gen/filters/rules/citation/_allcitations.py +++ b/gramps/gen/filters/rules/citation/_allcitations.py @@ -42,5 +42,5 @@ from .._everything import Everything class AllCitations(Everything): """Matches every citation""" - name = _('Every citation') + name = _('Every citation') description = _('Matches every citation in the database') diff --git a/gramps/gen/filters/rules/citation/_changedsince.py b/gramps/gen/filters/rules/citation/_changedsince.py index d863f88e0..b66c7b375 100644 --- a/gramps/gen/filters/rules/citation/_changedsince.py +++ b/gramps/gen/filters/rules/citation/_changedsince.py @@ -42,8 +42,8 @@ from .._changedsincebase import ChangedSinceBase class ChangedSince(ChangedSinceBase): """Rule that checks for citations changed since a specific time.""" - labels = [ _('Changed after:'), _('but before:') ] - name = _('Citations changed after ') + labels = [ _('Changed after:'), _('but before:') ] + name = _('Citations changed after ') description = _("Matches citation records changed after a specified " "date-time (yyyy-mm-dd hh:mm:ss) or in the range, if a second " "date-time is given.") diff --git a/gramps/gen/filters/rules/citation/_citationprivate.py b/gramps/gen/filters/rules/citation/_citationprivate.py index 8b3a69858..ef6a0c095 100644 --- a/gramps/gen/filters/rules/citation/_citationprivate.py +++ b/gramps/gen/filters/rules/citation/_citationprivate.py @@ -40,5 +40,5 @@ from .._isprivate import IsPrivate class CitationPrivate(IsPrivate): """Citation marked private""" - name = _('Citations marked private') + name = _('Citations marked private') description = _("Matches citations that are indicated as private") diff --git a/gramps/gen/filters/rules/citation/_hascitation.py b/gramps/gen/filters/rules/citation/_hascitation.py index 8e41e3103..f20d6e17d 100644 --- a/gramps/gen/filters/rules/citation/_hascitation.py +++ b/gramps/gen/filters/rules/citation/_hascitation.py @@ -45,11 +45,11 @@ from ....datehandler import parser class HasCitation(Rule): """Rule that checks for a citations with a particular value""" - labels = [ _('Volume/Page:'), + labels = [ _('Volume/Page:'), _('Date:'), _('Confidence level:')] - name = _('Citations matching parameters') - category = _('General filters') + name = _('Citations matching parameters') + category = _('General filters') description = _("Matches citations with particular parameters") allow_regex = True diff --git a/gramps/gen/filters/rules/citation/_hasgallery.py b/gramps/gen/filters/rules/citation/_hasgallery.py index 322be2867..1774df395 100644 --- a/gramps/gen/filters/rules/citation/_hasgallery.py +++ b/gramps/gen/filters/rules/citation/_hasgallery.py @@ -42,5 +42,5 @@ from .._hasgallerybase import HasGalleryBase class HasGallery(HasGalleryBase): """Rule that checks for citation who has media object reference""" - name = _('Citations with media') + name = _('Citations with media') description = _("Matches citations with a certain number of items in the gallery") diff --git a/gramps/gen/filters/rules/citation/_hasidof.py b/gramps/gen/filters/rules/citation/_hasidof.py index 1472ba22a..f7923031a 100644 --- a/gramps/gen/filters/rules/citation/_hasidof.py +++ b/gramps/gen/filters/rules/citation/_hasidof.py @@ -42,5 +42,5 @@ from .. import HasGrampsId class HasIdOf(HasGrampsId): """Rule that checks for a citation with a specific Gramps ID""" - name = _('Citation with ') + name = _('Citation with ') description = _("Matches a citation with a specified Gramps ID") diff --git a/gramps/gen/filters/rules/citation/_hasnote.py b/gramps/gen/filters/rules/citation/_hasnote.py index 0e7d3a779..083138336 100644 --- a/gramps/gen/filters/rules/citation/_hasnote.py +++ b/gramps/gen/filters/rules/citation/_hasnote.py @@ -43,5 +43,5 @@ from .._hasnotebase import HasNoteBase class HasNote(HasNoteBase): """Citations having notes""" - name = _('Citations having notes') + name = _('Citations having notes') description = _("Matches citations having a certain number of notes") diff --git a/gramps/gen/filters/rules/citation/_hasnotematchingsubstringof.py b/gramps/gen/filters/rules/citation/_hasnotematchingsubstringof.py index ee90044c2..11e4875cd 100644 --- a/gramps/gen/filters/rules/citation/_hasnotematchingsubstringof.py +++ b/gramps/gen/filters/rules/citation/_hasnotematchingsubstringof.py @@ -40,7 +40,7 @@ from .._hasnotesubstrbase import HasNoteSubstrBase class HasNoteMatchingSubstringOf(HasNoteSubstrBase): """Citations having notes containing """ - name = _('Citations having notes containing ') + name = _('Citations having notes containing ') description = _("Matches citations whose notes contain text " "matching a substring") diff --git a/gramps/gen/filters/rules/citation/_hasnoteregexp.py b/gramps/gen/filters/rules/citation/_hasnoteregexp.py index 1a68b0123..77e8c5de4 100644 --- a/gramps/gen/filters/rules/citation/_hasnoteregexp.py +++ b/gramps/gen/filters/rules/citation/_hasnoteregexp.py @@ -39,6 +39,6 @@ from .._hasnoteregexbase import HasNoteRegexBase #------------------------------------------------------------------------- class HasNoteRegexp(HasNoteRegexBase): - name = _('Citations having notes containing ') + name = _('Citations having notes containing ') description = _("Matches citations whose notes contain text " "matching a regular expression") diff --git a/gramps/gen/filters/rules/citation/_hasreferencecountof.py b/gramps/gen/filters/rules/citation/_hasreferencecountof.py index 0025ff739..e8eda4fbb 100644 --- a/gramps/gen/filters/rules/citation/_hasreferencecountof.py +++ b/gramps/gen/filters/rules/citation/_hasreferencecountof.py @@ -40,6 +40,6 @@ from .._hasreferencecountbase import HasReferenceCountBase class HasReferenceCountOf(HasReferenceCountBase): """Citation objects with a reference count of """ - name = _('Citations with a reference count of ') + name = _('Citations with a reference count of ') description = _("Matches citations with a certain reference count") diff --git a/gramps/gen/filters/rules/citation/_hassource.py b/gramps/gen/filters/rules/citation/_hassource.py index 3902848e5..549d00bff 100644 --- a/gramps/gen/filters/rules/citation/_hassource.py +++ b/gramps/gen/filters/rules/citation/_hassource.py @@ -45,14 +45,14 @@ from .._hassourcebase import HasSourceBase class HasSource(HasSourceBase): """Rule that checks for an citation with a particular value""" - labels = [ _('Title:'), + labels = [ _('Title:'), _('Author:'), _('Abbreviation:'), _('Publication:') ] - name = _('Sources matching parameters') + name = _('Sources matching parameters') description = _("Matches citations with a source of a particular " "value") - category = _('Source filters') + category = _('Source filters') def apply(self, dbase, citation): source = dbase.get_source_from_handle( diff --git a/gramps/gen/filters/rules/citation/_hassourceidof.py b/gramps/gen/filters/rules/citation/_hassourceidof.py index 0d2aa6946..5bc14c200 100644 --- a/gramps/gen/filters/rules/citation/_hassourceidof.py +++ b/gramps/gen/filters/rules/citation/_hassourceidof.py @@ -43,10 +43,10 @@ class HasSourceIdOf(HasGrampsId): """Rule that checks for a citation with a source which has a specific Gramps ID""" - name = _('Citation with Source ') + name = _('Citation with Source ') description = _("Matches a citation with a source with a specified Gramps " "ID") - category = _('Source filters') + category = _('Source filters') def apply(self, dbase, citation): source = dbase.get_source_from_handle( diff --git a/gramps/gen/filters/rules/citation/_hassourcenoteregexp.py b/gramps/gen/filters/rules/citation/_hassourcenoteregexp.py index 8ed8c34f2..41d2f3271 100644 --- a/gramps/gen/filters/rules/citation/_hassourcenoteregexp.py +++ b/gramps/gen/filters/rules/citation/_hassourcenoteregexp.py @@ -49,10 +49,10 @@ class HasSourceNoteRegexp(HasNoteRegexBase): substring or matches a regular expression. """ - name = _('Citations having source notes containing ') + name = _('Citations having source notes containing ') description = _("Matches citations whose source notes contain a substring " "or match a regular expression") - category = _('Source filters') + category = _('Source filters') def apply(self, db, citation): source = db.get_source_from_handle(citation.get_reference_handle()) diff --git a/gramps/gen/filters/rules/citation/_hastag.py b/gramps/gen/filters/rules/citation/_hastag.py index 385b83c01..2396d230b 100644 --- a/gramps/gen/filters/rules/citation/_hastag.py +++ b/gramps/gen/filters/rules/citation/_hastag.py @@ -45,6 +45,6 @@ class HasTag(HasTagBase): """ Rule that checks for a citation with a particular tag. """ - labels = [ _('Tag:') ] - name = _('Citations with the ') + labels = [ _('Tag:') ] + name = _('Citations with the ') description = _("Matches citations with the particular tag") diff --git a/gramps/gen/filters/rules/citation/_matchesfilter.py b/gramps/gen/filters/rules/citation/_matchesfilter.py index adf45cfb0..769e36e8a 100644 --- a/gramps/gen/filters/rules/citation/_matchesfilter.py +++ b/gramps/gen/filters/rules/citation/_matchesfilter.py @@ -42,6 +42,6 @@ from .._matchesfilterbase import MatchesFilterBase class MatchesFilter(MatchesFilterBase): """Rule that checks against another filter""" - name = _('Citations matching the ') + name = _('Citations matching the ') description = _("Matches citations matched by the specified filter name") - namespace = 'Citation' + namespace = 'Citation' diff --git a/gramps/gen/filters/rules/citation/_matchespagesubstringof.py b/gramps/gen/filters/rules/citation/_matchespagesubstringof.py index ac88dfa48..1e74a6ca7 100644 --- a/gramps/gen/filters/rules/citation/_matchespagesubstringof.py +++ b/gramps/gen/filters/rules/citation/_matchespagesubstringof.py @@ -39,11 +39,11 @@ from .. import Rule class MatchesPageSubstringOf(Rule): """Citation Volume/Page title containing """ - labels = [ _('Text:')] - name = _('Citations with Volume/Page containing ') + labels = [ _('Text:')] + name = _('Citations with Volume/Page containing ') description = _("Matches citations whose Volume/Page contains a " "certain substring") - category = _('General filters') + category = _('General filters') allow_regex = True def apply(self, db, object): diff --git a/gramps/gen/filters/rules/citation/_matchesrepositoryfilter.py b/gramps/gen/filters/rules/citation/_matchesrepositoryfilter.py index 0558fd6d2..308929b72 100644 --- a/gramps/gen/filters/rules/citation/_matchesrepositoryfilter.py +++ b/gramps/gen/filters/rules/citation/_matchesrepositoryfilter.py @@ -42,12 +42,12 @@ from .. import MatchesFilterBase class MatchesRepositoryFilter(MatchesFilterBase): """Citations which have a source which references the selected repository""" - labels = [ _('Repository filter name:') ] - name = _('Citations with a source with a repository reference ' + labels = [ _('Repository filter name:') ] + name = _('Citations with a source with a repository reference ' 'matching the ') description = _("Matches citations with sources with a repository " "reference that match a certain repository filter") - category = _('General filters') + category = _('General filters') # we want to have this filter show repository filters namespace = 'Repository' diff --git a/gramps/gen/filters/rules/citation/_matchessourcefilter.py b/gramps/gen/filters/rules/citation/_matchessourcefilter.py index 1ce3a4518..71bc120bb 100644 --- a/gramps/gen/filters/rules/citation/_matchessourcefilter.py +++ b/gramps/gen/filters/rules/citation/_matchessourcefilter.py @@ -45,14 +45,14 @@ class MatchesSourceFilter(MatchesFilterBase): Rule that checks against another filter. """ - labels = [_('Source filter name:')] - name = _('Citations with source matching the ') + labels = [_('Source filter name:')] + name = _('Citations with source matching the ') description = _("Matches citations with sources that match the " "specified source filter name") - category = _('General filters') + category = _('General filters') # we want to have this filter show source filters - namespace = 'Source' + namespace = 'Source' def prepare(self, db, user): MatchesFilterBase.prepare(self, db, user) diff --git a/gramps/gen/filters/rules/citation/_regexpidof.py b/gramps/gen/filters/rules/citation/_regexpidof.py index 0fd3d101c..52b093fad 100644 --- a/gramps/gen/filters/rules/citation/_regexpidof.py +++ b/gramps/gen/filters/rules/citation/_regexpidof.py @@ -45,6 +45,6 @@ class RegExpIdOf(RegExpIdBase): matches regular expression. """ - name = _('Citations with Id containing ') + name = _('Citations with Id containing ') description = _("Matches citations whose Gramps ID matches " "the regular expression") diff --git a/gramps/gen/filters/rules/citation/_regexpsourceidof.py b/gramps/gen/filters/rules/citation/_regexpsourceidof.py index b7341dec8..322d28660 100644 --- a/gramps/gen/filters/rules/citation/_regexpsourceidof.py +++ b/gramps/gen/filters/rules/citation/_regexpsourceidof.py @@ -45,10 +45,10 @@ class RegExpSourceIdOf(RegExpIdBase): matches regular expression. """ - name = _('Citations with Source Id containing ') + name = _('Citations with Source Id containing ') description = _("Matches citations whose source has a Gramps ID that " "matches the regular expression") - category = _('Source filters') + category = _('Source filters') def apply(self, dbase, citation): source = dbase.get_source_from_handle( diff --git a/gramps/gen/filters/rules/event/_allevents.py b/gramps/gen/filters/rules/event/_allevents.py index 6d4cc237c..0ffa4e9ba 100644 --- a/gramps/gen/filters/rules/event/_allevents.py +++ b/gramps/gen/filters/rules/event/_allevents.py @@ -41,5 +41,5 @@ from .._everything import Everything class AllEvents(Everything): """Matches Everyone""" - name = _('Every event') + name = _('Every event') description = _('Matches every event in the database') diff --git a/gramps/gen/filters/rules/event/_changedsince.py b/gramps/gen/filters/rules/event/_changedsince.py index 3ce96ec74..3a71fcc1e 100644 --- a/gramps/gen/filters/rules/event/_changedsince.py +++ b/gramps/gen/filters/rules/event/_changedsince.py @@ -43,8 +43,8 @@ from .._changedsincebase import ChangedSinceBase class ChangedSince(ChangedSinceBase): """Rule that checks for an event changed since a specific time.""" - labels = [ _('Changed after:'), _('but before:') ] - name = _('Events changed after ') + labels = [ _('Changed after:'), _('but before:') ] + name = _('Events changed after ') description = _("Matches event records changed after a specified " "date/time (yyyy-mm-dd hh:mm:ss) or in the range, if a second " "date/time is given.") diff --git a/gramps/gen/filters/rules/event/_eventprivate.py b/gramps/gen/filters/rules/event/_eventprivate.py index 17e9f55d1..7b985ca97 100644 --- a/gramps/gen/filters/rules/event/_eventprivate.py +++ b/gramps/gen/filters/rules/event/_eventprivate.py @@ -39,5 +39,5 @@ from .._isprivate import IsPrivate class EventPrivate(IsPrivate): """Event marked private""" - name = _('Events marked private') + name = _('Events marked private') description = _("Matches events that are indicated as private") diff --git a/gramps/gen/filters/rules/event/_hasattribute.py b/gramps/gen/filters/rules/event/_hasattribute.py index 6790820b0..fb5a11824 100644 --- a/gramps/gen/filters/rules/event/_hasattribute.py +++ b/gramps/gen/filters/rules/event/_hasattribute.py @@ -41,7 +41,7 @@ from .._hasattributebase import HasAttributeBase class HasAttribute(HasAttributeBase): """Rule that checks for an event with a particular event attribute""" - labels = [ _('Event attribute:'), _('Value:') ] - name = _('Events with the attribute ') + labels = [ _('Event attribute:'), _('Value:') ] + name = _('Events with the attribute ') description = _("Matches events with the event attribute " "of a particular value") diff --git a/gramps/gen/filters/rules/event/_hascitation.py b/gramps/gen/filters/rules/event/_hascitation.py index ffd53c1c4..390c6d90e 100644 --- a/gramps/gen/filters/rules/event/_hascitation.py +++ b/gramps/gen/filters/rules/event/_hascitation.py @@ -45,9 +45,9 @@ from .._hascitationbase import HasCitationBase class HasCitation(HasCitationBase): """Rule that checks for an event with a particular value""" - labels = [ _('Volume/Page:'), + labels = [ _('Volume/Page:'), _('Date:'), _('Confidence level:')] - name = _('Events with the ') + name = _('Events with the ') description = _("Matches events with a citation of a particular " "value") diff --git a/gramps/gen/filters/rules/event/_hasdata.py b/gramps/gen/filters/rules/event/_hasdata.py index 3f779aa20..87f59e75c 100644 --- a/gramps/gen/filters/rules/event/_hasdata.py +++ b/gramps/gen/filters/rules/event/_hasdata.py @@ -44,11 +44,11 @@ from .. import Rule class HasData(Rule): """Rule that checks for an event containing particular values""" - labels = [ _('Event type:'), _('Date:'), _('Place:'), + labels = [ _('Event type:'), _('Date:'), _('Place:'), _('Description:') ] - name = _('Events with ') + name = _('Events with ') description = _("Matches events with data of a particular value") - category = _('General filters') + category = _('General filters') allow_regex = True def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/event/_hasdayofweek.py b/gramps/gen/filters/rules/event/_hasdayofweek.py index ec3555df5..6c69e0818 100644 --- a/gramps/gen/filters/rules/event/_hasdayofweek.py +++ b/gramps/gen/filters/rules/event/_hasdayofweek.py @@ -35,10 +35,10 @@ _ = glocale.translation.gettext class HasDayOfWeek(Rule): """Rule that matches an event occurring on a particular day of the week.""" - labels = [ _('Day of Week:') ] - name = _('Events occurring on a particular day of the week') + labels = [ _('Day of Week:') ] + name = _('Events occurring on a particular day of the week') description = _('Matches events occurring on a particular day of the week') - category = _('General filters') + category = _('General filters') def apply(self, db, event): if not self.list[0]: diff --git a/gramps/gen/filters/rules/event/_hasgallery.py b/gramps/gen/filters/rules/event/_hasgallery.py index 608dbd0a9..6bf351e2b 100644 --- a/gramps/gen/filters/rules/event/_hasgallery.py +++ b/gramps/gen/filters/rules/event/_hasgallery.py @@ -42,5 +42,5 @@ from .._hasgallerybase import HasGalleryBase class HasGallery(HasGalleryBase): """Rule that checks for event who has media object reference""" - name = _('Events with media') + name = _('Events with media') description = _("Matches events with a certain number of items in the gallery") diff --git a/gramps/gen/filters/rules/event/_hasidof.py b/gramps/gen/filters/rules/event/_hasidof.py index 99f875982..ac8911d52 100644 --- a/gramps/gen/filters/rules/event/_hasidof.py +++ b/gramps/gen/filters/rules/event/_hasidof.py @@ -41,5 +41,5 @@ from .. import HasGrampsId class HasIdOf(HasGrampsId): """Rule that checks for a family with a specific Gramps ID""" - name = _('Event with ') + name = _('Event with ') description = _("Matches an event with a specified Gramps ID") diff --git a/gramps/gen/filters/rules/event/_hasnote.py b/gramps/gen/filters/rules/event/_hasnote.py index 27bdaa142..883e6fb47 100644 --- a/gramps/gen/filters/rules/event/_hasnote.py +++ b/gramps/gen/filters/rules/event/_hasnote.py @@ -42,5 +42,5 @@ from .._hasnotebase import HasNoteBase class HasNote(HasNoteBase): """Events having notes""" - name = _('Events having notes') + name = _('Events having notes') description = _("Matches events having a certain number of notes") diff --git a/gramps/gen/filters/rules/event/_hasnotematchingsubstringof.py b/gramps/gen/filters/rules/event/_hasnotematchingsubstringof.py index 982d392c9..1844490cf 100644 --- a/gramps/gen/filters/rules/event/_hasnotematchingsubstringof.py +++ b/gramps/gen/filters/rules/event/_hasnotematchingsubstringof.py @@ -39,7 +39,7 @@ from .._hasnotesubstrbase import HasNoteSubstrBase class HasNoteMatchingSubstringOf(HasNoteSubstrBase): """People having notes containing """ - name = _('Events having notes containing ') + name = _('Events having notes containing ') description = _("Matches events whose notes contain text " "matching a substring") diff --git a/gramps/gen/filters/rules/event/_hasnoteregexp.py b/gramps/gen/filters/rules/event/_hasnoteregexp.py index ee7ca5de0..e9f8acea5 100644 --- a/gramps/gen/filters/rules/event/_hasnoteregexp.py +++ b/gramps/gen/filters/rules/event/_hasnoteregexp.py @@ -38,6 +38,6 @@ from .._hasnoteregexbase import HasNoteRegexBase #------------------------------------------------------------------------- class HasNoteRegexp(HasNoteRegexBase): - name = _('Events having notes containing ') + name = _('Events having notes containing ') description = _("Matches events whose notes contain text " "matching a regular expression") diff --git a/gramps/gen/filters/rules/event/_hasreferencecountof.py b/gramps/gen/filters/rules/event/_hasreferencecountof.py index 591ef6426..967d61cea 100644 --- a/gramps/gen/filters/rules/event/_hasreferencecountof.py +++ b/gramps/gen/filters/rules/event/_hasreferencecountof.py @@ -39,6 +39,6 @@ from .._hasreferencecountbase import HasReferenceCountBase class HasReferenceCountOf(HasReferenceCountBase): """Events with a reference count of """ - name = _('Events with a reference count of ') + name = _('Events with a reference count of ') description = _("Matches events with a certain reference count") diff --git a/gramps/gen/filters/rules/event/_hassourcecount.py b/gramps/gen/filters/rules/event/_hassourcecount.py index 99c771888..ca4e200f8 100644 --- a/gramps/gen/filters/rules/event/_hassourcecount.py +++ b/gramps/gen/filters/rules/event/_hassourcecount.py @@ -41,5 +41,5 @@ from .._hassourcecountbase import HasSourceCountBase class HasSourceCount(HasSourceCountBase): """Events with sources""" - name = _('Events with sources') + name = _('Events with sources') description = _("Matches events with a certain number of sources connected to it") diff --git a/gramps/gen/filters/rules/event/_hastag.py b/gramps/gen/filters/rules/event/_hastag.py index 24615135a..c599c5124 100644 --- a/gramps/gen/filters/rules/event/_hastag.py +++ b/gramps/gen/filters/rules/event/_hastag.py @@ -45,6 +45,6 @@ class HasTag(HasTagBase): """ Rule that checks for an event with a particular tag. """ - labels = [ _('Tag:') ] - name = _('Events with the ') + labels = [ _('Tag:') ] + name = _('Events with the ') description = _("Matches events with the particular tag") diff --git a/gramps/gen/filters/rules/event/_hastype.py b/gramps/gen/filters/rules/event/_hastype.py index a7ae6ec77..a4d5d0d16 100644 --- a/gramps/gen/filters/rules/event/_hastype.py +++ b/gramps/gen/filters/rules/event/_hastype.py @@ -42,10 +42,10 @@ from .. import Rule class HasType(Rule): """Rule that checks for an event of a particular type.""" - labels = [ _('Event type:') ] - name = _('Events with the particular type') + labels = [ _('Event type:') ] + name = _('Events with the particular type') description = _("Matches events with the particular type ") - category = _('General filters') + category = _('General filters') def apply(self, db, event): if not self.list[0]: diff --git a/gramps/gen/filters/rules/event/_matchesfilter.py b/gramps/gen/filters/rules/event/_matchesfilter.py index 196d0034b..3f529f999 100644 --- a/gramps/gen/filters/rules/event/_matchesfilter.py +++ b/gramps/gen/filters/rules/event/_matchesfilter.py @@ -41,6 +41,6 @@ from .. import MatchesFilterBase class MatchesFilter(MatchesFilterBase): """Rule that checks against another filter.""" - name = _('Events matching the ') + name = _('Events matching the ') description = _("Matches events matched by the specified filter name") - namespace = 'Event' + namespace = 'Event' diff --git a/gramps/gen/filters/rules/event/_matchespersonfilter.py b/gramps/gen/filters/rules/event/_matchespersonfilter.py index 3e04cabed..a4640ff4c 100644 --- a/gramps/gen/filters/rules/event/_matchespersonfilter.py +++ b/gramps/gen/filters/rules/event/_matchespersonfilter.py @@ -47,14 +47,14 @@ class MatchesPersonFilter(MatchesFilterBase): """ - labels = [_('Person filter name:'), _('Include Family events:')] - name = _('Events of persons matching the ') + labels = [_('Person filter name:'), _('Include Family events:')] + name = _('Events of persons matching the ') description = _("Matches events of persons matched by the specified " "person filter name") - category = _('General filters') + category = _('General filters') # we want to have this filter show person filters - namespace = 'Person' + namespace = 'Person' def prepare(self, db, user): MatchesFilterBase.prepare(self, db, user) diff --git a/gramps/gen/filters/rules/event/_matchesplacefilter.py b/gramps/gen/filters/rules/event/_matchesplacefilter.py index 2ff3b67b4..240a904f7 100644 --- a/gramps/gen/filters/rules/event/_matchesplacefilter.py +++ b/gramps/gen/filters/rules/event/_matchesplacefilter.py @@ -46,13 +46,13 @@ class MatchesPlaceFilter(MatchesFilterBase): Subclasses need to define the namespace class attribute. """ - labels = [_('Place filter name:')] - name = _('Events of places matching the ') + labels = [_('Place filter name:')] + name = _('Events of places matching the ') description = _("Matches events that occurred at places that match the " "specified place filter name") - category = _('General filters') + category = _('General filters') # we want to have this filter show place filters - namespace = 'Place' + namespace = 'Place' def apply(self, db, event): filt = self.find_filter() diff --git a/gramps/gen/filters/rules/event/_matchessourceconfidence.py b/gramps/gen/filters/rules/event/_matchessourceconfidence.py index db79d3219..f3a163e7b 100644 --- a/gramps/gen/filters/rules/event/_matchessourceconfidence.py +++ b/gramps/gen/filters/rules/event/_matchessourceconfidence.py @@ -41,7 +41,7 @@ from .._matchessourceconfidencebase import MatchesSourceConfidenceBase class MatchesSourceConfidence(MatchesSourceConfidenceBase): """Events matching a specific confidence level on its 'direct' source references""" - labels = [_('Confidence level:')] - name = _('Events with at least one direct source >= ') + labels = [_('Confidence level:')] + name = _('Events with at least one direct source >= ') description = _("Matches events with at least one direct source with confidence level(s)") diff --git a/gramps/gen/filters/rules/event/_matchessourcefilter.py b/gramps/gen/filters/rules/event/_matchessourcefilter.py index 8f2463ea6..3c61ea719 100644 --- a/gramps/gen/filters/rules/event/_matchessourcefilter.py +++ b/gramps/gen/filters/rules/event/_matchessourcefilter.py @@ -45,11 +45,11 @@ class MatchesSourceFilter(MatchesSourceFilterBase): Rule that checks against another filter. """ - labels = [_('Source filter name:')] - name = _('Events with source matching the ') + labels = [_('Source filter name:')] + name = _('Events with source matching the ') description = _("Matches events with sources that match the " "specified source filter name") - category = _('Citation/source filters') + category = _('Citation/source filters') # we want to have this filter show source filters - namespace = 'Source' + namespace = 'Source' diff --git a/gramps/gen/filters/rules/event/_regexpidof.py b/gramps/gen/filters/rules/event/_regexpidof.py index f692e8a4e..129c8db78 100644 --- a/gramps/gen/filters/rules/event/_regexpidof.py +++ b/gramps/gen/filters/rules/event/_regexpidof.py @@ -44,6 +44,6 @@ class RegExpIdOf(RegExpIdBase): matches regular expression. """ - name = _('Events with Id containing ') + name = _('Events with Id containing ') description = _("Matches events whose Gramps ID matches " "the regular expression") diff --git a/gramps/gen/filters/rules/family/_allfamilies.py b/gramps/gen/filters/rules/family/_allfamilies.py index 0e1c6904c..ec4321667 100644 --- a/gramps/gen/filters/rules/family/_allfamilies.py +++ b/gramps/gen/filters/rules/family/_allfamilies.py @@ -41,6 +41,6 @@ from .._everything import Everything class AllFamilies(Everything): """Matches Everyone""" - name = _('Every family') + name = _('Every family') description = _('Matches every family in the database') diff --git a/gramps/gen/filters/rules/family/_changedsince.py b/gramps/gen/filters/rules/family/_changedsince.py index 6dc2b24cd..062a8ea3a 100644 --- a/gramps/gen/filters/rules/family/_changedsince.py +++ b/gramps/gen/filters/rules/family/_changedsince.py @@ -43,8 +43,8 @@ from .._changedsincebase import ChangedSinceBase class ChangedSince(ChangedSinceBase): """Rule that checks for families changed since a specific time.""" - labels = [ _('Changed after:'), _('but before:') ] - name = _('Families changed after ') + labels = [ _('Changed after:'), _('but before:') ] + name = _('Families changed after ') description = _("Matches family records changed after a specified " "date-time (yyyy-mm-dd hh:mm:ss) or in the range, if a second " "date-time is given.") diff --git a/gramps/gen/filters/rules/family/_childhasidof.py b/gramps/gen/filters/rules/family/_childhasidof.py index b870fba50..7f04f1726 100644 --- a/gramps/gen/filters/rules/family/_childhasidof.py +++ b/gramps/gen/filters/rules/family/_childhasidof.py @@ -42,10 +42,10 @@ from ._memberbase import child_base class ChildHasIdOf(RegExpIdBase): """Rule that checks for a person with a specific Gramps ID""" - labels = [ _('Person ID:') ] - name = _('Families having child with Id containing ') + labels = [ _('Person ID:') ] + name = _('Families having child with Id containing ') description = _("Matches families where child has a specified " "Gramps ID") - category = _('Child filters') + category = _('Child filters') base_class = RegExpIdBase apply = child_base diff --git a/gramps/gen/filters/rules/family/_childhasnameof.py b/gramps/gen/filters/rules/family/_childhasnameof.py index 3a5423112..547ca27ad 100644 --- a/gramps/gen/filters/rules/family/_childhasnameof.py +++ b/gramps/gen/filters/rules/family/_childhasnameof.py @@ -42,9 +42,9 @@ from ._memberbase import child_base class ChildHasNameOf(HasNameOf): """Rule that checks for full or partial name matches""" - name = _('Families with child with the ') + name = _('Families with child with the ') description = _("Matches families where child has a specified " "(partial) name") - category = _('Child filters') + category = _('Child filters') base_class = HasNameOf apply = child_base diff --git a/gramps/gen/filters/rules/family/_familyprivate.py b/gramps/gen/filters/rules/family/_familyprivate.py index 327b18771..0e26bb350 100644 --- a/gramps/gen/filters/rules/family/_familyprivate.py +++ b/gramps/gen/filters/rules/family/_familyprivate.py @@ -39,5 +39,5 @@ from .._isprivate import IsPrivate class FamilyPrivate(IsPrivate): """Family marked private""" - name = _('Families marked private') + name = _('Families marked private') description = _("Matches families that are indicated as private") diff --git a/gramps/gen/filters/rules/family/_fatherhasidof.py b/gramps/gen/filters/rules/family/_fatherhasidof.py index 248665779..faa59efc0 100644 --- a/gramps/gen/filters/rules/family/_fatherhasidof.py +++ b/gramps/gen/filters/rules/family/_fatherhasidof.py @@ -42,10 +42,10 @@ from ._memberbase import father_base class FatherHasIdOf(RegExpIdBase): """Rule that checks for a person with a specific Gramps ID""" - labels = [ _('Person ID:') ] - name = _('Families having father with Id containing ') + labels = [ _('Person ID:') ] + name = _('Families having father with Id containing ') description = _("Matches families whose father has a specified " "Gramps ID") - category = _('Father filters') + category = _('Father filters') base_class = RegExpIdBase apply = father_base diff --git a/gramps/gen/filters/rules/family/_fatherhasnameof.py b/gramps/gen/filters/rules/family/_fatherhasnameof.py index 943deaa33..434dfed86 100644 --- a/gramps/gen/filters/rules/family/_fatherhasnameof.py +++ b/gramps/gen/filters/rules/family/_fatherhasnameof.py @@ -42,9 +42,9 @@ from ._memberbase import father_base class FatherHasNameOf(HasNameOf): """Rule that checks for full or partial name matches""" - name = _('Families with father with the ') + name = _('Families with father with the ') description = _("Matches families whose father has a specified " "(partial) name") - category = _('Father filters') + category = _('Father filters') base_class = HasNameOf apply = father_base diff --git a/gramps/gen/filters/rules/family/_hasattribute.py b/gramps/gen/filters/rules/family/_hasattribute.py index 5647dcec2..7c169bd35 100644 --- a/gramps/gen/filters/rules/family/_hasattribute.py +++ b/gramps/gen/filters/rules/family/_hasattribute.py @@ -41,7 +41,7 @@ from .._hasattributebase import HasAttributeBase class HasAttribute(HasAttributeBase): """Rule that checks for a family with a particular family attribute""" - labels = [ _('Family attribute:'), _('Value:') ] - name = _('Families with the family ') + labels = [ _('Family attribute:'), _('Value:') ] + name = _('Families with the family ') description = _("Matches families with the family attribute " "of a particular value") diff --git a/gramps/gen/filters/rules/family/_hascitation.py b/gramps/gen/filters/rules/family/_hascitation.py index 2d8cd50a4..734e93134 100644 --- a/gramps/gen/filters/rules/family/_hascitation.py +++ b/gramps/gen/filters/rules/family/_hascitation.py @@ -45,9 +45,9 @@ from .._hascitationbase import HasCitationBase class HasCitation(HasCitationBase): """Rule that checks for a family with a particular value""" - labels = [ _('Volume/Page:'), + labels = [ _('Volume/Page:'), _('Date:'), _('Confidence level:')] - name = _('Families with the ') + name = _('Families with the ') description = _("Matches families with a citation of a particular " "value") diff --git a/gramps/gen/filters/rules/family/_hasevent.py b/gramps/gen/filters/rules/family/_hasevent.py index a80ab1a81..5a22d5891 100644 --- a/gramps/gen/filters/rules/family/_hasevent.py +++ b/gramps/gen/filters/rules/family/_hasevent.py @@ -44,12 +44,12 @@ from .._haseventbase import HasEventBase class HasEvent(HasEventBase): """Rule that checks for a family event with a particular value""" - labels = [ _('Family event:'), + labels = [ _('Family event:'), _('Date:'), _('Place:'), _('Description:'), _('Main Participants') ] - name = _('Families with the ') + name = _('Families with the ') description = _("Matches families with an event of a particular value") def apply(self, dbase, family): diff --git a/gramps/gen/filters/rules/family/_hasgallery.py b/gramps/gen/filters/rules/family/_hasgallery.py index 7d1f7f38a..21817ce96 100644 --- a/gramps/gen/filters/rules/family/_hasgallery.py +++ b/gramps/gen/filters/rules/family/_hasgallery.py @@ -42,5 +42,5 @@ from .._hasgallerybase import HasGalleryBase class HasGallery(HasGalleryBase): """Rule that checks for family who has media object reference""" - name = _('Families with media') + name = _('Families with media') description = _("Matches families with a certain number of items in the gallery") diff --git a/gramps/gen/filters/rules/family/_hasidof.py b/gramps/gen/filters/rules/family/_hasidof.py index a977b1efc..ac502dbb8 100644 --- a/gramps/gen/filters/rules/family/_hasidof.py +++ b/gramps/gen/filters/rules/family/_hasidof.py @@ -41,5 +41,5 @@ from .. import HasGrampsId class HasIdOf(HasGrampsId): """Rule that checks for a family with a specific Gramps ID""" - name = _('Family with ') + name = _('Family with ') description = _("Matches a family with a specified Gramps ID") diff --git a/gramps/gen/filters/rules/family/_haslds.py b/gramps/gen/filters/rules/family/_haslds.py index b85dc415d..608e3c237 100644 --- a/gramps/gen/filters/rules/family/_haslds.py +++ b/gramps/gen/filters/rules/family/_haslds.py @@ -45,5 +45,5 @@ from .._hasldsbase import HasLDSBase class HasLDS(HasLDSBase): """Rule that checks for family with a LDS event""" - name = _('Families with LDS events') + name = _('Families with LDS events') description = _("Matches families with a certain number of LDS events") diff --git a/gramps/gen/filters/rules/family/_hasnote.py b/gramps/gen/filters/rules/family/_hasnote.py index 54a34b441..adb40b256 100644 --- a/gramps/gen/filters/rules/family/_hasnote.py +++ b/gramps/gen/filters/rules/family/_hasnote.py @@ -42,5 +42,5 @@ from .._hasnotebase import HasNoteBase class HasNote(HasNoteBase): """Families having notes""" - name = _('Families having notes') + name = _('Families having notes') description = _("Matches families having a certain number notes") diff --git a/gramps/gen/filters/rules/family/_hasnotematchingsubstringof.py b/gramps/gen/filters/rules/family/_hasnotematchingsubstringof.py index 5bfeb5526..f540664fe 100644 --- a/gramps/gen/filters/rules/family/_hasnotematchingsubstringof.py +++ b/gramps/gen/filters/rules/family/_hasnotematchingsubstringof.py @@ -39,6 +39,6 @@ from .._hasnotesubstrbase import HasNoteSubstrBase class HasNoteMatchingSubstringOf(HasNoteSubstrBase): """People having notes containing """ - name = _('Families having notes containing ') + name = _('Families having notes containing ') description = _("Matches families whose notes contain text matching a substring") diff --git a/gramps/gen/filters/rules/family/_hasnoteregexp.py b/gramps/gen/filters/rules/family/_hasnoteregexp.py index 8ef1820d2..8635c3230 100644 --- a/gramps/gen/filters/rules/family/_hasnoteregexp.py +++ b/gramps/gen/filters/rules/family/_hasnoteregexp.py @@ -38,7 +38,7 @@ from .._hasnoteregexbase import HasNoteRegexBase #------------------------------------------------------------------------- class HasNoteRegexp(HasNoteRegexBase): - name = _('Families having notes containing ') + name = _('Families having notes containing ') description = _("Matches families whose notes contain text " "matching a regular expression") diff --git a/gramps/gen/filters/rules/family/_hasreferencecountof.py b/gramps/gen/filters/rules/family/_hasreferencecountof.py index c6bce75b4..5fb07db5c 100644 --- a/gramps/gen/filters/rules/family/_hasreferencecountof.py +++ b/gramps/gen/filters/rules/family/_hasreferencecountof.py @@ -39,6 +39,6 @@ from .._hasreferencecountbase import HasReferenceCountBase class HasReferenceCountOf(HasReferenceCountBase): """Family objects with a reference count of """ - name = _('Families with a reference count of ') + name = _('Families with a reference count of ') description = _("Matches family objects with a certain reference count") diff --git a/gramps/gen/filters/rules/family/_hasreltype.py b/gramps/gen/filters/rules/family/_hasreltype.py index fa41f0ca5..d42477ee4 100644 --- a/gramps/gen/filters/rules/family/_hasreltype.py +++ b/gramps/gen/filters/rules/family/_hasreltype.py @@ -42,11 +42,11 @@ from .. import Rule class HasRelType(Rule): """Rule that checks for a person with a particular personal attribute""" - labels = [ _('Relationship type:') ] - name = _('Families with the relationship type') + labels = [ _('Relationship type:') ] + name = _('Families with the relationship type') description = _("Matches families with the relationship type " "of a particular value") - category = _('General filters') + category = _('General filters') def prepare(self, db, user): if self.list[0]: diff --git a/gramps/gen/filters/rules/family/_hassourcecount.py b/gramps/gen/filters/rules/family/_hassourcecount.py index b926d90b8..949350dd9 100644 --- a/gramps/gen/filters/rules/family/_hassourcecount.py +++ b/gramps/gen/filters/rules/family/_hassourcecount.py @@ -42,5 +42,5 @@ from .._hassourcecountbase import HasSourceCountBase class HasSourceCount(HasSourceCountBase): """Families with sources""" - name = _('Families with sources') + name = _('Families with sources') description = _("Matches families with a certain number of sources connected to it") diff --git a/gramps/gen/filters/rules/family/_hassourceof.py b/gramps/gen/filters/rules/family/_hassourceof.py index 310b8fa26..221ed0ff1 100644 --- a/gramps/gen/filters/rules/family/_hassourceof.py +++ b/gramps/gen/filters/rules/family/_hassourceof.py @@ -42,7 +42,7 @@ from .._hassourceofbase import HasSourceOfBase class HasSourceOf(HasSourceOfBase): """Rule that checks family that have a particular source.""" - labels = [ _('Source ID:') ] - name = _('Families with the ') - category = _('Citation/source filters') + labels = [ _('Source ID:') ] + name = _('Families with the ') + category = _('Citation/source filters') description = _('Matches families who have a particular source') diff --git a/gramps/gen/filters/rules/family/_hastag.py b/gramps/gen/filters/rules/family/_hastag.py index 996363470..9114e1a55 100644 --- a/gramps/gen/filters/rules/family/_hastag.py +++ b/gramps/gen/filters/rules/family/_hastag.py @@ -45,6 +45,6 @@ class HasTag(HasTagBase): """ Rule that checks for a family with a particular tag. """ - labels = [ _('Tag:') ] - name = _('Families with the ') + labels = [ _('Tag:') ] + name = _('Families with the ') description = _("Matches families with the particular tag") diff --git a/gramps/gen/filters/rules/family/_hastwins.py b/gramps/gen/filters/rules/family/_hastwins.py index b1c8654e0..a6da6c821 100644 --- a/gramps/gen/filters/rules/family/_hastwins.py +++ b/gramps/gen/filters/rules/family/_hastwins.py @@ -42,9 +42,9 @@ _ = glocale.translation.gettext class HasTwins(Rule): """Rule that checks for a family with twins""" - name = _('Families with twins') + name = _('Families with twins') description = _("Matches families with twins") - category = _('Child filters') + category = _('Child filters') def apply(self, db, family): date_list = [] diff --git a/gramps/gen/filters/rules/family/_isbookmarked.py b/gramps/gen/filters/rules/family/_isbookmarked.py index bc0690411..8090f04e2 100644 --- a/gramps/gen/filters/rules/family/_isbookmarked.py +++ b/gramps/gen/filters/rules/family/_isbookmarked.py @@ -41,8 +41,8 @@ from .. import Rule class IsBookmarked(Rule): """Rule that checks for the bookmark list in the database""" - name = _('Bookmarked families') - category = _('General filters') + name = _('Bookmarked families') + category = _('General filters') description = _("Matches the families on the bookmark list") def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/family/_matchesfilter.py b/gramps/gen/filters/rules/family/_matchesfilter.py index d793594ed..18776837b 100644 --- a/gramps/gen/filters/rules/family/_matchesfilter.py +++ b/gramps/gen/filters/rules/family/_matchesfilter.py @@ -41,6 +41,6 @@ from .. import MatchesFilterBase class MatchesFilter(MatchesFilterBase): """Rule that checks against another filter.""" - name = _('Families matching the ') + name = _('Families matching the ') description = _("Matches families matched by the specified filter name") - namespace = 'Family' + namespace = 'Family' diff --git a/gramps/gen/filters/rules/family/_matchessourceconfidence.py b/gramps/gen/filters/rules/family/_matchessourceconfidence.py index e1954fc9c..baa70d9cb 100644 --- a/gramps/gen/filters/rules/family/_matchessourceconfidence.py +++ b/gramps/gen/filters/rules/family/_matchessourceconfidence.py @@ -40,7 +40,7 @@ from .._matchessourceconfidencebase import MatchesSourceConfidenceBase class MatchesSourceConfidence(MatchesSourceConfidenceBase): """Families matching a specific confidence level on its 'direct' source references""" - labels = [_('Confidence level:')] - name = _('Families with at least one direct source >= ') + labels = [_('Confidence level:')] + name = _('Families with at least one direct source >= ') description = _("Matches families with at least one direct source with confidence level(s)") diff --git a/gramps/gen/filters/rules/family/_motherhasidof.py b/gramps/gen/filters/rules/family/_motherhasidof.py index 3a432bcee..f7559c2fc 100644 --- a/gramps/gen/filters/rules/family/_motherhasidof.py +++ b/gramps/gen/filters/rules/family/_motherhasidof.py @@ -42,10 +42,10 @@ from ._memberbase import mother_base class MotherHasIdOf(RegExpIdBase): """Rule that checks for a person with a specific Gramps ID""" - labels = [ _('Person ID:') ] - name = _('Families having mother with Id containing ') + labels = [ _('Person ID:') ] + name = _('Families having mother with Id containing ') description = _("Matches families whose mother has a specified " "Gramps ID") - category = _('Mother filters') + category = _('Mother filters') base_class = RegExpIdBase apply = mother_base diff --git a/gramps/gen/filters/rules/family/_motherhasnameof.py b/gramps/gen/filters/rules/family/_motherhasnameof.py index b35419da6..e2eb613b1 100644 --- a/gramps/gen/filters/rules/family/_motherhasnameof.py +++ b/gramps/gen/filters/rules/family/_motherhasnameof.py @@ -42,9 +42,9 @@ from ._memberbase import mother_base class MotherHasNameOf(HasNameOf): """Rule that checks for full or partial name matches""" - name = _('Families with mother with the ') + name = _('Families with mother with the ') description = _("Matches families whose mother has a specified " "(partial) name") - category = _('Mother filters') + category = _('Mother filters') base_class = HasNameOf apply = mother_base diff --git a/gramps/gen/filters/rules/family/_regexpchildname.py b/gramps/gen/filters/rules/family/_regexpchildname.py index b85ed75c2..7d34dec92 100644 --- a/gramps/gen/filters/rules/family/_regexpchildname.py +++ b/gramps/gen/filters/rules/family/_regexpchildname.py @@ -42,9 +42,9 @@ from ._memberbase import child_base class RegExpChildName(RegExpName): """Rule that checks for full or partial name matches""" - name = _('Families with child matching the ') + name = _('Families with child matching the ') description = _("Matches families where some child has a name " "that matches a specified regular expression") - category = _('Child filters') + category = _('Child filters') base_class = RegExpName apply = child_base diff --git a/gramps/gen/filters/rules/family/_regexpfathername.py b/gramps/gen/filters/rules/family/_regexpfathername.py index b60968cf2..2d0afba6e 100644 --- a/gramps/gen/filters/rules/family/_regexpfathername.py +++ b/gramps/gen/filters/rules/family/_regexpfathername.py @@ -42,9 +42,9 @@ from ._memberbase import father_base class RegExpFatherName(RegExpName): """Rule that checks for full or partial name matches""" - name = _('Families with father matching the ') + name = _('Families with father matching the ') description = _("Matches families whose father has a name " "matching a specified regular expression") - category = _('Father filters') + category = _('Father filters') base_class = RegExpName apply = father_base diff --git a/gramps/gen/filters/rules/family/_regexpidof.py b/gramps/gen/filters/rules/family/_regexpidof.py index f3749e3bd..c47c39a07 100644 --- a/gramps/gen/filters/rules/family/_regexpidof.py +++ b/gramps/gen/filters/rules/family/_regexpidof.py @@ -44,6 +44,6 @@ class RegExpIdOf(RegExpIdBase): matches regular expression. """ - name = _('Families with Id containing ') + name = _('Families with Id containing ') description = _("Matches families whose Gramps ID matches " "the regular expression") diff --git a/gramps/gen/filters/rules/family/_regexpmothername.py b/gramps/gen/filters/rules/family/_regexpmothername.py index f370e81bc..3a092e416 100644 --- a/gramps/gen/filters/rules/family/_regexpmothername.py +++ b/gramps/gen/filters/rules/family/_regexpmothername.py @@ -42,9 +42,9 @@ from ._memberbase import mother_base class RegExpMotherName(RegExpName): """Rule that checks for full or partial name matches""" - name = _('Families with mother matching the ') + name = _('Families with mother matching the ') description = _("Matches families whose mother has a name " "matching a specified regular expression") - category = _('Mother filters') + category = _('Mother filters') base_class = RegExpName apply = mother_base diff --git a/gramps/gen/filters/rules/family/_searchchildname.py b/gramps/gen/filters/rules/family/_searchchildname.py index a4f73a083..f82c5dd79 100644 --- a/gramps/gen/filters/rules/family/_searchchildname.py +++ b/gramps/gen/filters/rules/family/_searchchildname.py @@ -42,9 +42,9 @@ from ._memberbase import child_base class SearchChildName(SearchName): """Rule that checks for full or partial name matches""" - name = _('Families with any child matching the ') + name = _('Families with any child matching the ') description = _("Matches families where any child has a specified " "(partial) name") - category = _('Child filters') + category = _('Child filters') base_class = SearchName apply = child_base diff --git a/gramps/gen/filters/rules/family/_searchfathername.py b/gramps/gen/filters/rules/family/_searchfathername.py index cf0cb40d2..ad2041f98 100644 --- a/gramps/gen/filters/rules/family/_searchfathername.py +++ b/gramps/gen/filters/rules/family/_searchfathername.py @@ -42,9 +42,9 @@ from ._memberbase import father_base class SearchFatherName(SearchName): """Rule that checks for full or partial name matches""" - name = _('Families with father matching the ') + name = _('Families with father matching the ') description = _("Matches families whose father has a specified " "(partial) name") - category = _('Father filters') + category = _('Father filters') base_class = SearchName apply = father_base diff --git a/gramps/gen/filters/rules/family/_searchmothername.py b/gramps/gen/filters/rules/family/_searchmothername.py index 6148417dc..5f32e66d4 100644 --- a/gramps/gen/filters/rules/family/_searchmothername.py +++ b/gramps/gen/filters/rules/family/_searchmothername.py @@ -42,9 +42,9 @@ from ._memberbase import mother_base class SearchMotherName(SearchName): """Rule that checks for full or partial name matches""" - name = _('Families with mother matching the ') + name = _('Families with mother matching the ') description = _("Matches families whose mother has a specified " "(partial) name") - category = _('Mother filters') + category = _('Mother filters') base_class = SearchName apply = mother_base diff --git a/gramps/gen/filters/rules/media/_allmedia.py b/gramps/gen/filters/rules/media/_allmedia.py index 69ae63dd2..6146b2a64 100644 --- a/gramps/gen/filters/rules/media/_allmedia.py +++ b/gramps/gen/filters/rules/media/_allmedia.py @@ -41,5 +41,5 @@ from .._everything import Everything class AllMedia(Everything): """Matches Everyone""" - name = _('Every media object') + name = _('Every media object') description = _('Matches every media object in the database') diff --git a/gramps/gen/filters/rules/media/_changedsince.py b/gramps/gen/filters/rules/media/_changedsince.py index 33be2f754..23b594f51 100644 --- a/gramps/gen/filters/rules/media/_changedsince.py +++ b/gramps/gen/filters/rules/media/_changedsince.py @@ -41,8 +41,8 @@ from .._changedsincebase import ChangedSinceBase class ChangedSince(ChangedSinceBase): """Rule that checks for media objects changed since a specific time""" - labels = [ _('Changed after:'), _('but before:') ] - name = _('Media objects changed after ') + labels = [ _('Changed after:'), _('but before:') ] + name = _('Media objects changed after ') description = _("Matches media objects changed after a specified " "date:time (yyyy-mm-dd hh:mm:ss) or in the range, if a second " "date:time is given.") diff --git a/gramps/gen/filters/rules/media/_hasattribute.py b/gramps/gen/filters/rules/media/_hasattribute.py index 82e915d46..0773a7b47 100644 --- a/gramps/gen/filters/rules/media/_hasattribute.py +++ b/gramps/gen/filters/rules/media/_hasattribute.py @@ -41,7 +41,7 @@ from .._hasattributebase import HasAttributeBase class HasAttribute(HasAttributeBase): """Rule that checks for a media object with a particular attribute""" - labels = [ _('Media attribute:'), _('Value:') ] - name = _('Media objects with the attribute ') + labels = [ _('Media attribute:'), _('Value:') ] + name = _('Media objects with the attribute ') description = _("Matches media objects with the attribute " "of a particular value") diff --git a/gramps/gen/filters/rules/media/_hascitation.py b/gramps/gen/filters/rules/media/_hascitation.py index 079d95de2..d8104ab93 100644 --- a/gramps/gen/filters/rules/media/_hascitation.py +++ b/gramps/gen/filters/rules/media/_hascitation.py @@ -44,9 +44,9 @@ from .._hascitationbase import HasCitationBase class HasCitation(HasCitationBase): """Rule that checks for a person with a particular value""" - labels = [ _('Volume/Page:'), + labels = [ _('Volume/Page:'), _('Date:'), _('Confidence level:')] - name = _('Media with the ') + name = _('Media with the ') description = _("Matches media with a citation of a particular " "value") diff --git a/gramps/gen/filters/rules/media/_hasidof.py b/gramps/gen/filters/rules/media/_hasidof.py index 60ce470c5..6e0b0d978 100644 --- a/gramps/gen/filters/rules/media/_hasidof.py +++ b/gramps/gen/filters/rules/media/_hasidof.py @@ -41,5 +41,5 @@ from .. import HasGrampsId class HasIdOf(HasGrampsId): """Rule that checks for a media object with a specific Gramps ID""" - name = _('Media object with ') + name = _('Media object with ') description = _("Matches a media object with a specified Gramps ID") diff --git a/gramps/gen/filters/rules/media/_hasmedia.py b/gramps/gen/filters/rules/media/_hasmedia.py index 9651242b4..5c61c5911 100644 --- a/gramps/gen/filters/rules/media/_hasmedia.py +++ b/gramps/gen/filters/rules/media/_hasmedia.py @@ -43,14 +43,14 @@ class HasMedia(Rule): """Rule that checks for a media with a particular value""" - labels = [ _('Title:'), + labels = [ _('Title:'), _('Type:'), _('Path:'), _('Date:'), ] - name = _('Media objects matching parameters') + name = _('Media objects matching parameters') description = _("Matches media objects with particular parameters") - category = _('General filters') + category = _('General filters') allow_regex = True def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/media/_hasnotematchingsubstringof.py b/gramps/gen/filters/rules/media/_hasnotematchingsubstringof.py index d9c1b1ff1..7b8338f71 100644 --- a/gramps/gen/filters/rules/media/_hasnotematchingsubstringof.py +++ b/gramps/gen/filters/rules/media/_hasnotematchingsubstringof.py @@ -39,7 +39,7 @@ from .._hasnotesubstrbase import HasNoteSubstrBase class HasNoteMatchingSubstringOf(HasNoteSubstrBase): """Media having notes containing """ - name = _('Media objects having notes containing ') + name = _('Media objects having notes containing ') description = _("Matches media objects whose notes contain text " "matching a substring") diff --git a/gramps/gen/filters/rules/media/_hasnoteregexp.py b/gramps/gen/filters/rules/media/_hasnoteregexp.py index 75fc0cd43..3d45ee421 100644 --- a/gramps/gen/filters/rules/media/_hasnoteregexp.py +++ b/gramps/gen/filters/rules/media/_hasnoteregexp.py @@ -38,6 +38,6 @@ from .._hasnoteregexbase import HasNoteRegexBase #------------------------------------------------------------------------- class HasNoteRegexp(HasNoteRegexBase): - name = _('Media objects having notes containing ') + name = _('Media objects having notes containing ') description = _("Matches media objects whose notes contain text " "matching a regular expression") diff --git a/gramps/gen/filters/rules/media/_hasreferencecountof.py b/gramps/gen/filters/rules/media/_hasreferencecountof.py index 1a99f3e83..553cf4d21 100644 --- a/gramps/gen/filters/rules/media/_hasreferencecountof.py +++ b/gramps/gen/filters/rules/media/_hasreferencecountof.py @@ -39,6 +39,6 @@ from .._hasreferencecountbase import HasReferenceCountBase class HasReferenceCountOf(HasReferenceCountBase): """Media objects with a reference count of """ - name = _('Media objects with a reference count of ') + name = _('Media objects with a reference count of ') description = _("Matches media objects with a certain reference count") diff --git a/gramps/gen/filters/rules/media/_hassourcecount.py b/gramps/gen/filters/rules/media/_hassourcecount.py index cc54e2ce9..08af90a19 100644 --- a/gramps/gen/filters/rules/media/_hassourcecount.py +++ b/gramps/gen/filters/rules/media/_hassourcecount.py @@ -42,5 +42,5 @@ from .._hassourcecountbase import HasSourceCountBase class HasSourceCount(HasSourceCountBase): """Media with sources""" - name = _('Media with sources') + name = _('Media with sources') description = _("Matches media with a certain number of sources connected to it") diff --git a/gramps/gen/filters/rules/media/_hassourceof.py b/gramps/gen/filters/rules/media/_hassourceof.py index ee8f2f6af..d644b8dd6 100644 --- a/gramps/gen/filters/rules/media/_hassourceof.py +++ b/gramps/gen/filters/rules/media/_hassourceof.py @@ -42,7 +42,7 @@ from .._hassourceofbase import HasSourceOfBase class HasSourceOf(HasSourceOfBase): """Rule that checks media that have a particular source.""" - labels = [ _('Source ID:') ] - name = _('Media with the ') - category = _('Citation/source filters') + labels = [ _('Source ID:') ] + name = _('Media with the ') + category = _('Citation/source filters') description = _('Matches media who have a particular source') diff --git a/gramps/gen/filters/rules/media/_hastag.py b/gramps/gen/filters/rules/media/_hastag.py index 34944e1df..bf56811b9 100644 --- a/gramps/gen/filters/rules/media/_hastag.py +++ b/gramps/gen/filters/rules/media/_hastag.py @@ -45,6 +45,6 @@ class HasTag(HasTagBase): """ Rule that checks for a media object with a particular tag. """ - labels = [ _('Tag:') ] - name = _('Media objects with the ') + labels = [ _('Tag:') ] + name = _('Media objects with the ') description = _("Matches media objects with the particular tag") diff --git a/gramps/gen/filters/rules/media/_matchesfilter.py b/gramps/gen/filters/rules/media/_matchesfilter.py index 66509e1f7..8613a4761 100644 --- a/gramps/gen/filters/rules/media/_matchesfilter.py +++ b/gramps/gen/filters/rules/media/_matchesfilter.py @@ -41,7 +41,7 @@ from .. import MatchesFilterBase class MatchesFilter(MatchesFilterBase): """Rule that checks against another filter.""" - name = _('Media objects matching the ') + name = _('Media objects matching the ') description = _("Matches media objects matched by the " "specified filter name") - namespace = 'Media' + namespace = 'Media' diff --git a/gramps/gen/filters/rules/media/_matchessourceconfidence.py b/gramps/gen/filters/rules/media/_matchessourceconfidence.py index 3c15fda08..290d02a34 100644 --- a/gramps/gen/filters/rules/media/_matchessourceconfidence.py +++ b/gramps/gen/filters/rules/media/_matchessourceconfidence.py @@ -40,6 +40,6 @@ from .._matchessourceconfidencebase import MatchesSourceConfidenceBase class MatchesSourceConfidence(MatchesSourceConfidenceBase): """Media matching a specific confidence level on its 'direct' source references""" - labels = [_('Confidence level:')] - name = _('Media with a direct source >= ') + labels = [_('Confidence level:')] + name = _('Media with a direct source >= ') description = _("Matches media with at least one direct source with confidence level(s)") diff --git a/gramps/gen/filters/rules/media/_mediaprivate.py b/gramps/gen/filters/rules/media/_mediaprivate.py index 655696b22..a26992850 100644 --- a/gramps/gen/filters/rules/media/_mediaprivate.py +++ b/gramps/gen/filters/rules/media/_mediaprivate.py @@ -39,5 +39,5 @@ from .._isprivate import IsPrivate class MediaPrivate(IsPrivate): """Media marked private""" - name = _('Media objects marked private') + name = _('Media objects marked private') description = _("Matches Media objects that are indicated as private") diff --git a/gramps/gen/filters/rules/media/_regexpidof.py b/gramps/gen/filters/rules/media/_regexpidof.py index 89af082e0..9554a9b08 100644 --- a/gramps/gen/filters/rules/media/_regexpidof.py +++ b/gramps/gen/filters/rules/media/_regexpidof.py @@ -44,6 +44,6 @@ class RegExpIdOf(RegExpIdBase): matches regular expression. """ - name = _('Media objects with Id containing ') + name = _('Media objects with Id containing ') description = _("Matches media objects whose Gramps ID matches " "the regular expression") diff --git a/gramps/gen/filters/rules/note/_allnotes.py b/gramps/gen/filters/rules/note/_allnotes.py index 6c0848008..3ae3712d4 100644 --- a/gramps/gen/filters/rules/note/_allnotes.py +++ b/gramps/gen/filters/rules/note/_allnotes.py @@ -41,5 +41,5 @@ from .._everything import Everything class AllNotes(Everything): """Matches every note""" - name = _('Every note') + name = _('Every note') description = _('Matches every note in the database') diff --git a/gramps/gen/filters/rules/note/_changedsince.py b/gramps/gen/filters/rules/note/_changedsince.py index 4102dfb08..7eb9cb009 100644 --- a/gramps/gen/filters/rules/note/_changedsince.py +++ b/gramps/gen/filters/rules/note/_changedsince.py @@ -43,8 +43,8 @@ from .._changedsincebase import ChangedSinceBase class ChangedSince(ChangedSinceBase): """Rule that checks for notes changed since a specific time.""" - labels = [ _('Changed after:'), _('but before:') ] - name = _('Notes changed after ') + labels = [ _('Changed after:'), _('but before:') ] + name = _('Notes changed after ') description = _("Matches note records changed after a specified " "date-time (yyyy-mm-dd hh:mm:ss) or in the range, if a second " "date-time is given.") diff --git a/gramps/gen/filters/rules/note/_hasidof.py b/gramps/gen/filters/rules/note/_hasidof.py index a2ad963c1..845609ebc 100644 --- a/gramps/gen/filters/rules/note/_hasidof.py +++ b/gramps/gen/filters/rules/note/_hasidof.py @@ -41,5 +41,5 @@ from .. import HasGrampsId class HasIdOf(HasGrampsId): """Rule that checks for a note with a specific Gramps ID""" - name = _('Note with ') + name = _('Note with ') description = _("Matches a note with a specified Gramps ID") diff --git a/gramps/gen/filters/rules/note/_hasnote.py b/gramps/gen/filters/rules/note/_hasnote.py index 02089530f..1f15d4ca4 100644 --- a/gramps/gen/filters/rules/note/_hasnote.py +++ b/gramps/gen/filters/rules/note/_hasnote.py @@ -43,12 +43,12 @@ class HasNote(Rule): """Rule that checks for a note with a particular value""" - labels = [ _('Text:'), + labels = [ _('Text:'), _('Note type:'), ] - name = _('Notes matching parameters') + name = _('Notes matching parameters') description = _("Matches Notes with particular parameters") - category = _('General filters') + category = _('General filters') allow_regex = True def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/note/_hasreferencecountof.py b/gramps/gen/filters/rules/note/_hasreferencecountof.py index 35ed58a9a..8cfe84de9 100644 --- a/gramps/gen/filters/rules/note/_hasreferencecountof.py +++ b/gramps/gen/filters/rules/note/_hasreferencecountof.py @@ -39,6 +39,6 @@ from .._hasreferencecountbase import HasReferenceCountBase class HasReferenceCountOf(HasReferenceCountBase): """Notes with a reference count of """ - name = _('Notes with a reference count of ') + name = _('Notes with a reference count of ') description = _("Matches notes with a certain reference count") diff --git a/gramps/gen/filters/rules/note/_hastag.py b/gramps/gen/filters/rules/note/_hastag.py index 817302296..91114546b 100644 --- a/gramps/gen/filters/rules/note/_hastag.py +++ b/gramps/gen/filters/rules/note/_hastag.py @@ -45,6 +45,6 @@ class HasTag(HasTagBase): """ Rule that checks for a note with a particular tag. """ - labels = [ _('Tag:') ] - name = _('Notes with the ') + labels = [ _('Tag:') ] + name = _('Notes with the ') description = _("Matches notes with the particular tag") diff --git a/gramps/gen/filters/rules/note/_hastype.py b/gramps/gen/filters/rules/note/_hastype.py index 25ab96972..02276c3ae 100644 --- a/gramps/gen/filters/rules/note/_hastype.py +++ b/gramps/gen/filters/rules/note/_hastype.py @@ -42,10 +42,10 @@ _ = glocale.translation.gettext class HasType(Rule): """Rule that checks for a note of a particular type.""" - labels = [ _('Note type:') ] - name = _('Notes with the particular type') + labels = [ _('Note type:') ] + name = _('Notes with the particular type') description = _("Matches notes with the particular type ") - category = _('General filters') + category = _('General filters') def apply(self, db, note): if not self.list[0]: diff --git a/gramps/gen/filters/rules/note/_matchesfilter.py b/gramps/gen/filters/rules/note/_matchesfilter.py index 3361b4b6b..958824ac7 100644 --- a/gramps/gen/filters/rules/note/_matchesfilter.py +++ b/gramps/gen/filters/rules/note/_matchesfilter.py @@ -41,7 +41,7 @@ from .. import MatchesFilterBase class MatchesFilter(MatchesFilterBase): """Rule that checks against another filter.""" - name = _('Notes matching the ') + name = _('Notes matching the ') description = _("Matches notes matched " "by the specified filter name") - namespace = 'Note' + namespace = 'Note' diff --git a/gramps/gen/filters/rules/note/_matchesregexpof.py b/gramps/gen/filters/rules/note/_matchesregexpof.py index 71ff9fe10..68e935ebb 100644 --- a/gramps/gen/filters/rules/note/_matchesregexpof.py +++ b/gramps/gen/filters/rules/note/_matchesregexpof.py @@ -40,11 +40,11 @@ from .. import Rule #------------------------------------------------------------------------- class MatchesRegexpOf(Rule): - labels = [ _('Text:')] - name = _('Notes containing ') + labels = [ _('Text:')] + name = _('Notes containing ') description = _("Matches notes that contain a substring " "or match a regular expression") - category = _('General filters') + category = _('General filters') allow_regex = True def apply(self, db, note): diff --git a/gramps/gen/filters/rules/note/_matchessubstringof.py b/gramps/gen/filters/rules/note/_matchessubstringof.py index 7b13dbe10..0583b230d 100644 --- a/gramps/gen/filters/rules/note/_matchessubstringof.py +++ b/gramps/gen/filters/rules/note/_matchessubstringof.py @@ -40,11 +40,11 @@ from .. import Rule class MatchesSubstringOf(Rule): """Notes having notes containing """ - labels = [ _('Substring:')] - name = _('Notes containing ') + labels = [ _('Substring:')] + name = _('Notes containing ') description = _("Matches notes that contain text " "which matches a substring") - category = _('General filters') + category = _('General filters') def apply(self, db, note): """ Apply the filter """ diff --git a/gramps/gen/filters/rules/note/_noteprivate.py b/gramps/gen/filters/rules/note/_noteprivate.py index 471d0fc96..1c5778984 100644 --- a/gramps/gen/filters/rules/note/_noteprivate.py +++ b/gramps/gen/filters/rules/note/_noteprivate.py @@ -39,5 +39,5 @@ from .._isprivate import IsPrivate class NotePrivate(IsPrivate): """Note marked private""" - name = _('Notes marked private') + name = _('Notes marked private') description = _("Matches notes that are indicated as private") diff --git a/gramps/gen/filters/rules/note/_regexpidof.py b/gramps/gen/filters/rules/note/_regexpidof.py index def5c8a84..9a0945c96 100644 --- a/gramps/gen/filters/rules/note/_regexpidof.py +++ b/gramps/gen/filters/rules/note/_regexpidof.py @@ -44,6 +44,6 @@ class RegExpIdOf(RegExpIdBase): matches regular expression. """ - name = _('Notes with Id containing ') + name = _('Notes with Id containing ') description = _("Matches notes whose Gramps ID matches " "the regular expression") diff --git a/gramps/gen/filters/rules/person/_changedsince.py b/gramps/gen/filters/rules/person/_changedsince.py index 35cfc1632..341048b0b 100644 --- a/gramps/gen/filters/rules/person/_changedsince.py +++ b/gramps/gen/filters/rules/person/_changedsince.py @@ -43,7 +43,7 @@ from .._changedsincebase import ChangedSinceBase class ChangedSince(ChangedSinceBase): """Rule that checks for persons changed since a specific time.""" - labels = [ _('Changed after:'), _('but before:') ] + labels = [ _('Changed after:'), _('but before:') ] name = _('Persons changed after ') description = _("Matches person records changed after a specified " "date-time (yyyy-mm-dd hh:mm:ss) or in the range, if a second " diff --git a/gramps/gen/filters/rules/person/_disconnected.py b/gramps/gen/filters/rules/person/_disconnected.py index 36bec0b4e..448d62cef 100644 --- a/gramps/gen/filters/rules/person/_disconnected.py +++ b/gramps/gen/filters/rules/person/_disconnected.py @@ -41,8 +41,8 @@ from .. import Rule class Disconnected(Rule): """Matches disconnected people""" - name = _('Disconnected people') - category = _('General filters') + name = _('Disconnected people') + category = _('General filters') description = _('Matches people that have no family relationships ' 'to any other person in the database') diff --git a/gramps/gen/filters/rules/person/_everyone.py b/gramps/gen/filters/rules/person/_everyone.py index 68d5c6178..b0af0ed5c 100644 --- a/gramps/gen/filters/rules/person/_everyone.py +++ b/gramps/gen/filters/rules/person/_everyone.py @@ -41,8 +41,8 @@ from .. import Rule class Everyone(Rule): """Match Everyone.""" - name = _('Everyone') - category = _('General filters') + name = _('Everyone') + category = _('General filters') description = _('Matches everyone in the database') def is_empty(self): diff --git a/gramps/gen/filters/rules/person/_familywithincompleteevent.py b/gramps/gen/filters/rules/person/_familywithincompleteevent.py index ae362d2cb..657d7a8cf 100644 --- a/gramps/gen/filters/rules/person/_familywithincompleteevent.py +++ b/gramps/gen/filters/rules/person/_familywithincompleteevent.py @@ -39,10 +39,10 @@ from .. import Rule class FamilyWithIncompleteEvent(Rule): """Families with incomplete events""" - name = _('Families with incomplete events') + name = _('Families with incomplete events') description = _("Matches people with missing date or " "place in an event of the family") - category = _('Event filters') + category = _('Event filters') def apply(self,db,person): for family_handle in person.get_family_handle_list(): diff --git a/gramps/gen/filters/rules/person/_hasaddress.py b/gramps/gen/filters/rules/person/_hasaddress.py index 814f1005b..afe12b0a9 100644 --- a/gramps/gen/filters/rules/person/_hasaddress.py +++ b/gramps/gen/filters/rules/person/_hasaddress.py @@ -45,10 +45,10 @@ from .. import Rule class HasAddress(Rule): """Rule that checks for a person with a personal address""" - labels = [ _('Number of instances:'), _('Number must be:')] - name = _('People with addresses') + labels = [ _('Number of instances:'), _('Number must be:')] + name = _('People with addresses') description = _("Matches people with a certain number of personal addresses") - category = _('General filters') + category = _('General filters') def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/person/_hasalternatename.py b/gramps/gen/filters/rules/person/_hasalternatename.py index 35ce0c8be..2bd3cf1e9 100644 --- a/gramps/gen/filters/rules/person/_hasalternatename.py +++ b/gramps/gen/filters/rules/person/_hasalternatename.py @@ -42,9 +42,9 @@ from .. import Rule class HasAlternateName(Rule): """Rule that checks an alternate name""" - name = _('People with an alternate name') + name = _('People with an alternate name') description = _("Matches people with an alternate name") - category = _('General filters') + category = _('General filters') def apply(self, db, person): if person.get_alternate_names(): diff --git a/gramps/gen/filters/rules/person/_hasassociation.py b/gramps/gen/filters/rules/person/_hasassociation.py index 65d1b3e71..a6e3d05d3 100644 --- a/gramps/gen/filters/rules/person/_hasassociation.py +++ b/gramps/gen/filters/rules/person/_hasassociation.py @@ -45,10 +45,10 @@ from .. import Rule class HasAssociation(Rule): """Rule that checks for a person with a personal association""" - labels = [ _('Number of instances:'), _('Number must be:')] - name = _('People with associations') + labels = [ _('Number of instances:'), _('Number must be:')] + name = _('People with associations') description = _("Matches people with a certain number of associations") - category = _('General filters') + category = _('General filters') def prepare(self, db, user): # things we want to do just once, not for every handle diff --git a/gramps/gen/filters/rules/person/_hasattribute.py b/gramps/gen/filters/rules/person/_hasattribute.py index bd82b810b..2673a1e0d 100644 --- a/gramps/gen/filters/rules/person/_hasattribute.py +++ b/gramps/gen/filters/rules/person/_hasattribute.py @@ -41,7 +41,7 @@ from .._hasattributebase import HasAttributeBase class HasAttribute(HasAttributeBase): """Rule that checks for a person with a particular personal attribute""" - labels = [ _('Personal attribute:'), _('Value:') ] - name = _('People with the personal ') + labels = [ _('Personal attribute:'), _('Value:') ] + name = _('People with the personal ') description = _("Matches people with the personal attribute " "of a particular value") diff --git a/gramps/gen/filters/rules/person/_hasbirth.py b/gramps/gen/filters/rules/person/_hasbirth.py index 8a0cf5a65..adaee24d7 100644 --- a/gramps/gen/filters/rules/person/_hasbirth.py +++ b/gramps/gen/filters/rules/person/_hasbirth.py @@ -45,10 +45,10 @@ from .. import Rule class HasBirth(Rule): """Rule that checks for a person with a birth of a particular value""" - labels = [ _('Date:'), _('Place:'), _('Description:') ] - name = _('People with the ') + labels = [ _('Date:'), _('Place:'), _('Description:') ] + name = _('People with the ') description = _("Matches people with birth data of a particular value") - category = _('Event filters') + category = _('Event filters') allow_regex = True def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/person/_hascitation.py b/gramps/gen/filters/rules/person/_hascitation.py index cad459843..41c33fd88 100644 --- a/gramps/gen/filters/rules/person/_hascitation.py +++ b/gramps/gen/filters/rules/person/_hascitation.py @@ -44,9 +44,9 @@ from .._hascitationbase import HasCitationBase class HasCitation(HasCitationBase): """Rule that checks for a person with a particular value""" - labels = [ _('Volume/Page:'), + labels = [ _('Volume/Page:'), _('Date:'), _('Confidence level:')] - name = _('People with the ') + name = _('People with the ') description = _("Matches people with a citation of a particular " "value") diff --git a/gramps/gen/filters/rules/person/_hascommonancestorwith.py b/gramps/gen/filters/rules/person/_hascommonancestorwith.py index f49479ed0..ec2eaa7bf 100644 --- a/gramps/gen/filters/rules/person/_hascommonancestorwith.py +++ b/gramps/gen/filters/rules/person/_hascommonancestorwith.py @@ -42,9 +42,9 @@ from .. import Rule class HasCommonAncestorWith(Rule): """Rule that checks for a person that has a common ancestor with a specified person""" - labels = [ _('ID:') ] - name = _('People with a common ancestor with ') - category = _("Ancestral filters") + labels = [ _('ID:') ] + name = _('People with a common ancestor with ') + category = _("Ancestral filters") description = _("Matches people that have a common ancestor " "with a specified person") diff --git a/gramps/gen/filters/rules/person/_hascommonancestorwithfiltermatch.py b/gramps/gen/filters/rules/person/_hascommonancestorwithfiltermatch.py index f88966be0..923792c23 100644 --- a/gramps/gen/filters/rules/person/_hascommonancestorwithfiltermatch.py +++ b/gramps/gen/filters/rules/person/_hascommonancestorwithfiltermatch.py @@ -44,11 +44,11 @@ class HasCommonAncestorWithFilterMatch(HasCommonAncestorWith): """Rule that checks for a person that has a common ancestor with someone matching a filter""" - labels = [ _('Filter name:') ] - name = _('People with a common ancestor with match') + labels = [ _('Filter name:') ] + name = _('People with a common ancestor with match') description = _("Matches people that have a common ancestor " "with anybody matched by a filter") - category = _("Ancestral filters") + category = _("Ancestral filters") def __init__(self, list, use_regex=False): HasCommonAncestorWith.__init__(self, list, use_regex) diff --git a/gramps/gen/filters/rules/person/_hasdeath.py b/gramps/gen/filters/rules/person/_hasdeath.py index 6925c7668..bb04a9c3c 100644 --- a/gramps/gen/filters/rules/person/_hasdeath.py +++ b/gramps/gen/filters/rules/person/_hasdeath.py @@ -45,10 +45,10 @@ from .. import Rule class HasDeath(Rule): """Rule that checks for a person with a death of a particular value""" - labels = [ _('Date:'), _('Place:'), _('Description:') ] - name = _('People with the ') + labels = [ _('Date:'), _('Place:'), _('Description:') ] + name = _('People with the ') description = _("Matches people with death data of a particular value") - category = _('Event filters') + category = _('Event filters') allow_regex = True def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/person/_hasevent.py b/gramps/gen/filters/rules/person/_hasevent.py index d3264fcef..1eeb522c1 100644 --- a/gramps/gen/filters/rules/person/_hasevent.py +++ b/gramps/gen/filters/rules/person/_hasevent.py @@ -45,13 +45,13 @@ from .._haseventbase import HasEventBase class HasEvent(HasEventBase): """Rule that checks for a person with a particular value""" - labels = [ _('Personal event:'), + labels = [ _('Personal event:'), _('Date:'), _('Place:'), _('Description:'), _('Main Participants:'), _('Primary Role:') ] - name = _('People with the personal ') + name = _('People with the personal ') description = _("Matches people with a personal event of a particular " "value") diff --git a/gramps/gen/filters/rules/person/_hasfamilyattribute.py b/gramps/gen/filters/rules/person/_hasfamilyattribute.py index cdc655343..a1edd500c 100644 --- a/gramps/gen/filters/rules/person/_hasfamilyattribute.py +++ b/gramps/gen/filters/rules/person/_hasfamilyattribute.py @@ -41,11 +41,11 @@ from .. import Rule class HasFamilyAttribute(Rule): """Rule that checks for a person with a particular family attribute""" - labels = [ _('Family attribute:'), _('Value:') ] - name = _('People with the family ') + labels = [ _('Family attribute:'), _('Value:') ] + name = _('People with the family ') description = _("Matches people with the family attribute " "of a particular value") - category = _('General filters') + category = _('General filters') allow_regex = True def apply(self,db,person): diff --git a/gramps/gen/filters/rules/person/_hasfamilyevent.py b/gramps/gen/filters/rules/person/_hasfamilyevent.py index 2dad0fba7..7d4c905e2 100644 --- a/gramps/gen/filters/rules/person/_hasfamilyevent.py +++ b/gramps/gen/filters/rules/person/_hasfamilyevent.py @@ -45,13 +45,13 @@ class HasFamilyEvent(Rule): """Rule that checks for a person who has a relationship event with a particular value""" - labels = [ _('Family event:'), + labels = [ _('Family event:'), _('Date:'), _('Place:'), _('Description:') ] - name = _('People with the family ') + name = _('People with the family ') description = _("Matches people with a family event of a particular value") - category = _('Event filters') + category = _('Event filters') allow_regex = True def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/person/_hasgallery.py b/gramps/gen/filters/rules/person/_hasgallery.py index 0ac29452a..42a746de2 100644 --- a/gramps/gen/filters/rules/person/_hasgallery.py +++ b/gramps/gen/filters/rules/person/_hasgallery.py @@ -39,7 +39,7 @@ from .._hasgallerybase import HasGalleryBase class HavePhotos(HasGalleryBase): """Rule that checks for person who has media object reference""" - name = _('People with media') + name = _('People with media') description = _("Matches people with a certain number of items in the gallery") def __init__(self, arg, use_regex=False): diff --git a/gramps/gen/filters/rules/person/_hasidof.py b/gramps/gen/filters/rules/person/_hasidof.py index dd7602a3d..d34a8c7dc 100644 --- a/gramps/gen/filters/rules/person/_hasidof.py +++ b/gramps/gen/filters/rules/person/_hasidof.py @@ -41,5 +41,5 @@ from .. import HasGrampsId class HasIdOf(HasGrampsId): """Rule that checks for a person with a specific Gramps ID""" - name = _('Person with ') + name = _('Person with ') description = _("Matches person with a specified Gramps ID") diff --git a/gramps/gen/filters/rules/person/_haslds.py b/gramps/gen/filters/rules/person/_haslds.py index 1919d5072..ebb410de9 100644 --- a/gramps/gen/filters/rules/person/_haslds.py +++ b/gramps/gen/filters/rules/person/_haslds.py @@ -45,5 +45,5 @@ from .._hasldsbase import HasLDSBase class HasLDS(HasLDSBase): """Rule that checks for a person with a LDS event""" - name = _('People with LDS events') + name = _('People with LDS events') description = _("Matches people with a certain number of LDS events") diff --git a/gramps/gen/filters/rules/person/_hasnameof.py b/gramps/gen/filters/rules/person/_hasnameof.py index f7f6952ed..8585993a0 100644 --- a/gramps/gen/filters/rules/person/_hasnameof.py +++ b/gramps/gen/filters/rules/person/_hasnameof.py @@ -43,7 +43,7 @@ from ....lib.nameorigintype import NameOriginType class HasNameOf(Rule): """Rule that checks for full or partial name matches""" - labels = [_('Given name:'), + labels = [_('Given name:'), _('Full Family name:'), _('person|Title:'), _('Suffix:'), @@ -54,9 +54,9 @@ class HasNameOf(Rule): _('Connector'), _('Patronymic:'), _('Family Nick Name:')] - name = _('People with the ') + name = _('People with the ') description = _("Matches people with a specified (partial) name") - category = _('General filters') + category = _('General filters') allow_regex = True def apply(self, db, person): diff --git a/gramps/gen/filters/rules/person/_hasnameorigintype.py b/gramps/gen/filters/rules/person/_hasnameorigintype.py index 88adda83c..276356363 100644 --- a/gramps/gen/filters/rules/person/_hasnameorigintype.py +++ b/gramps/gen/filters/rules/person/_hasnameorigintype.py @@ -43,10 +43,10 @@ from ....lib.nameorigintype import NameOriginType class HasNameOriginType(Rule): """Rule that checks the type of Surname origin""" - labels = [ _('Surname origin type:')] - name = _('People with the ') + labels = [ _('Surname origin type:')] + name = _('People with the ') description = _("Matches people with a surname origin") - category = _('General filters') + category = _('General filters') def apply(self, db, person): if not self.list[0]: diff --git a/gramps/gen/filters/rules/person/_hasnametype.py b/gramps/gen/filters/rules/person/_hasnametype.py index 014e6e207..a8e50c2e1 100644 --- a/gramps/gen/filters/rules/person/_hasnametype.py +++ b/gramps/gen/filters/rules/person/_hasnametype.py @@ -43,10 +43,10 @@ from ....lib.nametype import NameType class HasNameType(Rule): """Rule that checks the type of name""" - labels = [ _('Name type:')] - name = _('People with the ') + labels = [ _('Name type:')] + name = _('People with the ') description = _("Matches people with a type of name") - category = _('General filters') + category = _('General filters') def apply(self, db, person): if not self.list[0]: diff --git a/gramps/gen/filters/rules/person/_hasnickname.py b/gramps/gen/filters/rules/person/_hasnickname.py index a01f2a7f8..fb90eae02 100644 --- a/gramps/gen/filters/rules/person/_hasnickname.py +++ b/gramps/gen/filters/rules/person/_hasnickname.py @@ -42,9 +42,9 @@ from .. import Rule class HasNickname(Rule): """Rule that checks a nickname""" - name = _('People with a nickname') + name = _('People with a nickname') description = _("Matches people with a nickname") - category = _('General filters') + category = _('General filters') def apply(self, db, person): if person.get_nick_name(): diff --git a/gramps/gen/filters/rules/person/_hasnote.py b/gramps/gen/filters/rules/person/_hasnote.py index 0f8e057a4..bb2c66f42 100644 --- a/gramps/gen/filters/rules/person/_hasnote.py +++ b/gramps/gen/filters/rules/person/_hasnote.py @@ -42,5 +42,5 @@ from .._hasnotebase import HasNoteBase class HasNote(HasNoteBase): """People having notes""" - name = _('People having notes') + name = _('People having notes') description = _("Matches people having a certain number of notes") diff --git a/gramps/gen/filters/rules/person/_hasnotematchingsubstringof.py b/gramps/gen/filters/rules/person/_hasnotematchingsubstringof.py index 45cadce58..8f2852bb0 100644 --- a/gramps/gen/filters/rules/person/_hasnotematchingsubstringof.py +++ b/gramps/gen/filters/rules/person/_hasnotematchingsubstringof.py @@ -39,5 +39,5 @@ from .._hasnotesubstrbase import HasNoteSubstrBase class HasNoteMatchingSubstringOf(HasNoteSubstrBase): """People having notes containing """ - name = _('People having notes containing ') + name = _('People having notes containing ') description = _("Matches people whose notes contain text matching a substring") diff --git a/gramps/gen/filters/rules/person/_hasnoteregexp.py b/gramps/gen/filters/rules/person/_hasnoteregexp.py index e382e821b..70fafffeb 100644 --- a/gramps/gen/filters/rules/person/_hasnoteregexp.py +++ b/gramps/gen/filters/rules/person/_hasnoteregexp.py @@ -38,7 +38,7 @@ from .._hasnoteregexbase import HasNoteRegexBase #------------------------------------------------------------------------- class HasNoteRegexp(HasNoteRegexBase): - name = _('People having notes containing ') + name = _('People having notes containing ') description = _("Matches people whose notes contain text " "matching a regular expression") diff --git a/gramps/gen/filters/rules/person/_hasrelationship.py b/gramps/gen/filters/rules/person/_hasrelationship.py index a8b5b2bdf..fd376cd70 100644 --- a/gramps/gen/filters/rules/person/_hasrelationship.py +++ b/gramps/gen/filters/rules/person/_hasrelationship.py @@ -42,12 +42,12 @@ from ....lib.familyreltype import FamilyRelType class HasRelationship(Rule): """Rule that checks for a person who has a particular relationship""" - labels = [ _('Number of relationships:'), + labels = [ _('Number of relationships:'), _('Relationship type:'), _('Number of children:') ] - name = _('People with the ') + name = _('People with the ') description = _("Matches people with a particular relationship") - category = _('Family filters') + category = _('Family filters') def apply(self,db,person): rel_type = 0 diff --git a/gramps/gen/filters/rules/person/_hassoundexname.py b/gramps/gen/filters/rules/person/_hassoundexname.py index 9cb6ec500..05b1df409 100644 --- a/gramps/gen/filters/rules/person/_hassoundexname.py +++ b/gramps/gen/filters/rules/person/_hassoundexname.py @@ -38,12 +38,12 @@ _ = glocale.translation.sgettext class HasSoundexName(Rule): """Rule that checks for full or partial name matches""" - labels = [_('Name:')] - name = _('Soundex match of People with the ') + labels = [_('Name:')] + name = _('Soundex match of People with the ') description = _("Soundex Match of people with a specified name. First " "name, Surname, Call name, and Nickname are searched in " "primary and alternate names.") - category = _('General filters') + category = _('General filters') allow_regex = False def apply(self, db, person): diff --git a/gramps/gen/filters/rules/person/_hassourcecount.py b/gramps/gen/filters/rules/person/_hassourcecount.py index dfd86a39f..97a655d1f 100644 --- a/gramps/gen/filters/rules/person/_hassourcecount.py +++ b/gramps/gen/filters/rules/person/_hassourcecount.py @@ -42,5 +42,5 @@ from .._hassourcecountbase import HasSourceCountBase class HasSourceCount(HasSourceCountBase): """People with sources""" - name = _('People with sources') + name = _('People with sources') description = _("Matches people with a certain number of sources connected to it") diff --git a/gramps/gen/filters/rules/person/_hassourceof.py b/gramps/gen/filters/rules/person/_hassourceof.py index 5d63de3f5..057725b90 100644 --- a/gramps/gen/filters/rules/person/_hassourceof.py +++ b/gramps/gen/filters/rules/person/_hassourceof.py @@ -42,7 +42,7 @@ from .._hassourceofbase import HasSourceOfBase class HasSourceOf(HasSourceOfBase): """Rule that checks people that have a particular source.""" - labels = [ _('Source ID:') ] - name = _('People with the ') - category = _('Citation/source filters') + labels = [ _('Source ID:') ] + name = _('People with the ') + category = _('Citation/source filters') description = _('Matches people who have a particular source') diff --git a/gramps/gen/filters/rules/person/_hastag.py b/gramps/gen/filters/rules/person/_hastag.py index 4059c767e..b1f9a7b21 100644 --- a/gramps/gen/filters/rules/person/_hastag.py +++ b/gramps/gen/filters/rules/person/_hastag.py @@ -45,6 +45,6 @@ class HasTag(HasTagBase): """ Rule that checks for a person with a particular tag. """ - labels = [ _('Tag:') ] - name = _('People with the ') + labels = [ _('Tag:') ] + name = _('People with the ') description = _("Matches people with the particular tag") diff --git a/gramps/gen/filters/rules/person/_hastextmatchingsubstringof.py b/gramps/gen/filters/rules/person/_hastextmatchingsubstringof.py index 835fe6dc0..fd3387eba 100644 --- a/gramps/gen/filters/rules/person/_hastextmatchingsubstringof.py +++ b/gramps/gen/filters/rules/person/_hastextmatchingsubstringof.py @@ -43,12 +43,12 @@ from .. import Rule class HasTextMatchingSubstringOf(Rule): """Rule that checks for string matches in any textual information""" - labels = [ _('Substring:'), + labels = [ _('Substring:'), _('Case sensitive:')] - name = _('People with records containing ') + name = _('People with records containing ') description = _("Matches people whose records contain text " "matching a substring") - category = _('General filters') + category = _('General filters') allow_regex = True def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/person/_hasunknowngender.py b/gramps/gen/filters/rules/person/_hasunknowngender.py index 714f36bcb..61cb2e940 100644 --- a/gramps/gen/filters/rules/person/_hasunknowngender.py +++ b/gramps/gen/filters/rules/person/_hasunknowngender.py @@ -42,8 +42,8 @@ from ....lib.person import Person class HasUnknownGender(Rule): """Rule that checks for a person that has unknown gender""" - name = _('People with unknown gender') - category = _('General filters') + name = _('People with unknown gender') + category = _('General filters') description = _('Matches all people with unknown gender') def apply(self,db,person): diff --git a/gramps/gen/filters/rules/person/_havealtfamilies.py b/gramps/gen/filters/rules/person/_havealtfamilies.py index 141d65fc0..80c1c96b5 100644 --- a/gramps/gen/filters/rules/person/_havealtfamilies.py +++ b/gramps/gen/filters/rules/person/_havealtfamilies.py @@ -40,9 +40,9 @@ from ....lib.childreftype import ChildRefType class HaveAltFamilies(Rule): """People who were adopted""" - name = _('Adopted people') + name = _('Adopted people') description = _("Matches people who were adopted") - category = _('Family filters') + category = _('Family filters') def apply(self,db,person): for fhandle in person.get_parent_family_handle_list(): diff --git a/gramps/gen/filters/rules/person/_havechildren.py b/gramps/gen/filters/rules/person/_havechildren.py index 56935fb7d..4c91ceb2a 100644 --- a/gramps/gen/filters/rules/person/_havechildren.py +++ b/gramps/gen/filters/rules/person/_havechildren.py @@ -39,9 +39,9 @@ from .. import Rule class HaveChildren(Rule): """People with children""" - name = _('People with children') + name = _('People with children') description = _("Matches people who have children") - category = _('Family filters') + category = _('Family filters') def apply(self,db,person): for family_handle in person.get_family_handle_list(): diff --git a/gramps/gen/filters/rules/person/_incompletenames.py b/gramps/gen/filters/rules/person/_incompletenames.py index 7b85f9273..c0a86b4eb 100644 --- a/gramps/gen/filters/rules/person/_incompletenames.py +++ b/gramps/gen/filters/rules/person/_incompletenames.py @@ -41,9 +41,9 @@ from .. import Rule class IncompleteNames(Rule): """People with incomplete names""" - name = _('People with incomplete names') + name = _('People with incomplete names') description = _("Matches people with firstname or lastname missing") - category = _('General filters') + category = _('General filters') def apply(self,db,person): for name in [person.get_primary_name()] + person.get_alternate_names(): diff --git a/gramps/gen/filters/rules/person/_isancestorof.py b/gramps/gen/filters/rules/person/_isancestorof.py index edf902d12..5785783bf 100644 --- a/gramps/gen/filters/rules/person/_isancestorof.py +++ b/gramps/gen/filters/rules/person/_isancestorof.py @@ -41,9 +41,9 @@ from .. import Rule class IsAncestorOf(Rule): """Rule that checks for a person that is an ancestor of a specified person""" - labels = [ _('ID:'), _('Inclusive:') ] - name = _('Ancestors of ') - category = _("Ancestral filters") + labels = [ _('ID:'), _('Inclusive:') ] + name = _('Ancestors of ') + category = _("Ancestral filters") description = _("Matches people that are ancestors of a specified person") def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/person/_isancestoroffiltermatch.py b/gramps/gen/filters/rules/person/_isancestoroffiltermatch.py index da9aa4f38..14bf03cfd 100644 --- a/gramps/gen/filters/rules/person/_isancestoroffiltermatch.py +++ b/gramps/gen/filters/rules/person/_isancestoroffiltermatch.py @@ -43,9 +43,9 @@ class IsAncestorOfFilterMatch(IsAncestorOf): """Rule that checks for a person that is an ancestor of someone matched by a filter""" - labels = [ _('Filter name:') ] - name = _('Ancestors of match') - category = _("Ancestral filters") + labels = [ _('Filter name:') ] + name = _('Ancestors of match') + category = _("Ancestral filters") description = _("Matches people that are ancestors " "of anybody matched by a filter") diff --git a/gramps/gen/filters/rules/person/_isbookmarked.py b/gramps/gen/filters/rules/person/_isbookmarked.py index 83a77ddb1..e7763b67c 100644 --- a/gramps/gen/filters/rules/person/_isbookmarked.py +++ b/gramps/gen/filters/rules/person/_isbookmarked.py @@ -42,8 +42,8 @@ from .. import Rule class IsBookmarked(Rule): """Rule that checks for the bookmark list in the database""" - name = _('Bookmarked people') - category = _('General filters') + name = _('Bookmarked people') + category = _('General filters') description = _("Matches the people on the bookmark list") def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/person/_ischildoffiltermatch.py b/gramps/gen/filters/rules/person/_ischildoffiltermatch.py index 2eb4970ab..bdb29550e 100644 --- a/gramps/gen/filters/rules/person/_ischildoffiltermatch.py +++ b/gramps/gen/filters/rules/person/_ischildoffiltermatch.py @@ -43,9 +43,9 @@ class IsChildOfFilterMatch(Rule): """Rule that checks for a person that is a child of someone matched by a filter""" - labels = [ _('Filter name:') ] - name = _('Children of match') - category = _('Family filters') + labels = [ _('Filter name:') ] + name = _('Children of match') + category = _('Family filters') description = _("Matches children of anybody matched by a filter") def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/person/_isdefaultperson.py b/gramps/gen/filters/rules/person/_isdefaultperson.py index 6d788d80c..715938c65 100644 --- a/gramps/gen/filters/rules/person/_isdefaultperson.py +++ b/gramps/gen/filters/rules/person/_isdefaultperson.py @@ -41,8 +41,8 @@ from .. import Rule class IsDefaultPerson(Rule): """Rule that checks for a default person in the database""" - name = _('Default person') - category = _('General filters') + name = _('Default person') + category = _('General filters') description = _("Matches the default person") def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/person/_isdescendantfamilyof.py b/gramps/gen/filters/rules/person/_isdescendantfamilyof.py index 49777d9c5..43fa79615 100644 --- a/gramps/gen/filters/rules/person/_isdescendantfamilyof.py +++ b/gramps/gen/filters/rules/person/_isdescendantfamilyof.py @@ -46,9 +46,9 @@ class IsDescendantFamilyOf(Rule): """Rule that checks for a person that is a descendant or the spouse of a descendant of a specified person""" - labels = [ _('ID:'), _('Inclusive:') ] - name = _('Descendant family members of ') - category = _('Descendant filters') + labels = [ _('ID:'), _('Inclusive:') ] + name = _('Descendant family members of ') + category = _('Descendant filters') description = _("Matches people that are descendants or the spouse " "of a descendant of a specified person") diff --git a/gramps/gen/filters/rules/person/_isdescendantfamilyoffiltermatch.py b/gramps/gen/filters/rules/person/_isdescendantfamilyoffiltermatch.py index 39f5948e4..36f27abc7 100644 --- a/gramps/gen/filters/rules/person/_isdescendantfamilyoffiltermatch.py +++ b/gramps/gen/filters/rules/person/_isdescendantfamilyoffiltermatch.py @@ -43,9 +43,9 @@ class IsDescendantFamilyOfFilterMatch(IsDescendantFamilyOf): """Rule that checks for a person that is a descendant of someone matched by a filter""" - labels = [ _('Filter name:')] - name = _('Descendant family members of match') - category = _('Descendant filters') + labels = [_('Filter name:')] + name = _('Descendant family members of match') + category = _('Descendant filters') description = _("Matches people that are descendants or the spouse " "of anybody matched by a filter") diff --git a/gramps/gen/filters/rules/person/_isdescendantof.py b/gramps/gen/filters/rules/person/_isdescendantof.py index 7e7ec7783..1ed33ecc1 100644 --- a/gramps/gen/filters/rules/person/_isdescendantof.py +++ b/gramps/gen/filters/rules/person/_isdescendantof.py @@ -42,9 +42,9 @@ class IsDescendantOf(Rule): """Rule that checks for a person that is a descendant of a specified person""" - labels = [ _('ID:'), _('Inclusive:') ] - name = _('Descendants of ') - category = _('Descendant filters') + labels = [ _('ID:'), _('Inclusive:') ] + name = _('Descendants of ') + category = _('Descendant filters') description = _('Matches all descendants for the specified person') def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/person/_isdescendantoffiltermatch.py b/gramps/gen/filters/rules/person/_isdescendantoffiltermatch.py index 19ace8404..d265540ca 100644 --- a/gramps/gen/filters/rules/person/_isdescendantoffiltermatch.py +++ b/gramps/gen/filters/rules/person/_isdescendantoffiltermatch.py @@ -43,9 +43,9 @@ class IsDescendantOfFilterMatch(IsDescendantOf): """Rule that checks for a person that is a descendant of someone matched by a filter""" - labels = [ _('Filter name:') ] - name = _('Descendants of match') - category = _('Descendant filters') + labels = [ _('Filter name:') ] + name = _('Descendants of match') + category = _('Descendant filters') description = _("Matches people that are descendants " "of anybody matched by a filter") diff --git a/gramps/gen/filters/rules/person/_isduplicatedancestorof.py b/gramps/gen/filters/rules/person/_isduplicatedancestorof.py index 5f65ee25a..206c13b69 100644 --- a/gramps/gen/filters/rules/person/_isduplicatedancestorof.py +++ b/gramps/gen/filters/rules/person/_isduplicatedancestorof.py @@ -43,9 +43,9 @@ class IsDuplicatedAncestorOf(Rule): """Rule that checks for a person that is a duplicated ancestor of a specified person""" - labels = [ _('ID:')] - name = _('Duplicated ancestors of ') - category = _("Ancestral filters") + labels = [ _('ID:')] + name = _('Duplicated ancestors of ') + category = _("Ancestral filters") description = _("Matches people that are ancestors twice or more " "of a specified person") diff --git a/gramps/gen/filters/rules/person/_isfemale.py b/gramps/gen/filters/rules/person/_isfemale.py index 356d41ea9..821f4f4bf 100644 --- a/gramps/gen/filters/rules/person/_isfemale.py +++ b/gramps/gen/filters/rules/person/_isfemale.py @@ -42,8 +42,8 @@ from ....lib.person import Person class IsFemale(Rule): """Rule that checks for a person that is a female""" - name = _('Females') - category = _('General filters') + name = _('Females') + category = _('General filters') description = _('Matches all females') def apply(self,db,person): diff --git a/gramps/gen/filters/rules/person/_islessthannthgenerationancestorof.py b/gramps/gen/filters/rules/person/_islessthannthgenerationancestorof.py index 847d7294e..4fe8067d3 100644 --- a/gramps/gen/filters/rules/person/_islessthannthgenerationancestorof.py +++ b/gramps/gen/filters/rules/person/_islessthannthgenerationancestorof.py @@ -42,9 +42,9 @@ class IsLessThanNthGenerationAncestorOf(Rule): """Rule that checks for a person that is an ancestor of a specified person not more than N generations away""" - labels = [ _('ID:'), _('Number of generations:') ] - name = _('Ancestors of not more than generations away') - category = _("Ancestral filters") + labels = [ _('ID:'), _('Number of generations:') ] + name = _('Ancestors of not more than generations away') + category = _("Ancestral filters") description = _("Matches people that are ancestors " "of a specified person not more than N generations away") diff --git a/gramps/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py b/gramps/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py index 5e0510cbf..0be87dad2 100644 --- a/gramps/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py +++ b/gramps/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py @@ -48,10 +48,10 @@ class IsLessThanNthGenerationAncestorOfBookmarked(Rule): """Rule that checks for a person that is an ancestor of bookmarked persons not more than N generations away""" - labels = [ _('Number of generations:') ] - name = _('Ancestors of bookmarked people not more ' + labels = [ _('Number of generations:') ] + name = _('Ancestors of bookmarked people not more ' 'than generations away') - category = _('Ancestral filters') + category = _('Ancestral filters') description = _("Matches ancestors of the people on the bookmark list " "not more than N generations away") diff --git a/gramps/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py b/gramps/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py index cbce57a74..89031f4f9 100644 --- a/gramps/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py +++ b/gramps/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py @@ -43,10 +43,10 @@ class IsLessThanNthGenerationAncestorOfDefaultPerson(Rule): """Rule that checks for a person that is an ancestor of the default person not more than N generations away""" - labels = [ _('Number of generations:') ] - name = _('Ancestors of the default person ' + labels = [ _('Number of generations:') ] + name = _('Ancestors of the default person ' 'not more than generations away') - category = _('Ancestral filters') + category = _('Ancestral filters') description = _("Matches ancestors of the default person " "not more than N generations away") diff --git a/gramps/gen/filters/rules/person/_islessthannthgenerationdescendantof.py b/gramps/gen/filters/rules/person/_islessthannthgenerationdescendantof.py index 3d5fb16da..2ccc768cd 100644 --- a/gramps/gen/filters/rules/person/_islessthannthgenerationdescendantof.py +++ b/gramps/gen/filters/rules/person/_islessthannthgenerationdescendantof.py @@ -42,10 +42,10 @@ class IsLessThanNthGenerationDescendantOf(Rule): """Rule that checks for a person that is a descendant of a specified person not more than N generations away""" - labels = [ _('ID:'), _('Number of generations:') ] - name = _('Descendants of not more than ' + labels = [ _('ID:'), _('Number of generations:') ] + name = _('Descendants of not more than ' ' generations away') - category = _('Descendant filters') + category = _('Descendant filters') description = _("Matches people that are descendants of a " "specified person not more than N generations away") diff --git a/gramps/gen/filters/rules/person/_ismale.py b/gramps/gen/filters/rules/person/_ismale.py index 78f1a2794..7951f0832 100644 --- a/gramps/gen/filters/rules/person/_ismale.py +++ b/gramps/gen/filters/rules/person/_ismale.py @@ -42,8 +42,8 @@ from ....lib.person import Person class IsMale(Rule): """Rule that checks for a person that is a male""" - name = _('Males') - category = _('General filters') + name = _('Males') + category = _('General filters') description = _('Matches all males') def apply(self,db,person): diff --git a/gramps/gen/filters/rules/person/_ismorethannthgenerationancestorof.py b/gramps/gen/filters/rules/person/_ismorethannthgenerationancestorof.py index 9ee74c59f..b6d65f73a 100644 --- a/gramps/gen/filters/rules/person/_ismorethannthgenerationancestorof.py +++ b/gramps/gen/filters/rules/person/_ismorethannthgenerationancestorof.py @@ -42,9 +42,9 @@ class IsMoreThanNthGenerationAncestorOf(Rule): """Rule that checks for a person that is an ancestor of a specified person at least N generations away""" - labels = [ _('ID:'), _('Number of generations:') ] - name = _('Ancestors of at least generations away') - category = _("Ancestral filters") + labels = [ _('ID:'), _('Number of generations:') ] + name = _('Ancestors of at least generations away') + category = _("Ancestral filters") description = _("Matches people that are ancestors " "of a specified person at least N generations away") diff --git a/gramps/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py b/gramps/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py index cfda861f9..30e2f01d3 100644 --- a/gramps/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py +++ b/gramps/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py @@ -42,9 +42,9 @@ class IsMoreThanNthGenerationDescendantOf(Rule): """Rule that checks for a person that is a descendant of a specified person at least N generations away""" - labels = [ _('ID:'), _('Number of generations:') ] - name = _('Descendants of at least generations away') - category = _("Descendant filters") + labels = [ _('ID:'), _('Number of generations:') ] + name = _('Descendants of at least generations away') + category = _("Descendant filters") description = _("Matches people that are descendants of a specified " "person at least N generations away") diff --git a/gramps/gen/filters/rules/person/_isparentoffiltermatch.py b/gramps/gen/filters/rules/person/_isparentoffiltermatch.py index 676f531b4..ab7a5ef81 100644 --- a/gramps/gen/filters/rules/person/_isparentoffiltermatch.py +++ b/gramps/gen/filters/rules/person/_isparentoffiltermatch.py @@ -43,9 +43,9 @@ class IsParentOfFilterMatch(Rule): """Rule that checks for a person that is a parent of someone matched by a filter""" - labels = [ _('Filter name:') ] - name = _('Parents of match') - category = _('Family filters') + labels = [ _('Filter name:') ] + name = _('Parents of match') + category = _('Family filters') description = _("Matches parents of anybody matched by a filter") def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/person/_isrelatedwith.py b/gramps/gen/filters/rules/person/_isrelatedwith.py index cca22efe2..f0a7bd6e6 100644 --- a/gramps/gen/filters/rules/person/_isrelatedwith.py +++ b/gramps/gen/filters/rules/person/_isrelatedwith.py @@ -41,9 +41,9 @@ from .. import Rule class IsRelatedWith(Rule): """Rule that checks if a person is related to a specified person""" - labels = [ _('ID:') ] - name = _('People related to ') - category = _("Relationship filters") + labels = [ _('ID:') ] + name = _('People related to ') + category = _("Relationship filters") description = _("Matches people related to a specified person") def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/person/_issiblingoffiltermatch.py b/gramps/gen/filters/rules/person/_issiblingoffiltermatch.py index b53b70d03..766214a7b 100644 --- a/gramps/gen/filters/rules/person/_issiblingoffiltermatch.py +++ b/gramps/gen/filters/rules/person/_issiblingoffiltermatch.py @@ -42,9 +42,9 @@ from ._matchesfilter import MatchesFilter class IsSiblingOfFilterMatch(Rule): """Rule that checks for siblings of someone matched by a filter""" - labels = [ _('Filter name:') ] - name = _('Siblings of match') - category = _('Family filters') + labels = [ _('Filter name:') ] + name = _('Siblings of match') + category = _('Family filters') description = _("Matches siblings of anybody matched by a filter") def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/person/_isspouseoffiltermatch.py b/gramps/gen/filters/rules/person/_isspouseoffiltermatch.py index cae016eb6..1eedbf0eb 100644 --- a/gramps/gen/filters/rules/person/_isspouseoffiltermatch.py +++ b/gramps/gen/filters/rules/person/_isspouseoffiltermatch.py @@ -43,10 +43,10 @@ class IsSpouseOfFilterMatch(Rule): """Rule that checks for a person married to someone matching a filter""" - labels = [_('Filter name:')] - name = _('Spouses of match') + labels = [_('Filter name:')] + name = _('Spouses of match') description = _("Matches people married to anybody matching a filter") - category = _('Family filters') + category = _('Family filters') def prepare(self, db, user): self.filt = MatchesFilter (self.list) diff --git a/gramps/gen/filters/rules/person/_iswitness.py b/gramps/gen/filters/rules/person/_iswitness.py index 375d70d15..99f82d547 100644 --- a/gramps/gen/filters/rules/person/_iswitness.py +++ b/gramps/gen/filters/rules/person/_iswitness.py @@ -41,10 +41,10 @@ from ....lib.eventtype import EventType class IsWitness(Rule): """Witnesses""" - labels = [_('Event type:')] - name = _('Witnesses') + labels = [_('Event type:')] + name = _('Witnesses') description = _("Matches people who are witnesses in any event") - category = _('Event filters') + category = _('Event filters') def apply(self,db,person): for event_ref in person.event_ref_list: diff --git a/gramps/gen/filters/rules/person/_matcheseventfilter.py b/gramps/gen/filters/rules/person/_matcheseventfilter.py index a1b126840..542cdcbdb 100644 --- a/gramps/gen/filters/rules/person/_matcheseventfilter.py +++ b/gramps/gen/filters/rules/person/_matcheseventfilter.py @@ -48,11 +48,11 @@ class MatchesEventFilter(MatchesEventFilterBase): """ - labels = [_('Event filter name:')] - name = _('Persons with events matching the ') + labels = [_('Event filter name:')] + name = _('Persons with events matching the ') description = _("Matches persons who have events that match a certain" " event filter") - category = _('General filters') + category = _('General filters') # we want to have this filter show event filters - namespace = 'Event' + namespace = 'Event' diff --git a/gramps/gen/filters/rules/person/_matchesfilter.py b/gramps/gen/filters/rules/person/_matchesfilter.py index ab4d62a98..2eb9c1dc7 100644 --- a/gramps/gen/filters/rules/person/_matchesfilter.py +++ b/gramps/gen/filters/rules/person/_matchesfilter.py @@ -41,6 +41,6 @@ from .. import MatchesFilterBase class MatchesFilter(MatchesFilterBase): """Rule that checks against another filter.""" - name = _('People matching the ') + name = _('People matching the ') description = _("Matches people matched by the specified filter name") - namespace = 'Person' + namespace = 'Person' diff --git a/gramps/gen/filters/rules/person/_matchessourceconfidence.py b/gramps/gen/filters/rules/person/_matchessourceconfidence.py index 6cb704761..3fc563664 100644 --- a/gramps/gen/filters/rules/person/_matchessourceconfidence.py +++ b/gramps/gen/filters/rules/person/_matchessourceconfidence.py @@ -40,7 +40,7 @@ from .._matchessourceconfidencebase import MatchesSourceConfidenceBase class MatchesSourceConfidence(MatchesSourceConfidenceBase): """Persons matching a specific confidence level on its 'direct' source references""" - labels = [_('Confidence level:')] - name = _('Persons with at least one direct source >= ') + labels = [_('Confidence level:')] + name = _('Persons with at least one direct source >= ') description = _("Matches persons with at least one direct source with confidence level(s)") diff --git a/gramps/gen/filters/rules/person/_matchidof.py b/gramps/gen/filters/rules/person/_matchidof.py index 535b3994a..b1f8e972c 100644 --- a/gramps/gen/filters/rules/person/_matchidof.py +++ b/gramps/gen/filters/rules/person/_matchidof.py @@ -41,10 +41,10 @@ from .. import Rule class MatchIdOf(Rule): """Rule that checks for a person with a specific Gramps ID""" - labels = [ _('ID:') ] - name = _('Person with ') + labels = [ _('ID:') ] + name = _('Person with ') description = _("Matches person with a specified Gramps ID") - category = _('General filters') + category = _('General filters') def apply(self,db,person): return person.gramps_id.find(self.list[0]) !=-1 diff --git a/gramps/gen/filters/rules/person/_missingparent.py b/gramps/gen/filters/rules/person/_missingparent.py index 6064e2c1d..919fbcfaf 100644 --- a/gramps/gen/filters/rules/person/_missingparent.py +++ b/gramps/gen/filters/rules/person/_missingparent.py @@ -40,11 +40,11 @@ from .. import Rule class MissingParent(Rule): """People with less than two parents""" - name = _('People missing parents') + name = _('People missing parents') description = _("Matches people that are children" " in a family with less than two parents" " or are not children in any family.") - category = _('Family filters') + category = _('Family filters') def apply(self,db,person): families = person.get_parent_family_handle_list() diff --git a/gramps/gen/filters/rules/person/_multiplemarriages.py b/gramps/gen/filters/rules/person/_multiplemarriages.py index 88e04b4f6..a2f845af2 100644 --- a/gramps/gen/filters/rules/person/_multiplemarriages.py +++ b/gramps/gen/filters/rules/person/_multiplemarriages.py @@ -39,9 +39,9 @@ from .. import Rule class MultipleMarriages(Rule): """People with multiple marriage records""" - name = _('People with multiple marriage records') + name = _('People with multiple marriage records') description = _("Matches people who have more than one spouse") - category = _('Family filters') + category = _('Family filters') def apply(self,db,person): return len(person.get_family_handle_list()) > 1 diff --git a/gramps/gen/filters/rules/person/_nevermarried.py b/gramps/gen/filters/rules/person/_nevermarried.py index 2c631b0c0..b81f49fc4 100644 --- a/gramps/gen/filters/rules/person/_nevermarried.py +++ b/gramps/gen/filters/rules/person/_nevermarried.py @@ -39,9 +39,9 @@ from .. import Rule class NeverMarried(Rule): """People with no marriage records""" - name = _('People with no marriage records') + name = _('People with no marriage records') description = _("Matches people who have no spouse") - category = _('Family filters') + category = _('Family filters') def apply(self,db,person): return len(person.get_family_handle_list()) == 0 diff --git a/gramps/gen/filters/rules/person/_nobirthdate.py b/gramps/gen/filters/rules/person/_nobirthdate.py index 03bf085a8..92e65b53c 100644 --- a/gramps/gen/filters/rules/person/_nobirthdate.py +++ b/gramps/gen/filters/rules/person/_nobirthdate.py @@ -39,9 +39,9 @@ from .. import Rule class NoBirthdate(Rule): """People without a birth date""" - name = _('People without a known birth date') + name = _('People without a known birth date') description = _("Matches people without a known birthdate") - category = _('General filters') + category = _('General filters') def apply(self,db,person): birth_ref = person.get_birth_ref() diff --git a/gramps/gen/filters/rules/person/_nodeathdate.py b/gramps/gen/filters/rules/person/_nodeathdate.py index 442a5e0ab..40b344ba6 100644 --- a/gramps/gen/filters/rules/person/_nodeathdate.py +++ b/gramps/gen/filters/rules/person/_nodeathdate.py @@ -39,9 +39,9 @@ from .. import Rule class NoDeathdate(Rule): """People without a death date""" - name = _('People without a known death date') + name = _('People without a known death date') description = _("Matches people without a known deathdate") - category = _('General filters') + category = _('General filters') def apply(self,db,person): death_ref = person.get_death_ref() diff --git a/gramps/gen/filters/rules/person/_peopleprivate.py b/gramps/gen/filters/rules/person/_peopleprivate.py index 3a5d37ec2..9052846dd 100644 --- a/gramps/gen/filters/rules/person/_peopleprivate.py +++ b/gramps/gen/filters/rules/person/_peopleprivate.py @@ -39,6 +39,6 @@ from .._isprivate import IsPrivate class PeoplePrivate(IsPrivate): """People marked private""" - name = _('People marked private') + name = _('People marked private') description = _("Matches people that are indicated as private") - category = _('General filters') + category = _('General filters') diff --git a/gramps/gen/filters/rules/person/_peoplepublic.py b/gramps/gen/filters/rules/person/_peoplepublic.py index 4884cdaf1..5b0db3d8c 100644 --- a/gramps/gen/filters/rules/person/_peoplepublic.py +++ b/gramps/gen/filters/rules/person/_peoplepublic.py @@ -40,6 +40,6 @@ from .._ispublic import IsPublic class PeoplePublic(IsPublic): """People not marked private""" - name = _('People not marked private') + name = _('People not marked private') description = _("Matches people that are not indicated as private") - category = _('General filters') + category = _('General filters') diff --git a/gramps/gen/filters/rules/person/_personwithincompleteevent.py b/gramps/gen/filters/rules/person/_personwithincompleteevent.py index 675490cdd..e331f060f 100644 --- a/gramps/gen/filters/rules/person/_personwithincompleteevent.py +++ b/gramps/gen/filters/rules/person/_personwithincompleteevent.py @@ -39,9 +39,9 @@ from .. import Rule class PersonWithIncompleteEvent(Rule): """People with incomplete events""" - name = _('People with incomplete events') + name = _('People with incomplete events') description = _("Matches people with missing date or place in an event") - category = _('Event filters') + category = _('Event filters') def apply(self,db,person): for event_ref in person.get_event_ref_list(): diff --git a/gramps/gen/filters/rules/person/_probablyalive.py b/gramps/gen/filters/rules/person/_probablyalive.py index 7722c02a9..85473b6a1 100644 --- a/gramps/gen/filters/rules/person/_probablyalive.py +++ b/gramps/gen/filters/rules/person/_probablyalive.py @@ -41,10 +41,10 @@ from ....datehandler import parser class ProbablyAlive(Rule): """People probably alive""" - labels = [_("On date:")] - name = _('People probably alive') + labels = [_("On date:")] + name = _('People probably alive') description = _("Matches people without indications of death that are not too old") - category = _('General filters') + category = _('General filters') def prepare(self, db, user): try: diff --git a/gramps/gen/filters/rules/person/_regexpidof.py b/gramps/gen/filters/rules/person/_regexpidof.py index a50d8ad67..17b4e3838 100644 --- a/gramps/gen/filters/rules/person/_regexpidof.py +++ b/gramps/gen/filters/rules/person/_regexpidof.py @@ -43,6 +43,6 @@ class RegExpIdOf(RegExpIdBase): matches regular expression. """ - name = _('People with Id containing ') + name = _('People with Id containing ') description = _("Matches people whose Gramps ID matches " "the regular expression") diff --git a/gramps/gen/filters/rules/person/_regexpname.py b/gramps/gen/filters/rules/person/_regexpname.py index 83b6d6e55..3bb5e0056 100644 --- a/gramps/gen/filters/rules/person/_regexpname.py +++ b/gramps/gen/filters/rules/person/_regexpname.py @@ -42,11 +42,11 @@ from .. import Rule class RegExpName(Rule): """Rule that checks for full or partial name matches""" - labels = [_('Text:')] - name = _('People with a name matching ') + labels = [_('Text:')] + name = _('People with a name matching ') description = _("Matches people's names containing a substring or " "matching a regular expression") - category = _('General filters') + category = _('General filters') allow_regex = True def apply(self,db,person): diff --git a/gramps/gen/filters/rules/person/_relationshippathbetween.py b/gramps/gen/filters/rules/person/_relationshippathbetween.py index 11ab408bf..8263780a1 100644 --- a/gramps/gen/filters/rules/person/_relationshippathbetween.py +++ b/gramps/gen/filters/rules/person/_relationshippathbetween.py @@ -42,9 +42,9 @@ class RelationshipPathBetween(Rule): """Rule that checks for a person that is a descendant of a specified person not more than N generations away""" - labels = [ _('ID:'), _('ID:') ] - name = _("Relationship path between ") - category = _('Relationship filters') + labels = [ _('ID:'), _('ID:') ] + name = _("Relationship path between ") + category = _('Relationship filters') description = _("Matches the ancestors of two persons back " "to a common ancestor, producing the relationship " "path between two persons.") diff --git a/gramps/gen/filters/rules/person/_relationshippathbetweenbookmarks.py b/gramps/gen/filters/rules/person/_relationshippathbetweenbookmarks.py index 8e0731372..46241306c 100644 --- a/gramps/gen/filters/rules/person/_relationshippathbetweenbookmarks.py +++ b/gramps/gen/filters/rules/person/_relationshippathbetweenbookmarks.py @@ -48,8 +48,8 @@ class RelationshipPathBetweenBookmarks(Rule): bookmarked individuals. """ - name = _("Relationship path between bookmarked persons") - category = _('Relationship filters') + name = _("Relationship path between bookmarked persons") + category = _('Relationship filters') description = _("Matches the ancestors of bookmarked individuals " "back to common ancestors, producing the relationship " "path(s) between bookmarked persons.") diff --git a/gramps/gen/filters/rules/person/_searchname.py b/gramps/gen/filters/rules/person/_searchname.py index 16b0dbd5c..7b5ad7362 100644 --- a/gramps/gen/filters/rules/person/_searchname.py +++ b/gramps/gen/filters/rules/person/_searchname.py @@ -42,10 +42,10 @@ from .. import Rule class SearchName(Rule): """Rule that checks for full or partial name matches""" - labels = [_('Substring:')] - name = _('People matching the ') + labels = [_('Substring:')] + name = _('People matching the ') description = _("Matches people with a specified (partial) name") - category = _('General filters') + category = _('General filters') def apply(self, db, person): src = self.list[0].upper() diff --git a/gramps/gen/filters/rules/place/_allplaces.py b/gramps/gen/filters/rules/place/_allplaces.py index 8fe87e476..993b0c231 100644 --- a/gramps/gen/filters/rules/place/_allplaces.py +++ b/gramps/gen/filters/rules/place/_allplaces.py @@ -41,5 +41,5 @@ from .._everything import Everything class AllPlaces(Everything): """Matches Everyone""" - name = _('Every place') + name = _('Every place') description = _('Matches every place in the database') diff --git a/gramps/gen/filters/rules/place/_changedsince.py b/gramps/gen/filters/rules/place/_changedsince.py index 01c10e835..3bddbc097 100644 --- a/gramps/gen/filters/rules/place/_changedsince.py +++ b/gramps/gen/filters/rules/place/_changedsince.py @@ -43,8 +43,8 @@ from .._changedsincebase import ChangedSinceBase class ChangedSince(ChangedSinceBase): """Rules that checks for places changed since a specific time.""" - labels = [ _('Changed after:'), _('but before:') ] - name = _('Places changed after ') + labels = [ _('Changed after:'), _('but before:') ] + name = _('Places changed after ') description = _("Matches place records changed after a specified " "date-time (yyyy-mm-dd hh:mm:ss) or in the range, if a second " "date-time is given.") diff --git a/gramps/gen/filters/rules/place/_hascitation.py b/gramps/gen/filters/rules/place/_hascitation.py index 732c739ac..9c70faf8a 100644 --- a/gramps/gen/filters/rules/place/_hascitation.py +++ b/gramps/gen/filters/rules/place/_hascitation.py @@ -45,9 +45,9 @@ from .._hascitationbase import HasCitationBase class HasCitation(HasCitationBase): """Rule that checks for a family with a particular value""" - labels = [ _('Volume/Page:'), + labels = [ _('Volume/Page:'), _('Date:'), _('Confidence level:')] - name = _('Place with the ') + name = _('Place with the ') description = _("Matches places with a citation of a particular " "value") diff --git a/gramps/gen/filters/rules/place/_hasdata.py b/gramps/gen/filters/rules/place/_hasdata.py index c60521530..63d323a3b 100644 --- a/gramps/gen/filters/rules/place/_hasdata.py +++ b/gramps/gen/filters/rules/place/_hasdata.py @@ -45,13 +45,13 @@ class HasData(Rule): Rule that checks for a place with a particular value """ - labels = [ _('Name:'), + labels = [ _('Name:'), _('Place type:'), _('Code:'), ] - name = _('Places matching parameters') + name = _('Places matching parameters') description = _('Matches places with particular parameters') - category = _('General filters') + category = _('General filters') allow_regex = True def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/place/_hasgallery.py b/gramps/gen/filters/rules/place/_hasgallery.py index e8ca9b5bb..67ca44979 100644 --- a/gramps/gen/filters/rules/place/_hasgallery.py +++ b/gramps/gen/filters/rules/place/_hasgallery.py @@ -42,5 +42,5 @@ from .._hasgallerybase import HasGalleryBase class HasGallery(HasGalleryBase): """Rule that checks for place who has media object reference""" - name = _('Places with media') + name = _('Places with media') description = _("Matches places with a certain number of items in the gallery") diff --git a/gramps/gen/filters/rules/place/_hasidof.py b/gramps/gen/filters/rules/place/_hasidof.py index 3fc099115..404c467a0 100644 --- a/gramps/gen/filters/rules/place/_hasidof.py +++ b/gramps/gen/filters/rules/place/_hasidof.py @@ -41,5 +41,5 @@ from .. import HasGrampsId class HasIdOf(HasGrampsId): """Rule that checks for a place with a specific Gramps ID""" - name = _('Place with ') + name = _('Place with ') description = _("Matches a place with a specified Gramps ID") diff --git a/gramps/gen/filters/rules/place/_hasnolatorlon.py b/gramps/gen/filters/rules/place/_hasnolatorlon.py index ba658f4d5..ec226bfec 100644 --- a/gramps/gen/filters/rules/place/_hasnolatorlon.py +++ b/gramps/gen/filters/rules/place/_hasnolatorlon.py @@ -44,10 +44,10 @@ class HasNoLatOrLon(Rule): """Rule that checks if Latitude or Longitude are not given""" - labels = [] - name = _('Places with no latitude or longitude given') + labels = [] + name = _('Places with no latitude or longitude given') description = _("Matches places with empty latitude or longitude") - category = _('Position filters') + category = _('Position filters') def apply(self,db,place): if place.get_latitude().strip and place.get_longitude().strip(): diff --git a/gramps/gen/filters/rules/place/_hasnote.py b/gramps/gen/filters/rules/place/_hasnote.py index f88bfc2c7..5a675ed92 100644 --- a/gramps/gen/filters/rules/place/_hasnote.py +++ b/gramps/gen/filters/rules/place/_hasnote.py @@ -42,5 +42,5 @@ from .._hasnotebase import HasNoteBase class HasNote(HasNoteBase): """Places having notes""" - name = _('Places having notes') + name = _('Places having notes') description = _("Matches places having a certain number of notes") diff --git a/gramps/gen/filters/rules/place/_hasnotematchingsubstringof.py b/gramps/gen/filters/rules/place/_hasnotematchingsubstringof.py index 984c0e25f..4ea8b4078 100644 --- a/gramps/gen/filters/rules/place/_hasnotematchingsubstringof.py +++ b/gramps/gen/filters/rules/place/_hasnotematchingsubstringof.py @@ -39,7 +39,7 @@ from .._hasnotesubstrbase import HasNoteSubstrBase class HasNoteMatchingSubstringOf(HasNoteSubstrBase): """Places having notes containing """ - name = _('Places having notes containing ') + name = _('Places having notes containing ') description = _("Matches places whose notes contain text " "matching a substring") diff --git a/gramps/gen/filters/rules/place/_hasnoteregexp.py b/gramps/gen/filters/rules/place/_hasnoteregexp.py index 6c9d49a58..633b5eded 100644 --- a/gramps/gen/filters/rules/place/_hasnoteregexp.py +++ b/gramps/gen/filters/rules/place/_hasnoteregexp.py @@ -38,6 +38,6 @@ from .._hasnoteregexbase import HasNoteRegexBase #------------------------------------------------------------------------- class HasNoteRegexp(HasNoteRegexBase): - name = _('Places having notes containing ') + name = _('Places having notes containing ') description = _("Matches places whose notes contain text " "matching a regular expression") diff --git a/gramps/gen/filters/rules/place/_hasplace.py b/gramps/gen/filters/rules/place/_hasplace.py index 6d7701692..9510bd940 100644 --- a/gramps/gen/filters/rules/place/_hasplace.py +++ b/gramps/gen/filters/rules/place/_hasplace.py @@ -45,7 +45,7 @@ from ....utils.location import get_locations class HasPlace(Rule): """Rule that checks for a place with a particular value""" - labels = [ _('Title:'), + labels = [ _('Title:'), _('Street:'), _('Locality:'), _('City:'), @@ -55,9 +55,9 @@ class HasPlace(Rule): _('ZIP/Postal Code:'), _('Church Parish:'), ] - name = _('Places matching parameters') + name = _('Places matching parameters') description = _("Matches places with particular parameters") - category = _('General filters') + category = _('General filters') allow_regex = True TYPE2FIELD = {PlaceType.STREET: 1, diff --git a/gramps/gen/filters/rules/place/_hasreferencecountof.py b/gramps/gen/filters/rules/place/_hasreferencecountof.py index 848b38531..289cf78fc 100644 --- a/gramps/gen/filters/rules/place/_hasreferencecountof.py +++ b/gramps/gen/filters/rules/place/_hasreferencecountof.py @@ -39,6 +39,6 @@ from .._hasreferencecountbase import HasReferenceCountBase class HasReferenceCountOf(HasReferenceCountBase): """Place objects with a reference count of """ - name = _('Places with a reference count of ') + name = _('Places with a reference count of ') description = _("Matches places with a certain reference count") diff --git a/gramps/gen/filters/rules/place/_hassourcecount.py b/gramps/gen/filters/rules/place/_hassourcecount.py index be11864a1..6b1536223 100644 --- a/gramps/gen/filters/rules/place/_hassourcecount.py +++ b/gramps/gen/filters/rules/place/_hassourcecount.py @@ -42,5 +42,5 @@ from .._hassourcecountbase import HasSourceCountBase class HasSourceCount(HasSourceCountBase): """Place with sources""" - name = _('Place with sources') + name = _('Place with sources') description = _("Matches places with a certain number of sources connected to it") diff --git a/gramps/gen/filters/rules/place/_hassourceof.py b/gramps/gen/filters/rules/place/_hassourceof.py index 09446f86a..a0ca8feda 100644 --- a/gramps/gen/filters/rules/place/_hassourceof.py +++ b/gramps/gen/filters/rules/place/_hassourceof.py @@ -42,7 +42,7 @@ from .._hassourceofbase import HasSourceOfBase class HasSourceOf(HasSourceOfBase): """Rule that checks family that have a particular source.""" - labels = [ _('Source ID:') ] - name = _('Places with the ') - category = _('Citation/source filters') + labels = [ _('Source ID:') ] + name = _('Places with the ') + category = _('Citation/source filters') description = _('Matches places who have a particular source') diff --git a/gramps/gen/filters/rules/place/_hastag.py b/gramps/gen/filters/rules/place/_hastag.py index 1f147783b..2b38e7f14 100644 --- a/gramps/gen/filters/rules/place/_hastag.py +++ b/gramps/gen/filters/rules/place/_hastag.py @@ -45,6 +45,6 @@ class HasTag(HasTagBase): """ Rule that checks for a place with a particular tag. """ - labels = [ _('Tag:') ] - name = _('Places with the ') + labels = [ _('Tag:') ] + name = _('Places with the ') description = _("Matches places with the particular tag") diff --git a/gramps/gen/filters/rules/place/_hastitle.py b/gramps/gen/filters/rules/place/_hastitle.py index a0b12c364..6c5f3ba5f 100644 --- a/gramps/gen/filters/rules/place/_hastitle.py +++ b/gramps/gen/filters/rules/place/_hastitle.py @@ -45,10 +45,10 @@ class HasTitle(Rule): Rule that checks for a place with a title """ - labels = [_('Title:')] - name = _('Places matching a title') + labels = [_('Title:')] + name = _('Places matching a title') description = _('Matches places with a particular title') - category = _('General filters') + category = _('General filters') allow_regex = True def apply(self, db, place): diff --git a/gramps/gen/filters/rules/place/_inlatlonneighborhood.py b/gramps/gen/filters/rules/place/_inlatlonneighborhood.py index 57109d380..15e676094 100644 --- a/gramps/gen/filters/rules/place/_inlatlonneighborhood.py +++ b/gramps/gen/filters/rules/place/_inlatlonneighborhood.py @@ -46,14 +46,14 @@ class InLatLonNeighborhood(Rule): Latitude or Longitude or""" - labels = [_('Latitude:'), _('Longitude:'), + labels = [_('Latitude:'), _('Longitude:'), _('Rectangle height:'), _('Rectangle width:')] - name = _('Places in neighborhood of given position') + name = _('Places in neighborhood of given position') description = _("Matches places with latitude or longitude positioned in " "a rectangle of given height and width (in degrees), and " "with middlepoint the given latitude and longitude." ) - category = _('Position filters') + category = _('Position filters') def prepare(self, db, user): if self.list[0] : @@ -110,13 +110,13 @@ class InLatLonNeighborhood(Rule): self.doublesquares = True self.E2 = self.E -360. self.W2 = -180. - self.E = 180 + self.E = 180 if self.W < -180. : #we need to check in two squares: self.doublesquares = True self.W2 = self.W + 360. self.E2 = 180. - self.W = -180 + self.W = -180 def apply(self,db,place): diff --git a/gramps/gen/filters/rules/place/_isenclosedby.py b/gramps/gen/filters/rules/place/_isenclosedby.py index f29020f66..0e0d158d0 100644 --- a/gramps/gen/filters/rules/place/_isenclosedby.py +++ b/gramps/gen/filters/rules/place/_isenclosedby.py @@ -45,10 +45,10 @@ class IsEnclosedBy(Rule): Rule that checks for a place enclosed by another place """ - labels = [_('ID:'), _('Inclusive:')] - name = _('Places enclosed by another place') + labels = [_('ID:'), _('Inclusive:')] + name = _('Places enclosed by another place') description = _('Matches a place enclosed by a particular place') - category = _('General filters') + category = _('General filters') def prepare(self, db, user): self.handle = None diff --git a/gramps/gen/filters/rules/place/_matcheseventfilter.py b/gramps/gen/filters/rules/place/_matcheseventfilter.py index ebcbb8302..98332e6ac 100644 --- a/gramps/gen/filters/rules/place/_matcheseventfilter.py +++ b/gramps/gen/filters/rules/place/_matcheseventfilter.py @@ -46,13 +46,13 @@ class MatchesEventFilter(MatchesFilterBase): Subclasses need to define the namespace class attribute. """ - labels = [_('Event filter name:')] - name = _('Places of events matching the ') + labels = [_('Event filter name:')] + name = _('Places of events matching the ') description = _("Matches places where events happened that match the " "specified event filter name") - category = _('General filters') + category = _('General filters') # we want to have this filter show event filters - namespace = 'Event' + namespace = 'Event' def apply(self,db,event): diff --git a/gramps/gen/filters/rules/place/_matchesfilter.py b/gramps/gen/filters/rules/place/_matchesfilter.py index c2cee64bf..c78988a97 100644 --- a/gramps/gen/filters/rules/place/_matchesfilter.py +++ b/gramps/gen/filters/rules/place/_matchesfilter.py @@ -41,6 +41,6 @@ from .._matchesfilterbase import MatchesFilterBase class MatchesFilter(MatchesFilterBase): """Rule that checks against another filter""" - name = _('Places matching the ') + name = _('Places matching the ') description = _("Matches places matched by the specified filter name") - namespace = 'Place' + namespace = 'Place' diff --git a/gramps/gen/filters/rules/place/_matchessourceconfidence.py b/gramps/gen/filters/rules/place/_matchessourceconfidence.py index a914eb278..25a2cf7db 100644 --- a/gramps/gen/filters/rules/place/_matchessourceconfidence.py +++ b/gramps/gen/filters/rules/place/_matchessourceconfidence.py @@ -40,6 +40,6 @@ from .._matchessourceconfidencebase import MatchesSourceConfidenceBase class MatchesSourceConfidence(MatchesSourceConfidenceBase): """Media matching a specific confidence level on its 'direct' source references""" - labels = [_('Confidence level:')] - name = _('Place with a direct source >= ') + labels = [_('Confidence level:')] + name = _('Place with a direct source >= ') description = _("Matches places with at least one direct source with confidence level(s)") diff --git a/gramps/gen/filters/rules/place/_placeprivate.py b/gramps/gen/filters/rules/place/_placeprivate.py index 7ed59fb38..be144470a 100644 --- a/gramps/gen/filters/rules/place/_placeprivate.py +++ b/gramps/gen/filters/rules/place/_placeprivate.py @@ -39,5 +39,5 @@ from .._isprivate import IsPrivate class PlacePrivate(IsPrivate): """Place marked private""" - name = _('Places marked private') + name = _('Places marked private') description = _("Matches places that are indicated as private") diff --git a/gramps/gen/filters/rules/place/_regexpidof.py b/gramps/gen/filters/rules/place/_regexpidof.py index f1493b24d..4fd00d5e4 100644 --- a/gramps/gen/filters/rules/place/_regexpidof.py +++ b/gramps/gen/filters/rules/place/_regexpidof.py @@ -44,6 +44,6 @@ class RegExpIdOf(RegExpIdBase): matches regular expression. """ - name = _('Places with Id containing ') + name = _('Places with Id containing ') description = _("Matches places whose Gramps ID matches " "the regular expression") diff --git a/gramps/gen/filters/rules/place/_withinarea.py b/gramps/gen/filters/rules/place/_withinarea.py index 6019415e9..62f76164e 100644 --- a/gramps/gen/filters/rules/place/_withinarea.py +++ b/gramps/gen/filters/rules/place/_withinarea.py @@ -47,10 +47,10 @@ class WithinArea(Rule): Rule that checks for a place within an area """ - labels = [_('ID:'), _('Value:'), _('Units:')] - name = _('Places within an area') + labels = [_('ID:'), _('Value:'), _('Units:')] + name = _('Places within an area') description = _('Matches places within a given distance of another place') - category = _('Position filters') + category = _('Position filters') def prepare(self, db, user): ref_place = db.get_place_from_gramps_id(self.list[0]) diff --git a/gramps/gen/filters/rules/repository/_allrepos.py b/gramps/gen/filters/rules/repository/_allrepos.py index 91b6f8bc0..cb6ed4dcd 100644 --- a/gramps/gen/filters/rules/repository/_allrepos.py +++ b/gramps/gen/filters/rules/repository/_allrepos.py @@ -41,5 +41,5 @@ from .._everything import Everything class AllRepos(Everything): """Matches Everyone""" - name = _('Every repository') + name = _('Every repository') description = _('Matches every repository in the database') diff --git a/gramps/gen/filters/rules/repository/_changedsince.py b/gramps/gen/filters/rules/repository/_changedsince.py index 7db91d485..2339d5710 100644 --- a/gramps/gen/filters/rules/repository/_changedsince.py +++ b/gramps/gen/filters/rules/repository/_changedsince.py @@ -43,8 +43,8 @@ from .._changedsincebase import ChangedSinceBase class ChangedSince(ChangedSinceBase): """Rule that checks for repositories changed since a specific time.""" - labels = [ _('Changed after:'), _('but before:') ] - name = _('Repositories changed after ') + labels = [ _('Changed after:'), _('but before:') ] + name = _('Repositories changed after ') description = _("Matches repository records changed after a specified " "date/time (yyyy-mm-dd hh:mm:ss) or in the range, if a second " "date/time is given.") diff --git a/gramps/gen/filters/rules/repository/_hasidof.py b/gramps/gen/filters/rules/repository/_hasidof.py index 31e4b88e0..f1d750ad5 100644 --- a/gramps/gen/filters/rules/repository/_hasidof.py +++ b/gramps/gen/filters/rules/repository/_hasidof.py @@ -41,5 +41,5 @@ from .. import HasGrampsId class HasIdOf(HasGrampsId): """Rule that checks for a repo with a specific Gramps ID""" - name = _('Repository with ') + name = _('Repository with ') description = _("Matches a repository with a specified Gramps ID") diff --git a/gramps/gen/filters/rules/repository/_hasnotematchingsubstringof.py b/gramps/gen/filters/rules/repository/_hasnotematchingsubstringof.py index 630506303..aca952e39 100644 --- a/gramps/gen/filters/rules/repository/_hasnotematchingsubstringof.py +++ b/gramps/gen/filters/rules/repository/_hasnotematchingsubstringof.py @@ -39,7 +39,7 @@ from .._hasnotesubstrbase import HasNoteSubstrBase class HasNoteMatchingSubstringOf(HasNoteSubstrBase): """Repos having notes containing """ - name = _('Repositories having notes containing ') + name = _('Repositories having notes containing ') description = _("Matches repositories whose notes contain text " "matching a substring") diff --git a/gramps/gen/filters/rules/repository/_hasnoteregexp.py b/gramps/gen/filters/rules/repository/_hasnoteregexp.py index 747c6b723..68cb53edd 100644 --- a/gramps/gen/filters/rules/repository/_hasnoteregexp.py +++ b/gramps/gen/filters/rules/repository/_hasnoteregexp.py @@ -38,6 +38,6 @@ from .._hasnoteregexbase import HasNoteRegexBase #------------------------------------------------------------------------- class HasNoteRegexp(HasNoteRegexBase): - name = _('Repositories having notes containing ') + name = _('Repositories having notes containing ') description = _("Matches repositories whose notes contain text " "matching a regular expression") diff --git a/gramps/gen/filters/rules/repository/_hasreferencecountof.py b/gramps/gen/filters/rules/repository/_hasreferencecountof.py index 82fbb0ba1..99eeee71a 100644 --- a/gramps/gen/filters/rules/repository/_hasreferencecountof.py +++ b/gramps/gen/filters/rules/repository/_hasreferencecountof.py @@ -39,6 +39,6 @@ from .._hasreferencecountbase import HasReferenceCountBase class HasReferenceCountOf(HasReferenceCountBase): """Repositories with a reference count of """ - name = _('Repositories with a reference count of ') + name = _('Repositories with a reference count of ') description = _("Matches repositories with a certain reference count") diff --git a/gramps/gen/filters/rules/repository/_hasrepo.py b/gramps/gen/filters/rules/repository/_hasrepo.py index 6f535967b..5dfe0a4f4 100644 --- a/gramps/gen/filters/rules/repository/_hasrepo.py +++ b/gramps/gen/filters/rules/repository/_hasrepo.py @@ -43,14 +43,14 @@ class HasRepo(Rule): """Rule that checks for a repo with a particular value""" - labels = [ _('repo|Name:'), + labels = [ _('repo|Name:'), _('Type:'), _('Address:'), _('URL:'), ] - name = _('Repositories matching parameters') + name = _('Repositories matching parameters') description = _("Matches Repositories with particular parameters") - category = _('General filters') + category = _('General filters') allow_regex = True def prepare(self, db, user): diff --git a/gramps/gen/filters/rules/repository/_hastag.py b/gramps/gen/filters/rules/repository/_hastag.py index 22bb0f2b9..c8d5c833e 100644 --- a/gramps/gen/filters/rules/repository/_hastag.py +++ b/gramps/gen/filters/rules/repository/_hastag.py @@ -45,6 +45,6 @@ class HasTag(HasTagBase): """ Rule that checks for a repository with a particular tag. """ - labels = [ _('Tag:') ] - name = _('Repositories with the ') + labels = [ _('Tag:') ] + name = _('Repositories with the ') description = _("Matches repositories with the particular tag") diff --git a/gramps/gen/filters/rules/repository/_matchesfilter.py b/gramps/gen/filters/rules/repository/_matchesfilter.py index 9d750d0cd..7de4b90df 100644 --- a/gramps/gen/filters/rules/repository/_matchesfilter.py +++ b/gramps/gen/filters/rules/repository/_matchesfilter.py @@ -41,7 +41,7 @@ from .._matchesfilterbase import MatchesFilterBase class MatchesFilter(MatchesFilterBase): """Rule that checks against another filter""" - name = _('Repositories matching the ') + name = _('Repositories matching the ') description = _("Matches repositories matched " "by the specified filter name") - namespace = 'Repository' + namespace = 'Repository' diff --git a/gramps/gen/filters/rules/repository/_matchesnamesubstringof.py b/gramps/gen/filters/rules/repository/_matchesnamesubstringof.py index 1229c5a96..f2076204a 100644 --- a/gramps/gen/filters/rules/repository/_matchesnamesubstringof.py +++ b/gramps/gen/filters/rules/repository/_matchesnamesubstringof.py @@ -39,10 +39,10 @@ from .. import Rule class MatchesNameSubstringOf(Rule): """Repository name containing """ - labels = [ _('Text:')] - name = _('Repositories with name containing ') + labels = [ _('Text:')] + name = _('Repositories with name containing ') description = _("Matches repositories whose name contains a certain substring") - category = _('General filters') + category = _('General filters') allow_regex = True def apply(self, db, repository): diff --git a/gramps/gen/filters/rules/repository/_regexpidof.py b/gramps/gen/filters/rules/repository/_regexpidof.py index cedcde5c2..73e724862 100644 --- a/gramps/gen/filters/rules/repository/_regexpidof.py +++ b/gramps/gen/filters/rules/repository/_regexpidof.py @@ -44,6 +44,6 @@ class RegExpIdOf(RegExpIdBase): matches regular expression. """ - name = _('Repositories with Id containing ') + name = _('Repositories with Id containing ') description = _("Matches repositories whose Gramps ID matches " "the regular expression") diff --git a/gramps/gen/filters/rules/repository/_repoprivate.py b/gramps/gen/filters/rules/repository/_repoprivate.py index 901ef8d16..da88aeb2f 100644 --- a/gramps/gen/filters/rules/repository/_repoprivate.py +++ b/gramps/gen/filters/rules/repository/_repoprivate.py @@ -39,5 +39,5 @@ from .._isprivate import IsPrivate class RepoPrivate(IsPrivate): """Repo marked private""" - name = _('Repositories marked private') + name = _('Repositories marked private') description = _("Matches repositories that are indicated as private") diff --git a/gramps/gen/filters/rules/source/_allsources.py b/gramps/gen/filters/rules/source/_allsources.py index b61deda84..118868d10 100644 --- a/gramps/gen/filters/rules/source/_allsources.py +++ b/gramps/gen/filters/rules/source/_allsources.py @@ -41,5 +41,5 @@ from .._everything import Everything class AllSources(Everything): """Matches Everyone""" - name = _('Every source') + name = _('Every source') description = _('Matches every source in the database') diff --git a/gramps/gen/filters/rules/source/_changedsince.py b/gramps/gen/filters/rules/source/_changedsince.py index 50aa09355..320e4be8d 100644 --- a/gramps/gen/filters/rules/source/_changedsince.py +++ b/gramps/gen/filters/rules/source/_changedsince.py @@ -43,8 +43,8 @@ from .._changedsincebase import ChangedSinceBase class ChangedSince(ChangedSinceBase): """Rule that checks for sources changed since a specific time.""" - labels = [ _('Changed after:'), _('but before:') ] - name = _('Sources changed after ') + labels = [ _('Changed after:'), _('but before:') ] + name = _('Sources changed after ') description = _("Matches source records changed after a specified " "date-time (yyyy-mm-dd hh:mm:ss) or in the range, if a second " "date-time is given.") diff --git a/gramps/gen/filters/rules/source/_hasgallery.py b/gramps/gen/filters/rules/source/_hasgallery.py index d34f37845..497c730dd 100644 --- a/gramps/gen/filters/rules/source/_hasgallery.py +++ b/gramps/gen/filters/rules/source/_hasgallery.py @@ -42,5 +42,5 @@ from .._hasgallerybase import HasGalleryBase class HasGallery(HasGalleryBase): """Rule that checks for source who has media object reference""" - name = _('Sources with media') + name = _('Sources with media') description = _("Matches sources with a certain number of items in the gallery") diff --git a/gramps/gen/filters/rules/source/_hasidof.py b/gramps/gen/filters/rules/source/_hasidof.py index 29bb769ce..bd88111e8 100644 --- a/gramps/gen/filters/rules/source/_hasidof.py +++ b/gramps/gen/filters/rules/source/_hasidof.py @@ -41,5 +41,5 @@ from .. import HasGrampsId class HasIdOf(HasGrampsId): """Rule that checks for a source with a specific Gramps ID""" - name = _('Source with ') + name = _('Source with ') description = _("Matches a source with a specified Gramps ID") diff --git a/gramps/gen/filters/rules/source/_hasnote.py b/gramps/gen/filters/rules/source/_hasnote.py index a7314a62c..8b4a06ebc 100644 --- a/gramps/gen/filters/rules/source/_hasnote.py +++ b/gramps/gen/filters/rules/source/_hasnote.py @@ -42,5 +42,5 @@ from .._hasnotebase import HasNoteBase class HasNote(HasNoteBase): """Sources having notes""" - name = _('Sources having notes') + name = _('Sources having notes') description = _("Matches sources having a certain number of notes") diff --git a/gramps/gen/filters/rules/source/_hasnotematchingsubstringof.py b/gramps/gen/filters/rules/source/_hasnotematchingsubstringof.py index 6f9eed185..052677194 100644 --- a/gramps/gen/filters/rules/source/_hasnotematchingsubstringof.py +++ b/gramps/gen/filters/rules/source/_hasnotematchingsubstringof.py @@ -39,7 +39,7 @@ from .._hasnotesubstrbase import HasNoteSubstrBase class HasNoteMatchingSubstringOf(HasNoteSubstrBase): """Sources having notes containing """ - name = _('Sources having notes containing ') + name = _('Sources having notes containing ') description = _("Matches sources whose notes contain text " "matching a substring") diff --git a/gramps/gen/filters/rules/source/_hasnoteregexp.py b/gramps/gen/filters/rules/source/_hasnoteregexp.py index 12e919b51..1ebfd11c9 100644 --- a/gramps/gen/filters/rules/source/_hasnoteregexp.py +++ b/gramps/gen/filters/rules/source/_hasnoteregexp.py @@ -38,6 +38,6 @@ from .._hasnoteregexbase import HasNoteRegexBase #------------------------------------------------------------------------- class HasNoteRegexp(HasNoteRegexBase): - name = _('Sources having notes containing ') + name = _('Sources having notes containing ') description = _("Matches sources whose notes contain text " "matching a regular expression") diff --git a/gramps/gen/filters/rules/source/_hasreferencecountof.py b/gramps/gen/filters/rules/source/_hasreferencecountof.py index 26341bb10..df33d42ad 100644 --- a/gramps/gen/filters/rules/source/_hasreferencecountof.py +++ b/gramps/gen/filters/rules/source/_hasreferencecountof.py @@ -39,6 +39,6 @@ from .._hasreferencecountbase import HasReferenceCountBase class HasReferenceCountOf(HasReferenceCountBase): """Source objects with a reference count of """ - name = _('Sources with a reference count of ') + name = _('Sources with a reference count of ') description = _("Matches sources with a certain reference count") diff --git a/gramps/gen/filters/rules/source/_hasrepository.py b/gramps/gen/filters/rules/source/_hasrepository.py index 68047245e..b14bff228 100644 --- a/gramps/gen/filters/rules/source/_hasrepository.py +++ b/gramps/gen/filters/rules/source/_hasrepository.py @@ -43,10 +43,10 @@ from .. import Rule class HasRepository(Rule): """Objects which reference repositories""" - labels = [ _('Number of instances:'), _('Number must be:')] - name = _('Sources with Repository references') + labels = [ _('Number of instances:'), _('Number must be:')] + name = _('Sources with Repository references') description = _("Matches sources with a certain number of repository references") - category = _('General filters') + category = _('General filters') def prepare(self, db, user): # things we want to do just once, not for every handle diff --git a/gramps/gen/filters/rules/source/_hasrepositorycallnumberref.py b/gramps/gen/filters/rules/source/_hasrepositorycallnumberref.py index c669434b6..625d264f9 100644 --- a/gramps/gen/filters/rules/source/_hasrepositorycallnumberref.py +++ b/gramps/gen/filters/rules/source/_hasrepositorycallnumberref.py @@ -40,11 +40,11 @@ from .. import Rule class HasRepositoryCallNumberRef(Rule): """Sources which reference repositories by a special Call Number""" - labels = [ _('Text:')] - name = _('Sources with repository reference containing in "Call Number"') + labels = [ _('Text:')] + name = _('Sources with repository reference containing in "Call Number"') description = _("Matches sources with a repository reference\n" "containing a substring in \"Call Number\"") - category = _('General filters') + category = _('General filters') allow_regex = True def apply(self, db, obj): diff --git a/gramps/gen/filters/rules/source/_hastag.py b/gramps/gen/filters/rules/source/_hastag.py index 6ee0a236d..b67f34904 100644 --- a/gramps/gen/filters/rules/source/_hastag.py +++ b/gramps/gen/filters/rules/source/_hastag.py @@ -45,6 +45,6 @@ class HasTag(HasTagBase): """ Rule that checks for a source with a particular tag. """ - labels = [ _('Tag:') ] - name = _('Sources with the ') + labels = [ _('Tag:') ] + name = _('Sources with the ') description = _("Matches sources with the particular tag") diff --git a/gramps/gen/filters/rules/source/_matchesfilter.py b/gramps/gen/filters/rules/source/_matchesfilter.py index 32d63b634..8d2c2d357 100644 --- a/gramps/gen/filters/rules/source/_matchesfilter.py +++ b/gramps/gen/filters/rules/source/_matchesfilter.py @@ -41,6 +41,6 @@ from .._matchesfilterbase import MatchesFilterBase class MatchesFilter(MatchesFilterBase): """Rule that checks against another filter""" - name = _('Sources matching the ') + name = _('Sources matching the ') description = _("Matches sources matched by the specified filter name") - namespace = 'Source' + namespace = 'Source' diff --git a/gramps/gen/filters/rules/source/_matchesrepositoryfilter.py b/gramps/gen/filters/rules/source/_matchesrepositoryfilter.py index 0349bdb0b..17cecadc4 100644 --- a/gramps/gen/filters/rules/source/_matchesrepositoryfilter.py +++ b/gramps/gen/filters/rules/source/_matchesrepositoryfilter.py @@ -40,11 +40,11 @@ from .. import MatchesFilterBase class MatchesRepositoryFilter(MatchesFilterBase): """Sources which reference the selected repository""" - labels = [ _('Repository filter name:') ] - name = _('Sources with repository reference matching the ') + labels = [ _('Repository filter name:') ] + name = _('Sources with repository reference matching the ') description = _("Matches sources with a repository reference that match a certain\n" "repository filter") - category = _('General filters') + category = _('General filters') # we want to have this filter show repository filters namespace = 'Repository' diff --git a/gramps/gen/filters/rules/source/_matchestitlesubstringof.py b/gramps/gen/filters/rules/source/_matchestitlesubstringof.py index 40a606d53..0c5c31bd2 100644 --- a/gramps/gen/filters/rules/source/_matchestitlesubstringof.py +++ b/gramps/gen/filters/rules/source/_matchestitlesubstringof.py @@ -39,11 +39,11 @@ from .. import Rule class MatchesTitleSubstringOf(Rule): """Source title containing """ - labels = [ _('Text:')] - name = _('Sources with title containing ') + labels = [ _('Text:')] + name = _('Sources with title containing ') description = _("Matches sources whose title contains a " "certain substring") - category = _('General filters') + category = _('General filters') allow_regex = True def apply(self, db, source): diff --git a/gramps/gen/filters/rules/source/_regexpidof.py b/gramps/gen/filters/rules/source/_regexpidof.py index 72114ed29..0ffba1e52 100644 --- a/gramps/gen/filters/rules/source/_regexpidof.py +++ b/gramps/gen/filters/rules/source/_regexpidof.py @@ -44,6 +44,6 @@ class RegExpIdOf(RegExpIdBase): matches regular expression. """ - name = _('Sources with Id containing ') + name = _('Sources with Id containing ') description = _("Matches sources whose Gramps ID matches " "the regular expression") diff --git a/gramps/gen/filters/rules/source/_sourceprivate.py b/gramps/gen/filters/rules/source/_sourceprivate.py index 4cd9dbb90..173534dc7 100644 --- a/gramps/gen/filters/rules/source/_sourceprivate.py +++ b/gramps/gen/filters/rules/source/_sourceprivate.py @@ -39,5 +39,5 @@ from .._isprivate import IsPrivate class SourcePrivate(IsPrivate): """Source marked private""" - name = _('Sources marked private') + name = _('Sources marked private') description = _("Matches sources that are indicated as private") diff --git a/gramps/gen/lib/date.py b/gramps/gen/lib/date.py index 41e17577c..682839da2 100644 --- a/gramps/gen/lib/date.py +++ b/gramps/gen/lib/date.py @@ -60,7 +60,7 @@ class Span: Span is used to represent the difference between two dates for three main purposes: sorting, ranking, and describing. - sort = (base day count, offset) + sort = (base day count, offset) minmax = (min days, max days) """ diff --git a/gramps/gen/lib/test/grampstype_test.py b/gramps/gen/lib/test/grampstype_test.py index 47ad36f5d..d54eda8d8 100644 --- a/gramps/gen/lib/test/grampstype_test.py +++ b/gramps/gen/lib/test/grampstype_test.py @@ -27,7 +27,7 @@ from ..grampstype import GrampsType # some simple map items to test with vals = "zz ab cd ef".split() keys = list(range(len(vals))) -MAP = [(k, v*2, v) for (k, v) in zip(keys, vals)] +MAP = [(k, v*2, v) for (k, v) in zip(keys, vals)] BLIST= [1,3] class GT0(GrampsType): diff --git a/gramps/gen/plug/_manager.py b/gramps/gen/plug/_manager.py index 31f1b5d2f..73166b622 100644 --- a/gramps/gen/plug/_manager.py +++ b/gramps/gen/plug/_manager.py @@ -86,18 +86,18 @@ class BasePluginManager: raise Exception("This class is a singleton. " "Use the get_instance() method") - self.__import_plugins = [] - self.__export_plugins = [] - self.__docgen_plugins = [] + self.__import_plugins = [] + self.__export_plugins = [] + self.__docgen_plugins = [] - self.__attempt_list = [] - self.__failmsg_list = [] + self.__attempt_list = [] + self.__failmsg_list = [] self.__external_opt_dict = {} - self.__success_list = [] - self.__docgen_names = [] + self.__success_list = [] + self.__docgen_names = [] - self.__mod2text = {} - self.__modules = {} + self.__mod2text = {} + self.__modules = {} self.__pgr = PluginRegister.get_instance() self.__loaded_plugins = {} @@ -113,10 +113,10 @@ class BasePluginManager: immediately loaded so it is available for all. """ if rescan: - self.__import_plugins = [] - self.__export_plugins = [] - self.__docgen_plugins = [] - self.__docgen_names = [] + self.__import_plugins = [] + self.__export_plugins = [] + self.__docgen_plugins = [] + self.__docgen_names = [] self.__scanned_dirs = [] self.__pgr._PluginRegister__plugindata = [] self.__pgr._PluginRegister__id_to_pdata = {} @@ -536,9 +536,9 @@ class BasePluginManager: mod = self.load_plugin(pdata) if mod: imp = ImportPlugin(name=pdata.name, - description = pdata.description, + description = pdata.description, import_function = getattr(mod, pdata.import_function), - extension = pdata.extension) + extension = pdata.extension) self.__import_plugins.append(imp) return self.__import_plugins @@ -563,10 +563,10 @@ class BasePluginManager: hasattr(mod, pdata.export_options)): options = getattr(mod, pdata.export_options) exp = ExportPlugin(name=pdata.name_accell, - description = pdata.description, + description = pdata.description, export_function = getattr(mod, pdata.export_function), - extension = pdata.extension, - config = (pdata.export_options_title, options)) + extension = pdata.extension, + config = (pdata.export_options_title, options)) self.__export_plugins.append(exp) return self.__export_plugins @@ -593,10 +593,10 @@ class BasePluginManager: oclass = getattr(mod, pdata.optionclass) dgp = DocGenPlugin(name=pdata.name, description = pdata.description, - basedoc = getattr(mod, pdata.docclass), - paper = pdata.paper, - style = pdata.style, - extension = pdata.extension, + basedoc = getattr(mod, pdata.docclass), + paper = pdata.paper, + style = pdata.style, + extension = pdata.extension, docoptclass = oclass, basedocname = pdata.docclass ) self.__docgen_plugins.append(dgp) diff --git a/gramps/gen/plug/_pluginreg.py b/gramps/gen/plug/_pluginreg.py index e637e7ea8..fdf855c15 100644 --- a/gramps/gen/plug/_pluginreg.py +++ b/gramps/gen/plug/_pluginreg.py @@ -53,28 +53,28 @@ LOG = logging.getLogger('._manager') #------------------------------------------------------------------------- #a plugin is stable or unstable -STABLE = 0 +STABLE = 0 UNSTABLE = 1 -STATUS = [STABLE, UNSTABLE] +STATUS = [STABLE, UNSTABLE] STATUSTEXT = {STABLE: _('Stable'), UNSTABLE: _('Unstable')} #possible plugin types -REPORT = 0 +REPORT = 0 QUICKREPORT = 1 # deprecated -QUICKVIEW = 1 -TOOL = 2 -IMPORT = 3 -EXPORT = 4 -DOCGEN = 5 -GENERAL = 6 -MAPSERVICE = 7 -VIEW = 8 -RELCALC = 9 -GRAMPLET = 10 -SIDEBAR = 11 -DATABASE = 12 -PTYPE = [REPORT , QUICKREPORT, TOOL, IMPORT, EXPORT, DOCGEN, GENERAL, +QUICKVIEW = 1 +TOOL = 2 +IMPORT = 3 +EXPORT = 4 +DOCGEN = 5 +GENERAL = 6 +MAPSERVICE = 7 +VIEW = 8 +RELCALC = 9 +GRAMPLET = 10 +SIDEBAR = 11 +DATABASE = 12 +PTYPE = [REPORT , QUICKREPORT, TOOL, IMPORT, EXPORT, DOCGEN, GENERAL, MAPSERVICE, VIEW, RELCALC, GRAMPLET, SIDEBAR, DATABASE] -PTYPE_STR = { +PTYPE_STR = { REPORT: _('Report') , QUICKREPORT: _('Quickreport'), TOOL: _('Tool'), @@ -91,54 +91,54 @@ PTYPE_STR = { } #possible report categories -CATEGORY_TEXT = 0 -CATEGORY_DRAW = 1 -CATEGORY_CODE = 2 -CATEGORY_WEB = 3 -CATEGORY_BOOK = 4 -CATEGORY_GRAPHVIZ = 5 -CATEGORY_TREE = 6 -REPORT_CAT = [ CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_CODE, +CATEGORY_TEXT = 0 +CATEGORY_DRAW = 1 +CATEGORY_CODE = 2 +CATEGORY_WEB = 3 +CATEGORY_BOOK = 4 +CATEGORY_GRAPHVIZ = 5 +CATEGORY_TREE = 6 +REPORT_CAT = [ CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_CODE, CATEGORY_WEB, CATEGORY_BOOK, CATEGORY_GRAPHVIZ, CATEGORY_TREE] #possible tool categories -TOOL_DEBUG = -1 -TOOL_ANAL = 0 +TOOL_DEBUG = -1 +TOOL_ANAL = 0 TOOL_DBPROC = 1 -TOOL_DBFIX = 2 +TOOL_DBFIX = 2 TOOL_REVCTL = 3 -TOOL_UTILS = 4 -TOOL_CAT = [ TOOL_DEBUG, TOOL_ANAL, TOOL_DBPROC, TOOL_DBFIX, TOOL_REVCTL, +TOOL_UTILS = 4 +TOOL_CAT = [ TOOL_DEBUG, TOOL_ANAL, TOOL_DBPROC, TOOL_DBFIX, TOOL_REVCTL, TOOL_UTILS] #possible quickreport categories -CATEGORY_QR_MISC = -1 -CATEGORY_QR_PERSON = 0 -CATEGORY_QR_FAMILY = 1 -CATEGORY_QR_EVENT = 2 -CATEGORY_QR_SOURCE = 3 -CATEGORY_QR_PLACE = 4 +CATEGORY_QR_MISC = -1 +CATEGORY_QR_PERSON = 0 +CATEGORY_QR_FAMILY = 1 +CATEGORY_QR_EVENT = 2 +CATEGORY_QR_SOURCE = 3 +CATEGORY_QR_PLACE = 4 CATEGORY_QR_REPOSITORY = 5 -CATEGORY_QR_NOTE = 6 -CATEGORY_QR_DATE = 7 -CATEGORY_QR_MEDIA = 8 -CATEGORY_QR_CITATION = 9 +CATEGORY_QR_NOTE = 6 +CATEGORY_QR_DATE = 7 +CATEGORY_QR_MEDIA = 8 +CATEGORY_QR_CITATION = 9 CATEGORY_QR_SOURCE_OR_CITATION = 10 # Modes for generating reports REPORT_MODE_GUI = 1 # Standalone report using GUI REPORT_MODE_BKI = 2 # Book Item interface using GUI REPORT_MODE_CLI = 4 # Command line interface (CLI) -REPORT_MODES = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] +REPORT_MODES = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] # Modes for running tools TOOL_MODE_GUI = 1 # Standard tool using GUI TOOL_MODE_CLI = 2 # Command line interface (CLI) -TOOL_MODES = [TOOL_MODE_GUI, TOOL_MODE_CLI] +TOOL_MODES = [TOOL_MODE_GUI, TOOL_MODE_CLI] # possible view orders START = 1 -END = 2 +END = 2 #------------------------------------------------------------------------- # @@ -169,10 +169,10 @@ def valid_plugin_version(plugin_version_string): if not isinstance(plugin_version_string, str): return False dots = plugin_version_string.count(".") if dots == 1: - plugin_version = tuple(map(int, plugin_version_string.split(".", 1))) + plugin_version = tuple(map(int, plugin_version_string.split(".", 1))) return plugin_version == VERSION_TUPLE[:2] elif dots == 2: - plugin_version = tuple(map(int, plugin_version_string.split(".", 2))) + plugin_version = tuple(map(int, plugin_version_string.split(".", 2))) return (plugin_version[:2] == VERSION_TUPLE[:2] and plugin_version <= VERSION_TUPLE) return False @@ -934,7 +934,7 @@ class PluginData: return self._menu_label sidebarclass = property(_get_sidebarclass, _set_sidebarclass) - menu_label = property(_get_menu_label, _set_menu_label) + menu_label = property(_get_menu_label, _set_menu_label) #VIEW and SIDEBAR attributes def _set_order(self, order): @@ -1108,7 +1108,7 @@ class PluginRegister: self.stable_only = True if __debug__: self.stable_only = False - self.__plugindata = [] + self.__plugindata = [] self.__id_to_pdata = {} def add_plugindata(self, plugindata): diff --git a/gramps/gen/plug/docbackend/docbackend.py b/gramps/gen/plug/docbackend/docbackend.py index 1d7bfe27f..9431d4767 100644 --- a/gramps/gen/plug/docbackend/docbackend.py +++ b/gramps/gen/plug/docbackend/docbackend.py @@ -207,15 +207,15 @@ class DocBackend: if not self.STYLETYPE_MAP or \ self.CLASSMAP != tagtype.__class__.__name__ : self.CLASSMAP = tagtype.__class__.__name__ - self.STYLETYPE_MAP[tagtype.BOLD] = self.BOLD - self.STYLETYPE_MAP[tagtype.ITALIC] = self.ITALIC - self.STYLETYPE_MAP[tagtype.UNDERLINE] = self.UNDERLINE - self.STYLETYPE_MAP[tagtype.FONTFACE] = self.FONTFACE - self.STYLETYPE_MAP[tagtype.FONTSIZE] = self.FONTSIZE - self.STYLETYPE_MAP[tagtype.FONTCOLOR] = self.FONTCOLOR - self.STYLETYPE_MAP[tagtype.HIGHLIGHT] = self.HIGHLIGHT + self.STYLETYPE_MAP[tagtype.BOLD] = self.BOLD + self.STYLETYPE_MAP[tagtype.ITALIC] = self.ITALIC + self.STYLETYPE_MAP[tagtype.UNDERLINE] = self.UNDERLINE + self.STYLETYPE_MAP[tagtype.FONTFACE] = self.FONTFACE + self.STYLETYPE_MAP[tagtype.FONTSIZE] = self.FONTSIZE + self.STYLETYPE_MAP[tagtype.FONTCOLOR] = self.FONTCOLOR + self.STYLETYPE_MAP[tagtype.HIGHLIGHT] = self.HIGHLIGHT self.STYLETYPE_MAP[tagtype.SUPERSCRIPT] = self.SUPERSCRIPT - self.STYLETYPE_MAP[tagtype.LINK] = self.LINK + self.STYLETYPE_MAP[tagtype.LINK] = self.LINK if s_tag.name == tagtype.LINK: return self.format_link(s_tag.value) diff --git a/gramps/gen/plug/docgen/fontstyle.py b/gramps/gen/plug/docgen/fontstyle.py index 9e4ddcf9b..22ba7786f 100644 --- a/gramps/gen/plug/docgen/fontstyle.py +++ b/gramps/gen/plug/docgen/fontstyle.py @@ -50,8 +50,8 @@ log = logging.getLogger(".fontstyle") # #------------------------------------------------------------------------- FONT_SANS_SERIF = 0 -FONT_SERIF = 1 -FONT_MONOSPACE = 2 +FONT_SERIF = 1 +FONT_MONOSPACE = 2 #------------------------------------------------------------------------ # @@ -78,19 +78,19 @@ class FontStyle: FontStyle instead of using the defaults. """ if style: - self.face = style.face - self.size = style.size + self.face = style.face + self.size = style.size self.italic = style.italic - self.bold = style.bold - self.color = style.color - self.under = style.under + self.bold = style.bold + self.color = style.color + self.under = style.under else: - self.face = FONT_SERIF - self.size = 12 + self.face = FONT_SERIF + self.size = 12 self.italic = 0 - self.bold = 0 - self.color = (0, 0, 0) - self.under = 0 + self.bold = 0 + self.color = (0, 0, 0) + self.under = 0 def set(self, face=None, size=None, italic=None, bold=None, underline=None, color=None): diff --git a/gramps/gen/plug/docgen/graphicstyle.py b/gramps/gen/plug/docgen/graphicstyle.py index aaa28733d..50b21c10f 100644 --- a/gramps/gen/plug/docgen/graphicstyle.py +++ b/gramps/gen/plug/docgen/graphicstyle.py @@ -51,7 +51,7 @@ log = logging.getLogger(".graphicstyle") # Line style # #------------------------------------------------------------------------- -SOLID = 0 +SOLID = 0 DASHED = 1 DOTTED = 2 diff --git a/gramps/gen/plug/docgen/paperstyle.py b/gramps/gen/plug/docgen/paperstyle.py index d291563e2..b8430bdd2 100644 --- a/gramps/gen/plug/docgen/paperstyle.py +++ b/gramps/gen/plug/docgen/paperstyle.py @@ -50,7 +50,7 @@ log = logging.getLogger(".paperstyle") # Page orientation # #------------------------------------------------------------------------- -PAPER_PORTRAIT = 0 +PAPER_PORTRAIT = 0 PAPER_LANDSCAPE = 1 #------------------------------------------------------------------------ diff --git a/gramps/gen/plug/docgen/paragraphstyle.py b/gramps/gen/plug/docgen/paragraphstyle.py index e0586384f..2fc666798 100644 --- a/gramps/gen/plug/docgen/paragraphstyle.py +++ b/gramps/gen/plug/docgen/paragraphstyle.py @@ -48,9 +48,9 @@ log = logging.getLogger(".paragraphstyle") # Paragraph alignment # #------------------------------------------------------------------------- -PARA_ALIGN_CENTER = 0 -PARA_ALIGN_LEFT = 1 -PARA_ALIGN_RIGHT = 2 +PARA_ALIGN_CENTER = 0 +PARA_ALIGN_LEFT = 1 +PARA_ALIGN_RIGHT = 2 PARA_ALIGN_JUSTIFY = 3 #------------------------------------------------------------------------ diff --git a/gramps/gen/plug/docgen/tablestyle.py b/gramps/gen/plug/docgen/tablestyle.py index 7e29ba676..cf1472fa9 100644 --- a/gramps/gen/plug/docgen/tablestyle.py +++ b/gramps/gen/plug/docgen/tablestyle.py @@ -66,7 +66,7 @@ class TableStyle: if obj: self.width = obj.width self.columns = obj.columns - self.colwid = obj.colwid[:] + self.colwid = obj.colwid[:] self.description = obj.description else: self.width = 0 diff --git a/gramps/gen/proxy/living.py b/gramps/gen/proxy/living.py index 2a3c6c015..6618ca0c0 100644 --- a/gramps/gen/proxy/living.py +++ b/gramps/gen/proxy/living.py @@ -45,7 +45,7 @@ class LivingProxyDb(ProxyDbBase): A proxy to a Gramps database. This proxy will act like a Gramps database, but all living people will be hidden from the user. """ - MODE_EXCLUDE_ALL = 0 + MODE_EXCLUDE_ALL = 0 MODE_INCLUDE_LAST_NAME_ONLY = 1 MODE_INCLUDE_FULL_NAME_ONLY = 2 MODE_REPLACE_COMPLETE_NAME = 3 diff --git a/gramps/gen/utils/alive.py b/gramps/gen/utils/alive.py index 99626eabc..84d8b62a6 100644 --- a/gramps/gen/utils/alive.py +++ b/gramps/gen/utils/alive.py @@ -52,14 +52,14 @@ _ = glocale.translation.sgettext # cache values; use refresh_constants() if they change try: from ..config import config - _MAX_AGE_PROB_ALIVE = config.get('behavior.max-age-prob-alive') - _MAX_SIB_AGE_DIFF = config.get('behavior.max-sib-age-diff') - _AVG_GENERATION_GAP = config.get('behavior.avg-generation-gap') + _MAX_AGE_PROB_ALIVE = config.get('behavior.max-age-prob-alive') + _MAX_SIB_AGE_DIFF = config.get('behavior.max-sib-age-diff') + _AVG_GENERATION_GAP = config.get('behavior.avg-generation-gap') except ImportError: # Utils used as module not part of GRAMPS - _MAX_AGE_PROB_ALIVE = 110 - _MAX_SIB_AGE_DIFF = 20 - _AVG_GENERATION_GAP = 20 + _MAX_AGE_PROB_ALIVE = 110 + _MAX_SIB_AGE_DIFF = 20 + _AVG_GENERATION_GAP = 20 #------------------------------------------------------------------------- # @@ -542,6 +542,6 @@ def update_constants(): """ from ..config import config global _MAX_AGE_PROB_ALIVE, _MAX_SIB_AGE_DIFF, _AVG_GENERATION_GAP - _MAX_AGE_PROB_ALIVE = config.get('behavior.max-age-prob-alive') - _MAX_SIB_AGE_DIFF = config.get('behavior.max-sib-age-diff') - _AVG_GENERATION_GAP = config.get('behavior.avg-generation-gap') + _MAX_AGE_PROB_ALIVE = config.get('behavior.max-age-prob-alive') + _MAX_SIB_AGE_DIFF = config.get('behavior.max-sib-age-diff') + _AVG_GENERATION_GAP = config.get('behavior.avg-generation-gap') diff --git a/gramps/gen/utils/config.py b/gramps/gen/utils/config.py index b58109f05..b73fa0ecf 100644 --- a/gramps/gen/utils/config.py +++ b/gramps/gen/utils/config.py @@ -41,15 +41,15 @@ def get_researcher(): """ Return a new database owner with the default values from the config file. """ - name = config.get('researcher.researcher-name') - address = config.get('researcher.researcher-addr') - locality = config.get('researcher.researcher-locality') - city = config.get('researcher.researcher-city') - state = config.get('researcher.researcher-state') + name = config.get('researcher.researcher-name') + address = config.get('researcher.researcher-addr') + locality = config.get('researcher.researcher-locality') + city = config.get('researcher.researcher-city') + state = config.get('researcher.researcher-state') country = config.get('researcher.researcher-country') - post_code = config.get('researcher.researcher-postal') + post_code = config.get('researcher.researcher-postal') phone = config.get('researcher.researcher-phone') - email = config.get('researcher.researcher-email') + email = config.get('researcher.researcher-email') owner = Researcher() owner.set_name(name) diff --git a/gramps/gui/configure.py b/gramps/gui/configure.py index 5d5b1e168..ff139722a 100644 --- a/gramps/gui/configure.py +++ b/gramps/gui/configure.py @@ -87,9 +87,9 @@ _surname_styles = [ ] # column numbers for the 'name format' model -COL_NUM = 0 +COL_NUM = 0 COL_NAME = 1 -COL_FMT = 2 +COL_FMT = 2 COL_EXPL = 3 WIKI_HELP_PAGE = URL_MANUAL_PAGE + "_-_Settings" diff --git a/gramps/gui/ddtargets.py b/gramps/gui/ddtargets.py index 3d7139fbb..cdb1ee937 100644 --- a/gramps/gui/ddtargets.py +++ b/gramps/gui/ddtargets.py @@ -124,36 +124,36 @@ class _DdTargets: self._type_map = {} self._app_id_map = {} - self.ADDRESS = _DdType(self, 'paddr') - self.ATTRIBUTE = _DdType(self, 'pattr') - self.CHILDREF = _DdType(self, 'childref') - self.DATA = _DdType(self, 'data_tuple') - self.EVENT = _DdType(self, 'pevent') - self.EVENTREF = _DdType(self, 'eventref') - self.FAMILY_ATTRIBUTE = _DdType(self, 'fattr') - self.FAMILY_EVENT = _DdType(self, 'fevent') - self.LOCATION = _DdType(self, 'location') - self.MEDIAOBJ = _DdType(self, 'media') - self.MEDIAREF = _DdType(self, 'mediaref') - self.NAME = _DdType(self, 'name') - self.NOTE_LINK = _DdType(self, 'note-link') - self.PLACE_LINK = _DdType(self, 'place-link') - self.PLACENAME = _DdType(self, 'placename') - self.PLACEREF = _DdType(self, 'placeref') - self.REPO_LINK = _DdType(self, 'repo-link') - self.REPOREF = _DdType(self, 'reporef') - self.PERSON_LINK = _DdType(self, 'person-link') - self.FAMILY_LINK = _DdType(self, 'family-link') - self.LINK_LIST = _DdType(self, 'link-list') - self.RAW_LIST = _DdType(self, 'raw-list') - self.HANDLE_LIST = _DdType(self, 'handle-list') - self.PERSONREF = _DdType(self, 'personref') - self.SOURCEREF = _DdType(self, 'srcref') - self.SOURCE_LINK = _DdType(self, 'source-link') - self.SRCATTRIBUTE = _DdType(self, 'sattr') - self.URL = _DdType(self, 'url') - self.SURNAME = _DdType(self, 'surname') - self.CITATION_LINK = _DdType(self, 'citation-link') + self.ADDRESS = _DdType(self, 'paddr') + self.ATTRIBUTE = _DdType(self, 'pattr') + self.CHILDREF = _DdType(self, 'childref') + self.DATA = _DdType(self, 'data_tuple') + self.EVENT = _DdType(self, 'pevent') + self.EVENTREF = _DdType(self, 'eventref') + self.FAMILY_ATTRIBUTE = _DdType(self, 'fattr') + self.FAMILY_EVENT = _DdType(self, 'fevent') + self.LOCATION = _DdType(self, 'location') + self.MEDIAOBJ = _DdType(self, 'media') + self.MEDIAREF = _DdType(self, 'mediaref') + self.NAME = _DdType(self, 'name') + self.NOTE_LINK = _DdType(self, 'note-link') + self.PLACE_LINK = _DdType(self, 'place-link') + self.PLACENAME = _DdType(self, 'placename') + self.PLACEREF = _DdType(self, 'placeref') + self.REPO_LINK = _DdType(self, 'repo-link') + self.REPOREF = _DdType(self, 'reporef') + self.PERSON_LINK = _DdType(self, 'person-link') + self.FAMILY_LINK = _DdType(self, 'family-link') + self.LINK_LIST = _DdType(self, 'link-list') + self.RAW_LIST = _DdType(self, 'raw-list') + self.HANDLE_LIST = _DdType(self, 'handle-list') + self.PERSONREF = _DdType(self, 'personref') + self.SOURCEREF = _DdType(self, 'srcref') + self.SOURCE_LINK = _DdType(self, 'source-link') + self.SRCATTRIBUTE = _DdType(self, 'sattr') + self.URL = _DdType(self, 'url') + self.SURNAME = _DdType(self, 'surname') + self.CITATION_LINK = _DdType(self, 'citation-link') # List of all types that are used between # gramps widgets but should not be exported @@ -188,15 +188,15 @@ class _DdTargets: self.CITATION_LINK ] - self.CHILD = _DdType(self, 'child') - self.SPOUSE = _DdType(self, 'spouse') - self.TEXT_MIME = _DdType(self, 'text/plain', 0, 0) - self.TEXT = _DdType(self, 'TEXT', 0, 1) - self.STRING = _DdType(self, 'STRING', 0, 2) + self.CHILD = _DdType(self, 'child') + self.SPOUSE = _DdType(self, 'spouse') + self.TEXT_MIME = _DdType(self, 'text/plain', 0, 0) + self.TEXT = _DdType(self, 'TEXT', 0, 1) + self.STRING = _DdType(self, 'STRING', 0, 2) self.COMPOUND_TEXT = _DdType(self, 'COMPOUND_TEXT', 0, 3) - self.UTF8_STRING = _DdType(self, 'UTF8_STRING', 0, 4) - self.URI_LIST = _DdType(self, 'text/uri-list', 0, 5) - self.APP_ROOT = _DdType(self, 'application/x-rootwin-drop', 0, 6) + self.UTF8_STRING = _DdType(self, 'UTF8_STRING', 0, 4) + self.URI_LIST = _DdType(self, 'text/uri-list', 0, 5) + self.APP_ROOT = _DdType(self, 'application/x-rootwin-drop', 0, 6) # List of all the text types. These are types # that can be interpreted as text. diff --git a/gramps/gui/editors/addmedia.py b/gramps/gui/editors/addmedia.py index d1885f478..40db25426 100644 --- a/gramps/gui/editors/addmedia.py +++ b/gramps/gui/editors/addmedia.py @@ -95,7 +95,7 @@ class AddMedia(ManagedWindow): self.callback = callback self.last_directory = config.get('behavior.addmedia-image-dir') - self.relative_path = config.get('behavior.addmedia-relative-path') + self.relative_path = config.get('behavior.addmedia-relative-path') self.glade = Glade() self.set_window( @@ -205,7 +205,7 @@ class AddMedia(ManagedWindow): filename = fname basename = os.path.basename(filename) (root, ext) = os.path.splitext(basename) - old_title = self.description.get_text() + old_title = self.description.get_text() if old_title == '' or old_title == self.temp_name: self.description.set_text(root) @@ -241,7 +241,7 @@ class AddMedia(ManagedWindow): try: image1 = GdkPixbuf.Pixbuf.new_from_file(path) - width = image1.get_width() + width = image1.get_width() height = image1.get_height() scale = size / float(max(width, height)) return image1.scale_simple(int(scale*width), int(scale*height), diff --git a/gramps/gui/editors/displaytabs/addrembedlist.py b/gramps/gui/editors/displaytabs/addrembedlist.py index 9c2319188..f49267245 100644 --- a/gramps/gui/editors/displaytabs/addrembedlist.py +++ b/gramps/gui/editors/displaytabs/addrembedlist.py @@ -55,7 +55,7 @@ class AddrEmbedList(EmbeddedList): """ _HANDLE_COL = 7 - _DND_TYPE = DdTargets.ADDRESS + _DND_TYPE = DdTargets.ADDRESS _MSG = { 'add' : _('Create and add a new address'), diff --git a/gramps/gui/editors/displaytabs/attrembedlist.py b/gramps/gui/editors/displaytabs/attrembedlist.py index b6a456c0e..c73deeb83 100644 --- a/gramps/gui/editors/displaytabs/attrembedlist.py +++ b/gramps/gui/editors/displaytabs/attrembedlist.py @@ -46,7 +46,7 @@ from .embeddedlist import EmbeddedList, TEXT_COL, MARKUP_COL, ICON_COL class AttrEmbedList(EmbeddedList): _HANDLE_COL = 3 - _DND_TYPE = DdTargets.ATTRIBUTE + _DND_TYPE = DdTargets.ATTRIBUTE _MSG = { 'add' : _('Create and add a new attribute'), diff --git a/gramps/gui/editors/displaytabs/buttontab.py b/gramps/gui/editors/displaytabs/buttontab.py index 789d7a276..209c66b76 100644 --- a/gramps/gui/editors/displaytabs/buttontab.py +++ b/gramps/gui/editors/displaytabs/buttontab.py @@ -123,9 +123,9 @@ class ButtonTab(GrampsTab): self.top_label.set_use_markup(True) self.track_ref_for_deletion("top_label") - self.add_btn = SimpleButton('list-add', self.add_button_clicked) + self.add_btn = SimpleButton('list-add', self.add_button_clicked) self.edit_btn = SimpleButton('gtk-edit', self.edit_button_clicked) - self.del_btn = SimpleButton('list-remove', self.del_button_clicked) + self.del_btn = SimpleButton('list-remove', self.del_button_clicked) self.track_ref_for_deletion("add_btn") self.track_ref_for_deletion("edit_btn") self.track_ref_for_deletion("del_btn") diff --git a/gramps/gui/editors/displaytabs/embeddedlist.py b/gramps/gui/editors/displaytabs/embeddedlist.py index 06bd344b1..9e8eedcc8 100644 --- a/gramps/gui/editors/displaytabs/embeddedlist.py +++ b/gramps/gui/editors/displaytabs/embeddedlist.py @@ -72,8 +72,8 @@ class EmbeddedList(ButtonTab): """ _HANDLE_COL = -1 - _DND_TYPE = None - _DND_EXTRA = None + _DND_TYPE = None + _DND_EXTRA = None def __init__(self, dbstate, uistate, track, name, build_model, share_button=False, move_buttons=False, jump_button=False, diff --git a/gramps/gui/editors/displaytabs/eventembedlist.py b/gramps/gui/editors/displaytabs/eventembedlist.py index aa0c9f73f..6255238eb 100644 --- a/gramps/gui/editors/displaytabs/eventembedlist.py +++ b/gramps/gui/editors/displaytabs/eventembedlist.py @@ -52,8 +52,8 @@ from ...selectors import SelectorFactory class EventEmbedList(DbGUIElement, GroupEmbeddedList): _HANDLE_COL = 8 - _DND_TYPE = DdTargets.EVENTREF - _DND_EXTRA = DdTargets.EVENT + _DND_TYPE = DdTargets.EVENTREF + _DND_EXTRA = DdTargets.EVENT _WORKGROUP = EventRefModel._ROOTINDEX _WORKNAME = _("Family") diff --git a/gramps/gui/editors/displaytabs/eventrefmodel.py b/gramps/gui/editors/displaytabs/eventrefmodel.py index cff8655e0..3dde65c8e 100644 --- a/gramps/gui/editors/displaytabs/eventrefmodel.py +++ b/gramps/gui/editors/displaytabs/eventrefmodel.py @@ -58,7 +58,7 @@ from gramps.gen.display.place import displayer as place_displayer # #------------------------------------------------------------------------- invalid_date_format = config.get('preferences.invalid-date-format') -age_precision = config.get('preferences.age-display-precision') +age_precision = config.get('preferences.age-display-precision') #------------------------------------------------------------------------- # diff --git a/gramps/gui/editors/displaytabs/familyldsembedlist.py b/gramps/gui/editors/displaytabs/familyldsembedlist.py index df1b089d3..940a30429 100644 --- a/gramps/gui/editors/displaytabs/familyldsembedlist.py +++ b/gramps/gui/editors/displaytabs/familyldsembedlist.py @@ -43,7 +43,7 @@ from gramps.gen.lib import LdsOrd class FamilyLdsEmbedList(LdsEmbedList): _HANDLE_COL = 6 -# _DND_TYPE = DdTargets.ADDRESS +# _DND_TYPE = DdTargets.ADDRESS #index = column in model. Value = # (name, sortcol in model, width, markup/text, weigth_col diff --git a/gramps/gui/editors/displaytabs/gallerytab.py b/gramps/gui/editors/displaytabs/gallerytab.py index 68e6592f8..fbcde948a 100644 --- a/gramps/gui/editors/displaytabs/gallerytab.py +++ b/gramps/gui/editors/displaytabs/gallerytab.py @@ -76,8 +76,8 @@ def make_launcher(path, uistate): #------------------------------------------------------------------------- class GalleryTab(ButtonTab, DbGUIElement): - _DND_TYPE = DdTargets.MEDIAREF - _DND_EXTRA = DdTargets.URI_LIST + _DND_TYPE = DdTargets.MEDIAREF + _DND_EXTRA = DdTargets.URI_LIST def __init__(self, dbstate, uistate, track, media_list, update=None): self.iconlist = Gtk.IconView() diff --git a/gramps/gui/editors/displaytabs/ldsembedlist.py b/gramps/gui/editors/displaytabs/ldsembedlist.py index 74324c514..95c8c9957 100644 --- a/gramps/gui/editors/displaytabs/ldsembedlist.py +++ b/gramps/gui/editors/displaytabs/ldsembedlist.py @@ -45,7 +45,7 @@ from .embeddedlist import EmbeddedList, TEXT_COL, MARKUP_COL, ICON_COL class LdsEmbedList(EmbeddedList): _HANDLE_COL = 6 -# _DND_TYPE = DdTargets.ADDRESS +# _DND_TYPE = DdTargets.ADDRESS _MSG = { 'add' : _('Create and add a new LDS ordinance'), diff --git a/gramps/gui/editors/displaytabs/locationembedlist.py b/gramps/gui/editors/displaytabs/locationembedlist.py index 4a8490f61..26b752479 100644 --- a/gramps/gui/editors/displaytabs/locationembedlist.py +++ b/gramps/gui/editors/displaytabs/locationembedlist.py @@ -46,7 +46,7 @@ from .embeddedlist import EmbeddedList, TEXT_COL, MARKUP_COL, ICON_COL class LocationEmbedList(EmbeddedList): _HANDLE_COL = 6 - _DND_TYPE = DdTargets.LOCATION + _DND_TYPE = DdTargets.LOCATION #index = column in model. Value = # (name, sortcol in model, width, markup/text, weigth_col diff --git a/gramps/gui/editors/displaytabs/nameembedlist.py b/gramps/gui/editors/displaytabs/nameembedlist.py index 67ecda7e0..a33efd452 100644 --- a/gramps/gui/editors/displaytabs/nameembedlist.py +++ b/gramps/gui/editors/displaytabs/nameembedlist.py @@ -56,7 +56,7 @@ from .groupembeddedlist import GroupEmbeddedList class NameEmbedList(GroupEmbeddedList): _HANDLE_COL = 2 - _DND_TYPE = DdTargets.NAME + _DND_TYPE = DdTargets.NAME _WORKGROUP = NameModel.ALTINDEX _MSG = { diff --git a/gramps/gui/editors/displaytabs/personrefembedlist.py b/gramps/gui/editors/displaytabs/personrefembedlist.py index 32e2a98dd..12486bac6 100644 --- a/gramps/gui/editors/displaytabs/personrefembedlist.py +++ b/gramps/gui/editors/displaytabs/personrefembedlist.py @@ -49,7 +49,7 @@ from ...dbguielement import DbGUIElement class PersonRefEmbedList(DbGUIElement, EmbeddedList): _HANDLE_COL = 4 - _DND_TYPE = DdTargets.PERSONREF + _DND_TYPE = DdTargets.PERSONREF _DND_EXTRA = DdTargets.PERSON_LINK _MSG = { diff --git a/gramps/gui/editors/displaytabs/placenameembedlist.py b/gramps/gui/editors/displaytabs/placenameembedlist.py index 155c5a7df..b4b69fe5a 100644 --- a/gramps/gui/editors/displaytabs/placenameembedlist.py +++ b/gramps/gui/editors/displaytabs/placenameembedlist.py @@ -47,7 +47,7 @@ from .embeddedlist import EmbeddedList, TEXT_COL, MARKUP_COL, ICON_COL class PlaceNameEmbedList(EmbeddedList): _HANDLE_COL = 3 - _DND_TYPE = DdTargets.PLACENAME + _DND_TYPE = DdTargets.PLACENAME _MSG = { 'add' : _('Create and add a new place name'), diff --git a/gramps/gui/editors/displaytabs/placerefembedlist.py b/gramps/gui/editors/displaytabs/placerefembedlist.py index 8f37bead0..1d3614b3a 100644 --- a/gramps/gui/editors/displaytabs/placerefembedlist.py +++ b/gramps/gui/editors/displaytabs/placerefembedlist.py @@ -52,7 +52,7 @@ class PlaceRefEmbedList(DbGUIElement, EmbeddedList): _HANDLE_COL = 4 _DND_TYPE = DdTargets.PLACEREF - _DND_EXTRA = DdTargets.PLACE_LINK + _DND_EXTRA = DdTargets.PLACE_LINK #index = column in model. Value = # (name, sortcol in model, width, markup/text, weigth_col diff --git a/gramps/gui/editors/displaytabs/srcattrembedlist.py b/gramps/gui/editors/displaytabs/srcattrembedlist.py index d6f5414bf..168b41cb0 100644 --- a/gramps/gui/editors/displaytabs/srcattrembedlist.py +++ b/gramps/gui/editors/displaytabs/srcattrembedlist.py @@ -47,7 +47,7 @@ from .embeddedlist import (EmbeddedList, TEXT_COL, MARKUP_COL, ICON_COL, class SrcAttrEmbedList(EmbeddedList): _HANDLE_COL = 3 - _DND_TYPE = DdTargets.SRCATTRIBUTE + _DND_TYPE = DdTargets.SRCATTRIBUTE _MSG = { 'add' : _('Create and add a new attribute'), diff --git a/gramps/gui/editors/displaytabs/surnametab.py b/gramps/gui/editors/displaytabs/surnametab.py index 1d4b079a9..23691201e 100644 --- a/gramps/gui/editors/displaytabs/surnametab.py +++ b/gramps/gui/editors/displaytabs/surnametab.py @@ -58,7 +58,7 @@ from ...utils import match_primary_mask, no_match_primary_mask class SurnameTab(EmbeddedList): _HANDLE_COL = 5 - _DND_TYPE = DdTargets.SURNAME + _DND_TYPE = DdTargets.SURNAME _MSG = { 'add' : _('Create and add a new surname'), diff --git a/gramps/gui/editors/displaytabs/webembedlist.py b/gramps/gui/editors/displaytabs/webembedlist.py index 1c4208feb..94b1a1136 100644 --- a/gramps/gui/editors/displaytabs/webembedlist.py +++ b/gramps/gui/editors/displaytabs/webembedlist.py @@ -48,7 +48,7 @@ from .embeddedlist import EmbeddedList, TEXT_COL, MARKUP_COL, ICON_COL class WebEmbedList(EmbeddedList): _HANDLE_COL = 4 - _DND_TYPE = DdTargets.URL + _DND_TYPE = DdTargets.URL _MSG = { 'add' : _('Create and add a new web address'), diff --git a/gramps/gui/editors/editfamily.py b/gramps/gui/editors/editfamily.py index 523119196..dfc59f3d6 100644 --- a/gramps/gui/editors/editfamily.py +++ b/gramps/gui/editors/editfamily.py @@ -577,18 +577,18 @@ class EditFamily(EditPrimary): # FIXME: remove if we can use show() self.window.show_all = self.window.show - self.fbirth = self.top.get_object('fbirth') - self.fdeath = self.top.get_object('fdeath') + self.fbirth = self.top.get_object('fbirth') + self.fdeath = self.top.get_object('fdeath') self.fbirth_label = self.top.get_object('label578') self.fdeath_label = self.top.get_object('label579') - self.mbirth = self.top.get_object('mbirth') - self.mdeath = self.top.get_object('mdeath') + self.mbirth = self.top.get_object('mbirth') + self.mdeath = self.top.get_object('mdeath') self.mbirth_label = self.top.get_object('label567') self.mdeath_label = self.top.get_object('label568') - self.mname = self.top.get_object('mname') - self.fname = self.top.get_object('fname') + self.mname = self.top.get_object('mname') + self.fname = self.top.get_object('fname') self.mbutton_index = self.top.get_object('mbutton_index') self.mbutton_add = self.top.get_object('mbutton_add') diff --git a/gramps/gui/editors/editlocation.py b/gramps/gui/editors/editlocation.py index 3933f4e65..5ae185bd3 100644 --- a/gramps/gui/editors/editlocation.py +++ b/gramps/gui/editors/editlocation.py @@ -61,13 +61,13 @@ class EditLocation(EditSecondary): self.obj.get_locality, self.db.readonly) - self.city = MonitoredEntry( + self.city = MonitoredEntry( self.top.get_object("city"), self.obj.set_city, self.obj.get_city, self.db.readonly) - self.state = MonitoredEntry( + self.state = MonitoredEntry( self.top.get_object("state"), self.obj.set_state, self.obj.get_state, diff --git a/gramps/gui/editors/editplace.py b/gramps/gui/editors/editplace.py index 89901feff..81b039d7f 100644 --- a/gramps/gui/editors/editplace.py +++ b/gramps/gui/editors/editplace.py @@ -355,7 +355,7 @@ class DeletePlaceQuery: self.obj = place self.person_list = person_list self.family_list = family_list - self.event_list = event_list + self.event_list = event_list def query_response(self): place_title = place_displayer.display(self.db, self.obj) diff --git a/gramps/gui/editors/editprimary.py b/gramps/gui/editors/editprimary.py index 92d17b9e2..be50437cc 100644 --- a/gramps/gui/editors/editprimary.py +++ b/gramps/gui/editors/editprimary.py @@ -65,9 +65,9 @@ class EditPrimary(ManagedWindow, DbGUIElement, metaclass=abc.ABCMeta): Associate a person with the window. """ - self.dp = parser - self.dd = displayer - self.name_displayer = name_displayer + self.dp = parser + self.dd = displayer + self.name_displayer = name_displayer self.obj = obj self.dbstate = state self.uistate = uistate diff --git a/gramps/gui/editors/editurl.py b/gramps/gui/editors/editurl.py index 1f2c4c0c4..a8ae44f7a 100644 --- a/gramps/gui/editors/editurl.py +++ b/gramps/gui/editors/editurl.py @@ -82,11 +82,11 @@ class EditUrl(EditSecondary): display_url(self.obj.get_path()) def _setup_fields(self): - self.des = MonitoredEntry(self.top.get_object("url_des"), + self.des = MonitoredEntry(self.top.get_object("url_des"), self.obj.set_description, self.obj.get_description, self.db.readonly) - self.addr = MonitoredEntry(self.top.get_object("url_addr"), + self.addr = MonitoredEntry(self.top.get_object("url_addr"), self.obj.set_path, self.obj.get_path, self.db.readonly) diff --git a/gramps/gui/editors/filtereditor.py b/gramps/gui/editors/filtereditor.py index 702b9659f..e53eb5070 100644 --- a/gramps/gui/editors/filtereditor.py +++ b/gramps/gui/editors/filtereditor.py @@ -288,7 +288,7 @@ class MyPlaces(Gtk.Entry): #------------------------------------------------------------------------- class MyID(Gtk.Box): _invalid_id_txt = _('Not a valid ID') - _empty_id_txt = _invalid_id_txt + _empty_id_txt = _invalid_id_txt obj_name = { 'Person' : _('Person'), diff --git a/gramps/gui/listmodel.py b/gramps/gui/listmodel.py index e96a5396e..3dc48456a 100644 --- a/gramps/gui/listmodel.py +++ b/gramps/gui/listmodel.py @@ -35,12 +35,12 @@ from gramps.gen.const import THUMBSCALE # constants # #------------------------------------------------------------------------- -TEXT = 0 -TOGGLE = 1 -COMBO = 2 -IMAGE = 3 +TEXT = 0 +TOGGLE = 1 +COMBO = 2 +IMAGE = 3 INTEGER = 4 -COLOR = 5 +COLOR = 5 NOSORT = -1 diff --git a/gramps/gui/plug/_dialogs.py b/gramps/gui/plug/_dialogs.py index fa1af9f73..ad300ebe0 100644 --- a/gramps/gui/plug/_dialogs.py +++ b/gramps/gui/plug/_dialogs.py @@ -55,7 +55,7 @@ from ..managedwindow import ManagedWindow # #------------------------------------------------------------------------- _REPORTS = 0 -_TOOLS = 1 +_TOOLS = 1 _UNSUPPORTED = _("Unsupported") #------------------------------------------------------------------------- diff --git a/gramps/gui/plug/export/_exportoptions.py b/gramps/gui/plug/export/_exportoptions.py index 063e4ab4b..b44eb3ca8 100644 --- a/gramps/gui/plug/export/_exportoptions.py +++ b/gramps/gui/plug/export/_exportoptions.py @@ -492,10 +492,10 @@ class WriterOptionBox: After this function is called, the following variables are defined: - private = privacy requested + private = privacy requested restrict = restrict information on living people - cfitler = return the GenericFilter selected - nfilter = return the NoteFilter selected + cfitler = return the GenericFilter selected + nfilter = return the NoteFilter selected reference = restrict referenced/orphaned records """ diff --git a/gramps/gui/plug/report/_papermenu.py b/gramps/gui/plug/report/_papermenu.py index 90db3df25..a6b9ef255 100644 --- a/gramps/gui/plug/report/_papermenu.py +++ b/gramps/gui/plug/report/_papermenu.py @@ -286,9 +286,9 @@ class PaperFrame(Gtk.Box): Float values returned. """ try: - width = float(self.pwidth.get_text().replace(",", ".")) * \ + width = float(self.pwidth.get_text().replace(",", ".")) * \ self.paper_unit_multiplier - height = float(self.pheight.get_text().replace(",", ".")) * \ + height = float(self.pheight.get_text().replace(",", ".")) * \ self.paper_unit_multiplier except ValueError: width = float(21.0) diff --git a/gramps/gui/selectors/baseselector.py b/gramps/gui/selectors/baseselector.py index f639500db..fa2276550 100644 --- a/gramps/gui/selectors/baseselector.py +++ b/gramps/gui/selectors/baseselector.py @@ -49,10 +49,10 @@ class BaseSelector(ManagedWindow): one of the primary objects """ - NONE = -1 - TEXT = 0 + NONE = -1 + TEXT = 0 MARKUP = 1 - IMAGE = 2 + IMAGE = 2 def __init__(self, dbstate, uistate, track=[], filter=None, skip=set(), show_search_bar = True, default=None): diff --git a/gramps/gui/views/treemodels/basemodel.py b/gramps/gui/views/treemodels/basemodel.py index 6926486c7..1d6f9bc9b 100644 --- a/gramps/gui/views/treemodels/basemodel.py +++ b/gramps/gui/views/treemodels/basemodel.py @@ -34,7 +34,7 @@ class BaseModel: _CACHE_SIZE = config.get('interface.treemodel-cache-size') def __init__(self): - self.lru_data = LRU(BaseModel._CACHE_SIZE) + self.lru_data = LRU(BaseModel._CACHE_SIZE) self.lru_path = LRU(BaseModel._CACHE_SIZE) def destroy(self): diff --git a/gramps/gui/views/treemodels/citationbasemodel.py b/gramps/gui/views/treemodels/citationbasemodel.py index ed1464dbf..81b0f488b 100644 --- a/gramps/gui/views/treemodels/citationbasemodel.py +++ b/gramps/gui/views/treemodels/citationbasemodel.py @@ -52,26 +52,26 @@ from gramps.gen.config import config #------------------------------------------------------------------------- # These are the column numbers in the serialize/unserialize interfaces in # the Citation object -COLUMN_HANDLE = 0 -COLUMN_ID = 1 -COLUMN_DATE = 2 -COLUMN_PAGE = 3 -COLUMN_CONFIDENCE = 4 -COLUMN_SOURCE = 5 -COLUMN_CHANGE = 9 -COLUMN_TAGS = 10 -COLUMN_PRIV = 11 +COLUMN_HANDLE = 0 +COLUMN_ID = 1 +COLUMN_DATE = 2 +COLUMN_PAGE = 3 +COLUMN_CONFIDENCE = 4 +COLUMN_SOURCE = 5 +COLUMN_CHANGE = 9 +COLUMN_TAGS = 10 +COLUMN_PRIV = 11 # Data for the Source object -COLUMN2_HANDLE = 0 -COLUMN2_ID = 1 -COLUMN2_TITLE = 2 -COLUMN2_AUTHOR = 3 -COLUMN2_PUBINFO = 4 -COLUMN2_ABBREV = 7 -COLUMN2_CHANGE = 8 -COLUMN2_TAGS = 11 -COLUMN2_PRIV = 12 +COLUMN2_HANDLE = 0 +COLUMN2_ID = 1 +COLUMN2_TITLE = 2 +COLUMN2_AUTHOR = 3 +COLUMN2_PUBINFO = 4 +COLUMN2_ABBREV = 7 +COLUMN2_CHANGE = 8 +COLUMN2_TAGS = 11 +COLUMN2_PRIV = 12 INVALID_DATE_FORMAT = config.get('preferences.invalid-date-format') diff --git a/gramps/gui/views/treemodels/eventmodel.py b/gramps/gui/views/treemodels/eventmodel.py index a2ae83096..3d6ff3497 100644 --- a/gramps/gui/views/treemodels/eventmodel.py +++ b/gramps/gui/views/treemodels/eventmodel.py @@ -52,15 +52,15 @@ from gramps.gen.const import GRAMPS_LOCALE as glocale # Positions in raw data structure # #------------------------------------------------------------------------- -COLUMN_HANDLE = 0 -COLUMN_ID = 1 -COLUMN_TYPE = 2 -COLUMN_DATE = 3 +COLUMN_HANDLE = 0 +COLUMN_ID = 1 +COLUMN_TYPE = 2 +COLUMN_DATE = 3 COLUMN_DESCRIPTION = 4 -COLUMN_PLACE = 5 -COLUMN_CHANGE = 10 -COLUMN_TAGS = 11 -COLUMN_PRIV = 12 +COLUMN_PLACE = 5 +COLUMN_CHANGE = 10 +COLUMN_TAGS = 11 +COLUMN_PRIV = 12 INVALID_DATE_FORMAT = config.get('preferences.invalid-date-format') diff --git a/gramps/gui/views/treemodels/peoplemodel.py b/gramps/gui/views/treemodels/peoplemodel.py index 8563141bd..a8af9259c 100644 --- a/gramps/gui/views/treemodels/peoplemodel.py +++ b/gramps/gui/views/treemodels/peoplemodel.py @@ -70,18 +70,18 @@ from gramps.gen.config import config # COLUMN constants; positions in raw data structure # #------------------------------------------------------------------------- -COLUMN_ID = 1 +COLUMN_ID = 1 COLUMN_GENDER = 2 -COLUMN_NAME = 3 -COLUMN_DEATH = 5 -COLUMN_BIRTH = 6 -COLUMN_EVENT = 7 +COLUMN_NAME = 3 +COLUMN_DEATH = 5 +COLUMN_BIRTH = 6 +COLUMN_EVENT = 7 COLUMN_FAMILY = 8 COLUMN_PARENT = 9 -COLUMN_NOTES = 16 +COLUMN_NOTES = 16 COLUMN_CHANGE = 17 -COLUMN_TAGS = 18 -COLUMN_PRIV = 19 +COLUMN_TAGS = 18 +COLUMN_PRIV = 19 invalid_date_format = config.get('preferences.invalid-date-format') diff --git a/gramps/gui/widgets/fanchartdesc.py b/gramps/gui/widgets/fanchartdesc.py index 65a3c655c..81ddbe355 100644 --- a/gramps/gui/widgets/fanchartdesc.py +++ b/gramps/gui/widgets/fanchartdesc.py @@ -443,7 +443,7 @@ class FanChartDescWidget(FanChartBaseWidget): cr.save() # Draw center person: (person, dup, start, slice, parentfampos, nrfam, userdata, status) \ - = self.gen2people[0][0] + = self.gen2people[0][0] if person: r, g, b, a = self.background_box(person, 0, userdata) radiusin_pers,radiusout_pers,radiusin_partner,radiusout_partner = \ @@ -511,7 +511,7 @@ class FanChartDescWidget(FanChartBaseWidget): generation = None for gen in range(self.generations): radiusin_pers,radiusout_pers,radiusin_partner,radiusout_partner \ - = self.get_radiusinout_for_generation_pair(gen) + = self.get_radiusinout_for_generation_pair(gen) if radiusin_pers <= radius <= radiusout_pers: generation, btype = gen, TYPE_BOX_NORMAL break diff --git a/gramps/gui/widgets/grampletpane.py b/gramps/gui/widgets/grampletpane.py index 8d8354199..05368703a 100644 --- a/gramps/gui/widgets/grampletpane.py +++ b/gramps/gui/widgets/grampletpane.py @@ -759,7 +759,7 @@ class GridGramplet(GuiGramplet): Class that handles the plugin interfaces for the GrampletView. """ TARGET_TYPE_FRAME = 80 - LOCAL_DRAG_TYPE = 'GRAMPLET' + LOCAL_DRAG_TYPE = 'GRAMPLET' LOCAL_DRAG_TARGET = Gtk.TargetEntry.new(LOCAL_DRAG_TYPE, 0, TARGET_TYPE_FRAME) diff --git a/gramps/plugins/db/bsddb/bsddb.gpr.py b/gramps/plugins/db/bsddb/bsddb.gpr.py index 3abc7f28e..261f55c80 100644 --- a/gramps/plugins/db/bsddb/bsddb.gpr.py +++ b/gramps/plugins/db/bsddb/bsddb.gpr.py @@ -22,9 +22,9 @@ from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext plg = newplugin() -plg.id = 'bsddb' -plg.name = _("BSDDB") -plg.name_accell = _("_BSDDB Database") +plg.id = 'bsddb' +plg.name = _("BSDDB") +plg.name_accell = _("_BSDDB Database") plg.description = _("Berkeley Software Distribution Database Backend") plg.version = '1.0' plg.gramps_target_version = "5.1" diff --git a/gramps/plugins/db/bsddb/cursor.py b/gramps/plugins/db/bsddb/cursor.py index 3e3fa63ae..1eecffc03 100644 --- a/gramps/plugins/db/bsddb/cursor.py +++ b/gramps/plugins/db/bsddb/cursor.py @@ -118,13 +118,13 @@ class BsddbBaseCursor: # Use closure to define access methods current = _get(db.DB_CURRENT) - first = _get(db.DB_FIRST) + first = _get(db.DB_FIRST) ##python2 iterator - next = _get(db.DB_NEXT) + next = _get(db.DB_NEXT) ##python3 iterator __next__ = _get(db.DB_NEXT) - last = _get(db.DB_LAST) - prev = _get(db.DB_PREV) + last = _get(db.DB_LAST) + prev = _get(db.DB_PREV) def update(self, key, data, flags=0, **kwargs): """ diff --git a/gramps/plugins/db/bsddb/read.py b/gramps/plugins/db/bsddb/read.py index c0deaf340..57906b795 100644 --- a/gramps/plugins/db/bsddb/read.py +++ b/gramps/plugins/db/bsddb/read.py @@ -94,7 +94,7 @@ _SIGBASE = ('person', 'family', 'source', 'citation', 'event', 'media', 'place', 'repository', 'reference', 'note', 'tag') -DBERRS = (db.DBRunRecoveryError, db.DBAccessError, +DBERRS = (db.DBRunRecoveryError, db.DBAccessError, db.DBPageNotFoundError, db.DBInvalidArgError) #------------------------------------------------------------------------- @@ -324,8 +324,8 @@ class DbBsddbRead(DbReadBase, Callback): self.open = 0 self.genderStats = GenderStats() - self.undodb = [] - self.id_trans = {} + self.undodb = [] + self.id_trans = {} self.fid_trans = {} self.pid_trans = {} self.sid_trans = {} @@ -338,23 +338,23 @@ class DbBsddbRead(DbReadBase, Callback): self.env = None self.person_map = {} self.family_map = {} - self.place_map = {} + self.place_map = {} self.source_map = {} self.citation_map = {} - self.repository_map = {} + self.repository_map = {} self.note_map = {} self.tag_map = {} - self.media_map = {} - self.event_map = {} - self.metadata = {} + self.media_map = {} + self.event_map = {} + self.metadata = {} self.name_group = {} self.undo_callback = None self.redo_callback = None self.undo_history_callback = None - self.modified = 0 + self.modified = 0 - #self.undoindex = -1 - #self.translist = [None] * DBUNDO + #self.undoindex = -1 + #self.translist = [None] * DBUNDO self.abort_possible = True #self.undo_history_timestamp = 0 self.default = None @@ -1134,16 +1134,16 @@ class DbBsddbRead(DbReadBase, Callback): # Use closure to define iterators for each primary object type - iter_person_handles = _f(get_person_cursor) - iter_family_handles = _f(get_family_cursor) - iter_event_handles = _f(get_event_cursor) - iter_place_handles = _f(get_place_cursor) - iter_source_handles = _f(get_source_cursor) - iter_citation_handles = _f(get_citation_cursor) + iter_person_handles = _f(get_person_cursor) + iter_family_handles = _f(get_family_cursor) + iter_event_handles = _f(get_event_cursor) + iter_place_handles = _f(get_place_cursor) + iter_source_handles = _f(get_source_cursor) + iter_citation_handles = _f(get_citation_cursor) iter_media_handles = _f(get_media_cursor) - iter_repository_handles = _f(get_repository_cursor) - iter_note_handles = _f(get_note_cursor) - iter_tag_handles = _f(get_tag_cursor) + iter_repository_handles = _f(get_repository_cursor) + iter_note_handles = _f(get_note_cursor) + iter_tag_handles = _f(get_tag_cursor) del _f def _f(curs_, obj_): @@ -1160,16 +1160,16 @@ class DbBsddbRead(DbReadBase, Callback): # Use closure to define iterators for each primary object type - iter_people = _f(get_person_cursor, Person) - iter_families = _f(get_family_cursor, Family) - iter_events = _f(get_event_cursor, Event) - iter_places = _f(get_place_cursor, Place) - iter_sources = _f(get_source_cursor, Source) - iter_citations = _f(get_citation_cursor, Citation) + iter_people = _f(get_person_cursor, Person) + iter_families = _f(get_family_cursor, Family) + iter_events = _f(get_event_cursor, Event) + iter_places = _f(get_place_cursor, Place) + iter_sources = _f(get_source_cursor, Source) + iter_citations = _f(get_citation_cursor, Citation) iter_media = _f(get_media_cursor, Media) - iter_repositories = _f(get_repository_cursor, Repository) - iter_notes = _f(get_note_cursor, Note) - iter_tags = _f(get_tag_cursor, Tag) + iter_repositories = _f(get_repository_cursor, Repository) + iter_notes = _f(get_note_cursor, Note) + iter_tags = _f(get_tag_cursor, Tag) del _f def find_initial_person(self): diff --git a/gramps/plugins/db/bsddb/test/cursor_test.py b/gramps/plugins/db/bsddb/test/cursor_test.py index cd432603c..e90e16fd4 100644 --- a/gramps/plugins/db/bsddb/test/cursor_test.py +++ b/gramps/plugins/db/bsddb/test/cursor_test.py @@ -79,7 +79,7 @@ class CursorTest(unittest.TestCase): dbmap.db.set_pagesize(16384) dbmap.open(self.full_name, 'person', db.DB_HASH, db.DB_CREATE|db.DB_AUTO_COMMIT, 0o666) - person_map = dbmap + person_map = dbmap table_flags = db.DB_CREATE|db.DB_AUTO_COMMIT @@ -103,7 +103,7 @@ class CursorTest(unittest.TestCase): dbmap.db.set_pagesize(16384) dbmap.open(self.full_name, 'places', db.DB_HASH, db.DB_CREATE|db.DB_AUTO_COMMIT, 0o666) - place_map = dbmap + place_map = dbmap table_flags = db.DB_CREATE|db.DB_AUTO_COMMIT diff --git a/gramps/plugins/db/bsddb/undoredo.py b/gramps/plugins/db/bsddb/undoredo.py index b4488164f..53ab39a60 100644 --- a/gramps/plugins/db/bsddb/undoredo.py +++ b/gramps/plugins/db/bsddb/undoredo.py @@ -61,7 +61,7 @@ from gramps.gen.errors import DbError # Local Constants # #------------------------------------------------------------------------- -DBERRS = (db.DBRunRecoveryError, db.DBAccessError, +DBERRS = (db.DBRunRecoveryError, db.DBAccessError, db.DBPageNotFoundError, db.DBInvalidArgError) _SIGBASE = ('person', 'family', 'source', 'event', 'media', @@ -507,13 +507,13 @@ def testundo(): self.person_map = {} self.family_map = {} self.source_map = {} - self.event_map = {} - self.media_map = {} - self.place_map = {} - self.note_map = {} - self.tag_map = {} + self.event_map = {} + self.media_map = {} + self.place_map = {} + self.note_map = {} + self.tag_map = {} self.repository_map = {} - self.reference_map = {} + self.reference_map = {} print("list tests") undo = DbUndoList(D()) diff --git a/gramps/plugins/db/bsddb/write.py b/gramps/plugins/db/bsddb/write.py index a4f4820ab..f1743fd21 100644 --- a/gramps/plugins/db/bsddb/write.py +++ b/gramps/plugins/db/bsddb/write.py @@ -89,37 +89,37 @@ LOG = logging.getLogger(".citation") _MINVERSION = 9 _DBVERSION = 19 -IDTRANS = "person_id" -FIDTRANS = "family_id" -PIDTRANS = "place_id" -OIDTRANS = "media_id" -EIDTRANS = "event_id" -RIDTRANS = "repo_id" -NIDTRANS = "note_id" -SIDTRANS = "source_id" -CIDTRANS = "citation_id" -TAGTRANS = "tag_name" -SURNAMES = "surnames" -NAME_GROUP = "name_group" -META = "meta_data" -PPARENT = "place_parent" +IDTRANS = "person_id" +FIDTRANS = "family_id" +PIDTRANS = "place_id" +OIDTRANS = "media_id" +EIDTRANS = "event_id" +RIDTRANS = "repo_id" +NIDTRANS = "note_id" +SIDTRANS = "source_id" +CIDTRANS = "citation_id" +TAGTRANS = "tag_name" +SURNAMES = "surnames" +NAME_GROUP = "name_group" +META = "meta_data" +PPARENT = "place_parent" -FAMILY_TBL = "family" -PLACES_TBL = "place" +FAMILY_TBL = "family" +PLACES_TBL = "place" SOURCES_TBL = "source" CITATIONS_TBL = "citation" -MEDIA_TBL = "media" -EVENTS_TBL = "event" -PERSON_TBL = "person" -REPO_TBL = "repo" -NOTE_TBL = "note" -TAG_TBL = "tag" +MEDIA_TBL = "media" +EVENTS_TBL = "event" +PERSON_TBL = "person" +REPO_TBL = "repo" +NOTE_TBL = "note" +TAG_TBL = "tag" -REF_MAP = "reference_map" -REF_PRI = "primary_map" -REF_REF = "referenced_map" +REF_MAP = "reference_map" +REF_PRI = "primary_map" +REF_REF = "referenced_map" -DBERRS = (db.DBRunRecoveryError, db.DBAccessError, +DBERRS = (db.DBRunRecoveryError, db.DBAccessError, db.DBPageNotFoundError, db.DBInvalidArgError) # The following two dictionaries provide fast translation @@ -1206,7 +1206,7 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback): callback(index+1) # Open reference_map and primary map - self.reference_map = self.__open_shelf(self.full_name, REF_MAP, + self.reference_map = self.__open_shelf(self.full_name, REF_MAP, dbtype=db.DB_BTREE) self.reference_map_primary_map = self.__open_db(self.full_name, @@ -1317,8 +1317,8 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback): if hasattr(self, 'metadata') and self.metadata: self.metadata.close() self.env.close() - self.metadata = None - self.env = None + self.metadata = None + self.env = None self.db_is_open = False @catch_db_error @@ -1368,20 +1368,20 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback): self.env.close() self.__close_undodb() - self.person_map = None - self.family_map = None + self.person_map = None + self.family_map = None self.repository_map = None - self.note_map = None - self.place_map = None - self.source_map = None - self.citation_map = None - self.media_map = None - self.event_map = None - self.tag_map = None - self.surnames = None - self.env = None - self.metadata = None - self.db_is_open = False + self.note_map = None + self.place_map = None + self.source_map = None + self.citation_map = None + self.media_map = None + self.event_map = None + self.tag_map = None + self.surnames = None + self.env = None + self.metadata = None + self.db_is_open = False self.surname_list = None DbBsddbRead.close(self) @@ -2235,7 +2235,7 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback): self.env.open(env_name, env_flags) self.env.txn_checkpoint() - self.metadata = self.__open_shelf(full_name, META) + self.metadata = self.__open_shelf(full_name, META) _LOG.debug("Write schema version %s" % _DBVERSION) with BSDDBTxn(self.env, self.metadata) as txn: diff --git a/gramps/plugins/docgen/docgen.gpr.py b/gramps/plugins/docgen/docgen.gpr.py index 5dc01e4a1..99321da56 100644 --- a/gramps/plugins/docgen/docgen.gpr.py +++ b/gramps/plugins/docgen/docgen.gpr.py @@ -30,8 +30,8 @@ MODULE_VERSION="5.1" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'asciidoc' -plg.name = _("Plain Text") +plg.id = 'asciidoc' +plg.name = _("Plain Text") plg.description = _("Generates documents in plain text format (.txt).") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -51,8 +51,8 @@ plg.extension = "txt" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'gtkprint' -plg.name = _('Print...') +plg.id = 'gtkprint' +plg.name = _('Print...') plg.description = _("Generates documents and prints them directly.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -72,8 +72,8 @@ plg.extension = "" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'htmldoc' -plg.name = _('HTML') +plg.id = 'htmldoc' +plg.name = _('HTML') plg.description = _("Generates documents in HTML format.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -93,8 +93,8 @@ plg.extension = "html" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'latexdoc' -plg.name = _('LaTeX') +plg.id = 'latexdoc' +plg.name = _('LaTeX') plg.description = _("Generates documents in LaTeX format.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -114,8 +114,8 @@ plg.extension = "tex" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'odfdoc' -plg.name = _('OpenDocument Text') +plg.id = 'odfdoc' +plg.name = _('OpenDocument Text') plg.description = _("Generates documents in OpenDocument " "Text format (.odt).") plg.version = '1.0' @@ -136,8 +136,8 @@ plg.extension = "odt" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'pdfdoc' -plg.name = _('PDF document') +plg.id = 'pdfdoc' +plg.name = _('PDF document') plg.description = _("Generates documents in PDF format (.pdf).") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -157,8 +157,8 @@ plg.extension = "pdf" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'psdrawdoc' -plg.name = _('PostScript') +plg.id = 'psdrawdoc' +plg.name = _('PostScript') plg.description = _("Generates documents in PostScript format (.ps).") plg.version = '2.0' plg.gramps_target_version = MODULE_VERSION @@ -178,8 +178,8 @@ plg.extension = "ps" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'rftdoc' -plg.name = _('RTF document') +plg.id = 'rftdoc' +plg.name = _('RTF document') plg.description = _("Generates documents in Rich Text format (.rtf).") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -199,8 +199,8 @@ plg.extension = "rtf" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'SVG (Scalable Vector Graphics)' -plg.name = _('SVG document') +plg.id = 'SVG (Scalable Vector Graphics)' +plg.name = _('SVG document') plg.description = _("Generates documents in Scalable " "Vector Graphics format (.svg).") plg.version = '1.0' diff --git a/gramps/plugins/drawreport/drawplugins.gpr.py b/gramps/plugins/drawreport/drawplugins.gpr.py index 1eee9be81..2f67d5d05 100644 --- a/gramps/plugins/drawreport/drawplugins.gpr.py +++ b/gramps/plugins/drawreport/drawplugins.gpr.py @@ -33,8 +33,8 @@ MODULE_VERSION="5.1" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'ancestor_chart,BKI' -plg.name = _("Ancestor Chart") +plg.id = 'ancestor_chart,BKI' +plg.name = _("Ancestor Chart") plg.description = _("Produces a graphical ancestral chart") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -49,8 +49,8 @@ plg.optionclass = 'AncestorTreeOptions' plg.report_modes = [REPORT_MODE_BKI] plg = newplugin() -plg.id = 'ancestor_chart' -plg.name = _("Ancestor Tree") +plg.id = 'ancestor_chart' +plg.name = _("Ancestor Tree") plg.description = _("Produces a graphical ancestral tree") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -71,8 +71,8 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_CLI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'calendar' -plg.name = _("Calendar") +plg.id = 'calendar' +plg.name = _("Calendar") plg.description = _("Produces a graphical calendar") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -93,8 +93,8 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'descend_chart,BKI' -plg.name = _("Descendant Chart") +plg.id = 'descend_chart,BKI' +plg.name = _("Descendant Chart") plg.description = _("Produces a graphical descendant chart") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -109,8 +109,8 @@ plg.optionclass = 'DescendTreeOptions' plg.report_modes = [REPORT_MODE_BKI] plg = newplugin() -plg.id = 'descend_chart' -plg.name = _("Descendant Tree") +plg.id = 'descend_chart' +plg.name = _("Descendant Tree") plg.description = _("Produces a graphical descendant tree") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -131,8 +131,8 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_CLI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'family_descend_chart,BKI' -plg.name = _("Family Descendant Chart") +plg.id = 'family_descend_chart,BKI' +plg.name = _("Family Descendant Chart") plg.description = _("Produces a graphical descendant chart around a family") plg.version = '1.0' plg.status = STABLE @@ -148,8 +148,8 @@ plg.optionclass = 'DescendTreeOptions' plg.report_modes = [REPORT_MODE_BKI] plg = newplugin() -plg.id = 'family_descend_chart' -plg.name = _("Family Descendant Tree") +plg.id = 'family_descend_chart' +plg.name = _("Family Descendant Tree") plg.description = _("Produces a graphical descendant tree around a family") plg.version = '1.0' plg.status = STABLE @@ -171,8 +171,8 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_CLI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'fan_chart' -plg.name = _("Fan Chart") +plg.id = 'fan_chart' +plg.name = _("Fan Chart") plg.description = _("Produces fan charts") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -193,8 +193,8 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'statistics_chart' -plg.name = _("Statistics Charts") +plg.id = 'statistics_chart' +plg.name = _("Statistics Charts") plg.description = _("Produces statistical bar and pie charts of the people " "in the database") plg.version = '1.0' @@ -217,8 +217,8 @@ plg.require_active = False #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'timeline' -plg.name = _("Timeline Chart") +plg.id = 'timeline' +plg.name = _("Timeline Chart") plg.description = _("Produces a timeline chart.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION diff --git a/gramps/plugins/export/export.gpr.py b/gramps/plugins/export/export.gpr.py index fc005ef71..38a9333b9 100644 --- a/gramps/plugins/export/export.gpr.py +++ b/gramps/plugins/export/export.gpr.py @@ -30,9 +30,9 @@ MODULE_VERSION="5.1" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'ex_csv' -plg.name = _("Comma Separated Values Spreadsheet (CSV)") -plg.name_accell = _("Comma _Separated Values Spreadsheet (CSV)") +plg.id = 'ex_csv' +plg.name = _("Comma Separated Values Spreadsheet (CSV)") +plg.name_accell = _("Comma _Separated Values Spreadsheet (CSV)") plg.description = _("CSV is a common spreadsheet format.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -51,9 +51,9 @@ plg.extension = "csv" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'ex_webfamtree' -plg.name = _('Web Family Tree') -plg.name_accell = _('_Web Family Tree') +plg.id = 'ex_webfamtree' +plg.name = _('Web Family Tree') +plg.name_accell = _('_Web Family Tree') plg.description = _("Web Family Tree format") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -72,9 +72,9 @@ plg.extension = "wft" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'ex_ged' -plg.name = _('GEDCOM') -plg.name_accell = _('GE_DCOM') +plg.id = 'ex_ged' +plg.name = _('GEDCOM') +plg.name_accell = _('GE_DCOM') plg.description = _('GEDCOM is used to transfer data between genealogy programs. ' 'Most genealogy software will accept a GEDCOM file as input.') plg.version = '1.0' @@ -94,9 +94,9 @@ plg.extension = "ged" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'ex_geneweb' -plg.name = _('GeneWeb') -plg.name_accell = _('_GeneWeb') +plg.id = 'ex_geneweb' +plg.name = _('GeneWeb') +plg.name_accell = _('_GeneWeb') plg.description = _('GeneWeb is a web based genealogy program.') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -115,9 +115,9 @@ plg.extension = "gw" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'ex_gpkg' -plg.name = _('Gramps XML Package (family tree and media)') -plg.name_accell = _('Gra_mps XML Package (family tree and media)') +plg.id = 'ex_gpkg' +plg.name = _('Gramps XML Package (family tree and media)') +plg.name_accell = _('Gra_mps XML Package (family tree and media)') plg.description = _('Gramps package is an archived XML family tree together ' 'with the media object files.') plg.version = '1.0' @@ -137,9 +137,9 @@ plg.extension = "gpkg" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'ex_gramps' -plg.name = _('Gramps XML (family tree)') -plg.name_accell = _('Gramps _XML (family tree)') +plg.id = 'ex_gramps' +plg.name = _('Gramps XML (family tree)') +plg.name_accell = _('Gramps _XML (family tree)') plg.description = _('Gramps XML export is a complete archived XML backup of a' ' Gramps family tree without the media object files.' ' Suitable for backup purposes.') @@ -160,9 +160,9 @@ plg.extension = "gramps" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'ex_vcal' -plg.name = _('vCalendar') -plg.name_accell = _('vC_alendar') +plg.id = 'ex_vcal' +plg.name = _('vCalendar') +plg.name_accell = _('vC_alendar') plg.description = _('vCalendar is used in many calendaring and PIM applications.') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -181,9 +181,9 @@ plg.extension = "vcs" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'ex_vcard' -plg.name = _('vCard') -plg.name_accell = _('_vCard') +plg.id = 'ex_vcard' +plg.name = _('vCard') +plg.name_accell = _('_vCard') plg.description = _('vCard is used in many addressbook and pim applications.') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION diff --git a/gramps/plugins/export/exportcsv.py b/gramps/plugins/export/exportcsv.py index 76f196b88..42896862e 100644 --- a/gramps/plugins/export/exportcsv.py +++ b/gramps/plugins/export/exportcsv.py @@ -76,7 +76,7 @@ def exportData(database, filename, user, option_box=None): #------------------------------------------------------------------------- def sortable_string_representation(text): numeric = "" - alpha = "" + alpha = "" for s in text: if s.isdigit(): numeric += s diff --git a/gramps/plugins/graph/graphplugins.gpr.py b/gramps/plugins/graph/graphplugins.gpr.py index e28c2319f..71884e530 100644 --- a/gramps/plugins/graph/graphplugins.gpr.py +++ b/gramps/plugins/graph/graphplugins.gpr.py @@ -32,8 +32,8 @@ MODULE_VERSION="5.1" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'familylines_graph' -plg.name = _("Family Lines Graph") +plg.id = 'familylines_graph' +plg.name = _("Family Lines Graph") plg.description = _("Produces family line graphs using Graphviz.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -55,8 +55,8 @@ plg.require_active = False #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'hourglass_graph' -plg.name = _("Hourglass Graph") +plg.id = 'hourglass_graph' +plg.name = _("Hourglass Graph") plg.description = _("Produces an hourglass graph using Graphviz.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -77,8 +77,8 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_CLI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'rel_graph' -plg.name = _("Relationship Graph") +plg.id = 'rel_graph' +plg.name = _("Relationship Graph") plg.description = _("Produces relationship graphs using Graphviz.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION diff --git a/gramps/plugins/importer/import.gpr.py b/gramps/plugins/importer/import.gpr.py index 712ef0c6f..c4ef9e4d7 100644 --- a/gramps/plugins/importer/import.gpr.py +++ b/gramps/plugins/importer/import.gpr.py @@ -32,8 +32,8 @@ MODULE_VERSION="5.1" _mime_type = "text/x-comma-separated-values" # CSV Document _mime_type_rfc_4180 = "text/csv" # CSV Document See rfc4180 for mime type plg = newplugin() -plg.id = 'im_csv' -plg.name = _("Comma Separated Values Spreadsheet (CSV)") +plg.id = 'im_csv' +plg.name = _("Comma Separated Values Spreadsheet (CSV)") plg.description = _("Import data from CSV files") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -50,8 +50,8 @@ plg.extension = "csv" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'im_ged' -plg.name = _('GEDCOM') +plg.id = 'im_ged' +plg.name = _('GEDCOM') plg.description = _('GEDCOM is used to transfer data between genealogy programs. ' 'Most genealogy software will accept a GEDCOM file as input.') plg.version = '1.0' @@ -69,8 +69,8 @@ plg.extension = "ged" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'im_geneweb' -plg.name = _('GeneWeb') +plg.id = 'im_geneweb' +plg.name = _('GeneWeb') plg.description = _('Import data from GeneWeb files') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -87,8 +87,8 @@ plg.extension = "gw" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'im_gpkg' -plg.name = _('Gramps package (portable XML)') +plg.id = 'im_gpkg' +plg.name = _('Gramps package (portable XML)') plg.description = _('Import data from a Gramps package (an archived XML ' 'Family Tree together with the media object files.)') plg.version = '1.0' @@ -106,8 +106,8 @@ plg.extension = "gpkg" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'im_gramps' -plg.name = _('Gramps XML Family Tree') +plg.id = 'im_gramps' +plg.name = _('Gramps XML Family Tree') plg.description = _('The Gramps XML format is a text ' 'version of a Family Tree. It is ' 'read-write compatible with the ' @@ -127,8 +127,8 @@ plg.extension = "gramps" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'im_grdb' -plg.name = _('Gramps 2.x database') +plg.id = 'im_grdb' +plg.name = _('Gramps 2.x database') plg.description = _('Import data from Gramps 2.x database files') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -145,8 +145,8 @@ plg.extension = "grdb" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'im_progen' -plg.name = _('Pro-Gen') +plg.id = 'im_progen' +plg.name = _('Pro-Gen') plg.description = _('Import data from Pro-Gen files') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -163,8 +163,8 @@ plg.extension = "def" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'im_vcard' -plg.name = _('vCard') +plg.id = 'im_vcard' +plg.name = _('vCard') plg.description = _('Import data from vCard files') plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION diff --git a/gramps/plugins/importer/importcsv.py b/gramps/plugins/importer/importcsv.py index b5a1f0bae..ce758f3fe 100644 --- a/gramps/plugins/importer/importcsv.py +++ b/gramps/plugins/importer/importcsv.py @@ -140,8 +140,8 @@ class CSVParser: self.fam_count = 0 self.indi_count = 0 self.place_count = 0 - self.pref = {} # person ref, internal to this sheet - self.fref = {} # family ref, internal to this sheet + self.pref = {} # person ref, internal to this sheet + self.fref = {} # family ref, internal to this sheet self.placeref = {} self.place_types = {} # Build reverse dictionary, name to type number @@ -365,8 +365,8 @@ class CSVParser: self.fam_count = 0 self.indi_count = 0 self.place_count = 0 - self.pref = {} # person ref, internal to this sheet - self.fref = {} # family ref, internal to this sheet + self.pref = {} # person ref, internal to this sheet + self.fref = {} # family ref, internal to this sheet self.placeref = {} header = None line_number = 0 @@ -402,9 +402,9 @@ class CSVParser: def _parse_marriage(self, line_number, row, col): "Parse the content of a Marriage,Husband,Wife line." - marriage_ref = rd(line_number, row, col, "marriage") - husband = rd(line_number, row, col, "husband") - wife = rd(line_number, row, col, "wife") + marriage_ref = rd(line_number, row, col, "marriage") + husband = rd(line_number, row, col, "husband") + wife = rd(line_number, row, col, "wife") marriagedate = rd(line_number, row, col, "date") marriageplace = rd(line_number, row, col, "place") marriageplace_id = rd(line_number, row, col, "place_id") @@ -484,15 +484,15 @@ class CSVParser: def _parse_family(self, line_number, row, col): "Parse the content of a family line" - family_ref = rd(line_number, row, col, "family") + family_ref = rd(line_number, row, col, "family") if family_ref is None: LOG.warning("no family reference found for family on line %d" % line_number) return # required - child = rd(line_number, row, col, "child") - source = rd(line_number, row, col, "source") - note = rd(line_number, row, col, "note") - gender = rd(line_number, row, col, "gender") + child = rd(line_number, row, col, "child") + source = rd(line_number, row, col, "source") + note = rd(line_number, row, col, "note") + gender = rd(line_number, row, col, "gender") child = self.lookup("person", child) family = self.lookup("family", family_ref) if family is None: @@ -560,34 +560,34 @@ class CSVParser: def _parse_person(self, line_number, row, col): "Parse the content of a Person line." - surname = rd(line_number, row, col, "surname") + surname = rd(line_number, row, col, "surname") firstname = rd(line_number, row, col, "firstname", "") - callname = rd(line_number, row, col, "callname") - title = rd(line_number, row, col, "title") - prefix = rd(line_number, row, col, "prefix") - suffix = rd(line_number, row, col, "suffix") - gender = rd(line_number, row, col, "gender") - source = rd(line_number, row, col, "source") - note = rd(line_number, row, col, "note") - birthplace = rd(line_number, row, col, "birthplace") - birthplace_id = rd(line_number, row, col, "birthplace_id") - birthdate = rd(line_number, row, col, "birthdate") + callname = rd(line_number, row, col, "callname") + title = rd(line_number, row, col, "title") + prefix = rd(line_number, row, col, "prefix") + suffix = rd(line_number, row, col, "suffix") + gender = rd(line_number, row, col, "gender") + source = rd(line_number, row, col, "source") + note = rd(line_number, row, col, "note") + birthplace = rd(line_number, row, col, "birthplace") + birthplace_id = rd(line_number, row, col, "birthplace_id") + birthdate = rd(line_number, row, col, "birthdate") birthsource = rd(line_number, row, col, "birthsource") - baptismplace = rd(line_number, row, col, "baptismplace") - baptismplace_id = rd(line_number, row, col, "baptismplace_id") - baptismdate = rd(line_number, row, col, "baptismdate") + baptismplace = rd(line_number, row, col, "baptismplace") + baptismplace_id = rd(line_number, row, col, "baptismplace_id") + baptismdate = rd(line_number, row, col, "baptismdate") baptismsource = rd(line_number, row, col, "baptismsource") - burialplace = rd(line_number, row, col, "burialplace") - burialplace_id = rd(line_number, row, col, "burialplace_id") - burialdate = rd(line_number, row, col, "burialdate") + burialplace = rd(line_number, row, col, "burialplace") + burialplace_id = rd(line_number, row, col, "burialplace_id") + burialdate = rd(line_number, row, col, "burialdate") burialsource = rd(line_number, row, col, "burialsource") - deathplace = rd(line_number, row, col, "deathplace") - deathplace_id = rd(line_number, row, col, "deathplace_id") - deathdate = rd(line_number, row, col, "deathdate") + deathplace = rd(line_number, row, col, "deathplace") + deathplace_id = rd(line_number, row, col, "deathplace_id") + deathdate = rd(line_number, row, col, "deathdate") deathsource = rd(line_number, row, col, "deathsource") - deathcause = rd(line_number, row, col, "deathcause") - grampsid = rd(line_number, row, col, "grampsid") - person_ref = rd(line_number, row, col, "person") + deathcause = rd(line_number, row, col, "deathcause") + grampsid = rd(line_number, row, col, "grampsid") + person_ref = rd(line_number, row, col, "person") ######################################################### # if this person already exists, don't create them person = self.lookup("person", person_ref) diff --git a/gramps/plugins/importer/importxml.py b/gramps/plugins/importer/importxml.py index 72b200cbe..bfba05633 100644 --- a/gramps/plugins/importer/importxml.py +++ b/gramps/plugins/importer/importxml.py @@ -538,7 +538,7 @@ class GrampsParser(UpdateCallback): self.media_file_map = {} # List of new name formats and a dict for remapping them - self.name_formats = [] + self.name_formats = [] self.name_formats_map = {} self.taken_name_format_numbers = [num[0] for num in self.db.name_formats] @@ -2353,7 +2353,7 @@ class GrampsParser(UpdateCallback): date_value = self.place_name.get_date_object() start = attrs['start'].split('-') - stop = attrs['stop'].split('-') + stop = attrs['stop'].split('-') try: year = int(start[0]) diff --git a/gramps/plugins/lib/libpersonview.py b/gramps/plugins/lib/libpersonview.py index 4a91dccc8..c10ecd600 100644 --- a/gramps/plugins/lib/libpersonview.py +++ b/gramps/plugins/lib/libpersonview.py @@ -121,10 +121,10 @@ class BasePersonView(ListView): ('columns.size', [250, 75, 75, 100, 175, 100, 175, 100, 30, 30, 30, 30, 30, 100, 100]) ) - ADD_MSG = _("Add a new person") - EDIT_MSG = _("Edit the selected person") - DEL_MSG = _("Delete the selected person") - MERGE_MSG = _("Merge the selected persons") + ADD_MSG = _("Add a new person") + EDIT_MSG = _("Edit the selected person") + DEL_MSG = _("Delete the selected person") + MERGE_MSG = _("Merge the selected persons") FILTER_TYPE = "Person" QR_CATEGORY = CATEGORY_QR_PERSON diff --git a/gramps/plugins/lib/libplaceview.py b/gramps/plugins/lib/libplaceview.py index 8da363d7d..603060500 100644 --- a/gramps/plugins/lib/libplaceview.py +++ b/gramps/plugins/lib/libplaceview.py @@ -100,10 +100,10 @@ class PlaceBaseView(ListView): COL_LAT, COL_LON, COL_PRIV, COL_TAGS, COL_CHAN]), ('columns.size', [250, 250, 75, 100, 100, 150, 150, 40, 100, 100]) ) - ADD_MSG = _("Add a new place") - EDIT_MSG = _("Edit the selected place") - DEL_MSG = _("Delete the selected place") - MERGE_MSG = _("Merge the selected places") + ADD_MSG = _("Add a new place") + EDIT_MSG = _("Edit the selected place") + DEL_MSG = _("Delete the selected place") + MERGE_MSG = _("Merge the selected places") FILTER_TYPE = "Place" QR_CATEGORY = CATEGORY_QR_PLACE diff --git a/gramps/plugins/lib/libplugins.gpr.py b/gramps/plugins/lib/libplugins.gpr.py index b5c0e92fb..0056f0b0a 100644 --- a/gramps/plugins/lib/libplugins.gpr.py +++ b/gramps/plugins/lib/libplugins.gpr.py @@ -30,8 +30,8 @@ MODULE_VERSION="5.1" # #------------------------------------------------------------------------ register(GENERAL, -id = 'libcairodoc', -name = "Cairodoc lib", +id = 'libcairodoc', +name = "Cairodoc lib", description = _("Provides a library for using Cairo to " "generate documents."), version = '1.0', @@ -49,8 +49,8 @@ authors_email = ["http://gramps-project.org"], # #------------------------------------------------------------------------ register(GENERAL, -id = 'libgedcom', -name = "GEDCOM library", +id = 'libgedcom', +name = "GEDCOM library", description = _("Provides GEDCOM processing functionality"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -83,8 +83,8 @@ register(GENERAL, # #------------------------------------------------------------------------ register(GENERAL, -id = 'libgrampsxml', -name = "Grampsxml lib", +id = 'libgrampsxml', +name = "Grampsxml lib", description = _("Provides common functionality for Gramps XML " "import/export."), version = '1.0', @@ -102,8 +102,8 @@ authors_email = ["http://gramps-project.org"], # #------------------------------------------------------------------------ register(GENERAL, -id = 'libholiday', -name = "holiday lib", +id = 'libholiday', +name = "holiday lib", description = _("Provides holiday information for different countries.") , version = '1.0', gramps_target_version = MODULE_VERSION, @@ -120,8 +120,8 @@ authors_email = ["http://gramps-project.org"], # #------------------------------------------------------------------------ register(GENERAL, -id = 'libhtmlbackend', -name = "htmlbackend lib", +id = 'libhtmlbackend', +name = "htmlbackend lib", description = _("Manages a HTML file implementing DocBackend.") , version = '1.0', gramps_target_version = MODULE_VERSION, @@ -138,8 +138,8 @@ authors_email = ["http://gramps-project.org"], # #------------------------------------------------------------------------ register(GENERAL, -id = 'libhtmlconst', -name = "htmlconst lib", +id = 'libhtmlconst', +name = "htmlconst lib", description = _("Common constants for html files.") , version = '1.0', gramps_target_version = MODULE_VERSION, @@ -156,8 +156,8 @@ authors_email = ["http://gramps-project.org"], # #------------------------------------------------------------------------ register(GENERAL, -id = 'libhtml', -name = "html lib", +id = 'libhtml', +name = "html lib", description = _("Manages an HTML DOM tree.") , version = '1.0', gramps_target_version = MODULE_VERSION, @@ -174,8 +174,8 @@ authors_email = ["gerald.britton@gmail.com"], # #------------------------------------------------------------------------ register(GENERAL, -id = 'libmapservice', -name = "mapservice lib", +id = 'libmapservice', +name = "mapservice lib", description = _("Provides base functionality for map services.") , version = '1.0', gramps_target_version = MODULE_VERSION, @@ -191,8 +191,8 @@ authors_email = ["http://gramps-project.org"], # #------------------------------------------------------------------------ register(GENERAL, -id = 'libnarrate', -name = "narration lib", +id = 'libnarrate', +name = "narration lib", description = _("Provides Textual Narration.") , version = '1.0', gramps_target_version = MODULE_VERSION, @@ -208,8 +208,8 @@ authors_email = ["brian@gramps-project.org"], # #------------------------------------------------------------------------ register(GENERAL, -id = 'libodfbackend', -name = "odfbackend lib", +id = 'libodfbackend', +name = "odfbackend lib", description = _("Manages an ODF file implementing DocBackend.") , version = '1.0', gramps_target_version = MODULE_VERSION, @@ -225,8 +225,8 @@ authors_email = ["http://gramps-project.org"], # #------------------------------------------------------------------------ register(GENERAL, -id = 'libpersonview', -name = "person list lib", +id = 'libpersonview', +name = "person list lib", description = _("Provides the Base needed for the List People views.") , version = '1.0', gramps_target_version = MODULE_VERSION, @@ -242,8 +242,8 @@ authors_email = ["http://gramps-project.org"], # #------------------------------------------------------------------------ register(GENERAL, -id = 'libprogen', -name = "Pro-Gen lib", +id = 'libprogen', +name = "Pro-Gen lib", description = _("Provides common functionality for Pro-Gen import"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -260,8 +260,8 @@ authors_email = ["http://gramps-project.org"], # #------------------------------------------------------------------------ register(GENERAL, -id = 'libplaceview', -name = "place list lib", +id = 'libplaceview', +name = "place list lib", description = _("Provides the Base needed for the List Place views.") , version = '1.0', gramps_target_version = MODULE_VERSION, @@ -277,8 +277,8 @@ authors_email = ["http://gramps-project.org"], # #------------------------------------------------------------------------ register(GENERAL, -id = 'libsubstkeyword', -name = "Substitution Values", +id = 'libsubstkeyword', +name = "Substitution Values", description = _("Provides variable substitution on display lines.") , version = '1.0', gramps_target_version = MODULE_VERSION, @@ -294,8 +294,8 @@ authors_email = ["http://gramps-project.org"], # #------------------------------------------------------------------------ register(GENERAL, -id = 'libtreebase', -name = "Graphical report lib", +id = 'libtreebase', +name = "Graphical report lib", description = _("Provides the base needed for the ancestor and " "descendant graphical reports.") , version = '1.0', diff --git a/gramps/plugins/lib/libsubstkeyword.py b/gramps/plugins/lib/libsubstkeyword.py index b7acdac10..3a9d5d34a 100644 --- a/gramps/plugins/lib/libsubstkeyword.py +++ b/gramps/plugins/lib/libsubstkeyword.py @@ -1377,7 +1377,7 @@ if __name__ == '__main__': name_to_test = Name() def name_set(): - #code = "tfcnxslg" + #code = "tfcnxslg" name_to_test.set_call_name("Bob" if 0 in y_or_n else "") name_to_test.set_title("Dr." if 1 in y_or_n else "") name_to_test.set_first_name("Billy" if 2 in y_or_n else "") diff --git a/gramps/plugins/lib/libtreebase.py b/gramps/plugins/lib/libtreebase.py index cb6f573dc..e5c158cc8 100644 --- a/gramps/plugins/lib/libtreebase.py +++ b/gramps/plugins/lib/libtreebase.py @@ -861,7 +861,7 @@ class LineBase: xbegin = start.x_cm + start.width - page.page_x_offset # out 3/4 of the way and x_cm end point(s) - x34 = xbegin + (report_opts.col_width * 3/4) + x34 = xbegin + (report_opts.col_width * 3/4) xend = xbegin + report_opts.col_width if x34 > 0: # > 0 tell us we are printing on this page. diff --git a/gramps/plugins/lib/maps/constants.py b/gramps/plugins/lib/maps/constants.py index 391552351..45c0a5d14 100644 --- a/gramps/plugins/lib/maps/constants.py +++ b/gramps/plugins/lib/maps/constants.py @@ -48,22 +48,22 @@ ICONS = { } # map providers -OPENSTREETMAP = 1 -OPENSTREETMAP_RENDERER = 2 -OPENAERIALMAP = 3 -MAPS_FOR_FREE = 4 -OPENCYCLEMAP = 5 -OSM_PUBLIC_TRANSPORT = 6 -OSMC_TRAILS = 7 -GOOGLE_STREET = 8 -GOOGLE_SATELLITE = 9 -GOOGLE_HYBRID = 10 -VIRTUAL_EARTH_STREET = 11 +OPENSTREETMAP = 1 +OPENSTREETMAP_RENDERER = 2 +OPENAERIALMAP = 3 +MAPS_FOR_FREE = 4 +OPENCYCLEMAP = 5 +OSM_PUBLIC_TRANSPORT = 6 +OSMC_TRAILS = 7 +GOOGLE_STREET = 8 +GOOGLE_SATELLITE = 9 +GOOGLE_HYBRID = 10 +VIRTUAL_EARTH_STREET = 11 VIRTUAL_EARTH_SATELLITE = 12 -VIRTUAL_EARTH_HYBRID = 13 -YAHOO_STREET = 14 -YAHOO_SATELLITE = 15 -YAHOO_HYBRID = 16 +VIRTUAL_EARTH_HYBRID = 13 +YAHOO_STREET = 14 +YAHOO_SATELLITE = 15 +YAHOO_HYBRID = 16 TILES_PATH = { OPENSTREETMAP : "openstreetmap", diff --git a/gramps/plugins/mapservices/mapservice.gpr.py b/gramps/plugins/mapservices/mapservice.gpr.py index c9add64fc..eb2f77571 100644 --- a/gramps/plugins/mapservices/mapservice.gpr.py +++ b/gramps/plugins/mapservices/mapservice.gpr.py @@ -29,8 +29,8 @@ MODULE_VERSION="5.1" #------------------------------------------------------------------------ register(MAPSERVICE, -id = 'EniroMaps', -name = _("EniroMaps"), +id = 'EniroMaps', +name = _("EniroMaps"), description = _("Opens on kartor.eniro.se"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -48,8 +48,8 @@ mapservice = 'EniroSVMapService' #------------------------------------------------------------------------ register(MAPSERVICE, -id = 'GoogleMaps', -name = _("GoogleMaps"), +id = 'GoogleMaps', +name = _("GoogleMaps"), description = _("Open on maps.google.com"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -67,8 +67,8 @@ mapservice = 'GoogleMapService' #------------------------------------------------------------------------ register(MAPSERVICE, -id = 'OpenStreetMap', -name = _("OpenStreetMap"), +id = 'OpenStreetMap', +name = _("OpenStreetMap"), description = _("Open on openstreetmap.org"), version = '1.0', gramps_target_version = MODULE_VERSION, diff --git a/gramps/plugins/quickview/all_relations.py b/gramps/plugins/quickview/all_relations.py index ae606b3a8..58c70dd1c 100644 --- a/gramps/plugins/quickview/all_relations.py +++ b/gramps/plugins/quickview/all_relations.py @@ -36,7 +36,7 @@ from gramps.gen.relationship import get_relationship_calculator # define the formatting string once as a constant. Since this is reused -_FMT = "%-3d %s" +_FMT = "%-3d %s" _FMT_VOID = " %s" _FMT_DET1 = "%-3s %-15s" _FMT_DET2 = "%-30s %-15s\t%-10s %-2s" @@ -56,7 +56,7 @@ class AllRelReport: """ def __init__(self, database, document, person): self.database = database - self.person = person + self.person = person self.sdb = SimpleAccess(database) self.sdoc = SimpleDoc(document) self.rel_class = get_relationship_calculator(glocale) diff --git a/gramps/plugins/quickview/lineage.py b/gramps/plugins/quickview/lineage.py index 08c0a6f23..a050ff3ae 100644 --- a/gramps/plugins/quickview/lineage.py +++ b/gramps/plugins/quickview/lineage.py @@ -36,7 +36,7 @@ from gramps.gui.plug.quick import QuickTable from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext -__FMT = "%-30s\t%-12s\t%-12s" +__FMT = "%-30s\t%-12s\t%-12s" __FMT_REM = " %s: %s" __MAX_GEN = 100 diff --git a/gramps/plugins/quickview/quickview.gpr.py b/gramps/plugins/quickview/quickview.gpr.py index ca1865f1d..c78b59e62 100644 --- a/gramps/plugins/quickview/quickview.gpr.py +++ b/gramps/plugins/quickview/quickview.gpr.py @@ -31,8 +31,8 @@ MODULE_VERSION="5.1" #------------------------------------------------------------------------ register(QUICKREPORT, -id = 'ageondate', -name = _("Age on Date"), +id = 'ageondate', +name = _("Age on Date"), description = _("Display people and ages on a particular date"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -51,8 +51,8 @@ runfunc = 'run' #------------------------------------------------------------------------ register(QUICKREPORT, -id = 'attribute_match', -name = _("Attribute Match"), +id = 'attribute_match', +name = _("Attribute Match"), description = _("Display people with same attribute."), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -71,8 +71,8 @@ runfunc = 'run' #------------------------------------------------------------------------ register(QUICKREPORT, -id = 'all_events', -name = _("All Events"), +id = 'all_events', +name = _("All Events"), description = _("Display a person's events, both personal and family."), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -86,8 +86,8 @@ runfunc = 'run' register(QUICKREPORT, -id = 'all_events_fam', -name = _("All Family Events"), +id = 'all_events_fam', +name = _("All Family Events"), description = _("Display the family and family members events."), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -106,8 +106,8 @@ runfunc = 'run_fam' #------------------------------------------------------------------------ register(QUICKREPORT, -id = 'all_relations', -name = _("Relation to Home Person"), +id = 'all_relations', +name = _("Relation to Home Person"), description = _("Display all relationships between person and home person."), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -126,8 +126,8 @@ runfunc = 'run' #------------------------------------------------------------------------ register(QUICKREPORT, -id = 'filterbyname', -name = _("Filter"), +id = 'filterbyname', +name = _("Filter"), description = _("Display filtered data"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -146,8 +146,8 @@ runfunc = 'run' #------------------------------------------------------------------------ register(QUICKREPORT, -id = 'father_lineage', -name = _("Father lineage"), +id = 'father_lineage', +name = _("Father lineage"), description = _("Display father lineage"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -160,8 +160,8 @@ runfunc = 'run_father' ) register(QUICKREPORT, -id = 'mother_lineage', -name = _("Mother lineage"), +id = 'mother_lineage', +name = _("Mother lineage"), description = _("Display mother lineage"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -180,8 +180,8 @@ runfunc = 'run_mother' #------------------------------------------------------------------------ register(QUICKREPORT, -id = 'onthisday', -name = _("On This Day"), +id = 'onthisday', +name = _("On This Day"), description = _("Display events on a particular day"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -213,8 +213,8 @@ refitems = [(CATEGORY_QR_PERSON, 'person', _("Person")), for (category, item, trans) in refitems: register(QUICKREPORT, - id = item + 'references', - name = _("%s References") % trans, + id = item + 'references', + name = _("%s References") % trans, description = _("Display references for a %s") % trans, version = '1.0', gramps_target_version = MODULE_VERSION, @@ -227,8 +227,8 @@ for (category, item, trans) in refitems: ) register(QUICKREPORT, - id = 'link_references', - name = _("Link References"), + id = 'link_references', + name = _("Link References"), description = _("Display link references for a note"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -247,8 +247,8 @@ register(QUICKREPORT, #------------------------------------------------------------------------ register(QUICKREPORT, -id = 'RepoRef', -name = _("Repository References"), +id = 'RepoRef', +name = _("Repository References"), description = _("Display the repository reference for sources related to" " the active repository"), version = '1.0', @@ -268,8 +268,8 @@ runfunc = 'run' #------------------------------------------------------------------------ register(QUICKREPORT, -id = 'samesurnames', -name = _("Same Surnames"), +id = 'samesurnames', +name = _("Same Surnames"), description = _("Display people with the same surname as a person."), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -282,8 +282,8 @@ runfunc = 'run' ) register(QUICKREPORT, -id = 'samegivens', -name = _("Same Given Names"), +id = 'samegivens', +name = _("Same Given Names"), description = _("Display people with the same given name as a person."), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -296,8 +296,8 @@ runfunc = 'run_given' ) register(QUICKREPORT, -id = 'samegivens_misc', -name = _("Same Given Names - stand-alone"), +id = 'samegivens_misc', +name = _("Same Given Names - stand-alone"), description = _("Display people with the same given name as a person."), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -315,8 +315,8 @@ runfunc = 'run_given' # #------------------------------------------------------------------------ register(QUICKREPORT, -id = 'siblings', -name = _("Siblings"), +id = 'siblings', +name = _("Siblings"), description = _("Display a person's siblings."), version = '1.0', gramps_target_version = MODULE_VERSION, diff --git a/gramps/plugins/quickview/references.py b/gramps/plugins/quickview/references.py index a617c615f..1ab2f5c88 100644 --- a/gramps/plugins/quickview/references.py +++ b/gramps/plugins/quickview/references.py @@ -84,11 +84,11 @@ def run(database, document, object, item, trans): #functions for the actual quickreports run_person = lambda db, doc, obj: run(db, doc, obj, 'person', _("Person")) run_family = lambda db, doc, obj: run(db, doc, obj, 'family', _("Family")) -run_event = lambda db, doc, obj: run(db, doc, obj, 'event', _("Event")) +run_event = lambda db, doc, obj: run(db, doc, obj, 'event', _("Event")) run_source = lambda db, doc, obj: run(db, doc, obj, 'source', _("Source")) run_citation = lambda db, doc, obj: run(db, doc, obj, 'citation', _("Citation")) run_source_or_citation = lambda db, doc, obj: run(db, doc, obj, 'source or citation', _("Source or Citation")) -run_place = lambda db, doc, obj: run(db, doc, obj, 'place', _("Place")) -run_media = lambda db, doc, obj: run(db, doc, obj, 'media', _("Media")) -run_note = lambda db, doc, obj: run(db, doc, obj, 'note', _("Note")) +run_place = lambda db, doc, obj: run(db, doc, obj, 'place', _("Place")) +run_media = lambda db, doc, obj: run(db, doc, obj, 'media', _("Media")) +run_note = lambda db, doc, obj: run(db, doc, obj, 'note', _("Note")) diff --git a/gramps/plugins/quickview/samesurnames.py b/gramps/plugins/quickview/samesurnames.py index d7263a047..93d6bf148 100644 --- a/gramps/plugins/quickview/samesurnames.py +++ b/gramps/plugins/quickview/samesurnames.py @@ -36,9 +36,9 @@ from gramps.gen.filters import GenericFilterFactory class IncompleteSurname(Rule): """People with incomplete surnames""" - name = _('People with incomplete surnames') + name = _('People with incomplete surnames') description = _("Matches people with lastname missing") - category = _('General filters') + category = _('General filters') def apply(self, db, person): for name in [person.get_primary_name()] + person.get_alternate_names(): if name.get_group_name() == "": @@ -47,10 +47,10 @@ class IncompleteSurname(Rule): class SameSurname(Rule): """People with same surname""" - labels = [_('Substring:')] - name = _('People matching the ') + labels = [_('Substring:')] + name = _('People matching the ') description = _("Matches people with same lastname") - category = _('General filters') + category = _('General filters') def apply(self, db, person): src = self.list[0].upper() for name in [person.get_primary_name()] + person.get_alternate_names(): @@ -60,10 +60,10 @@ class SameSurname(Rule): class SameGiven(Rule): """People with same given name""" - labels = [_('Substring:')] - name = _('People matching the ') + labels = [_('Substring:')] + name = _('People matching the ') description = _("Matches people with same given name") - category = _('General filters') + category = _('General filters') def apply(self, db, person): src = self.list[0].upper() for name in [person.get_primary_name()] + person.get_alternate_names(): @@ -85,9 +85,9 @@ class SameGiven(Rule): class IncompleteGiven(Rule): """People with incomplete given names""" - name = _('People with incomplete given names') + name = _('People with incomplete given names') description = _("Matches people with firstname missing") - category = _('General filters') + category = _('General filters') def apply(self, db, person): for name in [person.get_primary_name()] + person.get_alternate_names(): if name.get_first_name() == "": diff --git a/gramps/plugins/rel/rel_ca.py b/gramps/plugins/rel/rel_ca.py index 2eb8eb91b..725658959 100644 --- a/gramps/plugins/rel/rel_ca.py +++ b/gramps/plugins/rel/rel_ca.py @@ -711,9 +711,9 @@ def _get_oncle_valencia(levela, levelb, inlaw="", step=""): """ if levela <= levelb: return "error a _get_oncle_valencia" - val_level = levela-levelb - amplada = levelb-1 - retorn = _get_uncle(val_level+1, "", step) + val_level = levela-levelb + amplada = levelb-1 + retorn = _get_uncle(val_level+1, "", step) if amplada == 1: stramplada = "" else: @@ -728,9 +728,9 @@ def _get_oncles_valencians(levela, levelb, inlaw=""): inlaw += "s" if levela <= levelb: return "error a _get_oncles_valencians" - val_level = levela-levelb - amplada = levelb-1 - retorn = _get_uncles(val_level+1, "") + val_level = levela-levelb + amplada = levelb-1 + retorn = _get_uncles(val_level+1, "") if amplada == 1: stramplada = "" else: @@ -743,9 +743,9 @@ def _get_nebot_valencia(levela, levelb, inlaw="", step=""): """ if levelb <= levela: return "error a _get_nebot_valencia" - val_level = levelb-levela - amplada = levela - 1 - retorn = _get_nephew(val_level, "", step) + val_level = levelb-levela + amplada = levela - 1 + retorn = _get_nephew(val_level, "", step) if amplada == 1: stramplada = "" else: @@ -761,9 +761,9 @@ def _get_nebots_valencians(levela, levelb, inlaw=""): inlaw += "s" if levelb <= levela: return "error a _get_nebots_valencians" - val_level = levelb-levela - amplada = levela - 1 - retorn = _get_nephews(val_level+1, "") + val_level = levelb-levela + amplada = levela - 1 + retorn = _get_nephews(val_level+1, "") if amplada == 1: stramplada = "" else: @@ -779,9 +779,9 @@ def _get_tia_valenciana(levela, levelb, inlaw="", step=""): inlaw += "a" if levela <= levelb: return "error a _get_tia_valenciana" - val_level = levela-levelb - amplada = levelb-1 - retorn = _get_aunt(val_level+1, "", step) + val_level = levela-levelb + amplada = levelb-1 + retorn = _get_aunt(val_level+1, "", step) if amplada == 1: stramplada = "" else: @@ -797,9 +797,9 @@ def _get_neboda_valenciana(levela, levelb, inlaw="", step=""): inlaw += "a" if levelb <= levela: return "error a _get_neboda_valenciana" - val_level = levelb-levela - amplada = levela - 1 - retorn = _get_niece(val_level, "", step) + val_level = levelb-levela + amplada = levela - 1 + retorn = _get_niece(val_level, "", step) if amplada == 1: stramplada = "" else: diff --git a/gramps/plugins/rel/relplugins.gpr.py b/gramps/plugins/rel/relplugins.gpr.py index 1c3399e71..536cdfb2c 100644 --- a/gramps/plugins/rel/relplugins.gpr.py +++ b/gramps/plugins/rel/relplugins.gpr.py @@ -30,8 +30,8 @@ MODULE_VERSION="5.1" # ca plg = newplugin() -plg.id = 'relcalc_ca' -plg.name = _("Catalan Relationship Calculator") +plg.id = 'relcalc_ca' +plg.name = _("Catalan Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -44,8 +44,8 @@ plg.lang_list = ['ca_ES', 'ca', 'català', 'Catalan', 'ca_FR', 'ca_AD', 'ca_IT'] # cs plg = newplugin() -plg.id = 'relcalc_cs' -plg.name = _("Czech Relationship Calculator") +plg.id = 'relcalc_cs' +plg.name = _("Czech Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -57,8 +57,8 @@ plg.lang_list = ["cs", "CZ", "cs_CZ", "česky", "czech", "Czech", "cs_CZ.UTF8", # da plg = newplugin() -plg.id = 'relcalc_da' -plg.name = _("Danish Relationship Calculator") +plg.id = 'relcalc_da' +plg.name = _("Danish Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -73,8 +73,8 @@ plg.lang_list = [ "da", "DA", "da_DK", "danish", "Danish", "da_DK.UTF8", # de plg = newplugin() -plg.id = 'relcalc_de' -plg.name = _("German Relationship Calculator") +plg.id = 'relcalc_de' +plg.name = _("German Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -89,8 +89,8 @@ plg.lang_list = ["de", "DE", "de_DE", "deutsch", "Deutsch", "de_DE.UTF8", # es plg = newplugin() -plg.id = 'relcalc_es' -plg.name = _("Spanish Relationship Calculator") +plg.id = 'relcalc_es' +plg.name = _("Spanish Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -104,8 +104,8 @@ plg.lang_list = ["es", "ES", "es_ES", "espanol", "Espanol", "es_ES.UTF8", # fi plg = newplugin() -plg.id = 'relcalc_fi' -plg.name = _("Finnish Relationship Calculator") +plg.id = 'relcalc_fi' +plg.name = _("Finnish Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -119,8 +119,8 @@ plg.lang_list = ["fi", "FI", "fi_FI", "finnish", "Finnish", "fi_FI.UTF8", # fr plg = newplugin() -plg.id = 'relcalc_fr' -plg.name = _("French Relationship Calculator") +plg.id = 'relcalc_fr' +plg.name = _("French Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -136,8 +136,8 @@ plg.lang_list = ["fr", "FR", "fr_FR", "fr_CA", "français", # hr plg = newplugin() -plg.id = 'relcalc_hr' -plg.name = _("Croatian Relationship Calculator") +plg.id = 'relcalc_hr' +plg.name = _("Croatian Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -150,8 +150,8 @@ plg.lang_list = ["hrvatski", "Hrvatski", "croatian", "Croatian", "hr", "HR", # hu plg = newplugin() -plg.id = 'relcalc_hu' -plg.name = _("Hungarian Relationship Calculator") +plg.id = 'relcalc_hu' +plg.name = _("Hungarian Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -163,8 +163,8 @@ plg.lang_list = ["hu", "HU", "hu_HU", "hu_HU.utf8", "hu_HU.UTF8"] # is plg = newplugin() -plg.id = 'relcalc_is' -plg.name = _("Icelandic Relationship Calculator") +plg.id = 'relcalc_is' +plg.name = _("Icelandic Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -176,8 +176,8 @@ plg.lang_list = ["is", "IS", "is_IS", "is_IS@euro", "is_IS.utf8"] # it plg = newplugin() -plg.id = 'relcalc_it' -plg.name = _("Italian Relationship Calculator") +plg.id = 'relcalc_it' +plg.name = _("Italian Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -189,8 +189,8 @@ plg.lang_list = ["it", "IT", "it_IT", "it_IT@euro", "it_IT.utf8"] # nl plg = newplugin() -plg.id = 'relcalc_nl' -plg.name = _("Dutch Relationship Calculator") +plg.id = 'relcalc_nl' +plg.name = _("Dutch Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -206,8 +206,8 @@ plg.lang_list = ["nl", "NL", "nl_NL", "nl_BE", "nederlands", "Nederlands", # no plg = newplugin() -plg.id = 'relcalc_no' -plg.name = _("Norwegian Relationship Calculator") +plg.id = 'relcalc_no' +plg.name = _("Norwegian Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -223,8 +223,8 @@ plg.lang_list = ["nb", "nn", "no", "nb_NO", "nn_NO", "no_NO", "nb_NO.UTF8", # pl plg = newplugin() -plg.id = 'relcalc_pl' -plg.name = _("Polish Relationship Calculator") +plg.id = 'relcalc_pl' +plg.name = _("Polish Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -239,8 +239,8 @@ plg.lang_list = ["pl", "PL", "pl_PL", "polski", "Polski", # pt plg = newplugin() -plg.id = 'relcalc_pt' -plg.name = _("Portuguese Relationship Calculator") +plg.id = 'relcalc_pt' +plg.name = _("Portuguese Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -255,8 +255,8 @@ plg.lang_list = ["pt", "PT", "pt_PT", "pt_BR", "portugues", "Portugues", # ru plg = newplugin() -plg.id = 'relcalc_ru' -plg.name = _("Russian Relationship Calculator") +plg.id = 'relcalc_ru' +plg.name = _("Russian Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -271,8 +271,8 @@ plg.lang_list = ["ru", "RU", "ru_RU", "koi8r", "ru_koi8r", "russian", # sk plg = newplugin() -plg.id = 'relcalc_sk' -plg.name = _("Slovak Relationship Calculator") +plg.id = 'relcalc_sk' +plg.name = _("Slovak Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -285,8 +285,8 @@ plg.lang_list = ["sk", "SK", "sk_SK", "slovensky", "slovak", "Slovak", # sl plg = newplugin() -plg.id = 'relcalc_sl' -plg.name = _("Slovenian Relationship Calculator") +plg.id = 'relcalc_sl' +plg.name = _("Slovenian Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -298,8 +298,8 @@ plg.lang_list = ["sl", "SL", "sl_SI", "slovenščina", "slovenian", "Slovenian", "sl_SI.UTF8", "sl_SI.UTF-8", "sl_SI.utf-8", "sl_SI.utf8"] # sv plg = newplugin() -plg.id = 'relcalc_sv' -plg.name = _("Swedish Relationship Calculator") +plg.id = 'relcalc_sv' +plg.name = _("Swedish Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -312,8 +312,8 @@ plg.lang_list = ["sv", "SV", "sv_SE", "swedish", "Swedish", "sv_SE.UTF8", "sv_SE.UTF-8", "sv_SE.utf-8", "sv_SE.utf8", "Swedish_Sweden"] # uk plg = newplugin() -plg.id = 'relcalc_uk' -plg.name = _("Ukrainian Relationship Calculator") +plg.id = 'relcalc_uk' +plg.name = _("Ukrainian Relationship Calculator") plg.description = _("Calculates relationships between people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION diff --git a/gramps/plugins/sidebar/sidebar.gpr.py b/gramps/plugins/sidebar/sidebar.gpr.py index d7ec9ed73..d9ae76b47 100644 --- a/gramps/plugins/sidebar/sidebar.gpr.py +++ b/gramps/plugins/sidebar/sidebar.gpr.py @@ -29,8 +29,8 @@ MODULE_VERSION="5.1" #------------------------------------------------------------------------ register(SIDEBAR, -id = 'categorysidebar', -name = _("Category Sidebar"), +id = 'categorysidebar', +name = _("Category Sidebar"), description = _("A sidebar to allow the selection of view categories"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -44,8 +44,8 @@ order = START ) register(SIDEBAR, -id = 'dropdownsidebar', -name = _("Drop-down Sidebar"), +id = 'dropdownsidebar', +name = _("Drop-down Sidebar"), description = _("Selection of categories and views from drop-down lists"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -59,8 +59,8 @@ order = END ) register(SIDEBAR, -id = 'expandersidebar', -name = _("Expander Sidebar"), +id = 'expandersidebar', +name = _("Expander Sidebar"), description = _("Selection of views from lists with expanders"), version = '1.0', gramps_target_version = MODULE_VERSION, diff --git a/gramps/plugins/textreport/textplugins.gpr.py b/gramps/plugins/textreport/textplugins.gpr.py index ab0cdcddc..0bd0a3af0 100644 --- a/gramps/plugins/textreport/textplugins.gpr.py +++ b/gramps/plugins/textreport/textplugins.gpr.py @@ -33,8 +33,8 @@ MODULE_VERSION="5.1" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'ancestor_report' -plg.name = _("Ahnentafel Report") +plg.id = 'ancestor_report' +plg.name = _("Ahnentafel Report") plg.description = _("Produces a textual ancestral report") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -55,8 +55,8 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'birthday_report' -plg.name = _("Birthday and Anniversary Report") +plg.id = 'birthday_report' +plg.name = _("Birthday and Anniversary Report") plg.description = _("Produces a report of birthdays and anniversaries") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -77,8 +77,8 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'custom_text' -plg.name = _("Custom Text") +plg.id = 'custom_text' +plg.name = _("Custom Text") plg.description = _("Add custom text to the book report") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -99,8 +99,8 @@ plg.report_modes = [REPORT_MODE_BKI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'descend_report' -plg.name = _("Descendant Report") +plg.id = 'descend_report' +plg.name = _("Descendant Report") plg.description = _("Produces a list of descendants of the active person") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -121,8 +121,8 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'det_ancestor_report' -plg.name = _("Detailed Ancestral Report") +plg.id = 'det_ancestor_report' +plg.name = _("Detailed Ancestral Report") plg.description = _("Produces a detailed ancestral report") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -143,8 +143,8 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'det_descendant_report' -plg.name = _("Detailed Descendant Report") +plg.id = 'det_descendant_report' +plg.name = _("Detailed Descendant Report") plg.description = _("Produces a detailed descendant report") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -165,8 +165,8 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'endofline_report' -plg.name = _("End of Line Report") +plg.id = 'endofline_report' +plg.name = _("End of Line Report") plg.description = _("Produces a textual end of line report") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -187,8 +187,8 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'family_group' -plg.name = _("Family Group Report") +plg.id = 'family_group' +plg.name = _("Family Group Report") plg.description = _("Produces a family group report showing information " "on a set of parents and their children.") plg.version = '1.0' @@ -210,8 +210,8 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'indiv_complete' -plg.name = _("Complete Individual Report") +plg.id = 'indiv_complete' +plg.name = _("Complete Individual Report") plg.description = _("Produces a complete report on the selected people") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -232,8 +232,8 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'kinship_report' -plg.name = _("Kinship Report") +plg.id = 'kinship_report' +plg.name = _("Kinship Report") plg.description = _("Produces a textual report of kinship for a given person") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -254,8 +254,8 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'tag_report' -plg.name = _("Tag Report") +plg.id = 'tag_report' +plg.name = _("Tag Report") plg.description = _("Produces a list of people with a specified tag") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -277,8 +277,8 @@ plg.require_active = False #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'number_of_ancestors' -plg.name = _("Number of Ancestors Report") +plg.id = 'number_of_ancestors' +plg.name = _("Number of Ancestors Report") plg.description = _("Counts number of ancestors of selected person") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -299,8 +299,8 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_BKI, REPORT_MODE_CLI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'place_report' -plg.name = _("Place Report") +plg.id = 'place_report' +plg.name = _("Place Report") plg.description = _("Produces a textual place report") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -322,8 +322,8 @@ plg.require_active = False #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'simple_book_title' -plg.name = _("Title Page") +plg.id = 'simple_book_title' +plg.name = _("Title Page") plg.description = _("Produces a title page for book reports.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION @@ -344,8 +344,8 @@ plg.report_modes = [REPORT_MODE_BKI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'summary' -plg.name = _("Database Summary Report") +plg.id = 'summary' +plg.name = _("Database Summary Report") plg.description = _("Provides a summary of the current database") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION diff --git a/gramps/plugins/tool/mediamanager.py b/gramps/plugins/tool/mediamanager.py index 4e73e2052..95d83b698 100644 --- a/gramps/plugins/tool/mediamanager.py +++ b/gramps/plugins/tool/mediamanager.py @@ -407,7 +407,7 @@ class BatchOp(UpdateCallback): """ Base class for the sub-tools. """ - title = 'Untitled operation' + title = 'Untitled operation' description = 'This operation needs to be described' def __init__(self, db, callback): @@ -485,7 +485,7 @@ class BatchOp(UpdateCallback): # Simple op to replace substrings in the paths #------------------------------------------------------------------------ class PathChange(BatchOp): - title = _('Replace _substrings in the path') + title = _('Replace _substrings in the path') description = _('This tool allows replacing specified substring in the ' 'path of media objects with another substring. ' 'This can be useful when you move your media files ' @@ -570,7 +570,7 @@ class PathChange(BatchOp): #An op to convert relative paths to absolute #------------------------------------------------------------------------ class Convert2Abs(BatchOp): - title = _('Convert paths from relative to _absolute') + title = _('Convert paths from relative to _absolute') description = _("This tool allows converting relative media paths " "to the absolute ones. It does this by prepending " "the base path as given in the Preferences, or if " @@ -604,7 +604,7 @@ class Convert2Abs(BatchOp): #An op to convert absolute paths to relative #------------------------------------------------------------------------ class Convert2Rel(BatchOp): - title = _('Convert paths from absolute to r_elative') + title = _('Convert paths from absolute to r_elative') description = _("This tool allows converting absolute media paths " "to a relative path. The relative path is relative " "viz-a-viz the base path as given in the Preferences, " @@ -641,7 +641,7 @@ class Convert2Rel(BatchOp): #An op to look for images that may have been forgotten. #------------------------------------------------------------------------ class ImagesNotIncluded(BatchOp): - title = _('Add images not included in database') + title = _('Add images not included in database') description = _("Check directories for images not included in database") description = _("This tool adds images in directories that are " "referenced by existing images in the database.") diff --git a/gramps/plugins/tool/notrelated.py b/gramps/plugins/tool/notrelated.py index 41f4e79cd..8a3bcb8e0 100644 --- a/gramps/plugins/tool/notrelated.py +++ b/gramps/plugins/tool/notrelated.py @@ -150,14 +150,14 @@ class NotRelated(tool.ActivePersonTool, ManagedWindow): self.treeView.connect('row-activated', self.rowActivated) # initialize a few variables we're going to need - self.numberOfPeopleInDatabase = self.db.get_number_of_people() - self.numberOfRelatedPeople = 0 - self.numberOfUnrelatedPeople = 0 + self.numberOfPeopleInDatabase = self.db.get_number_of_people() + self.numberOfRelatedPeople = 0 + self.numberOfUnrelatedPeople = 0 # create the sets used to track related and unrelated people - self.handlesOfPeopleToBeProcessed = set() - self.handlesOfPeopleAlreadyProcessed = set() - self.handlesOfPeopleNotRelated = set() + self.handlesOfPeopleToBeProcessed = set() + self.handlesOfPeopleAlreadyProcessed = set() + self.handlesOfPeopleNotRelated = set() # build a set of all people related to the selected person self.handlesOfPeopleToBeProcessed.add(person.get_handle()) @@ -234,10 +234,10 @@ class NotRelated(tool.ActivePersonTool, ManagedWindow): display_help(WIKI_HELP_PAGE , WIKI_HELP_SEC) - def applyTagClicked(self, button): - progress = None - rows = self.treeSelection.count_selected_rows() - tag_name = str(self.tagcombo.get_active_text()) + def applyTagClicked(self, button) : + progress = None + rows = self.treeSelection.count_selected_rows() + tag_name = str(self.tagcombo.get_active_text()) # start the db transaction with DbTxn("Tag not related", self.db) as transaction: @@ -273,9 +273,9 @@ class NotRelated(tool.ActivePersonTool, ManagedWindow): progress.step() # for the current row, get the GID and the person from the database - iter = self.model.get_iter(path) - personGid = self.model.get_value(iter, 1) - person = self.db.get_person_from_gramps_id(personGid) + iter = self.model.get_iter(path) + personGid = self.model.get_value(iter, 1) + person = self.db.get_person_from_gramps_id(personGid) # add the tag to the person person.add_tag(tag_handle) @@ -287,9 +287,9 @@ class NotRelated(tool.ActivePersonTool, ManagedWindow): # refresh the tags column self.treeView.set_model(None) for path in paths: - iter = self.model.get_iter(path) - personGid = self.model.get_value(iter, 1) - person = self.db.get_person_from_gramps_id(personGid) + iter = self.model.get_iter(path) + personGid = self.model.get_value(iter, 1) + person = self.db.get_person_from_gramps_id(personGid) self.model.set_value(iter, 3, self.get_tag_list(person)) self.treeView.set_model(self.model) self.treeView.expand_all() @@ -419,32 +419,32 @@ class NotRelated(tool.ActivePersonTool, ManagedWindow): # loop through the entire list of unrelated people for handle in self.handlesOfPeopleNotRelated: self.progress.step() - person = self.db.get_person_from_handle(handle) + person = self.db.get_person_from_handle(handle) primaryname = person.get_primary_name() - surname = primaryname.get_surname() - name = primaryname.get_name() - gid = person.get_gramps_id() + surname = primaryname.get_surname() + name = primaryname.get_name() + gid = person.get_gramps_id() # Retrieve the sorted tag list tag_list = self.get_tag_list(person) # find the names of the parents - familygid = '' + familygid = '' parentNames = '' parentFamilyHandle = person.get_main_parents_family_handle() if parentFamilyHandle: parentFamily = self.db.get_family_from_handle(parentFamilyHandle) - familygid = parentFamily.get_gramps_id() - fatherName = None - motherName = None + familygid = parentFamily.get_gramps_id() + fatherName = None + motherName = None fatherHandle = parentFamily.get_father_handle() if fatherHandle: - father = self.db.get_person_from_handle(fatherHandle) - fatherName = father.get_primary_name().get_first_name() + father = self.db.get_person_from_handle(fatherHandle) + fatherName = father.get_primary_name().get_first_name() motherHandle = parentFamily.get_mother_handle() if motherHandle: - mother = self.db.get_person_from_handle(motherHandle) - motherName = mother.get_primary_name().get_first_name() + mother = self.db.get_person_from_handle(motherHandle) + motherName = mother.get_primary_name().get_first_name() # now that we have the names, come up with a label we can use if fatherName: diff --git a/gramps/plugins/tool/patchnames.py b/gramps/plugins/tool/patchnames.py index 8c15fad92..8fef269d8 100644 --- a/gramps/plugins/tool/patchnames.py +++ b/gramps/plugins/tool/patchnames.py @@ -96,9 +96,9 @@ _nick_re = re.compile(r"(.+) \s* [(\"] (.+) [)\"]", re.VERBOSE) class PatchNames(tool.BatchTool, ManagedWindow): titleid = 1 - nickid = 2 + nickid = 2 pref1id = 3 - compid = 4 + compid = 4 def __init__(self, dbstate, user, options_class, name, callback=None): uistate = user.uistate diff --git a/gramps/plugins/tool/tools.gpr.py b/gramps/plugins/tool/tools.gpr.py index 14dd740d9..cdbe7cf54 100644 --- a/gramps/plugins/tool/tools.gpr.py +++ b/gramps/plugins/tool/tools.gpr.py @@ -34,8 +34,8 @@ MODULE_VERSION="5.1" #------------------------------------------------------------------------ register(TOOL, -id = 'chname', -name = _("Fix Capitalization of Family Names"), +id = 'chname', +name = _("Fix Capitalization of Family Names"), description = _("Searches the entire database and attempts to " "fix capitalization of the names."), version = '1.0', @@ -57,8 +57,8 @@ tool_modes = [TOOL_MODE_GUI] #------------------------------------------------------------------------ register(TOOL, -id = 'chtype', -name = _("Rename Event Types"), +id = 'chtype', +name = _("Rename Event Types"), description = _("Allows all the events of a certain name " "to be renamed to a new name."), version = '1.0', @@ -80,8 +80,8 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] #------------------------------------------------------------------------ register(TOOL, -id = 'check', -name = _("Check and Repair Database"), +id = 'check', +name = _("Check and Repair Database"), description = _("Checks the database for integrity problems, fixing the " "problems that it can"), version = '1.0', @@ -103,8 +103,8 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] #------------------------------------------------------------------------ register(TOOL, -id = 'eventcmp', -name = _("Compare Individual Events"), +id = 'eventcmp', +name = _("Compare Individual Events"), description = _("Aids in the analysis of data by allowing the " "development of custom filters that can be applied " "to the database to find similar events"), @@ -127,8 +127,8 @@ tool_modes = [TOOL_MODE_GUI] #------------------------------------------------------------------------ register(TOOL, -id = 'evname', -name = _("Extract Event Description"), +id = 'evname', +name = _("Extract Event Description"), description = _("Extracts event descriptions from the event data"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -149,8 +149,8 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] #------------------------------------------------------------------------ register(TOOL, -id = 'dupfind', -name = _("Find Possible Duplicate People"), +id = 'dupfind', +name = _("Find Possible Duplicate People"), description = _("Searches the entire database, looking for " "individual entries that may represent the same person."), version = '1.0', @@ -172,8 +172,8 @@ tool_modes = [TOOL_MODE_GUI] #------------------------------------------------------------------------ register(TOOL, -id = 'mediaman', -name = _("Media Manager"), +id = 'mediaman', +name = _("Media Manager"), description = _("Manages batch operations on media files"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -194,8 +194,8 @@ tool_modes = [TOOL_MODE_GUI] #------------------------------------------------------------------------ register(TOOL, -id = 'not_related', -name = _("Not Related"), +id = 'not_related', +name = _("Not Related"), description = _("Find people who are not in any way related to the " "selected person"), version = '1.0', @@ -217,8 +217,8 @@ tool_modes = [TOOL_MODE_GUI] #------------------------------------------------------------------------ register(TOOL, -id = 'editowner', -name = _("Edit Database Owner Information"), +id = 'editowner', +name = _("Edit Database Owner Information"), description = _("Allow editing database owner information."), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -239,8 +239,8 @@ tool_modes = [TOOL_MODE_GUI] #------------------------------------------------------------------------ register(TOOL, -id = 'patchnames', -name = _("Extract Information from Names"), +id = 'patchnames', +name = _("Extract Information from Names"), description = _("Extract titles, prefixes and compound surnames from given name or family name."), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -261,8 +261,8 @@ tool_modes = [TOOL_MODE_GUI] #------------------------------------------------------------------------ register(TOOL, -id = 'rebuild', -name = _("Rebuild Secondary Indexes"), +id = 'rebuild', +name = _("Rebuild Secondary Indexes"), description = _("Rebuilds secondary indexes"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -283,8 +283,8 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] #------------------------------------------------------------------------ register(TOOL, -id = 'rebuild_refmap', -name = _("Rebuild Reference Maps"), +id = 'rebuild_refmap', +name = _("Rebuild Reference Maps"), description = _("Rebuilds reference maps"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -305,8 +305,8 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] #------------------------------------------------------------------------ register(TOOL, -id = 'rebuild_genstats', -name = _("Rebuild Gender Statistics"), +id = 'rebuild_genstats', +name = _("Rebuild Gender Statistics"), description = _("Rebuilds gender statistics for name gender guessing..."), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -327,8 +327,8 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] #------------------------------------------------------------------------ register(TOOL, -id = 'relcalc', -name = _("Relationship Calculator"), +id = 'relcalc', +name = _("Relationship Calculator"), description = _("Calculates the relationship between two people"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -349,8 +349,8 @@ tool_modes = [TOOL_MODE_GUI] #------------------------------------------------------------------------ register(TOOL, -id = 'remove_unused', -name = _("Remove Unused Objects"), +id = 'remove_unused', +name = _("Remove Unused Objects"), description = _("Removes unused objects from the database"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -371,8 +371,8 @@ tool_modes = [TOOL_MODE_GUI] #------------------------------------------------------------------------ register(TOOL, -id = 'reorder_ids', -name = _("Reorder Gramps IDs"), +id = 'reorder_ids', +name = _("Reorder Gramps IDs"), description = _("Reorders the Gramps IDs " "according to Gramps' default rules."), version = '1.0', @@ -394,8 +394,8 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] #------------------------------------------------------------------------ register(TOOL, -id = 'sortevents', -name = _("Sorts events"), +id = 'sortevents', +name = _("Sorts events"), description = _("Sorts events"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -416,8 +416,8 @@ tool_modes = [TOOL_MODE_GUI] #------------------------------------------------------------------------ register(TOOL, -id = 'verify', -name = _("Verify the Data"), +id = 'verify', +name = _("Verify the Data"), description = _("Verifies the data against user-defined tests"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -438,8 +438,8 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] #------------------------------------------------------------------------ register(TOOL, -id = 'mergecitations', -name = _("Merge Citations"), +id = 'mergecitations', +name = _("Merge Citations"), description = _("Searches the entire database, looking for " "citations that have the same Volume/Page, Date and Confidence."), version = '1.0', @@ -461,8 +461,8 @@ tool_modes = [TOOL_MODE_GUI] #------------------------------------------------------------------------ register(TOOL, -id = 'loop', -name = _("Find database loop"), +id = 'loop', +name = _("Find database loop"), description = _("Searches the entire database, looking for " "a possible loop."), version = '1.0', diff --git a/gramps/plugins/tool/toolsdebug.gpr.py b/gramps/plugins/tool/toolsdebug.gpr.py index 072d58749..12d9b9fc9 100644 --- a/gramps/plugins/tool/toolsdebug.gpr.py +++ b/gramps/plugins/tool/toolsdebug.gpr.py @@ -34,8 +34,8 @@ MODULE_VERSION="5.1" #------------------------------------------------------------------------ register(TOOL, -id = 'test_for_date_parser_and_displayer', -name = "Check Localized Date Displayer and Parser", +id = 'test_for_date_parser_and_displayer', +name = "Check Localized Date Displayer and Parser", description = ("This test tool will create many people showing all" " different date variants as birth. The death date is" " created by parsing the result of the date displayer for" @@ -60,8 +60,8 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] #------------------------------------------------------------------------ register(TOOL, -id = 'dgenstats', -name = _("Dump Gender Statistics"), +id = 'dgenstats', +name = _("Dump Gender Statistics"), description = _("Will dump the statistics for guessing the gender " "from the first name."), version = '1.0', @@ -83,8 +83,8 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] #------------------------------------------------------------------------ register(TOOL, -id = 'testcasegenerator', -name = "Generate Testcases for Persons and Families", +id = 'testcasegenerator', +name = "Generate Testcases for Persons and Families", description = ("The testcase generator will generate some persons " "and families that have broken links in the database " "or data that is in conflict to a relation."), @@ -107,8 +107,8 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] #------------------------------------------------------------------------ register(TOOL, -id = 'populatesources', -name = "Populate Sources and Citations", +id = 'populatesources', +name = "Populate Sources and Citations", description = ("This tool generates sources and citations for each source in " "order to populate the database for testing with significant " "numbers of sources and citations."), diff --git a/gramps/plugins/view/citationlistview.py b/gramps/plugins/view/citationlistview.py index c2bfab321..de378c70c 100644 --- a/gramps/plugins/view/citationlistview.py +++ b/gramps/plugins/view/citationlistview.py @@ -79,20 +79,20 @@ class CitationListView(ListView): """ # The data items here have to correspond, in order, to the items in # src/giu/views/treemodels/citationlismodel.py - COL_TITLE_PAGE = 0 - COL_ID = 1 - COL_DATE = 2 - COL_CONFIDENCE = 3 - COL_PRIV = 4 - COL_TAGS = 5 - COL_CHAN = 6 - COL_SRC_TITLE = 7 - COL_SRC_ID = 8 - COL_SRC_AUTH = 9 - COL_SRC_ABBR = 10 - COL_SRC_PINFO = 11 - COL_SRC_PRIV = 12 - COL_SRC_CHAN = 13 + COL_TITLE_PAGE = 0 + COL_ID = 1 + COL_DATE = 2 + COL_CONFIDENCE = 3 + COL_PRIV = 4 + COL_TAGS = 5 + COL_CHAN = 6 + COL_SRC_TITLE = 7 + COL_SRC_ID = 8 + COL_SRC_AUTH = 9 + COL_SRC_ABBR = 10 + COL_SRC_PINFO = 11 + COL_SRC_PRIV = 12 + COL_SRC_CHAN = 13 # column definitions COLUMNS = [ (_('Volume/Page'), TEXT, None), diff --git a/gramps/plugins/view/citationtreeview.py b/gramps/plugins/view/citationtreeview.py index 2cc1c0699..b6de85b5c 100644 --- a/gramps/plugins/view/citationtreeview.py +++ b/gramps/plugins/view/citationtreeview.py @@ -78,16 +78,16 @@ class CitationTreeView(ListView): """ # The data items here have to correspond, in order, to the items in # src/giu/views/treemodels/citationtreemodel.py - COL_TITLE_PAGE = 0 - COL_ID = 1 - COL_DATE = 2 - COL_CONFIDENCE = 3 - COL_PRIV = 4 - COL_TAGS = 5 - COL_CHAN = 6 - COL_SRC_AUTH = 7 - COL_SRC_ABBR = 8 - COL_SRC_PINFO = 9 + COL_TITLE_PAGE = 0 + COL_ID = 1 + COL_DATE = 2 + COL_CONFIDENCE = 3 + COL_PRIV = 4 + COL_TAGS = 5 + COL_CHAN = 6 + COL_SRC_AUTH = 7 + COL_SRC_ABBR = 8 + COL_SRC_PINFO = 9 # column definitions COLUMNS = [ (_('Source: Title or Citation: Volume/Page'), TEXT, None), diff --git a/gramps/plugins/view/eventview.py b/gramps/plugins/view/eventview.py index f940a7022..97889f145 100644 --- a/gramps/plugins/view/eventview.py +++ b/gramps/plugins/view/eventview.py @@ -93,10 +93,10 @@ class EventView(ListView): COL_ID, COL_PRIV, COL_TAGS, COL_CHAN]), ('columns.size', [100, 230, 150, 200, 100, 75, 40, 100, 100]) ) - ADD_MSG = _("Add a new event") - EDIT_MSG = _("Edit the selected event") - DEL_MSG = _("Delete the selected event") - MERGE_MSG = _("Merge the selected events") + ADD_MSG = _("Add a new event") + EDIT_MSG = _("Edit the selected event") + DEL_MSG = _("Delete the selected event") + MERGE_MSG = _("Merge the selected events") FILTER_TYPE = "Event" QR_CATEGORY = CATEGORY_QR_EVENT diff --git a/gramps/plugins/view/familyview.py b/gramps/plugins/view/familyview.py index f046e5069..c257b4e72 100644 --- a/gramps/plugins/view/familyview.py +++ b/gramps/plugins/view/familyview.py @@ -94,10 +94,10 @@ class FamilyView(ListView): ('columns.size', [75, 200, 200, 100, 100, 40, 100, 100]) ) - ADD_MSG = _("Add a new family") - EDIT_MSG = _("Edit the selected family") - DEL_MSG = _("Delete the selected family") - MERGE_MSG = _("Merge the selected families") + ADD_MSG = _("Add a new family") + EDIT_MSG = _("Edit the selected family") + DEL_MSG = _("Delete the selected family") + MERGE_MSG = _("Merge the selected families") FILTER_TYPE = "Family" QR_CATEGORY = CATEGORY_QR_FAMILY diff --git a/gramps/plugins/view/geoplaces.py b/gramps/plugins/view/geoplaces.py index 264424ae4..a2a4466cf 100644 --- a/gramps/plugins/view/geoplaces.py +++ b/gramps/plugins/view/geoplaces.py @@ -352,7 +352,7 @@ class GeoPlaces(GeoGraphyView): self.kml_layer.clear() self.no_show_places_in_status_bar = False _col = self._config.get - self.plc_color = [ + self.plc_color = [ (PlaceType.UNKNOWN, _col('geography.color.unknown')), (PlaceType.CUSTOM, _col('geography.color.custom')), (PlaceType.COUNTRY, _col('geography.color.country')), diff --git a/gramps/plugins/view/mediaview.py b/gramps/plugins/view/mediaview.py index bcc22a013..740ef1a83 100644 --- a/gramps/plugins/view/mediaview.py +++ b/gramps/plugins/view/mediaview.py @@ -109,10 +109,10 @@ class MediaView(ListView): ('columns.size', [200, 75, 100, 200, 150, 40, 100, 150]) ) - ADD_MSG = _("Add a new media object") - EDIT_MSG = _("Edit the selected media object") - DEL_MSG = _("Delete the selected media object") - MERGE_MSG = _("Merge the selected media objects") + ADD_MSG = _("Add a new media object") + EDIT_MSG = _("Edit the selected media object") + DEL_MSG = _("Delete the selected media object") + MERGE_MSG = _("Merge the selected media objects") FILTER_TYPE = 'Media' QR_CATEGORY = CATEGORY_QR_MEDIA diff --git a/gramps/plugins/view/noteview.py b/gramps/plugins/view/noteview.py index e295f52e1..6380d4bfd 100644 --- a/gramps/plugins/view/noteview.py +++ b/gramps/plugins/view/noteview.py @@ -90,10 +90,10 @@ class NoteView(ListView): COL_CHAN]), ('columns.size', [350, 75, 100, 40, 100, 100])) - ADD_MSG = _("Add a new note") - EDIT_MSG = _("Edit the selected note") - DEL_MSG = _("Delete the selected note") - MERGE_MSG = _("Merge the selected notes") + ADD_MSG = _("Add a new note") + EDIT_MSG = _("Edit the selected note") + DEL_MSG = _("Delete the selected note") + MERGE_MSG = _("Merge the selected notes") FILTER_TYPE = "Note" QR_CATEGORY = CATEGORY_QR_NOTE diff --git a/gramps/plugins/view/relview.py b/gramps/plugins/view/relview.py index b5db1148a..9fab72a30 100644 --- a/gramps/plugins/view/relview.py +++ b/gramps/plugins/view/relview.py @@ -87,31 +87,31 @@ _GenderCode = { Person.UNKNOWN : '\u2650', } -_NAME_START = 0 -_LABEL_START = 0 -_LABEL_STOP = 1 -_DATA_START = _LABEL_STOP -_DATA_STOP = _DATA_START+1 -_BTN_START = _DATA_STOP -_BTN_STOP = _BTN_START+2 +_NAME_START = 0 +_LABEL_START = 0 +_LABEL_STOP = 1 +_DATA_START = _LABEL_STOP +_DATA_STOP = _DATA_START+1 +_BTN_START = _DATA_STOP +_BTN_STOP = _BTN_START+2 _PLABEL_START = 1 -_PLABEL_STOP = _PLABEL_START+1 -_PDATA_START = _PLABEL_STOP -_PDATA_STOP = _PDATA_START+2 -_PDTLS_START = _PLABEL_STOP -_PDTLS_STOP = _PDTLS_START+2 +_PLABEL_STOP = _PLABEL_START+1 +_PDATA_START = _PLABEL_STOP +_PDATA_STOP = _PDATA_START+2 +_PDTLS_START = _PLABEL_STOP +_PDTLS_STOP = _PDTLS_START+2 _CLABEL_START = _PLABEL_START+1 -_CLABEL_STOP = _CLABEL_START+1 -_CDATA_START = _CLABEL_STOP -_CDATA_STOP = _CDATA_START+1 -_CDTLS_START = _CDATA_START -_CDTLS_STOP = _CDTLS_START+1 +_CLABEL_STOP = _CLABEL_START+1 +_CDATA_START = _CLABEL_STOP +_CDATA_STOP = _CDATA_START+1 +_CDTLS_START = _CDATA_START +_CDTLS_STOP = _CDTLS_START+1 _ALABEL_START = 0 -_ALABEL_STOP = _ALABEL_START+1 -_ADATA_START = _ALABEL_STOP -_ADATA_STOP = _ADATA_START+3 -_SDATA_START = 2 -_SDATA_STOP = 4 +_ALABEL_STOP = _ALABEL_START+1 +_ADATA_START = _ALABEL_STOP +_ADATA_STOP = _ADATA_START+3 +_SDATA_START = 2 +_SDATA_STOP = 4 _RETURN = Gdk.keyval_from_name("Return") _KP_ENTER = Gdk.keyval_from_name("KP_Enter") _SPACE = Gdk.keyval_from_name("space") diff --git a/gramps/plugins/view/view.gpr.py b/gramps/plugins/view/view.gpr.py index 1a4f88c89..d45e10e17 100644 --- a/gramps/plugins/view/view.gpr.py +++ b/gramps/plugins/view/view.gpr.py @@ -33,8 +33,8 @@ MODULE_VERSION="5.1" #------------------------------------------------------------------------ register(VIEW, -id = 'eventview', -name = _("Events"), +id = 'eventview', +name = _("Events"), description = _("The view showing all the events"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -48,8 +48,8 @@ order = START, ) register(VIEW, -id = 'familyview', -name = _("Families"), +id = 'familyview', +name = _("Families"), description = _("The view showing all families"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -63,8 +63,8 @@ order = START, ) register(VIEW, -id = 'dashboardview', -name = _("Dashboard"), +id = 'dashboardview', +name = _("Dashboard"), description = _("The view showing Gramplets"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -78,8 +78,8 @@ order = START, ) register(VIEW, -id = 'mediaview', -name = _("Media"), +id = 'mediaview', +name = _("Media"), description = _("The view showing all the media objects"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -93,8 +93,8 @@ order = START, ) register(VIEW, -id = 'noteview', -name = _("Notes"), +id = 'noteview', +name = _("Notes"), description = _("The view showing all the notes"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -108,8 +108,8 @@ order = START, ) register(VIEW, -id = 'relview', -name = _("Relationships"), +id = 'relview', +name = _("Relationships"), description = _("The view showing all relationships of the selected person"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -123,8 +123,8 @@ order = START, ) register(VIEW, -id = 'pedigreeview', -name = _("Pedigree"), +id = 'pedigreeview', +name = _("Pedigree"), description = _("The view showing an ancestor pedigree of the selected person"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -139,8 +139,8 @@ stock_icon = 'gramps-pedigree', ) register(VIEW, -id = 'fanchartview', -name = _("Fan Chart"), +id = 'fanchartview', +name = _("Fan Chart"), category = ("Ancestry", _("Charts")), description = _("A view showing parents through a fanchart"), version = '1.0', @@ -154,8 +154,8 @@ stock_icon = 'gramps-fanchart', ) register(VIEW, -id = 'fanchartdescview', -name = _("Descendant Fan"), +id = 'fanchartdescview', +name = _("Descendant Fan"), category = ("Ancestry", _("Charts")), description = _("Showing descendants through a fanchart"), version = '1.0', @@ -169,8 +169,8 @@ stock_icon = 'gramps-fanchartdesc', ) register(VIEW, -id = 'fanchart2wayview', -name = _("2-Way Fan"), +id = 'fanchart2wayview', +name = _("2-Way Fan"), category = ("Ancestry", _("Charts")), description = _("Showing ascendants and descendants through a fanchart"), version = '1.0', @@ -184,8 +184,8 @@ stock_icon = 'gramps-fanchart2way', ) register(VIEW, -id = 'personview', -name = _("Grouped People"), +id = 'personview', +name = _("Grouped People"), description = _("The view showing all people in the Family Tree grouped per" " family name"), version = '1.0', @@ -201,8 +201,8 @@ stock_icon = 'gramps-tree-group', ) register(VIEW, -id = 'personlistview', -name = _("People"), +id = 'personlistview', +name = _("People"), description = _("The view showing all people in the Family Tree" " in a flat list"), version = '1.0', @@ -217,8 +217,8 @@ stock_icon = 'gramps-tree-list', ) register(VIEW, -id = 'placelistview', -name = _("Places"), +id = 'placelistview', +name = _("Places"), description = _("The view showing all the places of the Family Tree"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -248,8 +248,8 @@ order = START, ) register(VIEW, -id = 'repoview', -name = _("Repositories"), +id = 'repoview', +name = _("Repositories"), description = _("The view showing all the repositories"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -263,8 +263,8 @@ order = START, ) register(VIEW, -id = 'sourceview', -name = _("Sources"), +id = 'sourceview', +name = _("Sources"), description = _("The view showing all the sources"), version = '1.0', gramps_target_version = MODULE_VERSION, @@ -279,8 +279,8 @@ stock_icon = 'gramps-tree-list', ) register(VIEW, -id = 'citationlistview', -name = _("Citations"), +id = 'citationlistview', +name = _("Citations"), description = _("The view showing all the citations"), version = '1.0', gramps_target_version = MODULE_VERSION, diff --git a/gramps/plugins/webreport/webplugins.gpr.py b/gramps/plugins/webreport/webplugins.gpr.py index 290ed93ed..6fd84709e 100644 --- a/gramps/plugins/webreport/webplugins.gpr.py +++ b/gramps/plugins/webreport/webplugins.gpr.py @@ -30,8 +30,8 @@ MODULE_VERSION="5.1" #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'navwebpage' -plg.name = _("Narrated Web Site") +plg.id = 'navwebpage' +plg.name = _("Narrated Web Site") plg.description = _("Produces web (HTML) pages for individuals, or a set of " "individuals") plg.version = '2.0' @@ -54,8 +54,8 @@ plg.report_modes = [REPORT_MODE_GUI, REPORT_MODE_CLI] #------------------------------------------------------------------------ plg = newplugin() -plg.id = 'WebCal' -plg.name = _("Web Calendar") +plg.id = 'WebCal' +plg.name = _("Web Calendar") plg.description = _("Produces web (HTML) calendars.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION diff --git a/gramps/plugins/webstuff/webstuff.gpr.py b/gramps/plugins/webstuff/webstuff.gpr.py index beb5f575d..687cb9d80 100644 --- a/gramps/plugins/webstuff/webstuff.gpr.py +++ b/gramps/plugins/webstuff/webstuff.gpr.py @@ -31,9 +31,9 @@ MODULE_VERSION="5.1" # #------------------------------------------------------------------------ register(GENERAL, -id = 'system webstuff', +id = 'system webstuff', category = "WEBSTUFF", -name = _("Webstuff"), +name = _("Webstuff"), description = _("Provides a collection of resources for the web"), version = '1.0', gramps_target_version = MODULE_VERSION, diff --git a/gramps/version.py b/gramps/version.py index 093e779c4..b1e0d2839 100644 --- a/gramps/version.py +++ b/gramps/version.py @@ -20,5 +20,5 @@ VERSION_TUPLE = (5, 1, 0) VERSION_QUALIFIER = "" -VERSION = '.'.join(map(str,VERSION_TUPLE)) + VERSION_QUALIFIER +VERSION = '.'.join(map(str,VERSION_TUPLE)) + VERSION_QUALIFIER major_version = "%s.%s" % (VERSION_TUPLE[0], VERSION_TUPLE[1])