Merge branch 'master' of github.com:gramps-project/gramps

gramps/gen/datehandler/_date_ar.py

@@ -39,6 +39,7 @@ from ..lib.date import Date
 from ._dateparser import DateParser
 from ._datedisplay import DateDisplay
 from ._datehandler import register_datehandler
+from ..const import ARABIC_COMMA
 
 #-------------------------------------------------------------------------
 #
@@ -202,6 +203,27 @@ class DateDisplayAR(DateDisplay):
             scal = self.format_extras(cal, newyear)
             return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, scal)
 
+    def dd_dformat01(self, date_val):
+        """
+        numerical -- for Arabic dates
+        """
+        value = DateDisplay.dd_dformat01(self, date_val)
+        return value.replace(',', ARABIC_COMMA)
+
+    def dd_dformat02(self, date_val, inflect, long_months):
+        """
+        month_name day, year -- for Arabic dates
+        """
+        value = DateDisplay.dd_dformat02(self, date_val, inflect, long_months)
+        return value.replace(',', ARABIC_COMMA)
+
+    def dd_dformat03(self, date_val, inflect, short_months):
+        """
+        month_abbreviation day, year -- for Arabic dates
+        """
+        value = DateDisplay.dd_dformat03(self, date_val, inflect, short_months)
+        return value.replace(',', ARABIC_COMMA)
+
 #-------------------------------------------------------------------------
 #
 # Register classes

gramps/gen/datehandler/_date_bg.py

@@ -305,6 +305,26 @@ class DateDisplayBG(DateDisplay):
             scal = self.format_extras(cal, newyear)
             return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, scal)
 
+    def dd_dformat01(self, date_val):
+        """
+        numerical -- for Bulgarian dates
+        """
+        if date_val[3]:
+            return self.display_iso(date_val)
+        else:
+            if date_val[0] == date_val[1] == 0:
+                return str(date_val[2])
+            else:
+                value = self._tformat.replace('%m', str(date_val[1]))
+                # some locales have %b for the month, e.g. ar_EG, is_IS, nb_NO
+                value = value.replace('%b', str(date_val[1]))
+                if date_val[0] == 0: # ignore the zero day and its delimiter
+                    i_day = value.find('%e') # Bulgarian uses %e and not %d
+                    value = value.replace(value[i_day:i_day+3], '')
+                value = value.replace('%e', str(date_val[0]))
+                value = value.replace('%Y', str(abs(date_val[2])))
+                return value.replace('-', '/')
+
 #-------------------------------------------------------------------------
 #
 # Register classes

gramps/gen/datehandler/_date_is.py

@@ -30,6 +30,7 @@ Icelandic-specific classes for parsing and displaying dates.
 #
 #-------------------------------------------------------------------------
 import re
+import datetime
 
 #-------------------------------------------------------------------------
 #
@@ -172,6 +173,34 @@ class DateDisplayIs(DateDisplay):
             return "%s%s%s%s" % (qual_str, self._mod_str[mod],
                                  text, scal)
 
+    def _get_weekday(self, date_val):
+        if date_val[0] == 0 or date_val[1] == 0: # no day or no month or both
+            return ''
+        w_day = datetime.date(date_val[2], date_val[1], date_val[0]) # y, m, d
+        return self.short_days[((w_day.weekday() + 1) % 7) + 1]
+
+    def dd_dformat01(self, date_val):
+        """
+        numerical -- for Icelandic dates
+        """
+        if date_val[3]:
+            return self.display_iso(date_val)
+        else:
+            if date_val[0] == date_val[1] == 0:
+                return str(date_val[2])
+            else:
+                value = self._tformat.replace('%m', str(date_val[1]))
+                # some locales have %b for the month, e.g. ar_EG, is_IS, nb_NO
+                value = value.replace('%b', str(date_val[1]))
+                # some locales have %a for the abbreviated day, e.g. is_IS
+                value = value.replace('%a', self._get_weekday(date_val))
+                if date_val[0] == 0: # ignore the zero day and its delimiter
+                    i_day = value.find('%e') # Icelandic uses %e and not %d
+                    value = value.replace(value[i_day:i_day+3], '')
+                value = value.replace('%e', str(date_val[0]))
+                value = value.replace('%Y', str(abs(date_val[2])))
+                return value.replace('-', '/')
+
 #-------------------------------------------------------------------------
 #
 # Register classes

