Merge branch 'gramps51'

debian/changelog

@@ -1,3 +1,11 @@
+gramps (5.1.5-1) unstable; urgency=medium
+
+  * New release
+  * Update copyright file
+  * Drop patch, incorporated upstream
+
+ -- Ross Gammon <rossgammon@debian.org>  Sat, 12 Feb 2022 17:01:21 +0100
+
 gramps (5.1.4-1) unstable; urgency=medium
 
   * New release

debian/copyright

@@ -46,7 +46,7 @@ Copyright: 2000-2007, Alex Roitman
            2009, Florian Heinle
            2009, Gerald W. Britton
            2009, Igal Shapira
-           2009-2018, Nick Hall
+           2009-2022, Nick Hall
            2009, Pander Musubi
            2009, Robert Ham
            2009, Swoon on bug tracker

debian/patches/fix-probably_alive_test.patch

@@ -1,22 +0,0 @@
-Description: Fix probably alive test
- The probably alive funtion was fixed just prior to the Gramps 5.1.4
- release. It appears the relevant unit test was not updated to match.
- The relevant commit:
- https://github.com/gramps-project/gramps/commit/a685b96f700dcfc6b953413cb3adc8be61d87438
-Author: Ross Gammon <rossgammon@debian.org>
-Forwarded: no
-Applied-Upstream: no
-Last-Update: 2021-08-09
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/gramps/gen/filters/rules/test/person_rules_test.py
-+++ b/gramps/gen/filters/rules/test/person_rules_test.py
-@@ -347,7 +347,7 @@
-         """
-         rule = ProbablyAlive(['1900'])
-         res = self.filter_with_rule(rule)
--        self.assertEqual(len(res), 766)
-+        self.assertEqual(len(res), 733)
- 
-     def test_RegExpName(self):
-         """

debian/patches/series

@@ -1 +0,0 @@
-fix-probably_alive_test.patch

gramps/gen/utils/grampslocale.py

@@ -119,7 +119,7 @@ _LOCALE_NAMES = {
 _RTL_LOCALES = ('ar', 'he')
 
 # locales with less than 70% currently translated
-INCOMPLETE_TRANSLATIONS = ('ar', 'bg', 'he', 'sq', 'ta', 'tr')
+INCOMPLETE_TRANSLATIONS = ('ar', 'bg', 'sq', 'ta', 'tr', 'zh_HK', 'zh_TW')
 
 def _check_mswin_locale(locale):
     msloc = None

gramps/plugins/lib/librecords.py

@@ -314,13 +314,16 @@ def find_records(db, filter, top_size, callname,
         if mother is None:
             continue
 
-        name = StyledText(trans_text("%(father)s and %(mother)s")) % {
+        father_name = _get_styled_primary_name(father, callname,
-                'father': _get_styled_primary_name(father, callname,
+                                               trans_text=trans_text,
-                                                   trans_text=trans_text,
+                                               name_format=name_format)
-                                                   name_format=name_format),
+        mother_name = _get_styled_primary_name(mother, callname,
-                'mother': _get_styled_primary_name(mother, callname,
+                                               trans_text=trans_text,
-                                                   trans_text=trans_text,
+                                               name_format=name_format)
-                                                   name_format=name_format)}
+
+        name = StyledText(trans_text("%(father)s and %(mother)s"))
+        name = name.replace('%(father)s', father_name)
+        name = name.replace('%(mother)s', mother_name)
 
         if (living_mode == LivingProxyDb.MODE_INCLUDE_ALL
             or (not probably_alive(unfil_father, db) and