From 95762e864f8ee6e00336f2eda16cc62c97c08c9f Mon Sep 17 00:00:00 2001 From: Paul Franklin Date: Thu, 16 Mar 2017 19:44:57 -0700 Subject: [PATCH] tidy up some translatable string things --- gramps/gen/plug/report/_paper.py | 2 -- gramps/gui/widgets/undoableentry.py | 2 -- gramps/plugins/db/dbapi/dbapi.py | 1 - gramps/plugins/export/exportftree.py | 2 -- gramps/plugins/lib/maps/cairoprint.py | 2 -- gramps/plugins/mapservices/googlemap.py | 2 -- gramps/plugins/mapservices/mapservice.gpr.py | 2 ++ gramps/plugins/mapservices/openstreetmap.py | 2 -- gramps/plugins/sidebar/sidebar.gpr.py | 3 ++- gramps/plugins/tool/toolsdebug.gpr.py | 4 +-- gramps/plugins/view/view.gpr.py | 2 ++ gramps/plugins/webstuff/webstuff.gpr.py | 2 ++ po/POTFILES.in | 27 ++++++++++++++++---- po/POTFILES.skip | 23 +++++------------ 14 files changed, 38 insertions(+), 38 deletions(-) diff --git a/gramps/gen/plug/report/_paper.py b/gramps/gen/plug/report/_paper.py index f0a7d9a09..b53705e6e 100644 --- a/gramps/gen/plug/report/_paper.py +++ b/gramps/gen/plug/report/_paper.py @@ -30,8 +30,6 @@ # Gramps modules # #------------------------------------------------------------------------- -from ...const import GRAMPS_LOCALE as glocale -_ = glocale.translation.sgettext from ..docgen import PaperSize from ...const import PAPERSIZE diff --git a/gramps/gui/widgets/undoableentry.py b/gramps/gui/widgets/undoableentry.py index 5f9a3c600..132356534 100644 --- a/gramps/gui/widgets/undoableentry.py +++ b/gramps/gui/widgets/undoableentry.py @@ -27,8 +27,6 @@ __all__ = ["UndoableEntry"] # Standard python modules # #------------------------------------------------------------------------- -from gramps.gen.const import GRAMPS_LOCALE as glocale -_ = glocale.translation.gettext import warnings import logging diff --git a/gramps/plugins/db/dbapi/dbapi.py b/gramps/plugins/db/dbapi/dbapi.py index 06cdb60f5..f47f312db 100644 --- a/gramps/plugins/db/dbapi/dbapi.py +++ b/gramps/plugins/db/dbapi/dbapi.py @@ -48,7 +48,6 @@ from gramps.gen.lib import (Tag, Media, Person, Family, Source, Citation, Event, Place, Repository, Note) from gramps.gen.lib.genderstats import GenderStats from gramps.gen.const import GRAMPS_LOCALE as glocale -_ = glocale.translation.gettext LOG = logging.getLogger(".dbapi") _LOG = logging.getLogger(DBLOGNAME) diff --git a/gramps/plugins/export/exportftree.py b/gramps/plugins/export/exportftree.py index 9dc2132e1..65d8e2ed4 100644 --- a/gramps/plugins/export/exportftree.py +++ b/gramps/plugins/export/exportftree.py @@ -28,8 +28,6 @@ # #------------------------------------------------------------------------- import os -from gramps.gen.const import GRAMPS_LOCALE as glocale -_ = glocale.translation.gettext #------------------------------------------------------------------------ # diff --git a/gramps/plugins/lib/maps/cairoprint.py b/gramps/plugins/lib/maps/cairoprint.py index bb68a342e..d4e7bb8e3 100644 --- a/gramps/plugins/lib/maps/cairoprint.py +++ b/gramps/plugins/lib/maps/cairoprint.py @@ -24,8 +24,6 @@ # #------------------------------------------------------------------------- from gi.repository import Gtk -from gramps.gen.const import GRAMPS_LOCALE as glocale -_ = glocale.translation.gettext #------------------------------------------------------------------------- # diff --git a/gramps/plugins/mapservices/googlemap.py b/gramps/plugins/mapservices/googlemap.py index ddcb27e50..92fc01523 100644 --- a/gramps/plugins/mapservices/googlemap.py +++ b/gramps/plugins/mapservices/googlemap.py @@ -26,8 +26,6 @@ Google Maps map service plugin. Open place in maps.google.com # python modules # #------------------------------------------------------------------------ -from gramps.gen.const import GRAMPS_LOCALE as glocale -_ = glocale.translation.gettext #------------------------------------------------------------------------ # diff --git a/gramps/plugins/mapservices/mapservice.gpr.py b/gramps/plugins/mapservices/mapservice.gpr.py index 2e3836e41..2e613928c 100644 --- a/gramps/plugins/mapservices/mapservice.gpr.py +++ b/gramps/plugins/mapservices/mapservice.gpr.py @@ -17,6 +17,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +from gramps.gen.const import GRAMPS_LOCALE as glocale +_ = glocale.translation.gettext MODULE_VERSION="5.0" diff --git a/gramps/plugins/mapservices/openstreetmap.py b/gramps/plugins/mapservices/openstreetmap.py index 6f800f381..0e919bb63 100644 --- a/gramps/plugins/mapservices/openstreetmap.py +++ b/gramps/plugins/mapservices/openstreetmap.py @@ -26,8 +26,6 @@ OpenStreetMap map service plugin. Open place in openstreetmap.org # python modules # #------------------------------------------------------------------------ -from gramps.gen.const import GRAMPS_LOCALE as glocale -_ = glocale.translation.gettext #------------------------------------------------------------------------ # diff --git a/gramps/plugins/sidebar/sidebar.gpr.py b/gramps/plugins/sidebar/sidebar.gpr.py index ecbe9e6a7..c25007cac 100644 --- a/gramps/plugins/sidebar/sidebar.gpr.py +++ b/gramps/plugins/sidebar/sidebar.gpr.py @@ -17,7 +17,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# $Id: sidebar.gpr.py 20634 2012-11-07 17:53:14Z bmcage $ +from gramps.gen.const import GRAMPS_LOCALE as glocale +_ = glocale.translation.gettext MODULE_VERSION="5.0" diff --git a/gramps/plugins/tool/toolsdebug.gpr.py b/gramps/plugins/tool/toolsdebug.gpr.py index 6b4679f0a..94caf88ff 100644 --- a/gramps/plugins/tool/toolsdebug.gpr.py +++ b/gramps/plugins/tool/toolsdebug.gpr.py @@ -61,8 +61,8 @@ tool_modes = [TOOL_MODE_GUI, TOOL_MODE_CLI] register(TOOL, id = 'dgenstats', -name = "Dump Gender Statistics", -description = ("Will dump the statistics for the gender guessing " +name = _("Dump Gender Statistics"), +description = _("Will dump the statistics for guessing the gender " "from the first name."), version = '1.0', gramps_target_version = MODULE_VERSION, diff --git a/gramps/plugins/view/view.gpr.py b/gramps/plugins/view/view.gpr.py index cda4edfc0..9b6666c90 100644 --- a/gramps/plugins/view/view.gpr.py +++ b/gramps/plugins/view/view.gpr.py @@ -21,6 +21,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +from gramps.gen.const import GRAMPS_LOCALE as glocale +_ = glocale.translation.gettext MODULE_VERSION="5.0" diff --git a/gramps/plugins/webstuff/webstuff.gpr.py b/gramps/plugins/webstuff/webstuff.gpr.py index 982987512..db5a74194 100644 --- a/gramps/plugins/webstuff/webstuff.gpr.py +++ b/gramps/plugins/webstuff/webstuff.gpr.py @@ -18,6 +18,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +from gramps.gen.const import GRAMPS_LOCALE as glocale +_ = glocale.translation.gettext # plugins/webstuff/webstuff.gpr.py diff --git a/po/POTFILES.in b/po/POTFILES.in index 1cd83f04c..b372fc6a0 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,5 @@ # List of source files which contain translatable strings. -# $Id$ +# gramps/cli/arghandler.py gramps/cli/argparser.py gramps/cli/clidbman.py @@ -10,14 +10,15 @@ gramps/gen/config.py gramps/gen/const.py gramps/gen/datehandler/__init__.py gramps/gen/datehandler/_datedisplay.py -gramps/gen/datehandler/_datestrings.py gramps/gen/datehandler/_dateparser.py +gramps/gen/datehandler/_datestrings.py +gramps/gen/datehandler/_dateutils.py gramps/gen/db/base.py gramps/gen/db/exceptions.py gramps/gen/db/generic.py -gramps/gen/db/undoredo.py gramps/gen/display/name.py gramps/gen/filters/_filterparser.py +gramps/gen/filters/_genericfilter.py gramps/gen/filters/rules/_changedsincebase.py gramps/gen/filters/rules/_everything.py gramps/gen/filters/rules/_hasattributebase.py @@ -177,6 +178,7 @@ gramps/gen/filters/rules/person/_hasnote.py gramps/gen/filters/rules/person/_hasnotematchingsubstringof.py gramps/gen/filters/rules/person/_hasnoteregexp.py gramps/gen/filters/rules/person/_hasrelationship.py +gramps/gen/filters/rules/person/_hassoundexname.py gramps/gen/filters/rules/person/_hassourcecount.py gramps/gen/filters/rules/person/_hassourceof.py gramps/gen/filters/rules/person/_hastag.py @@ -279,9 +281,13 @@ gramps/gen/filters/rules/source/_regexpidof.py gramps/gen/filters/rules/source/_sourceprivate.py gramps/gen/lib/attrtype.py gramps/gen/lib/childreftype.py +gramps/gen/lib/citation.py gramps/gen/lib/date.py +gramps/gen/lib/event.py +gramps/gen/lib/eventref.py gramps/gen/lib/eventroletype.py gramps/gen/lib/eventtype.py +gramps/gen/lib/family.py gramps/gen/lib/familyreltype.py gramps/gen/lib/grampstype.py gramps/gen/lib/ldsord.py @@ -290,14 +296,21 @@ gramps/gen/lib/media.py gramps/gen/lib/name.py gramps/gen/lib/nameorigintype.py gramps/gen/lib/nametype.py +gramps/gen/lib/note.py gramps/gen/lib/notetype.py gramps/gen/lib/person.py +gramps/gen/lib/place.py gramps/gen/lib/placetype.py +gramps/gen/lib/repo.py gramps/gen/lib/repotype.py +gramps/gen/lib/src.py gramps/gen/lib/srcmediatype.py gramps/gen/lib/srcattrtype.py +gramps/gen/lib/styledtext.py gramps/gen/lib/styledtexttagtype.py +gramps/gen/lib/surname.py gramps/gen/lib/surnamebase.py +gramps/gen/lib/tag.py gramps/gen/lib/urltype.py gramps/gen/merge/diff.py gramps/gen/merge/mergecitationquery.py @@ -322,7 +335,6 @@ gramps/gen/plug/docgen/paperstyle.py gramps/gen/plug/menu/_enumeratedlist.py gramps/gen/plug/report/_book.py gramps/gen/plug/report/_constants.py -gramps/gen/plug/report/_paper.py gramps/gen/plug/report/endnotes.py gramps/gen/plug/report/stdoptions.py gramps/gen/plug/report/utils.py @@ -331,8 +343,10 @@ gramps/gen/proxy/private.py gramps/gen/recentfiles.py gramps/gen/relationship.py gramps/gen/simple/_simpleaccess.py +gramps/gen/simple/_simpletable.py gramps/gen/utils/alive.py gramps/gen/utils/cast.py +gramps/gen/utils/configmanager.py gramps/gen/utils/db.py gramps/gen/utils/docgen/odstab.py gramps/gen/utils/image.py @@ -406,6 +420,7 @@ gramps/gui/editors/edittaglist.py gramps/gui/editors/editurl.py gramps/gui/editors/filtereditor.py gramps/gui/editors/objectentries.py +gramps/gui/filters/_filterstore.py gramps/gui/filters/_searchbar.py gramps/gui/filters/sidebar/_citationsidebarfilter.py gramps/gui/filters/sidebar/_eventsidebarfilter.py @@ -516,6 +531,7 @@ gramps/gui/views/listview.py gramps/gui/views/navigationview.py gramps/gui/views/pageview.py gramps/gui/views/tags.py +gramps/gui/views/treemodels/citationbasemodel.py gramps/gui/views/treemodels/citationtreemodel.py gramps/gui/views/treemodels/mediamodel.py gramps/gui/views/treemodels/peoplemodel.py @@ -541,7 +557,6 @@ gramps/plugins/db/bsddb/undoredo.py gramps/plugins/db/bsddb/upgrade.py gramps/plugins/db/bsddb/write.py gramps/plugins/db/dbapi/inmemorydb.gpr.py -gramps/plugins/db/dbapi/inmemorydb.py gramps/plugins/docgen/asciidoc.py gramps/plugins/docgen/docgen.gpr.py gramps/plugins/docgen/gtkprint.glade @@ -621,6 +636,7 @@ gramps/plugins/importer/importvcard.py gramps/plugins/importer/importxml.py gramps/plugins/lib/libcairodoc.py gramps/plugins/lib/libgedcom.py +gramps/plugins/lib/libholiday.py gramps/plugins/lib/libhtmlbackend.py gramps/plugins/lib/libhtmlconst.py gramps/plugins/lib/libmetadata.py @@ -707,6 +723,7 @@ gramps/plugins/tool/reorderids.py gramps/plugins/tool/sortevents.py gramps/plugins/tool/testcasegenerator.py gramps/plugins/tool/tools.gpr.py +gramps/plugins/tool/toolsdebug.gpr.py gramps/plugins/tool/verify.glade gramps/plugins/tool/verify.py gramps/plugins/view/citationlistview.py diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 396746327..88bbfcb2e 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1,5 +1,4 @@ # List of source files which do not need to be translated. -# $Id$ # # Python files # @@ -47,7 +46,6 @@ gramps/gen/datehandler/_date_sk.py gramps/gen/datehandler/_date_sl.py gramps/gen/datehandler/_date_sr.py gramps/gen/datehandler/_date_sv.py -gramps/gen/datehandler/_dateutils.py gramps/gen/datehandler/_date_zh.py gramps/gen/datehandler/_grampslocale.py # @@ -61,6 +59,7 @@ gramps/gen/db/cursor.py gramps/gen/db/dbconst.py gramps/gen/db/test/db_test.py gramps/gen/db/txn.py +gramps/gen/db/undoredo.py gramps/gen/db/utils.py # # gen.display package @@ -70,7 +69,6 @@ gramps/gen/display/__init__.py # gen.filters package # gramps/gen/filters/_filterlist.py -gramps/gen/filters/_genericfilter.py gramps/gen/filters/__init__.py gramps/gen/filters/_paramfilter.py gramps/gen/filters/_searchfilter.py @@ -139,12 +137,8 @@ gramps/gen/lib/baseobj.py gramps/gen/lib/gcalendar.py gramps/gen/lib/childref.py gramps/gen/lib/citationbase.py -gramps/gen/lib/citation.py gramps/gen/lib/const.py gramps/gen/lib/datebase.py -gramps/gen/lib/event.py -gramps/gen/lib/eventref.py -gramps/gen/lib/family.py gramps/gen/lib/genderstats.py gramps/gen/lib/ldsordbase.py gramps/gen/lib/location.py @@ -152,28 +146,21 @@ gramps/gen/lib/locationbase.py gramps/gen/lib/mediaobj.py gramps/gen/lib/mediabase.py gramps/gen/lib/mediaref.py -gramps/gen/lib/note.py gramps/gen/lib/notebase.py gramps/gen/lib/personref.py -gramps/gen/lib/place.py gramps/gen/lib/placebase.py gramps/gen/lib/primaryobj.py gramps/gen/lib/privacybase.py gramps/gen/lib/refbase.py -gramps/gen/lib/repo.py gramps/gen/lib/reporef.py gramps/gen/lib/researcher.py gramps/gen/lib/secondaryobj.py gramps/gen/lib/serialize.py -gramps/gen/lib/src.py gramps/gen/lib/srcbase.py gramps/gen/lib/srcref.py -gramps/gen/lib/styledtext.py gramps/gen/lib/styledtexttag.py -gramps/gen/lib/surname.py gramps/gen/lib/tableobj.py gramps/gen/lib/tagbase.py -gramps/gen/lib/tag.py gramps/gen/lib/test/date_test.py gramps/gen/lib/test/grampstype_test.py gramps/gen/lib/test/merge_test.py @@ -230,6 +217,7 @@ gramps/gen/plug/docgen/textdoc.py gramps/gen/plug/report/_bibliography.py gramps/gen/plug/report/__init__.py gramps/gen/plug/report/_options.py +gramps/gen/plug/report/_paper.py gramps/gen/plug/report/_reportbase.py # # gen proxy API @@ -356,7 +344,6 @@ gramps/gui/views/__init__.py # gui/views/treemodels - the GUI views package # gramps/gui/views/treemodels/__init__.py -gramps/gui/views/treemodels/citationbasemodel.py gramps/gui/views/treemodels/citationlistmodel.py gramps/gui/views/treemodels/eventmodel.py gramps/gui/views/treemodels/familymodel.py @@ -390,7 +377,10 @@ gramps/gui/widgets/valuetoolitem.py # plugins .gpr.py # gramps/plugins/__init__.py -gramps/plugins/tool/toolsdebug.gpr.py +# +# plugins/db directory +# +gramps/plugins/db/dbapi/inmemorydb.py # # plugins/docgen directory # @@ -410,7 +400,6 @@ gramps/plugins/export/test/exportvcard_test.py # gramps/plugins/lib/__init__.py gramps/plugins/lib/libgrampsxml.py -gramps/plugins/lib/libholiday.py gramps/plugins/lib/libhtml.py gramps/plugins/lib/libmapservice.py gramps/plugins/lib/libmixin.py