Merge branch 'maintenance/gramps41' of github.com:gramps-project/gramps into gramps41

po/check_po

@@ -116,6 +116,38 @@ class Check_named_fmt( Check ):
                         msgstr = msg.msgstr[1]
                         self.__process( msg, msgid, msgstr )
 
+class Check_mapping_fmt( Check ):
+        # A pattern to find all {}
+        find_map_pat = re.compile('\{ \w+ \}', re.VERBOSE)
+
+        def __init__( self ):
+                Check.__init__( self )
+                self.diag_header = "-------- {} name mismatches --------------"
+                self.summary_text = "{} name mismatches:"
+
+        def __process( self, msg, msgid, msgstr ):
+                # Same number of named formats?
+                fmts1 = self.find_map_pat.findall( msgid )
+                fmts2 = self.find_map_pat.findall( msgstr )
+                if len( fmts1 ) != len( fmts2 ):
+                        self.msgs.append( msg )
+                else:
+                        # Do we have the same named formats?
+                        fmts1.sort()
+                        fmts2.sort()
+                        if fmts1 != fmts2:
+                                self.msgs.append( msg )
+
+        def process( self, msg ):
+                msgid = msg.msgid
+                msgstr = msg.msgstr[0]
+                self.__process( msg, msgid, msgstr )
+
+                if msg.msgidp and len(msg.msgstr) >= 2:
+                        msgid = msg.msgidp
+                        msgstr = msg.msgstr[1]
+                        self.__process( msg, msgid, msgstr )
+
 class Check_missing_sd( Check ):
         # A pattern to find %() without s or d
         # Here is a command to use for testing
@@ -513,6 +545,7 @@ def analyze_msgs( args, fname, msgs, nr_templates = None, nth = 0 ):
         checks.append( Check_fmt( '%s' ) )
         checks.append( Check_fmt( '%d' ) )
         checks.append( Check_named_fmt() )
+        checks.append( Check_mapping_fmt() )
         checks.append( Check_missing_sd() )
         checks.append( Check_runaway() )
         checks.append( Check_xml_chars() )

po/nl.po

@@ -6399,23 +6399,20 @@ msgid "Street"
 msgstr "Straat"
 
 #: ../gramps/gen/lib/placetype.py:76
-#, fuzzy
 msgid "Province"
 msgstr "Deelstaat/Provincie"
 
 #: ../gramps/gen/lib/placetype.py:77
-#, fuzzy
 msgid "Region"
-msgstr "Religie"
+msgstr "Regio"
 
 #: ../gramps/gen/lib/placetype.py:78
-#, fuzzy
 msgid "Department"
-msgstr "Pensioen"
+msgstr "Departement"
 
 #: ../gramps/gen/lib/placetype.py:79
 msgid "Neighborhood"
-msgstr ""
+msgstr "Buurt"
 
 #: ../gramps/gen/lib/placetype.py:80
 msgid "District"
@@ -6426,9 +6423,8 @@ msgid "Borough"
 msgstr ""
 
 #: ../gramps/gen/lib/placetype.py:82
-#, fuzzy
 msgid "Municipality"
-msgstr "Plaats"
+msgstr "Gemeente"
 
 #: ../gramps/gen/lib/placetype.py:83
 msgid "Town"
@@ -6436,7 +6432,7 @@ msgstr ""
 
 #: ../gramps/gen/lib/placetype.py:84
 msgid "Village"
-msgstr ""
+msgstr "Dorp"
 
 #: ../gramps/gen/lib/placetype.py:85
 msgid "Hamlet"
@@ -6444,7 +6440,7 @@ msgstr ""
 
 #: ../gramps/gen/lib/placetype.py:86
 msgid "Farm"
-msgstr ""
+msgstr "Boerderij"
 
 #: ../gramps/gen/lib/placetype.py:87
 #, fuzzy
@@ -8110,7 +8106,7 @@ msgstr "Onbekend, aangemaakt om een ontbrekend opmerkingsobject te vervangen."
 #: ../gramps/gen/utils/unknown.py:149
 #, python-format
 msgid "Unknown, was missing %(time)s (%(count)d)"
-msgstr "Obekend, %(time)s (%(count)d) ontbrak"
+msgstr "Onbekend, %(time)s (%(count)d) ontbrak"
 
 #: ../gramps/gen/utils/unknown.py:168
 #, python-format
@@ -17681,7 +17677,7 @@ msgstr "doopdatum"
 
 #: ../gramps/plugins/export/exportcsv.py:368 ../gramps/plugins/importer/importcsv.py:201
 msgid "Baptism place"
-msgstr "doopplaats"
+msgstr "Doopplaats"
 
 #: ../gramps/plugins/export/exportcsv.py:368 ../gramps/plugins/importer/importcsv.py:206
 msgid "Baptism source"

po/update_po.py

@@ -169,9 +169,13 @@ def TipsParse(filename, mark):
     tips = open('../data/tips.xml.in.h', 'w')
     marklist = root.iter(mark)
     for key in marklist:
-        tip = ElementTree.tostring(key, encoding="UTF-8")
-        tip = tip.replace("<?xml version='1.0' encoding='UTF-8'?>", "")
-        tip = tip.replace('\n<_tip number="%(number)s">' % key.attrib, "")
+        tip = ElementTree.tostring(key, encoding="UTF-8", method="xml")
+        if sys.version_info[0] < 3:
+            tip = tip.replace("<?xml version='1.0' encoding='UTF-8'?>", "")
+            tip = tip.replace('\n<_tip number="%(number)s">' % key.attrib, "")
+        else: # python3 support
+            tip = tip.decode("utf-8")
+            tip = tip.replace('<_tip number="%(number)s">' % key.attrib, "")
         tip = tip.replace("<br />", "<br/>")
         #tip = tip.replace("\n</_tip>\n", "</_tip>\n") # special case tip 7
         #tip = tip.replace("\n<b>", "<b>") # special case tip 18