gramps/gen/datehandler/_date_pl.py

@@ -195,7 +195,7 @@ class DateDisplayPL(DateDisplay):
 
     formats = (
         "RRRR-MM-DD (ISO)", "Numeryczny", "Miesiąc Dzień, Rok",
-        "Dzień.Miesiąc.Rok", "Dzień Miesiąc Rok", "Dzień MieRzym Rok"
+        "Miesiąc.Dzień.Rok", "Dzień Miesiąc Rok", "Dzień MieRzym Rok"
         )
         # this definition must agree with its "_display_gregorian" method
 
@@ -224,15 +224,15 @@ class DateDisplayPL(DateDisplay):
         if self.format == 0:
             return self.display_iso(date_val)
         elif self.format == 1:
-            # month_number.day.year
+            # day.month_number.year
             if date_val[3]:
                 return self.display_iso(date_val)
             else:
                 if date_val[0] == date_val[1] == 0:
                     value = str(date_val[2])
                 else:
-                    value = self._tformat.replace('%m', str(date_val[0]))
+                    value = self._tformat.replace('%d', str(date_val[0]))
-                    value = value.replace('%d', str(date_val[1]))
+                    value = value.replace('%m', str(date_val[1]))
                     value = value.replace('%Y', str(date_val[2]))
         elif self.format == 2:
             # month_name day, year
@@ -245,14 +245,14 @@ class DateDisplayPL(DateDisplay):
                 value = "%s %d, %s" % (self.long_months[date_val[1]],
                                        date_val[0], year)
         elif self.format == 3:
-            # day. month_number. year
+            # month_number. day. year
             if date_val[0] == 0:
                 if date_val[1] == 0:
                     value = year
                 else:
                     value = "%d.%s" % (date_val[1], year)
             else:
-                value = "%d.%d.%s" % (date_val[0], date_val[1], year)
+                value = "%d.%d.%s" % (date_val[1], date_val[0], year)
         elif self.format == 4:
             # day month_name year
             if date_val[0] == 0:

gramps/gen/datehandler/_datedisplay.py

@@ -121,6 +121,7 @@ class DateDisplay:
         self._mod_str = self._ds.modifiers
         self._qual_str = self._ds.qualifiers
         self.long_days = self._ds.long_days
+        self.short_days = self._ds.short_days # Icelandic needs this
 
         if format is None:
             self.format = 0
@@ -553,6 +554,8 @@ class DateDisplay:
                 return str(date_val[2])
             else:
                 value = self._tformat.replace('%m', str(date_val[1]))
+                # some locales have %b for the month, e.g. ar_EG, is_IS, nb_NO
+                value = value.replace('%b', str(date_val[1]))
                 if date_val[0] == 0: # ignore the zero day and its delimiter
                     i_day = value.find('%d')
                     value = value.replace(value[i_day:i_day+3], '')

gramps/gen/datehandler/_datestrings.py

@@ -248,12 +248,23 @@ class DateStrings:
                 _("Saturday"),
             )
 
+        self.short_days = ("", # Icelandic needs them
+            _("Sun"),
+            _("Mon"),
+            _("Tue"),
+            _("Wed"),
+            _("Thu"),
+            _("Fri"),
+            _("Sat"))
+
+# set GRAMPS_RESOURCES then: python3 -m gramps.gen.datehandler._datestrings
 if __name__ == '__main__':
     import sys
     from ..utils.grampslocale import GrampsLocale
     from ..const import GRAMPS_LOCALE as glocale
     from ._grampslocale import (_deprecated_long_months as old_long,
             _deprecated_short_months as old_short,
+            _deprecated_short_days as old_short_days, # Icelandic needs them
             _deprecated_long_days as old_days)
     from ._datedisplay import DateDisplay
     import gettext
@@ -272,10 +283,10 @@ if __name__ == '__main__':
     print ("# Generating snippets for {}*.po\n"
             "# Available languages: {}".format(
                     lang_short, available_langs))
-    glocale = GrampsLocale(languages=(lang))
+    glocale = GrampsLocale(languages=(lang)) # in __main__
     dd = glocale.date_displayer
     ds = dd._ds
-    glocale_EN = GrampsLocale(languages=('en'))
+    glocale_EN = GrampsLocale(languages=('en')) # in __main__
     ds_EN = DateStrings(glocale_EN)
 
     filename = __file__
@@ -308,6 +319,7 @@ if __name__ == '__main__':
         localized_months = old_long
     print_po_snippet((ds_EN.long_months, localized_months, old_long),
             "localized lexeme inflections||")
+
     try:
         localized_months = dd.__class__.short_months
     except AttributeError:
@@ -315,6 +327,10 @@ if __name__ == '__main__':
     print_po_snippet((ds_EN.short_months, localized_months, old_short),
             "localized lexeme inflections - short month form||")
 
+    print_po_snippet((ds_EN.long_days, old_days, old_days), "")
+
+    print_po_snippet((ds_EN.short_days, old_short_days, old_short_days), "")
+
     try:
         loc = dd.__class__.hebrew
         print_po_snippet((ds_EN.hebrew, loc, loc),
@@ -356,5 +372,3 @@ if __name__ == '__main__':
                 "date quality|")
     except AttributeError:
         pass
-
-    print_po_snippet((ds_EN.long_days, old_days, old_days), "")

gramps/gen/db/undoredo.py

@@ -1,3 +1,22 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2015 Douglas S. Blank <doug.blank@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
 #-------------------------------------------------------------------------
 #
 # Standard python modules

gramps/gen/plug/docgen/graphicstyle.py

@@ -95,6 +95,7 @@ class GraphicsStyle:
             self.fill_color = obj.fill_color
             self.lwidth = obj.lwidth
             self.lstyle = obj.lstyle
+            self.description = obj.description
         else:
             self.para_name = ""
             self.shadow = 0
@@ -103,6 +104,19 @@ class GraphicsStyle:
             self.color = (0, 0, 0)
             self.fill_color = (255, 255, 255)
             self.lstyle = SOLID
+            self.description = ""
+
+    def set_description(self, text):
+        """
+        Set the desciption of the graphics object
+        """
+        self.description = text
+
+    def get_description(self):
+        """
+        Return the desciption of the graphics object
+        """
+        return self.description
 
     def set_line_width(self, val):
         """

gramps/gen/plug/docgen/stylesheet.py

@@ -147,25 +147,25 @@ class StyleSheetList:
             xml_file.write('<?xml version="1.0" encoding="utf-8"?>\n')
             xml_file.write('<stylelist>\n')
 
-            for name in sorted(self.map.keys()): # enable diff of archived copies
+            for name in sorted(self.map.keys()): # enable diff of archived ones
                 if name == "default":
                     continue
                 sheet = self.map[name]
-                xml_file.write('<sheet name="%s">\n' % escxml(name))
+                xml_file.write('  <sheet name="%s">\n' % escxml(name))
 
-                for p_name in sheet.get_paragraph_style_names():
+                for p_name in sorted(sheet.get_paragraph_style_names()):
                     self.write_paragraph_style(xml_file, sheet, p_name)
 
-                for t_name in sheet.get_table_style_names():
+                for t_name in sorted(sheet.get_table_style_names()):
                     self.write_table_style(xml_file, sheet, t_name)
 
-                for c_name in sheet.get_cell_style_names():
+                for c_name in sorted(sheet.get_cell_style_names()):
                     self.write_cell_style(xml_file, sheet, c_name)
 
-                for g_name in sheet.get_draw_style_names():
+                for g_name in sorted(sheet.get_draw_style_names()):
                     self.write_graphics_style(xml_file, sheet, g_name)
 
-                xml_file.write('</sheet>\n')
+                xml_file.write('  </sheet>\n')
             xml_file.write('</stylelist>\n')
 
     def write_paragraph_style(self, xml_file, sheet, p_name):
@@ -184,15 +184,15 @@ class StyleSheetList:
 
         # Write out style definition
         xml_file.write(
-            '<style name="%s">\n' % escxml(p_name) +
+            '    <style name="%s">\n' % escxml(p_name) +
-                '<font face="%d" ' % font.get_type_face() +
+            '      <font face="%d" ' % font.get_type_face() +
                     'size="%d" ' % font.get_size() +
                     'italic="%d" ' % font.get_italic() +
                     'bold="%d" ' % font.get_bold() +
                     'underline="%d" ' % font.get_underline() +
                     'color="#%02x%02x%02x" ' % font.get_color() +
                     '/>\n' +
-                '<para ' +
+            '      <para ' +
                     'description="%s" ' % escxml(para.get_description()) +
                     'rmargin="%.3f" ' % rmargin +
                     'lmargin="%.3f" ' % lmargin +
@@ -208,7 +208,7 @@ class StyleSheetList:
                     'rborder="%d" ' % para.get_right_border() +
                     'bborder="%d" ' % para.get_bottom_border() +
                     '/>\n' +
-            '</style>\n'
+            '    </style>\n'
         )
 
     def write_table_style(self, xml_file, sheet, t_name):
@@ -217,8 +217,8 @@ class StyleSheetList:
 
         # Write out style definition
         xml_file.write(
-            '<style name="%s">\n' % escxml(t_name) +
+            '    <style name="%s">\n' % escxml(t_name) +
-                '<table width="%d" ' % t_style.get_width() +
+            '      <table width="%d" ' % t_style.get_width() +
                     'columns="%d"' % t_style.get_columns() +
                     '>\n')
 
@@ -226,8 +226,8 @@ class StyleSheetList:
             column_width = t_style.get_column_width(col)
             xml_file.write('<column width="%d" />\n' % column_width)
 
-        xml_file.write('</table>\n')
+        xml_file.write('      </table>\n')
-        xml_file.write('</style>\n')
+        xml_file.write('    </style>\n')
 
     def write_cell_style(self, xml_file, sheet, c_name):
 
@@ -235,14 +235,14 @@ class StyleSheetList:
 
         # Write out style definition
         xml_file.write(
-            '<style name="%s">\n' % escxml(c_name) +
+            '    <style name="%s">\n' % escxml(c_name) +
-                '<cell lborder="%d" ' % cell.get_left_border() +
+            '      <cell lborder="%d" ' % cell.get_left_border() +
                     'rborder="%d" ' % cell.get_right_border() +
                     'tborder="%d" ' % cell.get_top_border() +
                     'bborder="%d" ' % cell.get_bottom_border() +
                     'pad="%.3f" ' % cell.get_padding() +
                     '/>\n' +
-            '</style>\n'
+            '    </style>\n'
         )
 
     def write_graphics_style(self, xml_file, sheet, g_name):
@@ -251,8 +251,9 @@ class StyleSheetList:
 
         # Write out style definition
         xml_file.write(
-            '<style name="%s">\n' % escxml(g_name) +
+            '    <style name="%s">\n' % escxml(g_name) +
-                '<draw para="%s" ' % draw.get_paragraph_style() +
+            '      <draw para="%s" ' % draw.get_paragraph_style() +
+                    'description="%s" ' % escxml(draw.get_description()) +
                     'width="%.3f" ' % draw.get_line_width() +
                     'style="%d" ' % draw.get_line_style() +
                     'color="#%02x%02x%02x" ' % draw.get_color() +
@@ -260,7 +261,7 @@ class StyleSheetList:
                     'shadow="%d" ' % draw.get_shadow() +
                     'space="%.3f" ' % draw.get_shadow_space() +
                     '/>\n' +
-            '</style>\n'
+            '    </style>\n'
         )
 
     def parse(self):
@@ -507,6 +508,8 @@ class SheetParser(handler.ContentHandler):
             self.c.set_padding(float(attrs['pad']))
         elif tag == "draw":
             self.g = GraphicsStyle()
+            if 'description' in attrs:
+                self.g.set_description(attrs['description'])
             self.g.set_paragraph_style(attrs['para'])
             self.g.set_line_width(float(attrs['width']))
             self.g.set_line_style(int(attrs['style']))

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
 

gramps/gen/utils/configmanager.py

@@ -256,8 +256,11 @@ class ConfigManager:
             try: # see bugs 5356, 5490, 5591, 5651, 5718, etc.
                 parser.read(filename, encoding='utf8')
             except Exception as err:
-                msg1 = _("WARNING: could not parse file %s because %s, recreating it:\n")
+                msg1 = _("WARNING: could not parse file:\n%(file)s\n"
-                logging.warn(msg1 % (filename, str(err)))
+                         "because %(error)s -- recreating it\n") % {
+                             'file' : filename,
+                             'error' : str(err)}
+                logging.warn(msg1)
                 return
             for sec in parser.sections():
                 name = sec.lower()

gramps/gui/logger/test/rotate_handler_test.py

@@ -32,6 +32,7 @@ class RotateHandlerTest(unittest.TestCase):
         rh = RotateHandler(10)
         l = logging.getLogger("RotateHandlerTest")
         l.setLevel(logging.DEBUG)
+        l.propagate = False
 
         l.addHandler(rh)
 
@@ -53,6 +54,7 @@ class RotateHandlerTest(unittest.TestCase):
         rh = RotateHandler(10)
         l = logging.getLogger("RotateHandlerTest")
         l.setLevel(logging.DEBUG)
+        l.propagate = False
 
         l.addHandler(rh)
 

gramps/gui/plug/report/_styleeditor.py

@@ -336,7 +336,9 @@ class StyleEditor(ManagedWindow):
         self.pname.set_text( '<span size="larger" weight="bold">%s</span>' %
                              self.current_name)
         self.pname.set_use_markup(True)
-        self.pdescription.set_text(_("No description available") )
+
+        descr = g.get_description()
+        self.pdescription.set_text(descr or _("No description available"))
 
         self.top.get_object("line_style").set_active(g.get_line_style())
         self.top.get_object("line_width").set_value(g.get_line_width())

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

gramps/plugins/db/bsddb/test/cursor_test.py

@@ -142,8 +142,8 @@ class CursorTest(unittest.TestCase):
 
         self.assertEqual(v.handle, data.handle)
 
-    def test_insert_with_curor_closed(self):
+    def test_insert_with_cursor_closed(self):
-        """test_insert_with_curor_closed"""
+        """test_insert_with_cursor_closed"""
 
         cursor_txn = self.env.txn_begin()
 
@@ -162,9 +162,8 @@ class CursorTest(unittest.TestCase):
 
         self.assertEqual(v.handle, data.handle)
 
-    @unittest.skip("Insert expected to fail with open cursor")
+    def test_insert_with_cursor_open(self):
-    def test_insert_with_curor_open(self):
+        """test_insert_with_cursor_open"""
-        """test_insert_with_curor_open"""
 
         cursor_txn = self.env.txn_begin()
         cursor = self.surnames.cursor(txn=cursor_txn)
@@ -172,9 +171,7 @@ class CursorTest(unittest.TestCase):
         cursor.next()
 
         data = Data(b'2', 'surname2', 'name2')
-        the_txn = self.env.txn_begin()
+        self.person_map.put(data.handle, data, txn=cursor_txn)
-        self.person_map.put(data.handle, data, txn=the_txn)
-        the_txn.commit()
 
         cursor.close()
         cursor_txn.commit()
@@ -183,9 +180,8 @@ class CursorTest(unittest.TestCase):
 
         self.assertEqual(v.handle, data.handle)
 
-    @unittest.skip("Insert expected to fail with open cursor")
+    def test_insert_with_cursor_open_and_db_open(self):
-    def test_insert_with_curor_open_and_db_open(self):
+        """test_insert_with_cursor_open_and_db_open"""
-        """test_insert_with_curor_open_and_db_open"""
 
         (person2,surnames2) = self._open_tables()
 
@@ -195,9 +191,7 @@ class CursorTest(unittest.TestCase):
         cursor.next()
 
         data = Data(b'2', 'surname2', 'name2')
-        the_txn = self.env.txn_begin()
+        self.person_map.put(data.handle, data, txn=cursor_txn)
-        self.person_map.put(data.handle, data, txn=the_txn)
-        the_txn.commit()
 
         cursor.close()
         cursor_txn.commit()

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)

gramps/plugins/export/exportftree.py

@@ -28,8 +28,6 @@
 #
 #-------------------------------------------------------------------------
 import os
-from gramps.gen.const import GRAMPS_LOCALE as glocale
-_ = glocale.translation.gettext
 
 #------------------------------------------------------------------------
 #

gramps/plugins/importer/importxml.py

@@ -119,7 +119,7 @@ def importData(database, filename, user):
     database.smap = {}
     database.pmap = {}
     database.fmap = {}
-    line_cnt = 0
+    line_cnt = 1
     person_cnt = 0
 
     with ImportOpenFileContextManager(filename, user) as xml_file:
@@ -900,7 +900,7 @@ class GrampsParser(UpdateCallback):
                 gramps_ids[id_] = gramps_id
         return gramps_ids[id_]
 
-    def parse(self, ifile, linecount=0, personcount=0):
+    def parse(self, ifile, linecount=1, personcount=0):
         """
         Parse the xml file
         :param ifile: must be a file handle that is already open, with position

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #------------------------------------------------------------------------
 #

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"
 

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
 
 #------------------------------------------------------------------------
 #

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"
 

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",
+name  = _("Dump Gender Statistics"),
-description =  ("Will dump the statistics for the gender guessing "
+description = _("Will dump the statistics for guessing the gender "
                 "from the first name."),
 version = '1.0',
 gramps_target_version = MODULE_VERSION,

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"
 

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
 

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

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

po/he.po

@@ -1970,109 +1970,77 @@ msgstr ""
 msgid "today"
 msgstr "היום"
 
-#. TRANSLATORS: see
-#. http://gramps-project.org/wiki/index.php?title=Translating_Gramps#Translating_dates
-#. to learn how to select proper inflection to be used in your localized
-#. DateDisplayer code!
-#: ../gramps/gen/datehandler/_datestrings.py:79
 msgid "localized lexeme inflections||January"
-msgstr ""
+msgstr "ינואר"
 
-#: ../gramps/gen/datehandler/_datestrings.py:80
 msgid "localized lexeme inflections||February"
-msgstr ""
+msgstr "פברואר"
 
-#: ../gramps/gen/datehandler/_datestrings.py:81
 msgid "localized lexeme inflections||March"
-msgstr ""
+msgstr "מרץ"
 
-#: ../gramps/gen/datehandler/_datestrings.py:82
 msgid "localized lexeme inflections||April"
-msgstr ""
+msgstr "אפריל"
 
-#: ../gramps/gen/datehandler/_datestrings.py:83
 msgid "localized lexeme inflections||May"
-msgstr ""
+msgstr "מאי"
 
-#: ../gramps/gen/datehandler/_datestrings.py:84
 msgid "localized lexeme inflections||June"
-msgstr ""
+msgstr "יוני"
 
-#: ../gramps/gen/datehandler/_datestrings.py:85
 msgid "localized lexeme inflections||July"
-msgstr ""
+msgstr "יולי"
 
-#: ../gramps/gen/datehandler/_datestrings.py:86
 msgid "localized lexeme inflections||August"
-msgstr ""
+msgstr "אוגוסט"
 
-#: ../gramps/gen/datehandler/_datestrings.py:87
 msgid "localized lexeme inflections||September"
-msgstr ""
+msgstr "ספטמבר"
 
-#: ../gramps/gen/datehandler/_datestrings.py:88
 msgid "localized lexeme inflections||October"
-msgstr ""
+msgstr "אוקטובר"
 
-#: ../gramps/gen/datehandler/_datestrings.py:89
 msgid "localized lexeme inflections||November"
-msgstr ""
+msgstr "נובמבר"
 
-#: ../gramps/gen/datehandler/_datestrings.py:90
 msgid "localized lexeme inflections||December"
-msgstr ""
+msgstr "דצמבר"
 
-#. TRANSLATORS: see
-#. http://gramps-project.org/wiki/index.php?title=Translating_Gramps#Translating_dates
-#. to learn how to select proper inflection to be used in your localized
-#. DateDisplayer code!
-#: ../gramps/gen/datehandler/_datestrings.py:97
 msgid "localized lexeme inflections - short month form||Jan"
-msgstr ""
+msgstr "ינו"
 
-#: ../gramps/gen/datehandler/_datestrings.py:98
 msgid "localized lexeme inflections - short month form||Feb"
-msgstr ""
+msgstr "פבר"
 
-#: ../gramps/gen/datehandler/_datestrings.py:99
 msgid "localized lexeme inflections - short month form||Mar"
-msgstr ""
+msgstr "מרץ"
 
-#: ../gramps/gen/datehandler/_datestrings.py:100
 msgid "localized lexeme inflections - short month form||Apr"
-msgstr ""
+msgstr "אפר"
 
-#: ../gramps/gen/datehandler/_datestrings.py:101
 msgid "localized lexeme inflections - short month form||May"
-msgstr ""
+msgstr "מאי"
 
-#: ../gramps/gen/datehandler/_datestrings.py:102
 msgid "localized lexeme inflections - short month form||Jun"
-msgstr ""
+msgstr "יונ"
 
-#: ../gramps/gen/datehandler/_datestrings.py:103
 msgid "localized lexeme inflections - short month form||Jul"
-msgstr ""
+msgstr "יול"
 
-#: ../gramps/gen/datehandler/_datestrings.py:104
 msgid "localized lexeme inflections - short month form||Aug"
-msgstr ""
+msgstr "אוג"
 
-#: ../gramps/gen/datehandler/_datestrings.py:105
 msgid "localized lexeme inflections - short month form||Sep"
-msgstr ""
+msgstr "ספט"
 
-#: ../gramps/gen/datehandler/_datestrings.py:106
 msgid "localized lexeme inflections - short month form||Oct"
-msgstr ""
+msgstr "אוק"
 
-#: ../gramps/gen/datehandler/_datestrings.py:107
 msgid "localized lexeme inflections - short month form||Nov"
-msgstr ""
+msgstr "נוב"
 
-#: ../gramps/gen/datehandler/_datestrings.py:108
 msgid "localized lexeme inflections - short month form||Dec"
-msgstr ""
+msgstr "דצמ"
 
 #. TRANSLATORS: see
 #. http://gramps-project.org/wiki/index.php?title=Translating_Gramps#Translating_dates
@@ -34669,6 +34637,27 @@ msgstr "נברסקה"
 msgid "No style sheet"
 msgstr "ללא עמוד סגנון"
 
+msgid "Sun"
+msgstr "א'"
+
+msgid "Mon"
+msgstr "ב'"
+
+msgid "Tue"
+msgstr "ג'"
+
+msgid "Wed"
+msgstr "ד'"
+
+msgid "Thu"
+msgstr "ה'"
+
+msgid "Fri"
+msgstr "ו'"
+
+msgid "Sat"
+msgstr "ש'"
+
 #~ msgid "none"
 #~ msgstr "ללא"
 

po/is.po

@@ -2756,6 +2756,34 @@ msgstr "Föstudagur"
 msgid "Saturday"
 msgstr "Laugardagur"
 
+#: ../gramps/gen/datehandler/_datestrings.py:10031
+msgid "Sun"
+msgstr "sun"
+
+#: ../gramps/gen/datehandler/_datestrings.py:10032
+msgid "Mon"
+msgstr "mán"
+
+#: ../gramps/gen/datehandler/_datestrings.py:10033
+msgid "Tue"
+msgstr "þri"
+
+#: ../gramps/gen/datehandler/_datestrings.py:10034
+msgid "Wed"
+msgstr "mið"
+
+#: ../gramps/gen/datehandler/_datestrings.py:10035
+msgid "Thu"
+msgstr "fim"
+
+#: ../gramps/gen/datehandler/_datestrings.py:10036
+msgid "Fri"
+msgstr "fös"
+
+#: ../gramps/gen/datehandler/_datestrings.py:10037
+msgid "Sat"
+msgstr "lau"
+
 #: ../gramps/gen/db/base.py:1750 ../gramps/gui/widgets/fanchart.py:1831
 msgid "Add child to family"
 msgstr "Bæta barni við fjölskyldu"