From 39114d52a4d1a176ee8d352c0460a74866f1f1fe Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Fri, 10 Jan 2025 15:24:11 -0500
Subject: [PATCH 01/26] Add keyword search on people's names (#1711)

---
 geniza/entities/forms.py                      | 15 +++
 geniza/entities/models.py                     | 33 +++++++
 .../templates/entities/person_list.html       | 27 +++++-
 geniza/entities/tests/test_entities_models.py | 60 +++++++++++-
 geniza/entities/tests/test_entities_views.py  | 41 ++++++++
 geniza/entities/views.py                      | 17 +++-
 sitemedia/js/controllers/search_controller.js | 66 ++++++++++++-
 sitemedia/scss/components/_peopleform.scss    |  4 +
 sitemedia/scss/components/_searchform.scss    | 96 ++++++++++---------
 sitemedia/scss/pages/_people.scss             | 30 ++++++
 sitemedia/scss/pages/_search.scss             |  5 +-
 solr_conf/conf/managed-schema                 |  6 ++
 solr_conf/conf/solrconfig.xml                 | 15 +++
 13 files changed, 359 insertions(+), 56 deletions(-)

diff --git a/geniza/entities/forms.py b/geniza/entities/forms.py
index d1552c4df..86e7be2f1 100644
--- a/geniza/entities/forms.py
+++ b/geniza/entities/forms.py
@@ -117,6 +117,19 @@ class Meta:
 
 
 class PersonListForm(RangeForm):
+    q = forms.CharField(
+        label="Keyword or Phrase",
+        required=False,
+        widget=forms.TextInput(
+            attrs={
+                # Translators: placeholder for people keyword search input
+                "placeholder": _("Search for people by name"),
+                # Translators: accessible label for people keyword search input
+                "aria-label": _("word or phrase"),
+                "type": "search",
+            }
+        ),
+    )
     gender = FacetChoiceField(label=_("Gender"))
     has_page = BooleanFacetField(label=_("Detail page available"))
     social_role = FacetChoiceField(label=_("Social role"))
@@ -125,6 +138,8 @@ class PersonListForm(RangeForm):
     date_range = RangeField(label=_("Dates"), required=False, widget=YearRangeWidget())
 
     SORT_CHOICES = [
+        # Translators: label for sort by relevance
+        ("relevance", _("Relevance")),
         # Translators: label for sort by name
         ("name", _("Name")),
         # Translators: label for sort by person activity dates
diff --git a/geniza/entities/models.py b/geniza/entities/models.py
index 2086d4566..73cedf4c3 100644
--- a/geniza/entities/models.py
+++ b/geniza/entities/models.py
@@ -16,6 +16,7 @@
 from django.db.models.query import Prefetch
 from django.forms import ValidationError
 from django.urls import reverse
+from django.utils.html import strip_tags
 from django.utils.translation import gettext as _
 from gfklookupwidget.fields import GfkLookupField
 from parasolr.django import AliasedSolrQuerySet
@@ -871,6 +872,7 @@ def index_data(self):
                 # basic metadata
                 "slug_s": self.slug,
                 "name_s": str(self),
+                "other_names_ss": [n.name for n in self.names.non_primary()],
                 "description_txt": self.description_en,
                 "gender_s": self.get_gender_display(),
                 "role_s": self.role.name_en if self.role else None,
@@ -951,8 +953,12 @@ class PersonSolrQuerySet(AliasedSolrQuerySet):
 
     #: map readable field names to actual solr fields
     field_aliases = {
+        "id": "id",  # needed to match results with highlighting
         "slug": "slug_s",
         "name": "name_s",
+        # need access to these other_names fields for highlighting
+        "other_names_nostem": "other_names_nostem",
+        "other_names_bigram": "other_names_bigram",
         "description": "description_txt",
         "gender": "gender_s",
         "role": "role_s",
@@ -965,6 +971,33 @@ class PersonSolrQuerySet(AliasedSolrQuerySet):
         "has_page": "has_page_b",
     }
 
+    keyword_search_qf = "{!type=edismax qf=$people_qf pf=$people_pf v=$keyword_query}"
+
+    def keyword_search(self, search_term):
+        """Allow searching using keywords with the specified query and phrase match
+        fields, and set the default operator to AND"""
+        query_params = {"keyword_query": search_term, "q.op": "AND"}
+        return self.search(self.keyword_search_qf).raw_query_parameters(
+            **query_params,
+        )
+
+    def get_highlighting(self):
+        """dedupe highlights across variant fields (e.g. for other_names)"""
+        highlights = super().get_highlighting()
+        for person in highlights.keys():
+            other_names = set()
+            # iterate through other_names_* fields to get all matches
+            for hls in [
+                highlights[person][field]
+                for field in highlights[person].keys()
+                if field.startswith("other_names_")
+            ]:
+                # strip highglight tags and whitespace, then add to set
+                cleaned_names = [strip_tags(hl.strip()) for hl in hls]
+                other_names.update(set(cleaned_names))
+            highlights[person]["other_names"] = [n for n in other_names if n]
+        return highlights
+
 
 class PastPersonSlug(models.Model):
     """A slug that was previously associated with a :class:`Person`;
diff --git a/geniza/entities/templates/entities/person_list.html b/geniza/entities/templates/entities/person_list.html
index 3197c9b5d..65c8d6f41 100644
--- a/geniza/entities/templates/entities/person_list.html
+++ b/geniza/entities/templates/entities/person_list.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load static i18n humanize widget_tweaks %}
+{% load static i18n humanize corpus_extras widget_tweaks %}
 
 {% block meta_title %}{{ page_title }}{% endblock meta_title %}
 {% block meta_description %}{{ page_description }}{% endblock meta_description %}
@@ -8,6 +8,13 @@
     <form data-controller="search" data-turbo-frame="main" data-turbo-action="advance" data-page="person">
         <div class="topheader-row">
             <h1>{{ page_title }}</h1>
+            <fieldset id="query">
+                {% render_field form.q data-search-target="query" data-action="input->search#autoUpdateRadioSort change->search#update" %}
+
+                {# Translators: Search submit button #}
+                {% translate 'Submit search' as search_label %}
+                <button type="submit" aria-label="{{ search_label }}" />
+            </fieldset>
             <label id="people-view-switcher" for="switcher">
                 <input id="switcher" type="checkbox" data-search-target="peopleMode" data-action="click->search#togglePeopleViewMode" />
                 {# Translators: label for people browse page list view #}
@@ -99,7 +106,7 @@ <h2>
                         <summary>
                             {{ form.get_sort_label|default:"Name" }}
                         </summary>
-                        <div id="sort-options">
+                        <div id="sort-options" data-search-target="radioSort" >
                             {% render_field form.sort data-action="search#update" %}
                             {% render_field form.sort_dir data-action="search#update" %}
                         </div>
@@ -111,6 +118,8 @@ <h2>
                 <thead>
                     {# Translators: Person "name" column header on the browse page #}
                     <th>{% translate "Name" %}</th>
+                    {# Translators: Person "other names" column header on the browse page #}
+                    {% if highlighting %}<th>{% translate "Other names" %}</th>{% endif %}
                     {# Translators: Person "gender" column header on the browse page #}
                     <th>{% translate "Gender" %}</th>
                     {# Translators: Person "dates of activity" column header on the browse page #}
@@ -142,6 +151,20 @@ <h2>
                                     <span>{{ person.name }}</span>
                                 {% endif %}
                             </td>
+                            {% with person_highlights=highlighting|dict_item:person.id %}
+                                {% if highlighting %}
+                                    {% spaceless %}
+                                        <td class="other-names">
+                                            {% if person_highlights.other_names %}
+                                                <span class="aka">{% translate "Also known as: " %}</span>
+                                                {% for match in person_highlights.other_names %}
+                                                    <span class="name">{{ match|safe }}</span>{% if not forloop.last %}, {% endif %}
+                                                {% endfor %}
+                                            {% endif %}
+                                        </td>
+                                    {% endspaceless %}
+                                {% endif %}
+                            {% endwith %}
                             <td class="gender">{{ person.gender }}</td>
                             <td class="dates">{{ person.date_str }}</td>
                             <td class="role">{{ person.role }}</td>
diff --git a/geniza/entities/tests/test_entities_models.py b/geniza/entities/tests/test_entities_models.py
index 901e5e7c1..aaed8df00 100644
--- a/geniza/entities/tests/test_entities_models.py
+++ b/geniza/entities/tests/test_entities_models.py
@@ -31,6 +31,7 @@
     PersonPlaceRelationType,
     PersonRole,
     PersonSignalHandlers,
+    PersonSolrQuerySet,
     Place,
     PlaceEventRelation,
     PlacePlaceRelation,
@@ -455,7 +456,7 @@ def test_solr_date_range(self, person, document):
     def test_total_to_index(self, person, person_multiname):
         assert Person.total_to_index() == 2
 
-    def test_index_data(self, person, document):
+    def test_index_data(self, person, person_multiname, document):
         document.doc_date_standard = "1200/1300"
         document.save()
         (pdrtype, _) = PersonDocumentRelationType.objects.get_or_create(name="test")
@@ -484,6 +485,63 @@ def test_index_data(self, person, document):
         assert index_data["end_dating_i"] == PartialDate("1300").numeric_format(
             mode="max"
         )
+        index_data = person_multiname.index_data()
+        assert str(person_multiname) not in index_data["other_names_ss"]
+        assert (
+            str(person_multiname.names.non_primary().first())
+            in index_data["other_names_ss"]
+        )
+
+
+class TestPersonSolrQuerySet:
+    def test_keyword_search(self):
+        pqs = PersonSolrQuerySet()
+        with patch.object(pqs, "search") as mocksearch:
+            pqs.keyword_search("halfon")
+            mocksearch.assert_called_with(pqs.keyword_search_qf)
+            mocksearch.return_value.raw_query_parameters.assert_called_with(
+                **{
+                    "keyword_query": "halfon",
+                    "q.op": "AND",
+                }
+            )
+
+    def test_get_highlighting(self):
+        pqs = PersonSolrQuerySet()
+        with patch("geniza.entities.models.super") as mock_super:
+            # no highlighting
+            mock_get_highlighting = mock_super.return_value.get_highlighting
+            mock_get_highlighting.return_value = {}
+            assert pqs.get_highlighting() == {}
+
+            # highlighting but no other_names field
+            test_highlight = {"person.1": {"description": ["foo bar baz"]}}
+            mock_get_highlighting.return_value = test_highlight
+            # returned unchanged
+            assert pqs.get_highlighting() == test_highlight
+
+            # highlighting single other_names field
+            test_highlight = {
+                "person.1": {"other_names_bigram": ["<em>Yaʿaqov</em> b. Shemuʾel"]}
+            }
+            mock_get_highlighting.return_value = test_highlight
+            # should strip html tags
+            assert pqs.get_highlighting()["person.1"]["other_names"] == [
+                "Yaʿaqov b. Shemuʾel"
+            ]
+
+            # highlighting multiple other_names fields
+            test_highlight = {
+                "person.1": {
+                    "other_names_nostem": ["", "<em>Ibn</em> al-Qaṭāʾif"],
+                    "other_names_bigram": ["", "<em>Ibn</em> al-Qaṭāʾif"],
+                }
+            }
+            mock_get_highlighting.return_value = test_highlight
+            # should strip html tags, dedupe, and remove empty strings
+            assert pqs.get_highlighting()["person.1"]["other_names"] == [
+                "Ibn al-Qaṭāʾif"
+            ]
 
 
 @pytest.mark.django_db
diff --git a/geniza/entities/tests/test_entities_views.py b/geniza/entities/tests/test_entities_views.py
index e2e5d9c94..4e869eddc 100644
--- a/geniza/entities/tests/test_entities_views.py
+++ b/geniza/entities/tests/test_entities_views.py
@@ -420,6 +420,47 @@ def test_get_queryset__filters(
                 personlist_view.get_queryset()
                 mock_order_by.assert_called_with("start_dating_i")
 
+    def test_get_queryset__keyword_query(
+        self, person, person_diacritic, person_multiname
+    ):
+        SolrClient().update.index(
+            [
+                person.index_data(),
+                person_diacritic.index_data(),
+                person_multiname.index_data(),
+            ],
+            commit=True,
+        )
+        personlist_view = PersonListView()
+        with patch.object(personlist_view, "get_form") as mock_get_form:
+            mock_get_form.return_value.cleaned_data = {"q": str(person)}
+            qs = personlist_view.get_queryset()
+            # should return the person
+            assert qs.count() == 1
+            resulting_ids = [result["id"] for result in qs]
+            assert f"person.{person.id}" in resulting_ids
+
+            Name.objects.create(name=str(person), content_object=person_multiname)
+            SolrClient().update.index([person_multiname.index_data()], commit=True)
+            mock_get_form.return_value.cleaned_data = {
+                "q": str(person),
+                "sort": "relevance",
+                "sort_dir": "desc",
+            }
+            qs = personlist_view.get_queryset()
+            # should return both people
+            assert qs.count() == 2
+            resulting_ids = [result["id"] for result in qs]
+            assert f"person.{person.id}" in resulting_ids
+            assert f"person.{person_multiname.id}" in resulting_ids
+            # primary name should be prioritized above other names in relevance
+            assert qs[0]["id"] == f"person.{person.id}"
+            assert qs[0]["score"] > qs[1]["score"]
+            # other names should be highlighted
+            highlights = qs.get_highlighting()
+            assert f"person.{person_multiname.id}" in highlights
+            assert "other_names" in highlights[f"person.{person_multiname.id}"]
+
     def test_get_context_data(self, client, person):
         with patch.object(PersonListForm, "set_choices_from_facets") as mock_setchoices:
             response = client.get(reverse("entities:person-list"))
diff --git a/geniza/entities/views.py b/geniza/entities/views.py
index 6955c2828..38813dcc5 100644
--- a/geniza/entities/views.py
+++ b/geniza/entities/views.py
@@ -545,6 +545,7 @@ class PersonListView(ListView, FormMixin, SolrDateRangeMixin):
 
     # sort options mapped to solr fields
     sort_fields = {
+        "relevance": "score",
         "name": "slug_s",
         "role": "role_s",
         "documents": "documents_i",
@@ -582,8 +583,18 @@ def get_queryset(self, *args, **kwargs):
         if not form.is_valid():
             return people.none()
 
-        # filter by database fields using the Django ORM
         search_opts = form.cleaned_data
+        if search_opts.get("q"):
+            # keyword search query, highlighting, and relevance scoring.
+            # highlight non-primary names so that we know to show them in the
+            # result list if they match the query; by default they are hidden
+            people = (
+                people.keyword_search(search_opts["q"].replace("'", ""))
+                .highlight("other_names_nostem", snippets=3, method="unified")
+                .highlight("other_names_bigram", snippets=3, method="unified")
+                .also("score")
+            )
+
         self.applied_filter_labels = []
         if search_opts.get("gender"):
             genders = literal_eval(search_opts["gender"])
@@ -680,6 +691,9 @@ def get_context_data(self, **kwargs):
         facet_dict = self.queryset.get_facets()
         # populate choices for facet filter fields on the form
         context_data["form"].set_choices_from_facets(facet_dict.facet_fields)
+        # get highlighting
+        paged_result = context_data["page_obj"].object_list
+        highlights = paged_result.get_highlighting() if paged_result.count() else {}
 
         context_data.update(
             {
@@ -687,6 +701,7 @@ def get_context_data(self, **kwargs):
                 "page_description": self.page_description,
                 "page_type": "people",
                 "applied_filters": self.applied_filter_labels,
+                "highlighting": highlights,
             }
         )
         return context_data
diff --git a/sitemedia/js/controllers/search_controller.js b/sitemedia/js/controllers/search_controller.js
index 4d72df2ea..fa9618b60 100644
--- a/sitemedia/js/controllers/search_controller.js
+++ b/sitemedia/js/controllers/search_controller.js
@@ -15,6 +15,7 @@ export default class extends Controller {
         "helpDialog",
         "placesMode",
         "peopleMode",
+        "radioSort",
     ];
     static debounces = ["update"];
 
@@ -205,15 +206,31 @@ export default class extends Controller {
         }
     }
 
-    sortByRelevance() {
-        this.sortTarget.value = this.relevanceSortElement.value;
+    sortByRelevance(radio = false) {
+        if (radio && !this.relevanceSortElement.checked) {
+            this.relevanceSortElement.checked = true;
+            this.relevanceSortDirectionElement.checked = true;
+            this.dropdownDetailsTarget.querySelector("summary").textContent =
+                this.relevanceSortLabel;
+        } else if (!radio) {
+            this.sortTarget.value = this.relevanceSortElement.value;
+        }
         this.relevanceSortElement.disabled = false;
         this.relevanceSortElement.ariaDisabled = false;
     }
 
-    disableRelevanceSort() {
+    disableRelevanceSort(radio = false) {
         // if relevance sort was selected, set back to default
-        if (this.sortTarget.value == this.relevanceSortElement.value) {
+        if (radio && this.relevanceSortElement.checked) {
+            this.relevanceSortElement.checked = false;
+            this.defaultSortElement.checked = true;
+            this.defaultSortDirectionElement.checked = true;
+            this.dropdownDetailsTarget.querySelector("summary").textContent =
+                this.defaultSortLabel;
+        } else if (
+            !radio &&
+            this.sortTarget.value == this.relevanceSortElement.value
+        ) {
             this.sortTarget.value = this.defaultSortElement.value;
         }
         // disable relevance sort
@@ -221,6 +238,47 @@ export default class extends Controller {
         this.relevanceSortElement.ariaDisabled = true;
     }
 
+    radioSortTargetConnected() {
+        // similar to sortTargetConnected, but handled differently for radio inputs
+        // as their DOM structure is different
+        const sortOptions = Array.from(
+            this.radioSortTarget.querySelectorAll("input")
+        );
+        this.relevanceSortElement = sortOptions.find(
+            (target) => target.value === "relevance"
+        );
+        // a search using radio input elements is only doing so because it is split into
+        // separate fields for sort field and direction, so handle direction too
+        this.relevanceSortDirectionElement = sortOptions.find(
+            (target) => target.value === "desc"
+        );
+        // keep track of labels since they aren't stored on the input elements
+        this.relevanceSortLabel = this.radioSortTarget.querySelector(
+            `label[for=${this.relevanceSortElement.id}]`
+        ).textContent;
+        this.defaultSortElement = sortOptions.find(
+            (target) => target.value === "name"
+        );
+        this.defaultSortDirectionElement = sortOptions.find(
+            (target) => target.value === "asc"
+        );
+        this.defaultSortLabel = this.radioSortTarget.querySelector(
+            `label[for=${this.defaultSortElement.id}]`
+        ).textContent;
+        this.autoUpdateRadioSort();
+    }
+
+    autoUpdateRadioSort(event) {
+        // when query is empty, disable sort by relevance
+        if (this.queryTarget.value.trim() == "") {
+            this.disableRelevanceSort(true);
+        } else if (event && this.defaultSortElement.checked) {
+            // if this was triggered by an event and not in sortTargetConnected,
+            // and the sort is currently the default, sort by relevance
+            this.sortByRelevance(true);
+        }
+    }
+
     clickCloseDropdown(e) {
         // Event listener to close the list view sort dropdown <details> element when a click is
         // registered outside of it. This needs to be on the whole document because the click could
diff --git a/sitemedia/scss/components/_peopleform.scss b/sitemedia/scss/components/_peopleform.scss
index 3e045b162..56d76f25d 100644
--- a/sitemedia/scss/components/_peopleform.scss
+++ b/sitemedia/scss/components/_peopleform.scss
@@ -250,6 +250,7 @@ main.search {
                     padding: 1rem;
                     background-color: var(--background);
                     box-shadow: 0px 1px 8px 0px var(--on-background-25);
+                    z-index: 9;
                     ul {
                         display: flex;
                         flex-flow: column;
@@ -268,6 +269,9 @@ main.search {
                                 margin: 0 0.5rem 0.2rem 0;
                                 overflow: visible;
                             }
+                            li:has(:disabled) label {
+                                color: var(--disabled);
+                            }
                         }
                         // last UL = ascending/descending only
                         &:last-of-type {
diff --git a/sitemedia/scss/components/_searchform.scss b/sitemedia/scss/components/_searchform.scss
index 4f3782de8..e2464ee1c 100644
--- a/sitemedia/scss/components/_searchform.scss
+++ b/sitemedia/scss/components/_searchform.scss
@@ -14,8 +14,6 @@
 main.search form {
     // search query box and button
     fieldset#query {
-        display: flex;
-        align-items: center;
         margin-bottom: 1.5rem;
         // search mode switch label (hidden on mobile)
         span.fieldname {
@@ -153,51 +151,6 @@ main.search form {
                 }
             }
         }
-        // search box
-        input[type="search"] {
-            flex-basis: 100%;
-            border: none;
-            border-radius: 5px;
-            border-top-right-radius: 0;
-            border-bottom-right-radius: 0;
-            border: 1px solid var(--background-gray);
-            border-right: none;
-            height: 3rem;
-            padding: 0 1rem;
-            @include typography.body;
-            background-color: var(--background-light);
-            color: var(--on-background-light);
-            @include breakpoints.for-tablet-landscape-up {
-                height: 2.5rem;
-            }
-        }
-        button[type="submit"] {
-            cursor: pointer;
-            width: 3rem;
-            height: 3rem;
-            border-radius: 5px;
-            border-top-left-radius: 0;
-            border-bottom-left-radius: 0;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            border: none;
-            margin-left: 0; // Needed to prevent wrapping on mobile
-            background-color: var(--secondary);
-            color: var(--on-secondary);
-            @include breakpoints.for-tablet-landscape-up {
-                height: 2.5rem;
-                min-width: 2.5rem;
-            }
-            // Magnifying glass icon
-            &::after {
-                content: "\f5e6"; // phosphor magnifying glass bold icon
-                @include typography.icon-button-md;
-                @include breakpoints.for-tablet-landscape-up {
-                    @include typography.icon-button-sm;
-                }
-            }
-        }
     }
     // dropdown in facet filters
     #filters label:has(select) {
@@ -251,6 +204,55 @@ main.people {
         width: 100%;
         padding: 0;
     }
+    fieldset#query {
+        display: flex;
+        align-items: center;
+    }
+    // search box
+    input[type="search"] {
+        flex-basis: 100%;
+        border: none;
+        border-radius: 5px;
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+        border: 1px solid var(--background-gray);
+        border-right: none;
+        height: 3rem;
+        padding: 0 1rem;
+        @include typography.body;
+        background-color: var(--background-light);
+        color: var(--on-background-light);
+        @include breakpoints.for-tablet-landscape-up {
+            height: 2.5rem;
+        }
+    }
+    button[type="submit"] {
+        cursor: pointer;
+        width: 3rem;
+        height: 3rem;
+        border-radius: 5px;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border: none;
+        margin-left: 0; // Needed to prevent wrapping on mobile
+        background-color: var(--secondary);
+        color: var(--on-secondary);
+        @include breakpoints.for-tablet-landscape-up {
+            height: 2.5rem;
+            min-width: 2.5rem;
+        }
+        // Magnifying glass icon
+        &::after {
+            content: "\f5e6"; // phosphor magnifying glass bold icon
+            @include typography.icon-button-md;
+            @include breakpoints.for-tablet-landscape-up {
+                @include typography.icon-button-sm;
+            }
+        }
+    }
     div#filters-header {
         display: flex;
         flex-flow: row nowrap;
diff --git a/sitemedia/scss/pages/_people.scss b/sitemedia/scss/pages/_people.scss
index 6607a5165..3ea656730 100644
--- a/sitemedia/scss/pages/_people.scss
+++ b/sitemedia/scss/pages/_people.scss
@@ -19,6 +19,18 @@ main.people {
         align-items: center;
         justify-content: space-between;
         width: 100%;
+        gap: 0.75rem;
+        @include breakpoints.for-tablet-landscape-up {
+            gap: 2rem;
+        }
+        fieldset#query {
+            flex-grow: 1;
+            margin-right: 5.75rem;
+            @include breakpoints.for-tablet-landscape-up {
+                margin-left: 8rem;
+                margin-right: 0;
+            }
+        }
         label#people-view-switcher {
             display: none;
             @include breakpoints.for-tablet-landscape-up {
@@ -231,6 +243,21 @@ main.people {
             }
         }
     }
+    .topheader-row:has(input#switcher:not(:checked))
+        ~ section#person-list
+        table {
+        td.other-names {
+            font-size: typography.$text-size-md;
+            color: var(--date-placeholder);
+            span.name {
+                font-weight: 700;
+            }
+            margin-bottom: 0.25rem;
+            &:empty {
+                display: none;
+            }
+        }
+    }
     @include breakpoints.for-tablet-landscape-up {
         .topheader-row:has(input#switcher:checked) ~ section#person-list table {
             display: table;
@@ -262,6 +289,9 @@ main.people {
                         border-top-left-radius: 5px;
                         border-bottom-left-radius: 5px;
                     }
+                    &.other-names span.aka {
+                        display: none;
+                    }
                     &:last-of-type {
                         padding-right: spacing.$spacing-md;
                         min-width: 3rem;
diff --git a/sitemedia/scss/pages/_search.scss b/sitemedia/scss/pages/_search.scss
index f07134361..b417f1f9c 100644
--- a/sitemedia/scss/pages/_search.scss
+++ b/sitemedia/scss/pages/_search.scss
@@ -24,7 +24,6 @@ main.people {
     // Header
     & > h1,
     .topheader-row h1 {
-        width: 100%;
         font-family: fonts.$primary;
         font-size: typography.$text-size-5xl;
         @include breakpoints.for-tablet-landscape-up {
@@ -36,3 +35,7 @@ main.people {
         margin-bottom: 1rem;
     }
 }
+
+main.search > h1 {
+    width: 100%;
+}
diff --git a/solr_conf/conf/managed-schema b/solr_conf/conf/managed-schema
index 8b3334304..92887db7d 100644
--- a/solr_conf/conf/managed-schema
+++ b/solr_conf/conf/managed-schema
@@ -354,6 +354,12 @@
   <copyField source="description_en_bigram" dest="description_nostem" maxChars="30000" />
   <copyField source="text_transcription" dest="transcription_nostem" maxChars="30000" />
 
+  <!-- copy people name fields to text fields -->
+  <copyField source="name_s" dest="name_bigram" maxChars="30000" />
+  <copyField source="name_s" dest="name_nostem" maxChars="30000" />
+  <copyField source="other_names_ss" dest="other_names_bigram" maxChars="30000" />
+  <copyField source="other_names_ss" dest="other_names_nostem" maxChars="30000" />
+
   <dynamicField name="*_descendent_path" type="descendent_path" indexed="true" stored="true"/>
   <dynamicField name="*_ancestor_path" type="ancestor_path" indexed="true" stored="true"/>
   <dynamicField name="ignored_*" type="ignored" multiValued="true"/>
diff --git a/solr_conf/conf/solrconfig.xml b/solr_conf/conf/solrconfig.xml
index 8914681da..8a6dc1c51 100644
--- a/solr_conf/conf/solrconfig.xml
+++ b/solr_conf/conf/solrconfig.xml
@@ -804,6 +804,20 @@
         old_shelfmark_textnum
         old_shelfmark_bigram
       </str>
+
+      <!-- search fields for people -->
+      <str name="people_qf">
+        name_nostem^30
+        name_bigram^20
+        other_names_nostem^10
+        other_names_bigram
+      </str>
+      <str name="people_pf">
+        name_nostem^30
+        name_bigram^20
+        other_names_nostem^10
+        other_names_bigram
+      </str>
     </lst>
 
     <!-- In addition to defaults, "appends" params can be specified
@@ -1357,6 +1371,7 @@
         <lst name="params">
           <str name="config_param">example config parameter</str>
         </lst>
+        
       </processor>
       <processor class="solr.RunUpdateProcessorFactory" />
     </updateRequestProcessorChain>

From 1618c618db9778ff946f4bd1e3a069846576ad0d Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Fri, 10 Jan 2025 15:37:01 -0500
Subject: [PATCH 02/26] Use empty_solr for people search tests; cleanup (#1711)

---
 geniza/entities/tests/test_entities_views.py | 2 +-
 solr_conf/conf/solrconfig.xml                | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/geniza/entities/tests/test_entities_views.py b/geniza/entities/tests/test_entities_views.py
index 4e869eddc..c4e2e251c 100644
--- a/geniza/entities/tests/test_entities_views.py
+++ b/geniza/entities/tests/test_entities_views.py
@@ -421,7 +421,7 @@ def test_get_queryset__filters(
                 mock_order_by.assert_called_with("start_dating_i")
 
     def test_get_queryset__keyword_query(
-        self, person, person_diacritic, person_multiname
+        self, person, person_diacritic, person_multiname, empty_solr
     ):
         SolrClient().update.index(
             [
diff --git a/solr_conf/conf/solrconfig.xml b/solr_conf/conf/solrconfig.xml
index 8a6dc1c51..4e6c31ef7 100644
--- a/solr_conf/conf/solrconfig.xml
+++ b/solr_conf/conf/solrconfig.xml
@@ -1371,7 +1371,6 @@
         <lst name="params">
           <str name="config_param">example config parameter</str>
         </lst>
-        
       </processor>
       <processor class="solr.RunUpdateProcessorFactory" />
     </updateRequestProcessorChain>

From 68e5e9c20cedb5f352f3675d7eb3433cffad6e51 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Tue, 14 Jan 2025 13:05:43 -0500
Subject: [PATCH 03/26] Set develop version to 4.20-dev

---
 geniza/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geniza/__init__.py b/geniza/__init__.py
index bdefd609b..4fbc09881 100644
--- a/geniza/__init__.py
+++ b/geniza/__init__.py
@@ -1,4 +1,4 @@
-__version_info__ = (4, 19, 0, None)
+__version_info__ = (4, 20, 0, "dev")
 
 
 # Dot-connect all but the last. Last is dash-connected if not None.

From 36c9353448da345afc0a004c0336141be2d4aad3 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Wed, 15 Jan 2025 13:51:11 -0500
Subject: [PATCH 04/26] Use FrankRuhl for Hebrew translations (#1714)

---
 sitemedia/css/admin-local.css                 |  4 +++-
 sitemedia/scss/components/_results.scss       | 10 +++++++++-
 sitemedia/scss/components/_transcription.scss | 10 +++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/sitemedia/css/admin-local.css b/sitemedia/css/admin-local.css
index 54b9d90fa..c38dff87e 100644
--- a/sitemedia/css/admin-local.css
+++ b/sitemedia/css/admin-local.css
@@ -122,7 +122,9 @@ a#needsreview:target {
 }
 /* need to apply these manually for overriding purposes */
 .form-row .transcription p,
-.form-row .transcription li {
+.form-row .transcription li,
+.form-row .translation[lang="he"] p,
+.form-row .translation[lang="he"] li {
     font-family: "FrankRuhl 1924 MF Medium", "Amiri", "Times New Roman", serif;
     box-sizing: border-box;
 }
diff --git a/sitemedia/scss/components/_results.scss b/sitemedia/scss/components/_results.scss
index dd699bc15..078b28191 100644
--- a/sitemedia/scss/components/_results.scss
+++ b/sitemedia/scss/components/_results.scss
@@ -159,13 +159,21 @@ section#document-list {
 
         .transcription {
             @include typography.transcription-search;
-
+        }
+        .transcription,
+        .translation {
             // arabic script
             &[lang="ar"],
             &[data-lang-script="arabic"],
             span[lang="ar"] {
                 @include typography.arabic-transcription-search;
             }
+            // hebrew script
+            &[lang="he"],
+            &[data-lang-script="hebrew"],
+            span[lang="he"] {
+                @include typography.transcription-search;
+            }
         }
 
         // related documents and entities
diff --git a/sitemedia/scss/components/_transcription.scss b/sitemedia/scss/components/_transcription.scss
index 174984937..03fe7f812 100644
--- a/sitemedia/scss/components/_transcription.scss
+++ b/sitemedia/scss/components/_transcription.scss
@@ -1498,13 +1498,21 @@
 }
 .transcription {
     @include typography.transcription;
-
+}
+.transcription,
+.translation {
     // arabic script
     &[lang="ar"],
     &[data-lang-script="arabic"],
     span[lang="ar"] {
         @include typography.arabic-transcription;
     }
+    // hebrew script
+    &[lang="he"],
+    &[data-lang-script="hebrew"],
+    span[lang="he"] {
+        @include typography.transcription;
+    }
 }
 
 // Manual (body-class based) theme overrides

From f0d3ecf263d60a8f6aa999881318f9a75b027885 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Thu, 16 Jan 2025 11:17:19 -0500
Subject: [PATCH 05/26] Person-Document Relation Type merge (#1709)

---
 geniza/entities/admin.py                      | 39 ++++++++-
 geniza/entities/forms.py                      | 39 +++++++++
 geniza/entities/models.py                     | 63 +++++++++++++-
 .../persondocumentrelationtype/merge.html     | 53 ++++++++++++
 ...rsondocumentrelationtype_option_label.html | 33 ++++++++
 geniza/entities/tests/test_entities_models.py | 77 ++++++++++++++++-
 geniza/entities/views.py                      | 83 ++++++++++++++++++-
 sitemedia/css/admin-local.css                 | 10 +++
 8 files changed, 393 insertions(+), 4 deletions(-)
 create mode 100644 geniza/entities/templates/admin/entities/persondocumentrelationtype/merge.html
 create mode 100644 geniza/entities/templates/entities/snippets/persondocumentrelationtype_option_label.html

diff --git a/geniza/entities/admin.py b/geniza/entities/admin.py
index 307595445..d2eb328ea 100644
--- a/geniza/entities/admin.py
+++ b/geniza/entities/admin.py
@@ -50,7 +50,7 @@
     PlacePlaceRelation,
     PlacePlaceRelationType,
 )
-from geniza.entities.views import PersonMerge
+from geniza.entities.views import PersonDocumentRelationTypeMerge, PersonMerge
 from geniza.footnotes.models import Footnote
 
 
@@ -417,6 +417,43 @@ class PersonDocumentRelationTypeAdmin(TabbedTranslationAdmin, admin.ModelAdmin):
     search_fields = ("name",)
     ordering = ("name",)
 
+    @admin.display(description="Merge selected Person-Document relationships")
+    def merge_person_document_relation_types(self, request, queryset=None):
+        """Admin action to merge selected person-document relation types. This
+        action redirects to an intermediate page, which displays a form to
+        review for confirmation and choose the primary person before merging.
+        """
+        selected = request.POST.getlist("_selected_action")
+        if len(selected) < 2:
+            messages.error(
+                request,
+                "You must select at least two person-document relationships to merge",
+            )
+            return HttpResponseRedirect(
+                reverse("admin:entities_persondocumentrelationtype_changelist")
+            )
+        return HttpResponseRedirect(
+            "%s?ids=%s"
+            % (
+                reverse("admin:person-document-relation-type-merge"),
+                ",".join(selected),
+            ),
+            status=303,
+        )  # status code 303 means "See Other"
+
+    def get_urls(self):
+        """Return admin urls; adds custom URL for merging"""
+        urls = [
+            path(
+                "merge/",
+                PersonDocumentRelationTypeMerge.as_view(),
+                name="person-document-relation-type-merge",
+            ),
+        ]
+        return urls + super().get_urls()
+
+    actions = (merge_person_document_relation_types,)
+
 
 @admin.register(PersonPersonRelationType)
 class PersonPersonRelationTypeAdmin(TabbedTranslationAdmin, admin.ModelAdmin):
diff --git a/geniza/entities/forms.py b/geniza/entities/forms.py
index 86e7be2f1..c9ac5f253 100644
--- a/geniza/entities/forms.py
+++ b/geniza/entities/forms.py
@@ -54,6 +54,45 @@ def __init__(self, *args, **kwargs):
         )
 
 
+class PersonDocumentRelationTypeChoiceField(forms.ModelChoiceField):
+    """Add a summary of each PersonDocumentRelationType to a form (used for merging)"""
+
+    label_template = get_template(
+        "entities/snippets/persondocumentrelationtype_option_label.html"
+    )
+
+    def label_from_instance(self, relation_type):
+        return self.label_template.render({"relation_type": relation_type})
+
+
+class PersonDocumentRelationTypeMergeForm(forms.Form):
+    primary_relation_type = PersonDocumentRelationTypeChoiceField(
+        label="Select primary person-document relationship",
+        queryset=None,
+        help_text=(
+            "Select the primary person-document relationship, which will be "
+            "used as the canonical entry. All associated relations and log "
+            "entries will be combined on the primary relationship."
+        ),
+        empty_label=None,
+        widget=forms.RadioSelect,
+    )
+
+    def __init__(self, *args, **kwargs):
+        ids = kwargs.get("ids", [])
+
+        # Remove the added kwarg so that the super method doesn't error
+        try:
+            del kwargs["ids"]
+        except KeyError:
+            pass
+
+        super().__init__(*args, **kwargs)
+        self.fields[
+            "primary_relation_type"
+        ].queryset = PersonDocumentRelationType.objects.filter(id__in=ids)
+
+
 class PersonPersonForm(forms.ModelForm):
     class Meta:
         model = PersonPersonRelation
diff --git a/geniza/entities/models.py b/geniza/entities/models.py
index 73cedf4c3..e730f39ff 100644
--- a/geniza/entities/models.py
+++ b/geniza/entities/models.py
@@ -11,7 +11,7 @@
 from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
 from django.contrib.contenttypes.models import ContentType
 from django.core.validators import RegexValidator
-from django.db import models
+from django.db import IntegrityError, models
 from django.db.models import F, Q, Value
 from django.db.models.query import Prefetch
 from django.forms import ValidationError
@@ -1025,6 +1025,9 @@ class PersonDocumentRelationType(models.Model):
 
     name = models.CharField(max_length=255, unique=True)
     objects = PersonDocumentRelationTypeManager()
+    log_entries = GenericRelation(
+        LogEntry, related_query_name="persondocumentrelationtype"
+    )
 
     class Meta:
         verbose_name = "Person-Document relationship"
@@ -1041,6 +1044,64 @@ def objects_by_label(cls):
             for obj in cls.objects.all()
         }
 
+    def merge_with(self, merge_relation_types, user=None):
+        """Merge the specified relation types into this one. Combines all
+        relationships into this relation type and creates a log entry
+        documenting the merge.
+
+        Closely adapted from :class:`Person` merge."""
+
+        # if user is not specified, log entry will be associated with script
+        if user is None:
+            user = User.objects.get(username=settings.SCRIPT_USERNAME)
+
+        for rel_type in merge_relation_types:
+            # combine log entries
+            for log_entry in rel_type.log_entries.all():
+                # annotate and reassociate
+                # - modify change message to type which object this event applied to
+                log_entry.change_message = "%s [merged type %s (id = %d)]" % (
+                    log_entry.get_change_message(),
+                    str(rel_type),
+                    rel_type.pk,
+                )
+
+                # - associate with the primary relation type
+                log_entry.object_id = self.id
+                log_entry.content_type_id = ContentType.objects.get_for_model(
+                    PersonDocumentRelationType
+                )
+                log_entry.save()
+
+            # combine person-document relationships
+            for relationship in rel_type.persondocumentrelation_set.all():
+                relationship.type = self
+                # handle unique constraint violation (one relationship per type
+                # between doc and person): only reassign type if it doesn't
+                # create a duplicate, otherwise delete.
+                try:
+                    relationship.save()
+                except IntegrityError:
+                    relationship.delete()
+
+        # save current relation type with changes; delete merged relation types
+        self.save()
+        merged_types = ", ".join([str(rel_type) for rel_type in merge_relation_types])
+        for rel_type in merge_relation_types:
+            rel_type.delete()
+        # create log entry documenting the merge; include rationale
+        pdrtype_contenttype = ContentType.objects.get_for_model(
+            PersonDocumentRelationType
+        )
+        LogEntry.objects.log_action(
+            user_id=user.id,
+            content_type_id=pdrtype_contenttype.pk,
+            object_id=self.pk,
+            object_repr=str(self),
+            change_message="merged with %s" % (merged_types,),
+            action_flag=CHANGE,
+        )
+
 
 class PersonDocumentRelation(models.Model):
     """A relationship between a person and a document."""
diff --git a/geniza/entities/templates/admin/entities/persondocumentrelationtype/merge.html b/geniza/entities/templates/admin/entities/persondocumentrelationtype/merge.html
new file mode 100644
index 000000000..e1bd360c8
--- /dev/null
+++ b/geniza/entities/templates/admin/entities/persondocumentrelationtype/merge.html
@@ -0,0 +1,53 @@
+{% extends 'admin/base_site.html' %}
+
+{% load admin_urls static %}
+
+{% block extrastyle %}
+    {{ block.super }}
+    <link rel="stylesheet" href="{% static "admin/css/forms.css" %}">
+    <link rel="stylesheet" href="{% static "css/admin-local.css" %}">
+{% endblock %}
+
+{% block title %} Merge selected person-document relationships {% endblock %}
+
+{% block breadcrumbs %}
+    {% if not is_popup %}
+        <div class="breadcrumbs">
+            <a href="{% url 'admin:index' %}">Home</a>
+            &rsaquo;
+            <a href="{% url 'admin:app_list' app_label='entities' %}">Entities</a>
+            &rsaquo;
+            <a href="{% url 'admin:entities_persondocumentrelationtype_changelist'%}">Person-Document relationships</a>
+            &rsaquo;
+            Merge selected person-document relationships
+        </div>
+    {% endif %}
+{% endblock %}
+
+
+{% block content_title %}
+    <h1>Merge selected person-document relationships</h1>
+    <h2>Note: there is no automated way to unmerge! Please review to make sure these relationships should be merged before submitting the form.</h2>
+{% endblock %}
+
+{% block content %}
+    <form method="post" class="merge-document merge-relationtype">
+        {% csrf_token %}
+        {% if form.errors|length > 0 %}
+            <p class="errornote">
+                Please correct the error below.
+            </p>
+        {% endif %}
+        <fieldset class="module aligned">
+            <div class="form-row">
+                {{ form.primary_relation_type.label_tag }}
+                {{ form.primary_relation_type }}
+                <p class="help">{{ form.primary_relation_type.help_text|safe }}</p>
+            </div>
+
+            <div class="submit-row">
+                <input type="submit" value="Submit">
+            </div>
+        </field>
+    </form>
+{% endblock %}
diff --git a/geniza/entities/templates/entities/snippets/persondocumentrelationtype_option_label.html b/geniza/entities/templates/entities/snippets/persondocumentrelationtype_option_label.html
new file mode 100644
index 000000000..c691ea08b
--- /dev/null
+++ b/geniza/entities/templates/entities/snippets/persondocumentrelationtype_option_label.html
@@ -0,0 +1,33 @@
+{# template snippet for displaying person-document relationship label on a form #}
+{# used on merge form to provide enough information to merge accurately #}
+
+<div class="merge-document-label">
+    <h2>{{ relation_type }}
+        <a target="_blank" href="{% url 'admin:entities_persondocumentrelationtype_change' relation_type.pk %}"
+           title="Go to this relationship's admin edit page">
+            <img src="/static/admin/img/icon-changelink.svg" alt="Change"></a>
+    </h2>
+    <details>
+        <summary>View all {{ relation_type.persondocumentrelation_set.count }} {{ relation_type }} relations</summary>
+        <ol>
+            {% for rel in relation_type.persondocumentrelation_set.all %}
+                <li>
+                    <div class="form-row">
+                        <label>{{ rel.type }} relation:</label>
+                        <div>
+                            <a target="_blank" href="{% url 'admin:entities_person_change' rel.person.pk %}">{{ rel.person }}</a>
+                            and
+                            <a target="_blank" href="{% url 'admin:corpus_document_change' rel.document.pk %}">{{ rel.document }}</a>
+                        </div>
+                    </div>
+                </li>
+            {% empty %}
+                <li>
+                    <div class="form-row">
+                        <label>No relations</label><div></div>
+                    </div>
+                </li>
+            {% endfor %}
+        </ol>
+    </details>
+</div>
diff --git a/geniza/entities/tests/test_entities_models.py b/geniza/entities/tests/test_entities_models.py
index aaed8df00..c7c4b7ec6 100644
--- a/geniza/entities/tests/test_entities_models.py
+++ b/geniza/entities/tests/test_entities_models.py
@@ -7,7 +7,6 @@
 from django.contrib.contenttypes.models import ContentType
 from django.forms import ValidationError
 from django.utils import timezone
-from modeltranslation.manager import MultilingualQuerySet
 from parasolr.django.indexing import ModelIndexable
 from slugify import slugify
 from unidecode import unidecode
@@ -706,6 +705,82 @@ def test_str(self):
         assert str(relation) == f"{recipient} relation: {goitein} and {doc}"
 
 
+@pytest.mark.django_db(transaction=True)
+class TestPersonDocumentRelationType:
+    def test_merge_with(self, person, person_multiname, document, join):
+        # create two PersonDocumentRelationTypes and some associations
+        rel_type = PersonDocumentRelationType.objects.create(name="test")
+        type_2 = PersonDocumentRelationType.objects.create(name="to be merged")
+        type_3 = PersonDocumentRelationType.objects.create(name="also merge me")
+        PersonDocumentRelation.objects.create(
+            type=rel_type, person=person, document=document
+        )
+        PersonDocumentRelation.objects.create(
+            type=type_2, person=person, document=document
+        )
+        PersonDocumentRelation.objects.create(
+            type=type_2, person=person_multiname, document=document
+        )
+        PersonDocumentRelation.objects.create(type=type_3, person=person, document=join)
+
+        # create some log entries
+        pdrtype_contenttype = ContentType.objects.get_for_model(
+            PersonDocumentRelationType
+        )
+        creation_date = timezone.make_aware(datetime(2023, 10, 12))
+        creator = User.objects.get_or_create(username="editor")[0]
+        type_2_str = str(type_2)
+        type_2_pk = type_2.pk
+        LogEntry.objects.bulk_create(
+            [
+                LogEntry(
+                    user_id=creator.id,
+                    content_type_id=pdrtype_contenttype.pk,
+                    object_id=type_2_pk,
+                    object_repr=type_2_str,
+                    change_message="first input",
+                    action_flag=ADDITION,
+                    action_time=creation_date,
+                ),
+                LogEntry(
+                    user_id=creator.id,
+                    content_type_id=pdrtype_contenttype.pk,
+                    object_id=type_2_pk,
+                    object_repr=type_2_str,
+                    change_message="major revision",
+                    action_flag=CHANGE,
+                    action_time=timezone.now(),
+                ),
+            ]
+        )
+        assert rel_type.persondocumentrelation_set.count() == 1
+        rel_type.merge_with([type_2, type_3])
+        # should skip the duplicate and add the others
+        assert rel_type.persondocumentrelation_set.count() == 3
+        # should delete other types and create merge log entry
+        assert not type_2.pk
+        assert not type_3.pk
+        assert LogEntry.objects.filter(
+            object_id=rel_type.pk,
+            change_message__contains=f"merged with {type_2}, {type_3}",
+        ).exists()
+        assert rel_type.log_entries.count() == 3
+        # based on default sorting, most recent log entry will be first
+        # - should document the merge event
+        merge_log = rel_type.log_entries.first()
+        assert merge_log.action_flag == CHANGE
+
+        # reassociated log entries should include merged type's name, id
+        assert (
+            " [merged type %s (id = %s)]" % (type_2_str, type_2_pk)
+            in rel_type.log_entries.all()[1].change_message
+        )
+        assert (
+            " [merged type %s (id = %s)]" % (type_2_str, type_2_pk)
+            in rel_type.log_entries.all()[2].change_message
+        )
+
+
 @pytest.mark.django_db
 class TestPlace:
     def test_str(self):
diff --git a/geniza/entities/views.py b/geniza/entities/views.py
index 38813dcc5..12432aba7 100644
--- a/geniza/entities/views.py
+++ b/geniza/entities/views.py
@@ -19,11 +19,17 @@
 
 from geniza.corpus.dates import PartialDate
 from geniza.corpus.views import SolrDateRangeMixin
-from geniza.entities.forms import PersonListForm, PersonMergeForm, PlaceListForm
+from geniza.entities.forms import (
+    PersonDocumentRelationTypeMergeForm,
+    PersonListForm,
+    PersonMergeForm,
+    PlaceListForm,
+)
 from geniza.entities.models import (
     PastPersonSlug,
     PastPlaceSlug,
     Person,
+    PersonDocumentRelationType,
     PersonPersonRelationType,
     PersonSolrQuerySet,
     Place,
@@ -95,6 +101,81 @@ def form_valid(self, form):
         return super().form_valid(form)
 
 
+class PersonDocumentRelationTypeMerge(PermissionRequiredMixin, FormView):
+    permission_required = (
+        "entities.change_persondocumentrelationtype",
+        "entities.delete_persondocumentrelationtype",
+    )
+    form_class = PersonDocumentRelationTypeMergeForm
+    template_name = "admin/entities/persondocumentrelationtype/merge.html"
+
+    def get_success_url(self):
+        return reverse(
+            "admin:entities_persondocumentrelationtype_change",
+            args=[self.primary_relation_type.pk],
+        )
+
+    def get_form_kwargs(self):
+        form_kwargs = super().get_form_kwargs()
+        form_kwargs["ids"] = self.ids
+        return form_kwargs
+
+    def get_initial(self):
+        # Default to first relation type selected
+        ids = self.request.GET.get("ids", None)
+        if ids:
+            self.ids = [int(id) for id in ids.split(",")]
+            # by default, prefer the first record created
+            return {"primary_relation_type": sorted(self.ids)[0]}
+        else:
+            self.ids = []
+
+    def form_valid(self, form):
+        """Merge the selected person-document relation types into the primary one."""
+        primary_relation_type = form.cleaned_data["primary_relation_type"]
+        self.primary_relation_type = primary_relation_type
+
+        secondary_ids = [id for id in self.ids if id != primary_relation_type.pk]
+        secondary_relation_types = PersonDocumentRelationType.objects.filter(
+            pk__in=secondary_ids
+        )
+
+        # Get string representations before they are merged
+        primary_relation_str = (
+            f"{str(primary_relation_type)} (id = {primary_relation_type.pk})"
+        )
+        secondary_relation_str = ", ".join(
+            [f"{str(rel)} (id = {rel.pk})" for rel in secondary_relation_types]
+        )
+
+        # Merge secondary relation types into the selected primary relation type
+        user = getattr(self.request, "user", None)
+
+        try:
+            primary_relation_type.merge_with(secondary_relation_types, user=user)
+        except ValidationError as err:
+            # in case the merge resulted in an error, display error to user
+            messages.error(self.request, err.message)
+            # redirect to this form page instead of one of the items
+            return HttpResponseRedirect(
+                "%s?ids=%s"
+                % (
+                    reverse("admin:person-document-relation-type-merge"),
+                    self.request.GET.get("ids", ""),
+                ),
+            )
+
+        # Display info about the merge to the user
+        messages.success(
+            self.request,
+            mark_safe(
+                f"Successfully merged {secondary_relation_str} with {primary_relation_str}."
+            ),
+        )
+
+        return super().form_valid(form)
+
+
 class UnaccentedNameAutocompleteView(autocomplete.Select2QuerySetView):
     def get_queryset(self):
         """entities filtered by entered query, or all entities, ordered by name"""
diff --git a/sitemedia/css/admin-local.css b/sitemedia/css/admin-local.css
index c38dff87e..2c5132a6a 100644
--- a/sitemedia/css/admin-local.css
+++ b/sitemedia/css/admin-local.css
@@ -380,3 +380,13 @@ div.form-row.field-doc_date_original .inline-group {
         grid-template-columns: 1fr 1fr;
     }
 }
+
+.merge-relationtype input[type="radio"] {
+    margin-top: 0.5rem;
+    margin-bottom: auto;
+    vertical-align: top;
+}
+.merge-relationtype details summary {
+    cursor: pointer;
+    margin-top: 0.5rem;
+}

From e54e0b1ea9fdccb15e2dbe5027115945c9c8cc05 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Thu, 16 Jan 2025 11:28:54 -0500
Subject: [PATCH 06/26] Add unit tests for person-doc relation type merge
 (#1709)

---
 geniza/entities/admin.py                     |  2 +-
 geniza/entities/tests/test_entities_forms.py | 28 ++++++-
 geniza/entities/tests/test_entities_views.py | 86 ++++++++++++++++++++
 3 files changed, 114 insertions(+), 2 deletions(-)

diff --git a/geniza/entities/admin.py b/geniza/entities/admin.py
index d2eb328ea..c08a0f684 100644
--- a/geniza/entities/admin.py
+++ b/geniza/entities/admin.py
@@ -421,7 +421,7 @@ class PersonDocumentRelationTypeAdmin(TabbedTranslationAdmin, admin.ModelAdmin):
     def merge_person_document_relation_types(self, request, queryset=None):
         """Admin action to merge selected person-document relation types. This
         action redirects to an intermediate page, which displays a form to
-        review for confirmation and choose the primary person before merging.
+        review for confirmation and choose the primary type before merging.
         """
         selected = request.POST.getlist("_selected_action")
         if len(selected) < 2:
diff --git a/geniza/entities/tests/test_entities_forms.py b/geniza/entities/tests/test_entities_forms.py
index 44e2895e8..196840730 100644
--- a/geniza/entities/tests/test_entities_forms.py
+++ b/geniza/entities/tests/test_entities_forms.py
@@ -6,11 +6,12 @@
 from geniza.corpus.forms import FacetChoiceField
 from geniza.entities.forms import (
     PersonChoiceField,
+    PersonDocumentRelationTypeMergeForm,
     PersonListForm,
     PersonMergeForm,
     PlaceListForm,
 )
-from geniza.entities.models import Name, Person, PersonRole
+from geniza.entities.models import Name, Person, PersonDocumentRelationType, PersonRole
 
 
 class TestPersonChoiceField:
@@ -51,6 +52,31 @@ def test_init(self):
         assert people.last() not in mergeform.fields["primary_person"].queryset
 
 
+class TestPersonDocumentRelationTypeMergeForm:
+    @pytest.mark.django_db
+    def test_init(self):
+        # adapted from TestPersonMergeForm
+
+        # no error if ids not specified
+        PersonDocumentRelationTypeMergeForm()
+
+        # create test records
+        PersonDocumentRelationType.objects.bulk_create(
+            [PersonDocumentRelationType(name=f"test{i}") for i in range(4)]
+        )
+        # initialize with ids for all but the last
+        types = PersonDocumentRelationType.objects.all().order_by("pk")
+        ids = list(types.values_list("id", flat=True))
+        mergeform = PersonDocumentRelationTypeMergeForm(ids=ids[:-1])
+        # total should have all but one type
+        assert (
+            mergeform.fields["primary_relation_type"].queryset.count()
+            == types.count() - 1
+        )
+        # last type should not be an available choice
+        assert types.last() not in mergeform.fields["primary_relation_type"].queryset
+
+
 @pytest.mark.django_db
 class TestPersonListForm:
     def test_set_choices_from_facets(self, person, person_diacritic):
diff --git a/geniza/entities/tests/test_entities_views.py b/geniza/entities/tests/test_entities_views.py
index c4e2e251c..a735f2bd5 100644
--- a/geniza/entities/tests/test_entities_views.py
+++ b/geniza/entities/tests/test_entities_views.py
@@ -25,6 +25,7 @@
 )
 from geniza.entities.views import (
     PersonAutocompleteView,
+    PersonDocumentRelationTypeMerge,
     PersonListView,
     PersonMerge,
     PlaceAutocompleteView,
@@ -110,6 +111,91 @@ def test_person_merge(self, admin_client, client):
             assert "test message" in messages
 
 
+class TestPersonDocumentRelationTypeMergeView:
+    # adapted from TestPersonMergeView
+    @pytest.mark.django_db
+    def test_get_success_url(self):
+        rel_type = PersonDocumentRelationType.objects.create(name="test")
+        merge_view = PersonDocumentRelationTypeMerge()
+        merge_view.primary_relation_type = rel_type
+
+        resolved_url = resolve(merge_view.get_success_url())
+        assert "admin" in resolved_url.app_names
+        assert resolved_url.url_name == "entities_persondocumentrelationtype_change"
+        assert resolved_url.kwargs["object_id"] == str(rel_type.pk)
+
+    def test_get_initial(self):
+        merge_view = PersonDocumentRelationTypeMerge()
+        merge_view.request = Mock(GET={"ids": "12,23,456,7"})
+
+        initial = merge_view.get_initial()
+        assert merge_view.ids == [12, 23, 456, 7]
+        # lowest id selected as default primary type
+        assert initial["primary_relation_type"] == 7
+
+        # Test when no ids are provided (a user shouldn't get here,
+        #  but shouldn't raise an error.)
+        merge_view.request = Mock(GET={"ids": ""})
+        initial = merge_view.get_initial()
+        assert merge_view.ids == []
+        merge_view.request = Mock(GET={})
+        initial = merge_view.get_initial()
+        assert merge_view.ids == []
+
+    def test_get_form_kwargs(self):
+        merge_view = PersonDocumentRelationTypeMerge()
+        merge_view.request = Mock(GET={"ids": "12,23,456,7"})
+        form_kwargs = merge_view.get_form_kwargs()
+        assert form_kwargs["ids"] == merge_view.ids
+
+    def test_person_merge(self, admin_client, client):
+        # Ensure that the merge view is not visible to public
+        response = client.get(reverse("admin:person-document-relation-type-merge"))
+        assert response.status_code == 302
+        assert response.url.startswith("/accounts/login/")
+
+        # create test records to merge
+        rel_type = PersonDocumentRelationType.objects.create(name="test")
+        dupe_rel_type = PersonDocumentRelationType.objects.create(name="test2")
+
+        idstring = ",".join(str(id) for id in [rel_type.id, dupe_rel_type.id])
+
+        # GET should display choices
+        response = admin_client.get(
+            reverse("admin:person-document-relation-type-merge"), {"ids": idstring}
+        )
+        assert response.status_code == 200
+
+        # POST should merge
+        merge_url = "%s?ids=%s" % (
+            reverse("admin:person-document-relation-type-merge"),
+            idstring,
+        )
+        response = admin_client.post(
+            merge_url, {"primary_relation_type": rel_type.id}, follow=True
+        )
+        TestCase().assertRedirects(
+            response,
+            reverse(
+                "admin:entities_persondocumentrelationtype_change", args=[rel_type.id]
+            ),
+        )
+        message = list(response.context.get("messages"))[0]
+        assert message.tags == "success"
+        assert "Successfully merged" in message.message
+        assert f"with {str(rel_type)} (id = {rel_type.pk})" in message.message
+
+        with patch.object(PersonDocumentRelationType, "merge_with") as mock_merge_with:
+            # should catch ValidationError and send back to form with error msg
+            mock_merge_with.side_effect = ValidationError("test message")
+            response = admin_client.post(
+                merge_url, {"primary_relation_type": rel_type.id}, follow=True
+            )
+            TestCase().assertRedirects(response, merge_url)
+            messages = [str(msg) for msg in list(response.context["messages"])]
+            assert "test message" in messages
+
+
 class TestPersonAutocompleteView:
     @pytest.mark.django_db
     def test_get_queryset(self):

From a965ff645d0da8671012c26db54fac6c506c19e5 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Thu, 16 Jan 2025 12:00:26 -0500
Subject: [PATCH 07/26] revise IntegrityError handling (#1709)

---
 geniza/entities/models.py                     | 7 +++++--
 geniza/entities/tests/test_entities_models.py | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/geniza/entities/models.py b/geniza/entities/models.py
index e730f39ff..c051a70c7 100644
--- a/geniza/entities/models.py
+++ b/geniza/entities/models.py
@@ -11,7 +11,7 @@
 from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
 from django.contrib.contenttypes.models import ContentType
 from django.core.validators import RegexValidator
-from django.db import IntegrityError, models
+from django.db import IntegrityError, models, transaction
 from django.db.models import F, Q, Value
 from django.db.models.query import Prefetch
 from django.forms import ValidationError
@@ -1075,12 +1075,15 @@ def merge_with(self, merge_relation_types, user=None):
 
             # combine person-document relationships
             for relationship in rel_type.persondocumentrelation_set.all():
+                # set type of each relationship to primary relation type
                 relationship.type = self
                 # handle unique constraint violation (one relationship per type
                 # between doc and person): only reassign type if it doesn't
                 # create a duplicate, otherwise delete.
+                # see https://docs.djangoproject.com/en/3.2/topics/db/transactions/#django.db.transaction.atomic
                 try:
-                    relationship.save()
+                    with transaction.atomic():
+                        relationship.save()
                 except IntegrityError:
                     relationship.delete()
 
diff --git a/geniza/entities/tests/test_entities_models.py b/geniza/entities/tests/test_entities_models.py
index c7c4b7ec6..23ae26eae 100644
--- a/geniza/entities/tests/test_entities_models.py
+++ b/geniza/entities/tests/test_entities_models.py
@@ -705,7 +705,7 @@ def test_str(self):
         assert str(relation) == f"{recipient} relation: {goitein} and {doc}"
 
 
-@pytest.mark.django_db(transaction=True)
+@pytest.mark.django_db
 class TestPersonDocumentRelationType:
     def test_merge_with(self, person, person_multiname, document, join):
         # create two PersonDocumentRelationTypes and some associations

From 8edbbacf4b0be7574ed0d8020769d9286999b4f2 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Tue, 21 Jan 2025 11:02:59 -0500
Subject: [PATCH 08/26] Add unit test for admin person-doc type merge (#1709)

---
 geniza/entities/tests/test_entities_admin.py | 28 ++++++++++++++++++++
 geniza/entities/tests/test_entities_views.py |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/geniza/entities/tests/test_entities_admin.py b/geniza/entities/tests/test_entities_admin.py
index 58e8b4759..77609de9f 100644
--- a/geniza/entities/tests/test_entities_admin.py
+++ b/geniza/entities/tests/test_entities_admin.py
@@ -12,6 +12,7 @@
     NameInlineFormSet,
     PersonAdmin,
     PersonDocumentInline,
+    PersonDocumentRelationTypeAdmin,
     PersonPersonInline,
     PersonPersonRelationTypeChoiceField,
     PersonPersonReverseInline,
@@ -21,6 +22,7 @@
     Name,
     Person,
     PersonDocumentRelation,
+    PersonDocumentRelationType,
     PersonPersonRelation,
     PersonPersonRelationType,
     PersonPlaceRelation,
@@ -415,3 +417,29 @@ def test_export_relations_to_csv(self, person):
         # - some content
         assert str(person) in content
         assert "Home base" in content
+
+
+class TestPersonDocumentRelationTypeAdmin:
+    def test_merge_person_document_relation_types(self):
+        pdr_admin = PersonDocumentRelationTypeAdmin(
+            model=PersonDocumentRelationType, admin_site=admin.site
+        )
+        mockrequest = Mock()
+        test_ids = ["1", "2", "3"]
+        mockrequest.POST.getlist.return_value = test_ids
+        resp = pdr_admin.merge_person_document_relation_types(mockrequest, Mock())
+        assert isinstance(resp, HttpResponseRedirect)
+        assert resp.status_code == 303
+        assert resp["location"].startswith(
+            reverse("admin:person-document-relation-type-merge")
+        )
+        assert resp["location"].endswith("?ids=%s" % ",".join(test_ids))
+
+        test_ids = ["1"]
+        mockrequest.POST.getlist.return_value = test_ids
+        resp = pdr_admin.merge_person_document_relation_types(mockrequest, Mock())
+        assert isinstance(resp, HttpResponseRedirect)
+        assert resp.status_code == 302
+        assert resp["location"] == reverse(
+            "admin:entities_persondocumentrelationtype_changelist"
+        )
diff --git a/geniza/entities/tests/test_entities_views.py b/geniza/entities/tests/test_entities_views.py
index a735f2bd5..8189e4b85 100644
--- a/geniza/entities/tests/test_entities_views.py
+++ b/geniza/entities/tests/test_entities_views.py
@@ -148,7 +148,7 @@ def test_get_form_kwargs(self):
         form_kwargs = merge_view.get_form_kwargs()
         assert form_kwargs["ids"] == merge_view.ids
 
-    def test_person_merge(self, admin_client, client):
+    def test_person_document_relation_type_merge(self, admin_client, client):
         # Ensure that the merge view is not visible to public
         response = client.get(reverse("admin:person-document-relation-type-merge"))
         assert response.status_code == 302

From b7bb7a281990cd4d11e6e66df2db7daf220f3609 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Wed, 22 Jan 2025 14:29:26 -0500
Subject: [PATCH 09/26] Merge tool for person-person relationship types (#1500)

---
 geniza/entities/admin.py                      | 52 ++++++++-----
 geniza/entities/forms.py                      | 54 ++++++++++---
 geniza/entities/models.py                     | 77 +++++++++++--------
 .../persondocumentrelationtype/merge.html     |  2 +-
 .../personpersonrelationtype/merge.html       | 53 +++++++++++++
 ...personpersonrelationtype_option_label.html | 33 ++++++++
 geniza/entities/tests/test_entities_admin.py  |  4 +-
 geniza/entities/tests/test_entities_models.py | 71 ++++++++++++++++-
 geniza/entities/views.py                      | 60 +++++++++++----
 sitemedia/css/admin-local.css                 |  8 +-
 10 files changed, 327 insertions(+), 87 deletions(-)
 create mode 100644 geniza/entities/templates/admin/entities/personpersonrelationtype/merge.html
 create mode 100644 geniza/entities/templates/entities/snippets/personpersonrelationtype_option_label.html

diff --git a/geniza/entities/admin.py b/geniza/entities/admin.py
index c08a0f684..643a1b8d4 100644
--- a/geniza/entities/admin.py
+++ b/geniza/entities/admin.py
@@ -50,7 +50,11 @@
     PlacePlaceRelation,
     PlacePlaceRelationType,
 )
-from geniza.entities.views import PersonDocumentRelationTypeMerge, PersonMerge
+from geniza.entities.views import (
+    PersonDocumentRelationTypeMerge,
+    PersonMerge,
+    PersonPersonRelationTypeMerge,
+)
 from geniza.footnotes.models import Footnote
 
 
@@ -409,17 +413,10 @@ class RoleAdmin(TabbedTranslationAdmin, admin.ModelAdmin):
     ordering = ("display_label", "name")
 
 
-@admin.register(PersonDocumentRelationType)
-class PersonDocumentRelationTypeAdmin(TabbedTranslationAdmin, admin.ModelAdmin):
-    """Admin for managing the controlled vocabulary of people's relationships to documents"""
-
-    fields = ("name",)
-    search_fields = ("name",)
-    ordering = ("name",)
-
-    @admin.display(description="Merge selected Person-Document relationships")
-    def merge_person_document_relation_types(self, request, queryset=None):
-        """Admin action to merge selected person-document relation types. This
+class RelationTypeMergeAdminMixin:
+    @admin.display(description="Merge selected %(verbose_name_plural)s")
+    def merge_relation_types(self, request, queryset=None):
+        """Admin action to merge selected entity-entity relation types. This
         action redirects to an intermediate page, which displays a form to
         review for confirmation and choose the primary type before merging.
         """
@@ -427,15 +424,15 @@ def merge_person_document_relation_types(self, request, queryset=None):
         if len(selected) < 2:
             messages.error(
                 request,
-                "You must select at least two person-document relationships to merge",
+                "You must select at least two person-person relationships to merge",
             )
             return HttpResponseRedirect(
-                reverse("admin:entities_persondocumentrelationtype_changelist")
+                reverse("admin:entities_%s_changelist" % self.model._meta.model_name)
             )
         return HttpResponseRedirect(
             "%s?ids=%s"
             % (
-                reverse("admin:person-document-relation-type-merge"),
+                reverse(f"admin:{self.merge_path_name}"),
                 ",".join(selected),
             ),
             status=303,
@@ -446,22 +443,39 @@ def get_urls(self):
         urls = [
             path(
                 "merge/",
-                PersonDocumentRelationTypeMerge.as_view(),
-                name="person-document-relation-type-merge",
+                self.view_class.as_view(),
+                name=self.merge_path_name,
             ),
         ]
         return urls + super().get_urls()
 
-    actions = (merge_person_document_relation_types,)
+    actions = (merge_relation_types,)
+
+
+@admin.register(PersonDocumentRelationType)
+class PersonDocumentRelationTypeAdmin(
+    RelationTypeMergeAdminMixin, TabbedTranslationAdmin, admin.ModelAdmin
+):
+    """Admin for managing the controlled vocabulary of people's relationships to documents"""
+
+    fields = ("name",)
+    search_fields = ("name",)
+    ordering = ("name",)
+    merge_path_name = "person-document-relation-type-merge"
+    view_class = PersonDocumentRelationTypeMerge
 
 
 @admin.register(PersonPersonRelationType)
-class PersonPersonRelationTypeAdmin(TabbedTranslationAdmin, admin.ModelAdmin):
+class PersonPersonRelationTypeAdmin(
+    RelationTypeMergeAdminMixin, TabbedTranslationAdmin, admin.ModelAdmin
+):
     """Admin for managing the controlled vocabulary of people's relationships to other people"""
 
     fields = ("name", "converse_name", "category")
     search_fields = ("name",)
     ordering = ("name",)
+    merge_path_name = "person-person-relation-type-merge"
+    view_class = PersonPersonRelationTypeMerge
 
 
 @admin.register(PersonPlaceRelationType)
diff --git a/geniza/entities/forms.py b/geniza/entities/forms.py
index c9ac5f253..9127e1578 100644
--- a/geniza/entities/forms.py
+++ b/geniza/entities/forms.py
@@ -10,6 +10,7 @@
     PersonDocumentRelationType,
     PersonEventRelation,
     PersonPersonRelation,
+    PersonPersonRelationType,
     PersonPlaceRelation,
     PersonRole,
     PlaceEventRelation,
@@ -54,6 +55,22 @@ def __init__(self, *args, **kwargs):
         )
 
 
+class RelationTypeMergeFormMixin:
+    def __init__(self, *args, **kwargs):
+        ids = kwargs.get("ids", [])
+
+        # Remove the added kwarg so that the super method doesn't error
+        try:
+            del kwargs["ids"]
+        except KeyError:
+            pass
+
+        super().__init__(*args, **kwargs)
+        self.fields[
+            "primary_relation_type"
+        ].queryset = self.reltype_model.objects.filter(id__in=ids)
+
+
 class PersonDocumentRelationTypeChoiceField(forms.ModelChoiceField):
     """Add a summary of each PersonDocumentRelationType to a form (used for merging)"""
 
@@ -65,7 +82,7 @@ def label_from_instance(self, relation_type):
         return self.label_template.render({"relation_type": relation_type})
 
 
-class PersonDocumentRelationTypeMergeForm(forms.Form):
+class PersonDocumentRelationTypeMergeForm(RelationTypeMergeFormMixin, forms.Form):
     primary_relation_type = PersonDocumentRelationTypeChoiceField(
         label="Select primary person-document relationship",
         queryset=None,
@@ -77,20 +94,33 @@ class PersonDocumentRelationTypeMergeForm(forms.Form):
         empty_label=None,
         widget=forms.RadioSelect,
     )
+    reltype_model = PersonDocumentRelationType
 
-    def __init__(self, *args, **kwargs):
-        ids = kwargs.get("ids", [])
 
-        # Remove the added kwarg so that the super method doesn't error
-        try:
-            del kwargs["ids"]
-        except KeyError:
-            pass
+class PersonPersonRelationTypeChoiceField(forms.ModelChoiceField):
+    """Add a summary of each PersonPersonRelationType to a form (used for merging)"""
 
-        super().__init__(*args, **kwargs)
-        self.fields[
-            "primary_relation_type"
-        ].queryset = PersonDocumentRelationType.objects.filter(id__in=ids)
+    label_template = get_template(
+        "entities/snippets/personpersonrelationtype_option_label.html"
+    )
+
+    def label_from_instance(self, relation_type):
+        return self.label_template.render({"relation_type": relation_type})
+
+
+class PersonPersonRelationTypeMergeForm(RelationTypeMergeFormMixin, forms.Form):
+    primary_relation_type = PersonPersonRelationTypeChoiceField(
+        label="Select primary person-person relationship",
+        queryset=None,
+        help_text=(
+            "Select the primary person-person relationship, which will be "
+            "used as the canonical entry. All associated relations and log "
+            "entries will be combined on the primary relationship."
+        ),
+        empty_label=None,
+        widget=forms.RadioSelect,
+    )
+    reltype_model = PersonPersonRelationType
 
 
 class PersonPersonForm(forms.ModelForm):
diff --git a/geniza/entities/models.py b/geniza/entities/models.py
index c051a70c7..5df3d20ef 100644
--- a/geniza/entities/models.py
+++ b/geniza/entities/models.py
@@ -1020,29 +1020,10 @@ def get_by_natural_key(self, name):
         return self.get(name_en=name)
 
 
-class PersonDocumentRelationType(models.Model):
-    """Controlled vocabulary of people's relationships to documents."""
-
-    name = models.CharField(max_length=255, unique=True)
-    objects = PersonDocumentRelationTypeManager()
-    log_entries = GenericRelation(
-        LogEntry, related_query_name="persondocumentrelationtype"
-    )
-
-    class Meta:
-        verbose_name = "Person-Document relationship"
-        verbose_name_plural = "Person-Document relationships"
-
-    def __str__(self):
-        return self.name
-
-    @cached_class_property
-    def objects_by_label(cls):
-        return {
-            # lookup on name_en since solr should always index in English
-            obj.name_en: obj
-            for obj in cls.objects.all()
-        }
+class MergeRelationTypesMixin:
+    """Mixin to include shared merge logic for relation types.
+    Requires inheriting relation type model to make its relationships
+    queryset available generically by the method name :meth:`relation_set`"""
 
     def merge_with(self, merge_relation_types, user=None):
         """Merge the specified relation types into this one. Combines all
@@ -1069,12 +1050,12 @@ def merge_with(self, merge_relation_types, user=None):
                 # - associate with the primary relation type
                 log_entry.object_id = self.id
                 log_entry.content_type_id = ContentType.objects.get_for_model(
-                    PersonDocumentRelationType
+                    self.__class__
                 )
                 log_entry.save()
 
-            # combine person-document relationships
-            for relationship in rel_type.persondocumentrelation_set.all():
+            # combine relationships
+            for relationship in rel_type.relation_set():
                 # set type of each relationship to primary relation type
                 relationship.type = self
                 # handle unique constraint violation (one relationship per type
@@ -1093,12 +1074,10 @@ def merge_with(self, merge_relation_types, user=None):
         for rel_type in merge_relation_types:
             rel_type.delete()
         # create log entry documenting the merge; include rationale
-        pdrtype_contenttype = ContentType.objects.get_for_model(
-            PersonDocumentRelationType
-        )
+        rtype_contenttype = ContentType.objects.get_for_model(self.__class__)
         LogEntry.objects.log_action(
             user_id=user.id,
-            content_type_id=pdrtype_contenttype.pk,
+            content_type_id=rtype_contenttype.pk,
             object_id=self.pk,
             object_repr=str(self),
             change_message="merged with %s" % (merged_types,),
@@ -1106,6 +1085,35 @@ def merge_with(self, merge_relation_types, user=None):
         )
 
 
+class PersonDocumentRelationType(MergeRelationTypesMixin, models.Model):
+    """Controlled vocabulary of people's relationships to documents."""
+
+    name = models.CharField(max_length=255, unique=True)
+    objects = PersonDocumentRelationTypeManager()
+    log_entries = GenericRelation(
+        LogEntry, related_query_name="persondocumentrelationtype"
+    )
+
+    class Meta:
+        verbose_name = "Person-Document relationship"
+        verbose_name_plural = "Person-Document relationships"
+
+    def __str__(self):
+        return self.name
+
+    @cached_class_property
+    def objects_by_label(cls):
+        return {
+            # lookup on name_en since solr should always index in English
+            obj.name_en: obj
+            for obj in cls.objects.all()
+        }
+
+    def relation_set(self):
+        # own relationships QuerySet as required by MergeRelationTypesMixin
+        return self.persondocumentrelation_set.all()
+
+
 class PersonDocumentRelation(models.Model):
     """A relationship between a person and a document."""
 
@@ -1140,7 +1148,7 @@ def get_by_natural_key(self, name):
         return self.get(name_en=name)
 
 
-class PersonPersonRelationType(models.Model):
+class PersonPersonRelationType(MergeRelationTypesMixin, models.Model):
     """Controlled vocabulary of people's relationships to other people."""
 
     # name of the relationship
@@ -1171,6 +1179,9 @@ class PersonPersonRelationType(models.Model):
         choices=CATEGORY_CHOICES,
     )
     objects = PersonPersonRelationTypeManager()
+    log_entries = GenericRelation(
+        LogEntry, related_query_name="personpersonrelationtype"
+    )
 
     class Meta:
         verbose_name = "Person-Person relationship"
@@ -1179,6 +1190,10 @@ class Meta:
     def __str__(self):
         return self.name
 
+    def relation_set(self):
+        # own relationships QuerySet as required by MergeRelationTypesMixin
+        return self.personpersonrelation_set.all()
+
 
 class PersonPersonRelation(models.Model):
     """A relationship between two people."""
diff --git a/geniza/entities/templates/admin/entities/persondocumentrelationtype/merge.html b/geniza/entities/templates/admin/entities/persondocumentrelationtype/merge.html
index e1bd360c8..fcb4061a4 100644
--- a/geniza/entities/templates/admin/entities/persondocumentrelationtype/merge.html
+++ b/geniza/entities/templates/admin/entities/persondocumentrelationtype/merge.html
@@ -31,7 +31,7 @@ <h2>Note: there is no automated way to unmerge! Please review to make sure these
 {% endblock %}
 
 {% block content %}
-    <form method="post" class="merge-document merge-relationtype">
+    <form method="post" class="merge-relationtype">
         {% csrf_token %}
         {% if form.errors|length > 0 %}
             <p class="errornote">
diff --git a/geniza/entities/templates/admin/entities/personpersonrelationtype/merge.html b/geniza/entities/templates/admin/entities/personpersonrelationtype/merge.html
new file mode 100644
index 000000000..880a3f363
--- /dev/null
+++ b/geniza/entities/templates/admin/entities/personpersonrelationtype/merge.html
@@ -0,0 +1,53 @@
+{% extends 'admin/base_site.html' %}
+
+{% load admin_urls static %}
+
+{% block extrastyle %}
+    {{ block.super }}
+    <link rel="stylesheet" href="{% static "admin/css/forms.css" %}">
+    <link rel="stylesheet" href="{% static "css/admin-local.css" %}">
+{% endblock %}
+
+{% block title %} Merge selected person-person relationships {% endblock %}
+
+{% block breadcrumbs %}
+    {% if not is_popup %}
+        <div class="breadcrumbs">
+            <a href="{% url 'admin:index' %}">Home</a>
+            &rsaquo;
+            <a href="{% url 'admin:app_list' app_label='entities' %}">Entities</a>
+            &rsaquo;
+            <a href="{% url 'admin:entities_personpersonrelationtype_changelist'%}">Person-Person relationships</a>
+            &rsaquo;
+            Merge selected person-person relationships
+        </div>
+    {% endif %}
+{% endblock %}
+
+
+{% block content_title %}
+    <h1>Merge selected person-person relationships</h1>
+    <h2>Note: there is no automated way to unmerge! Please review to make sure these relationships should be merged before submitting the form.</h2>
+{% endblock %}
+
+{% block content %}
+    <form method="post" class="merge-relationtype">
+        {% csrf_token %}
+        {% if form.errors|length > 0 %}
+            <p class="errornote">
+                Please correct the error below.
+            </p>
+        {% endif %}
+        <fieldset class="module aligned">
+            <div class="form-row">
+                {{ form.primary_relation_type.label_tag }}
+                {{ form.primary_relation_type }}
+                <p class="help">{{ form.primary_relation_type.help_text|safe }}</p>
+            </div>
+
+            <div class="submit-row">
+                <input type="submit" value="Submit">
+            </div>
+        </field>
+    </form>
+{% endblock %}
diff --git a/geniza/entities/templates/entities/snippets/personpersonrelationtype_option_label.html b/geniza/entities/templates/entities/snippets/personpersonrelationtype_option_label.html
new file mode 100644
index 000000000..ee99ec0a3
--- /dev/null
+++ b/geniza/entities/templates/entities/snippets/personpersonrelationtype_option_label.html
@@ -0,0 +1,33 @@
+{# template snippet for displaying person-person relationship label on a form #}
+{# used on merge form to provide enough information to merge accurately #}
+
+<div class="merge-document-label">
+    <h2>{{ relation_type }}
+        <a target="_blank" href="{% url 'admin:entities_personpersonrelationtype_change' relation_type.pk %}"
+           title="Go to this relationship's admin edit page">
+            <img src="/static/admin/img/icon-changelink.svg" alt="Change"></a>
+    </h2>
+    <details>
+        <summary>View all {{ relation_type.personpersonrelation_set.count }} {{ relation_type }} relations</summary>
+        <ol>
+            {% for rel in relation_type.personpersonrelation_set.all %}
+                <li>
+                    <div class="form-row">
+                        <label>{{ rel.type }}-{{ rel.type.converse_name|default:rel.type }} relation:</label>
+                        <div>
+                            <a target="_blank" href="{% url 'admin:entities_person_change' rel.from_person.pk %}">{{ rel.from_person }}</a>
+                            and
+                            <a target="_blank" href="{% url 'admin:entities_person_change' rel.to_person.pk %}">{{ rel.to_person }}</a>
+                        </div>
+                    </div>
+                </li>
+            {% empty %}
+                <li>
+                    <div class="form-row">
+                        <label>No relations</label><div></div>
+                    </div>
+                </li>
+            {% endfor %}
+        </ol>
+    </details>
+</div>
diff --git a/geniza/entities/tests/test_entities_admin.py b/geniza/entities/tests/test_entities_admin.py
index 77609de9f..5b39c63f3 100644
--- a/geniza/entities/tests/test_entities_admin.py
+++ b/geniza/entities/tests/test_entities_admin.py
@@ -427,7 +427,7 @@ def test_merge_person_document_relation_types(self):
         mockrequest = Mock()
         test_ids = ["1", "2", "3"]
         mockrequest.POST.getlist.return_value = test_ids
-        resp = pdr_admin.merge_person_document_relation_types(mockrequest, Mock())
+        resp = pdr_admin.merge_relation_types(mockrequest, Mock())
         assert isinstance(resp, HttpResponseRedirect)
         assert resp.status_code == 303
         assert resp["location"].startswith(
@@ -437,7 +437,7 @@ def test_merge_person_document_relation_types(self):
 
         test_ids = ["1"]
         mockrequest.POST.getlist.return_value = test_ids
-        resp = pdr_admin.merge_person_document_relation_types(mockrequest, Mock())
+        resp = pdr_admin.merge_relation_types(mockrequest, Mock())
         assert isinstance(resp, HttpResponseRedirect)
         assert resp.status_code == 302
         assert resp["location"] == reverse(
diff --git a/geniza/entities/tests/test_entities_models.py b/geniza/entities/tests/test_entities_models.py
index 23ae26eae..757ba5fa3 100644
--- a/geniza/entities/tests/test_entities_models.py
+++ b/geniza/entities/tests/test_entities_models.py
@@ -708,7 +708,7 @@ def test_str(self):
 @pytest.mark.django_db
 class TestPersonDocumentRelationType:
     def test_merge_with(self, person, person_multiname, document, join):
-        # create two PersonDocumentRelationTypes and some associations
+        # create three PersonDocumentRelationTypes and some associations
         rel_type = PersonDocumentRelationType.objects.create(name="test")
         type_2 = PersonDocumentRelationType.objects.create(name="to be merged")
         type_3 = PersonDocumentRelationType.objects.create(name="also merge me")
@@ -781,6 +781,75 @@ def test_merge_with(self, person, person_multiname, document, join):
         )
 
 
+@pytest.mark.django_db
+class TestPersonPersonRelationType:
+    def test_merge_with(self, person, person_multiname, person_diacritic):
+        # create two PersonPersonRelationTypes and some associations
+        rel_type = PersonPersonRelationType.objects.create(name="test")
+        type_2 = PersonPersonRelationType.objects.create(name="to be merged")
+        PersonPersonRelation.objects.create(
+            type=rel_type, from_person=person, to_person=person_multiname
+        )
+        PersonPersonRelation.objects.create(
+            type=type_2, from_person=person, to_person=person_diacritic
+        )
+
+        # create some log entries
+        pprtype_contenttype = ContentType.objects.get_for_model(
+            PersonPersonRelationType
+        )
+        creation_date = timezone.make_aware(datetime(2025, 1, 22))
+        creator = User.objects.get_or_create(username="editor")[0]
+        type_2_str = str(type_2)
+        type_2_pk = type_2.pk
+        LogEntry.objects.bulk_create(
+            [
+                LogEntry(
+                    user_id=creator.id,
+                    content_type_id=pprtype_contenttype.pk,
+                    object_id=type_2_pk,
+                    object_repr=type_2_str,
+                    change_message="first input",
+                    action_flag=ADDITION,
+                    action_time=creation_date,
+                ),
+                LogEntry(
+                    user_id=creator.id,
+                    content_type_id=pprtype_contenttype.pk,
+                    object_id=type_2_pk,
+                    object_repr=type_2_str,
+                    change_message="major revision",
+                    action_flag=CHANGE,
+                    action_time=timezone.now(),
+                ),
+            ]
+        )
+        assert rel_type.personpersonrelation_set.count() == 1
+        rel_type.merge_with([type_2])
+        assert rel_type.personpersonrelation_set.count() == 2
+        # should delete other types and create merge log entry
+        assert not type_2.pk
+        assert LogEntry.objects.filter(
+            object_id=rel_type.pk,
+            change_message__contains=f"merged with {type_2}",
+        ).exists()
+        assert rel_type.log_entries.count() == 3
+        # based on default sorting, most recent log entry will be first
+        # - should document the merge event
+        merge_log = rel_type.log_entries.first()
+        assert merge_log.action_flag == CHANGE
+
+        # reassociated log entries should include merged type's name, id
+        assert (
+            " [merged type %s (id = %s)]" % (type_2_str, type_2_pk)
+            in rel_type.log_entries.all()[1].change_message
+        )
+        assert (
+            " [merged type %s (id = %s)]" % (type_2_str, type_2_pk)
+            in rel_type.log_entries.all()[2].change_message
+        )
+
+
 @pytest.mark.django_db
 class TestPlace:
     def test_str(self):
diff --git a/geniza/entities/views.py b/geniza/entities/views.py
index 12432aba7..f49bbffb4 100644
--- a/geniza/entities/views.py
+++ b/geniza/entities/views.py
@@ -23,6 +23,7 @@
     PersonDocumentRelationTypeMergeForm,
     PersonListForm,
     PersonMergeForm,
+    PersonPersonRelationTypeMergeForm,
     PlaceListForm,
 )
 from geniza.entities.models import (
@@ -101,20 +102,7 @@ def form_valid(self, form):
         return super().form_valid(form)
 
 
-class PersonDocumentRelationTypeMerge(PermissionRequiredMixin, FormView):
-    permission_required = (
-        "entities.change_persondocumentrelationtype",
-        "entities.delete_persondocumentrelationtype",
-    )
-    form_class = PersonDocumentRelationTypeMergeForm
-    template_name = "admin/entities/persondocumentrelationtype/merge.html"
-
-    def get_success_url(self):
-        return reverse(
-            "admin:entities_persondocumentrelationtype_change",
-            args=[self.primary_relation_type.pk],
-        )
-
+class RelationTypeMergeViewMixin:
     def get_form_kwargs(self):
         form_kwargs = super().get_form_kwargs()
         form_kwargs["ids"] = self.ids
@@ -131,12 +119,12 @@ def get_initial(self):
             self.ids = []
 
     def form_valid(self, form):
-        """Merge the selected person-document relation types into the primary one."""
+        """Merge the selected relation types into the primary one."""
         primary_relation_type = form.cleaned_data["primary_relation_type"]
         self.primary_relation_type = primary_relation_type
 
         secondary_ids = [id for id in self.ids if id != primary_relation_type.pk]
-        secondary_relation_types = PersonDocumentRelationType.objects.filter(
+        secondary_relation_types = self.relation_type_class.objects.filter(
             pk__in=secondary_ids
         )
 
@@ -160,7 +148,7 @@ def form_valid(self, form):
             return HttpResponseRedirect(
                 "%s?ids=%s"
                 % (
-                    reverse("admin:person-document-relation-type-merge"),
+                    reverse(f"admin:{self.merge_path_name}"),
                     self.request.GET.get("ids", ""),
                 ),
             )
@@ -176,6 +164,44 @@ def form_valid(self, form):
         return super().form_valid(form)
 
 
+class PersonDocumentRelationTypeMerge(
+    RelationTypeMergeViewMixin, PermissionRequiredMixin, FormView
+):
+    permission_required = (
+        "entities.change_persondocumentrelationtype",
+        "entities.delete_persondocumentrelationtype",
+    )
+    form_class = PersonDocumentRelationTypeMergeForm
+    template_name = "admin/entities/persondocumentrelationtype/merge.html"
+    relation_type_class = PersonDocumentRelationType
+    merge_path_name = "person-document-relation-type-merge"
+
+    def get_success_url(self):
+        return reverse(
+            "admin:entities_persondocumentrelationtype_change",
+            args=[self.primary_relation_type.pk],
+        )
+
+
+class PersonPersonRelationTypeMerge(
+    RelationTypeMergeViewMixin, PermissionRequiredMixin, FormView
+):
+    permission_required = (
+        "entities.change_personpersonrelationtype",
+        "entities.delete_personpersonrelationtype",
+    )
+    form_class = PersonPersonRelationTypeMergeForm
+    template_name = "admin/entities/personpersonrelationtype/merge.html"
+    relation_type_class = PersonPersonRelationType
+    merge_path_name = "person-person-relation-type-merge"
+
+    def get_success_url(self):
+        return reverse(
+            "admin:entities_personpersonrelationtype_change",
+            args=[self.primary_relation_type.pk],
+        )
+
+
 class UnaccentedNameAutocompleteView(autocomplete.Select2QuerySetView):
     def get_queryset(self):
         """entities filtered by entered query, or all entities, ordered by name"""
diff --git a/sitemedia/css/admin-local.css b/sitemedia/css/admin-local.css
index 2c5132a6a..0d3eb76a1 100644
--- a/sitemedia/css/admin-local.css
+++ b/sitemedia/css/admin-local.css
@@ -242,12 +242,12 @@ fieldset.transcriptions-field
     max-height: 350px;
     overflow-y: scroll;
 }
-.merge-document li > label {
+[class^="merge-"] li > label {
     display: flex;
     justify-content: flex-start;
 }
 
-.merge-document .submit-row {
+[class^="merge-"] .submit-row {
     clear: left;
     padding: 12px 14px;
     margin: 20px 0 0;
@@ -279,10 +279,10 @@ fieldset.transcriptions-field
     list-style: auto;
 }
 
-.merge-document input[type="radio"] {
+[class^="merge-"] input[type="radio"] {
     margin-right: 0.5rem;
 }
-.merge-document textarea {
+[class^="merge-"] textarea {
     margin: 0 0 20px 180px;
 }
 

From b2a882909159e5a717dc1e3a3c155f754cd37372 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Wed, 22 Jan 2025 15:45:13 -0500
Subject: [PATCH 10/26] Add missing unit test coverage for personperson merge
 (#1500)

---
 geniza/entities/tests/test_entities_forms.py  | 59 ++++++++++++++++++-
 geniza/entities/tests/test_entities_models.py | 30 ++++++++++
 geniza/entities/tests/test_entities_views.py  | 15 +++++
 3 files changed, 103 insertions(+), 1 deletion(-)

diff --git a/geniza/entities/tests/test_entities_forms.py b/geniza/entities/tests/test_entities_forms.py
index 196840730..47f259b82 100644
--- a/geniza/entities/tests/test_entities_forms.py
+++ b/geniza/entities/tests/test_entities_forms.py
@@ -6,12 +6,22 @@
 from geniza.corpus.forms import FacetChoiceField
 from geniza.entities.forms import (
     PersonChoiceField,
+    PersonDocumentRelationTypeChoiceField,
     PersonDocumentRelationTypeMergeForm,
     PersonListForm,
     PersonMergeForm,
+    PersonPersonRelationTypeChoiceField,
     PlaceListForm,
 )
-from geniza.entities.models import Name, Person, PersonDocumentRelationType, PersonRole
+from geniza.entities.models import (
+    Name,
+    Person,
+    PersonDocumentRelation,
+    PersonDocumentRelationType,
+    PersonPersonRelation,
+    PersonPersonRelationType,
+    PersonRole,
+)
 
 
 class TestPersonChoiceField:
@@ -52,6 +62,28 @@ def test_init(self):
         assert people.last() not in mergeform.fields["primary_person"].queryset
 
 
+class TestPersonDocumentRelationTypeChoiceField:
+    @pytest.mark.django_db
+    def test_label_from_instance(self, person, document):
+        # adapted from TestDocumentChoiceField
+        choicefield = PersonDocumentRelationTypeChoiceField(Mock())
+
+        # Should not error on a relation with the most minimal information
+        minimal = PersonDocumentRelationType.objects.create()
+        label = choicefield.label_from_instance(minimal)
+        assert str(minimal.id) in label
+
+        # Check that the necessary information is in the label
+        reltype = PersonDocumentRelationType.objects.create(name="test")
+        PersonDocumentRelation.objects.create(
+            person=person, document=document, type=reltype
+        )
+        label = choicefield.label_from_instance(reltype)
+        assert "test relation" in label
+        assert str(person) in label
+        assert str(document) in label
+
+
 class TestPersonDocumentRelationTypeMergeForm:
     @pytest.mark.django_db
     def test_init(self):
@@ -77,6 +109,31 @@ def test_init(self):
         assert types.last() not in mergeform.fields["primary_relation_type"].queryset
 
 
+class TestPersonPersonRelationTypeChoiceField:
+    @pytest.mark.django_db
+    def test_label_from_instance(self, person, person_multiname):
+        # adapted from TestDocumentChoiceField
+        choicefield = PersonPersonRelationTypeChoiceField(Mock())
+
+        # Should not error on a relation with the most minimal information
+        minimal = PersonPersonRelationType.objects.create()
+        label = choicefield.label_from_instance(minimal)
+        assert str(minimal.id) in label
+
+        # Check that the necessary information is in the label
+        reltype = PersonPersonRelationType.objects.create(
+            name="test", converse_name="converse"
+        )
+        label = choicefield.label_from_instance(reltype)
+        assert "test" in label
+        assert "converse" not in label
+        PersonPersonRelation.objects.create(
+            type=reltype, from_person=person, to_person=person_multiname
+        )
+        label = choicefield.label_from_instance(reltype)
+        assert "converse" in label
+
+
 @pytest.mark.django_db
 class TestPersonListForm:
     def test_set_choices_from_facets(self, person, person_diacritic):
diff --git a/geniza/entities/tests/test_entities_models.py b/geniza/entities/tests/test_entities_models.py
index 757ba5fa3..a73af2785 100644
--- a/geniza/entities/tests/test_entities_models.py
+++ b/geniza/entities/tests/test_entities_models.py
@@ -780,6 +780,36 @@ def test_merge_with(self, person, person_multiname, document, join):
             in rel_type.log_entries.all()[2].change_message
         )
 
+    @pytest.mark.django_db
+    def test_objects_by_label(self):
+        """Should return dict of PersonDocumentRelationType objects keyed on English label"""
+        # invalidate cached property (it is computed in other tests in the suite)
+        if "objects_by_label" in PersonDocumentRelationType.__dict__:
+            # __dict__["objects_by_label"] returns a classmethod
+            # __func__ returns a property
+            # fget returns the actual cached function
+            PersonDocumentRelationType.__dict__[
+                "objects_by_label"
+            ].__func__.fget.cache_clear()
+        # add some new relation types
+        rel_type = PersonDocumentRelationType(name="Some kind of official")
+        rel_type.save()
+        rel_type_2 = PersonDocumentRelationType(name="Example")
+        rel_type_2.save()
+        # should be able to get a relation type by label
+        assert isinstance(
+            PersonDocumentRelationType.objects_by_label.get("Some kind of official"),
+            PersonDocumentRelationType,
+        )
+        assert (
+            PersonDocumentRelationType.objects_by_label.get("Some kind of official").pk
+            == rel_type.pk
+        )
+        assert (
+            PersonDocumentRelationType.objects_by_label.get("Example").pk
+            == rel_type_2.pk
+        )
+
 
 @pytest.mark.django_db
 class TestPersonPersonRelationType:
diff --git a/geniza/entities/tests/test_entities_views.py b/geniza/entities/tests/test_entities_views.py
index 8189e4b85..1bafa256a 100644
--- a/geniza/entities/tests/test_entities_views.py
+++ b/geniza/entities/tests/test_entities_views.py
@@ -28,6 +28,7 @@
     PersonDocumentRelationTypeMerge,
     PersonListView,
     PersonMerge,
+    PersonPersonRelationTypeMerge,
     PlaceAutocompleteView,
     PlaceListView,
 )
@@ -196,6 +197,20 @@ def test_person_document_relation_type_merge(self, admin_client, client):
             assert "test message" in messages
 
 
+class TestPersonPersonRelationTypeMergeView:
+    # adapted from TestPersonMergeView
+    @pytest.mark.django_db
+    def test_get_success_url(self):
+        rel_type = PersonPersonRelationType.objects.create(name="test")
+        merge_view = PersonPersonRelationTypeMerge()
+        merge_view.primary_relation_type = rel_type
+
+        resolved_url = resolve(merge_view.get_success_url())
+        assert "admin" in resolved_url.app_names
+        assert resolved_url.url_name == "entities_personpersonrelationtype_change"
+        assert resolved_url.kwargs["object_id"] == str(rel_type.pk)
+
+
 class TestPersonAutocompleteView:
     @pytest.mark.django_db
     def test_get_queryset(self):

From 614cff69ad245554561ecb7b416780131dbdf666 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Wed, 22 Jan 2025 16:58:37 -0500
Subject: [PATCH 11/26] Add img thumbnails to doc merge preview (#1460)

---
 .../corpus/snippets/document_option_label.html      | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/geniza/corpus/templates/corpus/snippets/document_option_label.html b/geniza/corpus/templates/corpus/snippets/document_option_label.html
index d071719ad..142bdf06d 100644
--- a/geniza/corpus/templates/corpus/snippets/document_option_label.html
+++ b/geniza/corpus/templates/corpus/snippets/document_option_label.html
@@ -1,10 +1,11 @@
+{% load corpus_extras %}
 {# template snippet for displaying document label on a form #}
 {# used on document merge form to provide enough information to merge accurately #}
 
 <div class="merge-document-label">
     <h2>{{ document }}
         <a target="_blank" href="{% url 'admin:corpus_document_change' document.id %}"
-            title="Go to this document's admin edit page">
+           title="Go to this document's admin edit page">
             <img src="/static/admin/img/icon-changelink.svg" alt="Change"></a>
     </h2>
     {% if document.description %}
@@ -32,6 +33,12 @@ <h2>{{ document }}
             <label>Needs Review</label><div>{{ document.needs_review }}</div>
         </div>
     {% endif %}
+    {% if document.iiif_images %}
+        <div class="form-row">
+            <label>Images</label>
+            {{ document.admin_thumbnails }}
+        </div>
+    {% endif %}
     {% if document.footnotes.count %}
         <div class="form-row">
             <label>Scholarship Records</label>
@@ -43,8 +50,8 @@ <h2>{{ document }}
                             <label>Bibliographic citation</label>
                             <div>{{ source.grouper.formatted_display|safe }}
                                 <a href="{% url 'admin:footnotes_source_change' source.grouper.id %}"
-                                    title="Go to this source's admin edit page"><img src="/static/admin/img/icon-changelink.svg"
-                                        alt="Change"></a>
+                                   title="Go to this source's admin edit page"><img src="/static/admin/img/icon-changelink.svg"
+                                                                                 alt="Change"></a>
                                 {% if source.grouper.source_type.type == "Unpublished" %}
                                     <div class="unpublished">unpublished</div>
                                 {% endif %}

From 698eea8be972dc29bfc37420e79948338a2ba04a Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Thu, 23 Jan 2025 13:38:29 -0500
Subject: [PATCH 12/26] Add tags to Person model, admin (#1720)

---
 geniza/common/models.py                       | 15 +++++++++++
 geniza/corpus/models.py                       | 14 ++--------
 geniza/entities/admin.py                      |  9 +++++++
 .../entities/migrations/0026_person_tags.py   | 26 +++++++++++++++++++
 geniza/entities/models.py                     | 10 ++++---
 5 files changed, 59 insertions(+), 15 deletions(-)
 create mode 100644 geniza/entities/migrations/0026_person_tags.py

diff --git a/geniza/common/models.py b/geniza/common/models.py
index 4d8b2a019..cd5bb788e 100644
--- a/geniza/common/models.py
+++ b/geniza/common/models.py
@@ -2,6 +2,7 @@
 
 from django.contrib.auth.models import User
 from django.db import models
+from django.db.models.functions.text import Lower
 from django.utils.safestring import mark_safe
 from modeltranslation.utils import fallbacks
 
@@ -110,3 +111,17 @@ def objects_by_label(cls):
             (obj.display_label_en or obj.name_en): obj
             for obj in cls.objects.all()
         }
+
+
+class TaggableMixin:
+    """Mixin for taggable models with convenience functions for generating lists of tags"""
+
+    def all_tags(self):
+        """comma delimited string of all tags for this instance"""
+        return ", ".join(t.name for t in self.tags.all())
+
+    all_tags.short_description = "tags"
+
+    def alphabetized_tags(self):
+        """tags in alphabetical order, case-insensitive sorting"""
+        return self.tags.order_by(Lower("name"))
diff --git a/geniza/corpus/models.py b/geniza/corpus/models.py
index c056cf875..0e1b91f06 100644
--- a/geniza/corpus/models.py
+++ b/geniza/corpus/models.py
@@ -18,7 +18,6 @@
 from django.core.validators import RegexValidator
 from django.db import models
 from django.db.models.functions import Concat
-from django.db.models.functions.text import Lower
 from django.db.models.query import Prefetch
 from django.db.models.signals import pre_delete
 from django.dispatch import receiver
@@ -41,6 +40,7 @@
 from geniza.annotations.models import Annotation
 from geniza.common.models import (
     DisplayLabelMixin,
+    TaggableMixin,
     TrackChangesModel,
     cached_class_property,
 )
@@ -521,7 +521,7 @@ def permalink(self):
         return absolutize_url(self.get_absolute_url().replace(f"/{lang}/", "/"))
 
 
-class Document(ModelIndexable, DocumentDateMixin, PermalinkMixin):
+class Document(ModelIndexable, DocumentDateMixin, PermalinkMixin, TaggableMixin):
     """A unified document such as a letter or legal document that
     appears on one or more fragments."""
 
@@ -749,16 +749,6 @@ def formatted_citation(self):
             f"{long_name}. {available_at} {self.permalink}, accessed {today}."
         )
 
-    def all_tags(self):
-        """comma delimited string of all tags for this document"""
-        return ", ".join(t.name for t in self.tags.all())
-
-    all_tags.short_description = "tags"
-
-    def alphabetized_tags(self):
-        """tags in alphabetical order, case-insensitive sorting"""
-        return self.tags.order_by(Lower("name"))
-
     def is_public(self):
         """admin display field indicating if doc is public or suppressed"""
         return self.status == self.PUBLIC
diff --git a/geniza/entities/admin.py b/geniza/entities/admin.py
index 643a1b8d4..d651b29c9 100644
--- a/geniza/entities/admin.py
+++ b/geniza/entities/admin.py
@@ -267,6 +267,14 @@ class PersonEventInline(admin.TabularInline):
 class PersonAdmin(TabbedTranslationAdmin, SortableAdminBase, admin.ModelAdmin):
     """Admin for Person entities in the PGP"""
 
+    list_display = (
+        "__str__",
+        "slug",
+        "gender",
+        "role",
+        "all_tags",
+        "has_page",
+    )
     search_fields = ("name_unaccented", "names__name")
     fields = (
         "slug",
@@ -276,6 +284,7 @@ class PersonAdmin(TabbedTranslationAdmin, SortableAdminBase, admin.ModelAdmin):
         "date",
         "automatic_date",
         "description",
+        "tags",
     )
     readonly_fields = ("automatic_date",)
     inlines = (
diff --git a/geniza/entities/migrations/0026_person_tags.py b/geniza/entities/migrations/0026_person_tags.py
new file mode 100644
index 000000000..a98a1270a
--- /dev/null
+++ b/geniza/entities/migrations/0026_person_tags.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.2.23 on 2025-01-23 17:51
+
+import taggit_selectize.managers
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("taggit", "0003_taggeditem_add_unique_index"),
+        ("entities", "0025_person_date"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="person",
+            name="tags",
+            field=taggit_selectize.managers.TaggableManager(
+                blank=True,
+                help_text="A comma-separated list of tags.",
+                related_name="tagged_person",
+                through="taggit.TaggedItem",
+                to="taggit.Tag",
+                verbose_name="Tags",
+            ),
+        ),
+    ]
diff --git a/geniza/entities/models.py b/geniza/entities/models.py
index 5df3d20ef..a37132a35 100644
--- a/geniza/entities/models.py
+++ b/geniza/entities/models.py
@@ -3,7 +3,6 @@
 from datetime import datetime
 from math import modf
 from operator import itemgetter
-from time import sleep
 
 from django.conf import settings
 from django.contrib.admin.models import CHANGE, LogEntry
@@ -22,9 +21,10 @@
 from parasolr.django import AliasedSolrQuerySet
 from parasolr.django.indexing import ModelIndexable
 from slugify import slugify
+from taggit_selectize.managers import TaggableManager
 from unidecode import unidecode
 
-from geniza.common.models import TrackChangesModel, cached_class_property
+from geniza.common.models import TaggableMixin, TrackChangesModel, cached_class_property
 from geniza.corpus.dates import DocumentDateMixin, PartialDate, standard_date_display
 from geniza.corpus.models import (
     DisplayLabelMixin,
@@ -313,7 +313,9 @@ def related_delete(sender, instance=None, raw=False, **_kwargs):
         PersonSignalHandlers.related_change(instance, raw, "delete")
 
 
-class Person(ModelIndexable, SlugMixin, DocumentDatableMixin, PermalinkMixin):
+class Person(
+    ModelIndexable, SlugMixin, DocumentDatableMixin, PermalinkMixin, TaggableMixin
+):
     """A person entity that appears within the PGP corpus."""
 
     names = GenericRelation(Name, related_query_name="person")
@@ -360,6 +362,8 @@ class Person(ModelIndexable, SlugMixin, DocumentDatableMixin, PermalinkMixin):
 
     log_entries = GenericRelation(LogEntry, related_query_name="document")
 
+    tags = TaggableManager(blank=True, related_name="tagged_person")
+
     # gender options
     MALE = "M"
     FEMALE = "F"

From 24db93e00d7374f91dbc2869d965817ee8eb6f35 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Fri, 24 Jan 2025 12:58:44 -0500
Subject: [PATCH 13/26] Add tags to people search (#1720)

---
 geniza/entities/models.py                     | 20 +++++++++++++++++++
 .../templates/entities/person_list.html       | 13 ++++++++++++
 geniza/entities/tests/test_entities_models.py | 11 ++++++++++
 sitemedia/scss/pages/_people.scss             | 20 +++++++++++++++++++
 4 files changed, 64 insertions(+)

diff --git a/geniza/entities/models.py b/geniza/entities/models.py
index a37132a35..d288e97ea 100644
--- a/geniza/entities/models.py
+++ b/geniza/entities/models.py
@@ -892,6 +892,7 @@ def index_data(self):
                         "type__name_en", flat=True
                     ).distinct()
                 ),
+                "tags_ss_lower": [t.name for t in self.tags.all()],
             }
         )
         solr_date_range = self.solr_date_range()
@@ -973,13 +974,31 @@ class PersonSolrQuerySet(AliasedSolrQuerySet):
         "document_relations": "document_relation_ss",
         "date_str": "date_str_s",
         "has_page": "has_page_b",
+        "tags": "tags_ss_lower",
     }
 
+    search_aliases = field_aliases.copy()
+    search_aliases.update(
+        {
+            # when searching, singular makes more sense for tags
+            "tag": field_aliases["tags"],
+        }
+    )
+    re_solr_fields = re.compile(
+        r"(%s):" % "|".join(key for key, val in search_aliases.items() if key != val),
+        flags=re.DOTALL,
+    )
+
     keyword_search_qf = "{!type=edismax qf=$people_qf pf=$people_pf v=$keyword_query}"
 
     def keyword_search(self, search_term):
         """Allow searching using keywords with the specified query and phrase match
         fields, and set the default operator to AND"""
+        if ":" in search_term:
+            # if any of the field aliases occur with a colon, replace with actual solr field
+            search_term = self.re_solr_fields.sub(
+                lambda x: "%s:" % self.search_aliases[x.group(1)], search_term
+            )
         query_params = {"keyword_query": search_term, "q.op": "AND"}
         return self.search(self.keyword_search_qf).raw_query_parameters(
             **query_params,
@@ -988,6 +1007,7 @@ def keyword_search(self, search_term):
     def get_highlighting(self):
         """dedupe highlights across variant fields (e.g. for other_names)"""
         highlights = super().get_highlighting()
+        highlights = {k: v for k, v in highlights.items() if v}
         for person in highlights.keys():
             other_names = set()
             # iterate through other_names_* fields to get all matches
diff --git a/geniza/entities/templates/entities/person_list.html b/geniza/entities/templates/entities/person_list.html
index 65c8d6f41..beabf6893 100644
--- a/geniza/entities/templates/entities/person_list.html
+++ b/geniza/entities/templates/entities/person_list.html
@@ -169,6 +169,19 @@ <h2>
                             <td class="dates">{{ person.date_str }}</td>
                             <td class="role">{{ person.role }}</td>
                             <td class="description">{{ person.description.0|truncatewords:15 }}</td>
+                            {# tags #}
+                            <td class="tags">{% if person.tags %}
+                                <ul class="tags">
+                                    {% spaceless %}
+                                        {% for tag in person.tags|alphabetize|slice:":5" %}
+                                            <li><a href='{% url "entities:person-list" %}?q=tag:"{{ tag }}"'>{{ tag }}</a></li>
+                                        {% endfor %}
+                                        {% if person.tags|length > 5 %}
+                                            <li class="more">(+ {{ person.tags|length|add:"-5" }} {% translate 'more' %})</li>
+                                        {% endif %}
+                                    {% endspaceless %}
+                                </ul>
+                            {% endif %}</td>
                             <td class="related documents">
                                 <span class="label">{% translate "Related Documents" %}</span>
                                 <span>{{ person.documents }}</span>
diff --git a/geniza/entities/tests/test_entities_models.py b/geniza/entities/tests/test_entities_models.py
index a73af2785..0557bb4b3 100644
--- a/geniza/entities/tests/test_entities_models.py
+++ b/geniza/entities/tests/test_entities_models.py
@@ -462,6 +462,9 @@ def test_index_data(self, person, person_multiname, document):
         PersonDocumentRelation.objects.create(
             person=person, document=document, type=pdrtype
         )
+        tags = ["testtag", "tag2"]
+        for t in tags:
+            person.tags.add(t)
         index_data = person.index_data()
         assert index_data["slug_s"] == person.slug
         assert index_data["name_s"] == str(person)
@@ -478,6 +481,7 @@ def test_index_data(self, person, person_multiname, document):
         assert index_data["documents_i"] == 1
         assert index_data["people_i"] == index_data["places_i"] == 0
         assert index_data["document_relation_ss"] == [str(pdrtype)]
+        assert index_data["tags_ss_lower"] == tags
         assert index_data["date_dr"] == person.solr_date_range()
         assert index_data["date_str_s"] == person.date_str
         assert index_data["start_dating_i"] == PartialDate("1200").numeric_format()
@@ -504,6 +508,13 @@ def test_keyword_search(self):
                     "q.op": "AND",
                 }
             )
+            pqs.keyword_search("tag:community")
+            mocksearch.return_value.raw_query_parameters.assert_called_with(
+                **{
+                    "keyword_query": "tags_ss_lower:community",
+                    "q.op": "AND",
+                }
+            )
 
     def test_get_highlighting(self):
         pqs = PersonSolrQuerySet()
diff --git a/sitemedia/scss/pages/_people.scss b/sitemedia/scss/pages/_people.scss
index 3ea656730..dcceace57 100644
--- a/sitemedia/scss/pages/_people.scss
+++ b/sitemedia/scss/pages/_people.scss
@@ -136,6 +136,7 @@ main.people {
                     "date date date"
                     "role role role"
                     "desc desc desc"
+                    "tags tags tags"
                     "reldocs relpeople relplaces";
                 @include breakpoints.for-tablet-landscape-up {
                     display: flex;
@@ -177,6 +178,12 @@ main.people {
                         margin-top: 0.375rem;
                     }
                 }
+                td.tags:not(:empty) {
+                    grid-area: tags;
+                    border-bottom: 1px solid var(--disabled);
+                    padding-bottom: 0.625rem;
+                    margin-bottom: 0.625rem;
+                }
                 td.related.documents {
                     grid-area: reldocs;
                 }
@@ -257,6 +264,16 @@ main.people {
                 display: none;
             }
         }
+        td.tags:not(:empty) {
+            border-bottom: 1px solid var(--disabled);
+            padding-bottom: 0.625rem;
+            margin-bottom: 0.625rem;
+            @include breakpoints.for-tablet-landscape-up {
+                ul {
+                    margin-top: -0.25rem;
+                }
+            }
+        }
     }
     @include breakpoints.for-tablet-landscape-up {
         .topheader-row:has(input#switcher:checked) ~ section#person-list table {
@@ -315,6 +332,9 @@ main.people {
                             display: none;
                         }
                     }
+                    &.tags:not(:empty) {
+                        padding: 0;
+                    }
                 }
                 & + tr {
                     margin-top: 0;

From af86d4ae21638767df09c654553cec28a27482fd Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Mon, 27 Jan 2025 11:33:11 -0500
Subject: [PATCH 14/26] Add converse_name to place-place relations (#1719)

---
 geniza/entities/admin.py                      | 10 ++--
 geniza/entities/metadata_export.py            | 17 ++++++-
 .../0027_placeplacerelation_converse_name.py  | 51 +++++++++++++++++++
 geniza/entities/models.py                     | 16 +++++-
 geniza/entities/tests/test_entities_admin.py  | 34 +++++++++++++
 .../tests/test_entities_metadata_export.py    | 12 ++++-
 geniza/entities/tests/test_entities_models.py | 12 +++++
 geniza/entities/translation.py                |  2 +-
 8 files changed, 146 insertions(+), 8 deletions(-)
 create mode 100644 geniza/entities/migrations/0027_placeplacerelation_converse_name.py

diff --git a/geniza/entities/admin.py b/geniza/entities/admin.py
index d651b29c9..8e72ba55c 100644
--- a/geniza/entities/admin.py
+++ b/geniza/entities/admin.py
@@ -537,14 +537,18 @@ class PlacePlaceReverseInline(admin.TabularInline):
     verbose_name_plural = "Related Places (automatically populated)"
     fields = (
         "place_a",
-        "type",
+        "relation",
         "notes",
     )
     fk_name = "place_b"
-    readonly_fields = ("place_a", "type", "notes")
+    readonly_fields = ("place_a", "relation", "notes")
     extra = 0
     max_num = 0
 
+    def relation(self, obj=None):
+        """Get the relationship type's converse name, if it exists, or else the type name"""
+        return (obj.type.converse_name or str(obj.type)) if obj else None
+
 
 class PlaceEventInline(admin.TabularInline):
     """Inline for events related to a place"""
@@ -655,7 +659,7 @@ def get_urls(self):
 class PlacePlaceRelationTypeAdmin(TabbedTranslationAdmin, admin.ModelAdmin):
     """Admin for managing the controlled vocabulary of places' relationships to other places"""
 
-    fields = ("name",)
+    fields = ("name", "converse_name")
     search_fields = ("name",)
     ordering = ("name",)
 
diff --git a/geniza/entities/metadata_export.py b/geniza/entities/metadata_export.py
index 06caad296..c8cb6c41f 100644
--- a/geniza/entities/metadata_export.py
+++ b/geniza/entities/metadata_export.py
@@ -605,6 +605,7 @@ def get_queryset(self):
                 related_object_type=Value("Place"),
                 relationship_type_id=F("type"),
                 relationship_notes=F("notes"),
+                use_converse_typename=Value(True),
             )
             .union(
                 place.place_b.values(
@@ -612,6 +613,7 @@ def get_queryset(self):
                     related_object_type=Value("Place"),
                     relationship_type_id=F("type"),
                     relationship_notes=F("notes"),
+                    use_converse_typename=Value(False),
                 )
             )
             .union(
@@ -620,6 +622,7 @@ def get_queryset(self):
                     related_object_type=Value("Person"),
                     relationship_type_id=F("type"),
                     relationship_notes=F("notes"),
+                    use_converse_typename=Value(False),
                 )
             )
             .union(
@@ -628,6 +631,7 @@ def get_queryset(self):
                     related_object_type=Value("Document"),
                     relationship_type_id=F("type"),
                     relationship_notes=F("notes"),
+                    use_converse_typename=Value(False),
                 )
             )
             .union(
@@ -638,6 +642,7 @@ def get_queryset(self):
                     # type for event relations
                     relationship_type_id=Value(-1),
                     relationship_notes=F("notes"),
+                    use_converse_typename=Value(False),
                 )
             )
         )
@@ -678,7 +683,7 @@ def populate_relation_fields(self, relations):
         place_relation_types = PlacePlaceRelationType.objects.filter(
             id__in=[r[RTID] for r in relations if r[TYPE] == "Place"]
         ).values("id", "name")
-        place_relation_typedict = {t["id"]: t["name"] for t in place_relation_types}
+        place_relation_typedict = {t["id"]: t for t in place_relation_types}
         doc_relation_types = DocumentPlaceRelationType.objects.filter(
             id__in=[r[RTID] for r in relations if r[TYPE] == "Document"]
         ).values("id", "name")
@@ -784,10 +789,18 @@ def populate_relation_fields(self, relations):
                     and n.get("content_type") == place_contenttype_id,
                     names,
                 )
+                rel_type = place_relation_typedict.get(rel[RTID])
                 rel.update(
                     {
                         "related_object_name": next(filtered_names).get("name"),
-                        "relationship_type": place_relation_typedict.get(rel[RTID]),
+                        "relationship_type": (
+                            # handle converse type names for self-referential relationships
+                            rel_type.get("converse_name")
+                            if rel["use_converse_typename"]
+                            and rel_type.get("converse_name")
+                            # use name if should use name, or converse does not exist
+                            else rel_type.get("name")
+                        ),
                         "shared_documents": ", ".join(
                             [
                                 docs_dict.get(doc_id, {}).get("name")
diff --git a/geniza/entities/migrations/0027_placeplacerelation_converse_name.py b/geniza/entities/migrations/0027_placeplacerelation_converse_name.py
new file mode 100644
index 000000000..860a33c30
--- /dev/null
+++ b/geniza/entities/migrations/0027_placeplacerelation_converse_name.py
@@ -0,0 +1,51 @@
+# Generated by Django 3.2.23 on 2025-01-24 18:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("entities", "0026_person_tags"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="placeplacerelationtype",
+            name="converse_name",
+            field=models.CharField(
+                blank=True,
+                help_text="The converse of the relationship, for example, 'City' when Name is 'Neighborhood'. May leave blank if the converse is identical (for example, 'Possibly the same as').",
+                max_length=255,
+            ),
+        ),
+        migrations.AddField(
+            model_name="placeplacerelationtype",
+            name="converse_name_ar",
+            field=models.CharField(
+                blank=True,
+                help_text="The converse of the relationship, for example, 'City' when Name is 'Neighborhood'. May leave blank if the converse is identical (for example, 'Possibly the same as').",
+                max_length=255,
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="placeplacerelationtype",
+            name="converse_name_en",
+            field=models.CharField(
+                blank=True,
+                help_text="The converse of the relationship, for example, 'City' when Name is 'Neighborhood'. May leave blank if the converse is identical (for example, 'Possibly the same as').",
+                max_length=255,
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="placeplacerelationtype",
+            name="converse_name_he",
+            field=models.CharField(
+                blank=True,
+                help_text="The converse of the relationship, for example, 'City' when Name is 'Neighborhood'. May leave blank if the converse is identical (for example, 'Possibly the same as').",
+                max_length=255,
+                null=True,
+            ),
+        ),
+    ]
diff --git a/geniza/entities/models.py b/geniza/entities/models.py
index d288e97ea..1cd2f55db 100644
--- a/geniza/entities/models.py
+++ b/geniza/entities/models.py
@@ -1584,6 +1584,15 @@ class PlacePlaceRelationType(models.Model):
     """Controlled vocabulary of place's relationships to other places."""
 
     name = models.CharField(max_length=255, unique=True)
+    # converse_name is the relationship in the reverse direction (the semantic converse)
+    # (example: name = "Neighborhood", converse_name = "City")
+    converse_name = models.CharField(
+        max_length=255,
+        blank=True,
+        help_text="The converse of the relationship, for example, 'City' when Name is "
+        + "'Neighborhood'. May leave blank if the converse is identical (for example, "
+        + "'Possibly the same as').",
+    )
     objects = PlacePlaceRelationTypeManager()
 
     class Meta:
@@ -1632,7 +1641,12 @@ class Meta:
         ]
 
     def __str__(self):
-        return f"{self.type} relation: {self.place_a} and {self.place_b}"
+        relation_type = (
+            f"{self.type}-{self.type.converse_name}"
+            if self.type.converse_name
+            else self.type
+        )
+        return f"{relation_type} relation: {self.place_a} and {self.place_b}"
 
 
 class PlaceEventRelation(models.Model):
diff --git a/geniza/entities/tests/test_entities_admin.py b/geniza/entities/tests/test_entities_admin.py
index 5b39c63f3..c26a13620 100644
--- a/geniza/entities/tests/test_entities_admin.py
+++ b/geniza/entities/tests/test_entities_admin.py
@@ -17,6 +17,7 @@
     PersonPersonRelationTypeChoiceField,
     PersonPersonReverseInline,
     PlaceAdmin,
+    PlacePlaceReverseInline,
 )
 from geniza.entities.models import (
     Name,
@@ -28,6 +29,8 @@
     PersonPlaceRelation,
     PersonPlaceRelationType,
     Place,
+    PlacePlaceRelation,
+    PlacePlaceRelationType,
 )
 
 
@@ -350,6 +353,37 @@ def test_get_min_num(self, admin_client, document):
         assert 'name="documenteventrelation_set-MIN_NUM_FORMS" value="0"' in content
 
 
+@pytest.mark.django_db
+class TestPlacePlaceReverseInline:
+    def test_relation(self):
+        # should show converse relationship type when available
+        (neighborhood, _) = PlacePlaceRelationType.objects.get_or_create(
+            name="Neighborhood",
+            converse_name="City",
+        )
+        fustat = Place.objects.create()
+        qasr = Place.objects.create()
+        rel = PlacePlaceRelation.objects.create(
+            place_a=fustat,
+            place_b=qasr,
+            type=neighborhood,
+        )
+        reverse_inline = PlacePlaceReverseInline(Place, admin_site=admin.site)
+        assert reverse_inline.relation(rel) == neighborhood.converse_name
+
+        # otherwise should just show relationship type
+        (same, _) = PlacePlaceRelationType.objects.get_or_create(
+            name="Possibly the same as",
+        )
+        fust2 = Place.objects.create()
+        rel = PlacePlaceRelation.objects.create(
+            place_a=fustat,
+            place_b=fust2,
+            type=same,
+        )
+        assert reverse_inline.relation(rel) == same.name
+
+
 @pytest.mark.django_db
 class TestPlaceAdmin:
     def test_save_related(self):
diff --git a/geniza/entities/tests/test_entities_metadata_export.py b/geniza/entities/tests/test_entities_metadata_export.py
index 5763446b1..02b9dee95 100644
--- a/geniza/entities/tests/test_entities_metadata_export.py
+++ b/geniza/entities/tests/test_entities_metadata_export.py
@@ -293,6 +293,8 @@ def test_place_relations_csv(person, document, join):
     Name.objects.create(content_object=fustat, name="Fusṭāṭ", primary=True)
     aydhab = Place.objects.create(slug="aydhab")
     Name.objects.create(name="ʿAydhāb", content_object=aydhab, primary=True)
+    qasr = Place.objects.create(slug="qasr-al-sham")
+    Name.objects.create(name="Qaṣr al-Shamʿ", content_object=qasr, primary=True)
     (home_base, _) = PersonPlaceRelationType.objects.get_or_create(name_en="Home base")
     (roots, _) = PersonPlaceRelationType.objects.get_or_create(
         name_en="Family traces roots to"
@@ -317,6 +319,11 @@ def test_place_relations_csv(person, document, join):
     )
     PlacePlaceRelation.objects.create(place_a=fustat, place_b=mosul, type=not_same)
     PlacePlaceRelation.objects.create(place_a=aydhab, place_b=fustat, type=not_same)
+    (neighborhood, _) = PlacePlaceRelationType.objects.get_or_create(
+        name="Neighborhood",
+        converse_name="City",
+    )
+    PlacePlaceRelation.objects.create(place_a=qasr, place_b=fustat, type=neighborhood)
     evt = Event.objects.create(name="Test event")
     PlaceEventRelation.objects.create(place=fustat, event=evt, notes="test")
 
@@ -335,13 +342,16 @@ def test_place_relations_csv(person, document, join):
             assert ", " in reltype
             assert str(join) in obj["shared_documents"]
         elif objtype == "Place":
-            assert reltype == not_same.name
             if id == mosul.id:
+                assert reltype == not_same.name
                 assert str(document) in obj["shared_documents"]
                 assert str(join) in obj["shared_documents"]
                 assert ", " in obj["shared_documents"]
             elif id == aydhab.id:
+                assert reltype == not_same.name
                 assert not obj["shared_documents"]
+            elif id == qasr.id:
+                assert reltype == neighborhood.name
         elif objtype == "Document":
             assert reltype == dprtype.name
             assert obj["related_object_name"] in [str(document), str(join)]
diff --git a/geniza/entities/tests/test_entities_models.py b/geniza/entities/tests/test_entities_models.py
index 0557bb4b3..823e16ff8 100644
--- a/geniza/entities/tests/test_entities_models.py
+++ b/geniza/entities/tests/test_entities_models.py
@@ -1014,6 +1014,18 @@ def test_str(self):
             type=possible_dupe,
         )
         assert str(relation) == f"{possible_dupe} relation: {fustat} and {other}"
+        (neighborhood, _) = PlacePlaceRelationType.objects.get_or_create(
+            name="Neighborhood", converse_name="City"
+        )
+        relation = PlacePlaceRelation.objects.create(
+            place_a=fustat,
+            place_b=other,
+            type=neighborhood,
+        )
+        assert (
+            str(relation)
+            == f"{neighborhood.name}-{neighborhood.converse_name} relation: {fustat} and {other}"
+        )
 
 
 @pytest.mark.django_db
diff --git a/geniza/entities/translation.py b/geniza/entities/translation.py
index 09df241c8..7e9dc9fc4 100644
--- a/geniza/entities/translation.py
+++ b/geniza/entities/translation.py
@@ -51,7 +51,7 @@ class DocumentPlaceRelationTypeOption(TranslationOptions):
 
 @register(PlacePlaceRelationType)
 class PlacePlaceRelationTypeOption(TranslationOptions):
-    fields = ("name",)
+    fields = ("name", "converse_name")
     required_languages = ()
 
 

From 5a707d5b8dc22dad65060014dce981faea48b864 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Mon, 27 Jan 2025 12:00:19 -0500
Subject: [PATCH 15/26] Add tags to person export (#1720)

---
 geniza/entities/metadata_export.py                     | 3 +++
 geniza/entities/tests/test_entities_metadata_export.py | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/geniza/entities/metadata_export.py b/geniza/entities/metadata_export.py
index c8cb6c41f..9ec032121 100644
--- a/geniza/entities/metadata_export.py
+++ b/geniza/entities/metadata_export.py
@@ -45,6 +45,7 @@ class PublicPersonExporter(Exporter):
         "auto_date_range",
         "manual_date_range",
         "description",
+        "tags",
         "related_people_count",
         "related_documents_count",
         "url",
@@ -82,6 +83,7 @@ def get_queryset(self):
                 "from_person",
                 "to_person",
                 "personplacerelation_set",
+                "tags",
                 Prefetch(
                     "persondocumentrelation_set",
                     queryset=PersonDocumentRelation.objects.select_related("type"),
@@ -117,6 +119,7 @@ def get_export_data_dict(self, person):
             "description": person.description,
             "related_people_count": person.related_people_count,
             "related_documents_count": person.documents.count(),
+            "tags": person.all_tags(),
         }
 
         # add url if present
diff --git a/geniza/entities/tests/test_entities_metadata_export.py b/geniza/entities/tests/test_entities_metadata_export.py
index 02b9dee95..b5a806af6 100644
--- a/geniza/entities/tests/test_entities_metadata_export.py
+++ b/geniza/entities/tests/test_entities_metadata_export.py
@@ -97,6 +97,9 @@ def test_person_iter_dicts(person, person_diacritic, person_multiname, document,
     person.documents.add(document)
     person.documents.add(join)
     person_multiname.documents.add(document)
+    person.tags.add("test")
+    person.tags.add("example")
+    person_multiname.tags.add("test")
 
     (partner, _) = PersonPersonRelationType.objects.get_or_create(
         name_en="Partner", category=PersonPersonRelationType.BUSINESS
@@ -123,9 +126,12 @@ def test_person_iter_dicts(person, person_diacritic, person_multiname, document,
             assert export_data.get("related_people_count") == 1
             assert export_data.get("related_documents_count") == 2
             assert "Mosul" in export_data.get("home_base")
+            assert "test" in export_data.get("tags")
+            assert "example" in export_data.get("tags")
         elif str(pers) == str(person_multiname):
             assert export_data.get("related_people_count") == 0
             assert export_data.get("related_documents_count") == 1
+            assert "test" in export_data.get("tags")
         elif str(pers) == str(person_diacritic):
             assert export_data.get("related_people_count") == 1
             assert export_data.get("related_documents_count") == 0

From 9b73482228903b68d8e9dca30255a15aa5f3d2f1 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Tue, 28 Jan 2025 12:25:16 -0500
Subject: [PATCH 16/26] Add related places to place detail page (#1696)

---
 geniza/entities/models.py                     | 86 +++++++++++++++++++
 .../templates/entities/place_detail.html      | 21 +++++
 geniza/entities/tests/test_entities_views.py  | 41 +++++++++
 geniza/entities/views.py                      |  3 +
 sitemedia/scss/pages/_document.scss           | 73 +++++++++-------
 sitemedia/scss/pages/_person.scss             |  3 +-
 sitemedia/scss/pages/_place.scss              |  7 ++
 7 files changed, 200 insertions(+), 34 deletions(-)

diff --git a/geniza/entities/models.py b/geniza/entities/models.py
index 1cd2f55db..d91399bb2 100644
--- a/geniza/entities/models.py
+++ b/geniza/entities/models.py
@@ -1420,6 +1420,92 @@ def items_to_index(cls):
             "names", "documentplacerelation_set", "personplacerelation_set"
         )
 
+    def related_places(self):
+        """Set of all places related to this place, with relationship type,
+        taking into account converse relations"""
+
+        # adapted from Person.related_people
+
+        # gather all relationships with places, both entered from this place and
+        # entered from the place on the other side of the relationship
+        place_relations = (
+            self.place_a.annotate(
+                # boolean to indicate if we should use converse or regular relation type name
+                use_converse_typename=Value(True),
+                related_slug=F("place_a__slug"),
+                related_id=F("place_a"),
+            ).union(  # union instead of joins for efficiency
+                self.place_b.annotate(
+                    use_converse_typename=Value(False),
+                    related_slug=F("place_b__slug"),
+                    related_id=F("place_b"),
+                )
+            )
+            # have to use values_list (NOT values) here with one argument, otherwise strange things
+            # happen, possibly due to union(). TODO: see if this is fixed in later django versions.
+            .values_list("related_id")
+        )
+        relation_list = [
+            {
+                # this is the order of fields returned by SQL after the annotated union
+                "id": r[-1],
+                "slug": r[-2],
+                "use_converse_typename": r[-3],
+                "notes": r[-4],
+                "type_id": r[-5],
+            }
+            for r in place_relations
+        ]
+
+        # folow GenericForeignKey to find primary name for each related place
+        place_contenttype = ContentType.objects.get_for_model(Place).pk
+        names = Name.objects.filter(
+            object_id__in=[r["id"] for r in relation_list],
+            primary=True,
+            content_type_id=place_contenttype,
+        ).values("name", "object_id")
+        # dict keyed on related place id
+        names_dict = {n["object_id"]: n["name"] for n in names}
+
+        # grab name and converse_name for each relation type since we may need either
+        # (name if the relation was entered from self, converse if entered from related place)
+        types = PlacePlaceRelationType.objects.filter(
+            pk__in=[r["type_id"] for r in relation_list],
+        ).values("pk", "name", "converse_name")
+        # dict keyed on related place id
+        types_dict = {t["pk"]: t for t in types}
+
+        # update with new data & dedupe
+        prev_relation = None
+        # sort by id (dedupe by matching against previous id), then type id for type dedupe
+        for relation in sorted(relation_list, key=itemgetter("id", "type_id")):
+            relation.update(
+                {
+                    # get name from cached queryset dict
+                    "name": names_dict[relation["id"]],
+                    # use type.converse_name if this relation is reverse (and if the type has one)
+                    "type": types_dict[relation["type_id"]][
+                        "converse_name" if relation["use_converse_typename"] else "name"
+                    ]
+                    # fallback to type.name if converse_name doesn't exist
+                    or types_dict[relation["type_id"]]["name"],
+                }
+            )
+            # dedupe and combine type and notes
+            if prev_relation and prev_relation["id"] == relation["id"]:
+                # dedupe type by string matching since we can't match reverse relations by id
+                if relation["type"].lower() not in prev_relation["type"].lower():
+                    prev_relation["type"] += f", {relation['type']}".lower()
+                # simply combine notes with html line break
+                prev_relation["notes"] += (
+                    f"<br />{relation['notes']}" if relation["notes"] else ""
+                )
+                relation_list.remove(relation)
+            else:
+                prev_relation = relation
+
+        return relation_list
+
     def index_data(self):
         """data for indexing in Solr"""
         index_data = super().index_data()
diff --git a/geniza/entities/templates/entities/place_detail.html b/geniza/entities/templates/entities/place_detail.html
index 661e256d7..6ca4f62ca 100644
--- a/geniza/entities/templates/entities/place_detail.html
+++ b/geniza/entities/templates/entities/place_detail.html
@@ -86,5 +86,26 @@ <h2>
                 <p>{{ place.notes }}</p>
             </section>
         {% endif %}
+        {# related places #}
+        {% if related_places %}
+            <section class="related">
+                {# Translators: heading label for document related places #}
+                <h2>{% translate "Related Places" %}</h2>
+                <dl>
+                    {% regroup related_places by type as place_relations %}
+                    {% for relation_type in place_relations %}
+                        <dt>{{ relation_type.grouper }}</dt>
+                        <dd>
+                            {% for relation in relation_type.list %}
+                                {% url "entities:place" relation.slug as place_url %}
+                                <a data-turbo="false" href="{{ place_url }}" title="{{ relation.name }}">
+                                    {{ relation.name }}
+                                </a>{% if not forloop.last %}, {% endif %}
+                            {% endfor %}
+                        </dd>
+                    {% endfor %}
+                </dl>
+            </section>
+        {% endif %}
     </div>
 {% endblock main %}
diff --git a/geniza/entities/tests/test_entities_views.py b/geniza/entities/tests/test_entities_views.py
index 1bafa256a..d9532dbc9 100644
--- a/geniza/entities/tests/test_entities_views.py
+++ b/geniza/entities/tests/test_entities_views.py
@@ -21,6 +21,8 @@
     PersonPlaceRelationType,
     PersonSolrQuerySet,
     Place,
+    PlacePlaceRelation,
+    PlacePlaceRelationType,
     PlaceSolrQuerySet,
 )
 from geniza.entities.views import (
@@ -660,6 +662,45 @@ def test_get_context_data(self, client):
         # context should include the maptiler token if one exists in settings
         assert response.context["maptiler_token"] == "example"
 
+    def test_related_places(self, client):
+        tlebanon = Place.objects.create(slug="tripoli-lebanon")
+        Name.objects.create(
+            name="Tripoli (Lebanon)", content_object=tlebanon, primary=True
+        )
+
+        # create some place-place relationshipss
+        tgreece = Place.objects.create(slug="tripoli-greece")
+        Name.objects.create(
+            name="Tripoli (Greece)", content_object=tgreece, primary=True
+        )
+        (nbc, _) = PlacePlaceRelationType.objects.get_or_create(
+            name="Not to be confused with"
+        )
+        PlacePlaceRelation.objects.create(place_a=tlebanon, place_b=tgreece, type=nbc)
+
+        # add an asymmetrical one from another place, it should show up too, but with converse name
+        zahriyeh = Place.objects.create(slug="zahriyeh")
+        Name.objects.create(name="Zahriyeh", content_object=zahriyeh, primary=True)
+        (city_neighborhood, _) = PlacePlaceRelationType.objects.get_or_create(
+            name="City", converse_name="Neighborhood"
+        )
+        PlacePlaceRelation.objects.create(
+            place_a=zahriyeh, place_b=tlebanon, type=city_neighborhood
+        )
+
+        response = client.get(reverse("entities:place", args=(tlebanon.slug,)))
+        assert len(response.context["related_places"]) == 2
+        # should be ordered by type name
+        assert (
+            response.context["related_places"][0]["type"]
+            == city_neighborhood.converse_name
+        )
+        assert response.context["related_places"][0]["use_converse_typename"] == True
+        assert response.context["related_places"][0]["name"] == str(zahriyeh)
+        assert response.context["related_places"][1]["type"] == nbc.name
+        assert response.context["related_places"][1]["use_converse_typename"] == False
+        assert response.context["related_places"][1]["name"] == str(tgreece)
+
 
 @pytest.mark.django_db
 class TestPersonDocumentsView:
diff --git a/geniza/entities/views.py b/geniza/entities/views.py
index f49bbffb4..b32d4af46 100644
--- a/geniza/entities/views.py
+++ b/geniza/entities/views.py
@@ -613,6 +613,9 @@ def get_context_data(self, **kwargs):
                 "page_description": self.page_description(),
                 "page_type": "place",
                 "maptiler_token": getattr(settings, "MAPTILER_API_TOKEN", ""),
+                "related_places": sorted(
+                    self.object.related_places(), key=lambda rp: rp["type"]
+                ),
             }
         )
         return context_data
diff --git a/sitemedia/scss/pages/_document.scss b/sitemedia/scss/pages/_document.scss
index 8d0ba5098..8030c8dea 100644
--- a/sitemedia/scss/pages/_document.scss
+++ b/sitemedia/scss/pages/_document.scss
@@ -189,39 +189,6 @@ main.document {
         }
         // related entities
         section.related {
-            dl {
-                margin: 0 0 0 1.25rem;
-                dt {
-                    padding-top: 0.5rem;
-                    @include typography.body-italic;
-                }
-                dd + dt {
-                    padding-top: 1rem;
-                    margin-top: 1rem;
-                    border-top: 1px solid var(--tabs-bottom);
-                }
-                dd {
-                    @include typography.body-sm;
-                }
-                @include breakpoints.for-tablet-landscape-up {
-                    display: grid;
-                    grid-template-columns: 33% 1fr;
-                    margin: 1.25rem 0 0 1.25rem;
-                    gap: 0.5rem 0;
-                    dt,
-                    dd {
-                        padding-top: 0;
-                        @include typography.body;
-                        font-style: normal;
-                    }
-                    dd + dt,
-                    dd + dt + dd {
-                        margin-top: 0;
-                        padding-top: 0.5rem;
-                        border-top: 1px solid var(--tabs-bottom);
-                    }
-                }
-            }
             padding-bottom: 2rem;
             border-bottom: 1px solid var(--disabled);
         }
@@ -264,6 +231,46 @@ main.document {
     }
 }
 
+main.document,
+main.place {
+    // related entities
+    section.related {
+        dl {
+            margin: 0 0 0 1.25rem;
+            dt {
+                padding-top: 0.5rem;
+                @include typography.body-italic;
+            }
+            dd + dt {
+                padding-top: 1rem;
+                margin-top: 1rem;
+                border-top: 1px solid var(--tabs-bottom);
+            }
+            dd {
+                @include typography.body-sm;
+            }
+            @include breakpoints.for-tablet-landscape-up {
+                display: grid;
+                grid-template-columns: 33% 1fr;
+                margin: 1.25rem 0 0 1.25rem;
+                gap: 0.5rem 0;
+                dt,
+                dd {
+                    padding-top: 0;
+                    @include typography.body;
+                    font-style: normal;
+                }
+                dd + dt,
+                dd + dt + dd {
+                    margin-top: 0;
+                    padding-top: 0.5rem;
+                    border-top: 1px solid var(--tabs-bottom);
+                }
+            }
+        }
+    }
+}
+
 section#document-list,
 main.document {
     // description content
diff --git a/sitemedia/scss/pages/_person.scss b/sitemedia/scss/pages/_person.scss
index 75823576b..6e3025d4c 100644
--- a/sitemedia/scss/pages/_person.scss
+++ b/sitemedia/scss/pages/_person.scss
@@ -187,7 +187,8 @@ main.place {
         section.metadata dt,
         section.description h2,
         section.events h2,
-        section.notes h2 {
+        section.notes h2,
+        section.related h2 {
             margin-bottom: spacing.$spacing-xs;
             @include typography.meta-bold;
             font-size: typography.$text-size-lg;
diff --git a/sitemedia/scss/pages/_place.scss b/sitemedia/scss/pages/_place.scss
index 764652bb1..d829f3c3a 100644
--- a/sitemedia/scss/pages/_place.scss
+++ b/sitemedia/scss/pages/_place.scss
@@ -1,5 +1,6 @@
 @use "../base/breakpoints";
 @use "../base/spacing";
+@use "../base/typography";
 
 main.place {
     * {
@@ -55,6 +56,12 @@ main.place {
             }
         }
     }
+    section.related {
+        margin: spacing.$spacing-md 0 0;
+        @include breakpoints.for-tablet-landscape-up {
+            margin: 2rem 0 0;
+        }
+    }
 }
 
 html.dark-mode main.place .map svg#marker {

From 7963c8b8f010e6b735a081befb25c35b4fa271aa Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Tue, 28 Jan 2025 13:04:36 -0500
Subject: [PATCH 17/26] Add unit test for place-place dedupe (#1696)

---
 geniza/entities/tests/test_entities_views.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/geniza/entities/tests/test_entities_views.py b/geniza/entities/tests/test_entities_views.py
index d9532dbc9..c24a4984c 100644
--- a/geniza/entities/tests/test_entities_views.py
+++ b/geniza/entities/tests/test_entities_views.py
@@ -701,6 +701,16 @@ def test_related_places(self, client):
         assert response.context["related_places"][1]["use_converse_typename"] == False
         assert response.context["related_places"][1]["name"] == str(tgreece)
 
+        # create a duplicate of the asymmetric relation to test dedupe
+        (neighborhood_city, _) = PlacePlaceRelationType.objects.get_or_create(
+            name="Neighborhood", converse_name="City"
+        )
+        PlacePlaceRelation.objects.create(
+            place_a=tlebanon, place_b=zahriyeh, type=neighborhood_city
+        )
+        response = client.get(reverse("entities:place", args=(tlebanon.slug,)))
+        assert len(response.context["related_places"]) == 2
+
 
 @pytest.mark.django_db
 class TestPersonDocumentsView:

From 8caaaa872cb3f8afeec99ffecdf2c55c925f0f97 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Tue, 28 Jan 2025 13:17:50 -0500
Subject: [PATCH 18/26] Test dedupe with different relation type names (#1696)

---
 geniza/entities/tests/test_entities_views.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/geniza/entities/tests/test_entities_views.py b/geniza/entities/tests/test_entities_views.py
index c24a4984c..8c8dd95bd 100644
--- a/geniza/entities/tests/test_entities_views.py
+++ b/geniza/entities/tests/test_entities_views.py
@@ -702,14 +702,19 @@ def test_related_places(self, client):
         assert response.context["related_places"][1]["name"] == str(tgreece)
 
         # create a duplicate of the asymmetric relation to test dedupe
-        (neighborhood_city, _) = PlacePlaceRelationType.objects.get_or_create(
-            name="Neighborhood", converse_name="City"
+        (subset_superset, _) = PlacePlaceRelationType.objects.get_or_create(
+            name="Subset", converse_name="Superset"
         )
         PlacePlaceRelation.objects.create(
-            place_a=tlebanon, place_b=zahriyeh, type=neighborhood_city
+            place_a=tlebanon, place_b=zahriyeh, type=subset_superset
         )
         response = client.get(reverse("entities:place", args=(tlebanon.slug,)))
         assert len(response.context["related_places"]) == 2
+        bothtypes = response.context["related_places"][0]["type"].lower()
+        assert (
+            city_neighborhood.converse_name.lower() in bothtypes
+            and subset_superset.name.lower() in bothtypes
+        )
 
 
 @pytest.mark.django_db

From 1bdaabcc5fe883755e8fcd13b176a0ee32423a50 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Tue, 28 Jan 2025 14:30:04 -0500
Subject: [PATCH 19/26] Add APD link to doc search on Arabic/JA query (#1697)

---
 .../templates/corpus/document_list.html       |  6 +++++
 geniza/corpus/tests/test_corpus_views.py      | 14 ++++++++++++
 geniza/corpus/views.py                        | 22 +++++++++++++++++++
 sitemedia/scss/components/_results.scss       | 13 +++++++++++
 4 files changed, 55 insertions(+)

diff --git a/geniza/corpus/templates/corpus/document_list.html b/geniza/corpus/templates/corpus/document_list.html
index d47a68366..61e43fd1f 100644
--- a/geniza/corpus/templates/corpus/document_list.html
+++ b/geniza/corpus/templates/corpus/document_list.html
@@ -157,6 +157,12 @@ <h2>
             {% if is_paginated %}
                 {% include "corpus/snippets/pagination.html" %}
             {% endif %}
+            {% if apd_link %}
+                <a id="apd" href="{{ apd_link }}">
+                    {# translators: Link to search a document query on the Arabic Papyrology Database #}
+                    {% translate 'View results in the Arabic Papyrology Database' %}
+                </a>
+            {% endif %}
         </section>
     </form>
 {% endblock main %}
diff --git a/geniza/corpus/tests/test_corpus_views.py b/geniza/corpus/tests/test_corpus_views.py
index 8fd3a9618..abade1486 100644
--- a/geniza/corpus/tests/test_corpus_views.py
+++ b/geniza/corpus/tests/test_corpus_views.py
@@ -1339,6 +1339,20 @@ def test_hebrew_prefix_highlight(self, source, empty_solr):
             0
         ] == clean_html("<em>מרכב</em>")
 
+    def test_get_apd_link(self):
+        dsv = DocumentSearchView(kwargs={})
+
+        # no arabic or ja: bail out
+        assert not dsv.get_apd_link(None)
+        assert not dsv.get_apd_link("test")
+
+        # arabic: leave as is
+        arabic = "العبد"
+        assert dsv.get_apd_link(arabic) == f"{dsv.apd_base_url}{arabic}"
+
+        # JA: translate with regex
+        assert dsv.get_apd_link("ואגב") == f"{dsv.apd_base_url}وا[غج]ب"
+
 
 class TestDocumentScholarshipView:
     def test_page_title(self, document, client, source):
diff --git a/geniza/corpus/views.py b/geniza/corpus/views.py
index c55508a98..fdea4268e 100644
--- a/geniza/corpus/views.py
+++ b/geniza/corpus/views.py
@@ -34,6 +34,7 @@
 from geniza.common.utils import absolutize_url
 from geniza.corpus import iiif_utils
 from geniza.corpus.forms import DocumentMergeForm, DocumentSearchForm, TagMergeForm
+from geniza.corpus.ja import contains_arabic, contains_hebrew, ja_arabic_chars
 from geniza.corpus.models import Document, TextBlock
 from geniza.corpus.solr_queryset import DocumentSolrQuerySet
 from geniza.corpus.templatetags import corpus_extras
@@ -353,6 +354,26 @@ def get_paginate_by(self, queryset):
                 pass
         return paginate_by
 
+    # base url for APD searches
+    apd_base_url = "https://www.apd.gwi.uni-muenchen.de/apd/asearch.jsp?searchtable1=601&showdwords=true&searchwordstring1="
+
+    def get_apd_link(self, query):
+        """Generate a link to the Arabic Papyrology Database (APD) search page
+        using the entered query, converting any Hebrew script to Arabic with Regex"""
+        if not query or not (contains_arabic(query) or contains_hebrew(query)):
+            # if no arabic OR hebrew in query, bail out
+            return None
+        # simplified version of ja_to_arabic that uses regex instead of solr OR
+        for k, v in ja_arabic_chars.items():
+            if type(v) == list:
+                # list means there is more than one option, so join options with regex
+                query = re.sub(k, f"[{''.join(v)}]", query)
+            elif type(v) == str:
+                # only one possible translation
+                query = re.sub(k, v, query)
+        query = query.strip()
+        return f"{self.apd_base_url}{query}"
+
     def get_context_data(self, **kwargs):
         """extend context data to add page metadata, highlighting,
         and update form with facets"""
@@ -387,6 +408,7 @@ def get_context_data(self, **kwargs):
                 "page_includes_transcriptions": True,  # preload transcription font
                 "highlighting": highlights,
                 "applied_filters": self.applied_filter_labels,
+                "apd_link": self.get_apd_link(context_data["form"].data.get("q", None)),
             }
         )
 
diff --git a/sitemedia/scss/components/_results.scss b/sitemedia/scss/components/_results.scss
index 078b28191..645f37e91 100644
--- a/sitemedia/scss/components/_results.scss
+++ b/sitemedia/scss/components/_results.scss
@@ -34,6 +34,19 @@ section#document-list {
             margin-top: spacing.$spacing-md;
         }
     }
+    a#apd {
+        text-align: center;
+        margin: 1.5rem 0;
+        @include breakpoints.for-tablet-landscape-up {
+            margin: 2.25rem 0;
+        }
+    }
+    nav.pagination + a#apd {
+        margin: 0;
+        @include breakpoints.for-tablet-landscape-up {
+            margin: 0;
+        }
+    }
 }
 
 // single result

From 904bb880917d33389dd40e4db32e2610319fc514 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Wed, 29 Jan 2025 11:17:23 -0500
Subject: [PATCH 20/26] Person active and deceased dates (#1687)

---
 geniza/entities/admin.py                      |  15 +-
 geniza/entities/metadata_export.py            |   3 +-
 geniza/entities/models.py                     |  43 ++-
 .../templates/entities/person_detail.html     |  21 +-
 geniza/entities/tests/test_entities_admin.py  |  25 ++
 .../tests/test_entities_metadata_export.py    |  20 +-
 geniza/entities/tests/test_entities_models.py |  70 +++-
 geniza/locale/ar/LC_MESSAGES/django.po        | 325 ++++++++++-------
 geniza/locale/en/LC_MESSAGES/django.po        | 237 +++++++------
 geniza/locale/he/LC_MESSAGES/django.po        | 326 +++++++++++-------
 sitemedia/scss/pages/_person.scss             |  28 +-
 11 files changed, 733 insertions(+), 380 deletions(-)

diff --git a/geniza/entities/admin.py b/geniza/entities/admin.py
index 8e72ba55c..fbb5a9e71 100644
--- a/geniza/entities/admin.py
+++ b/geniza/entities/admin.py
@@ -282,11 +282,12 @@ class PersonAdmin(TabbedTranslationAdmin, SortableAdminBase, admin.ModelAdmin):
         "role",
         "has_page",
         "date",
-        "automatic_date",
+        "active_dates",
+        "deceased_mention_dates",
         "description",
         "tags",
     )
-    readonly_fields = ("automatic_date",)
+    readonly_fields = ("active_dates", "deceased_mention_dates")
     inlines = (
         NameInline,
         FootnoteInline,
@@ -406,9 +407,13 @@ def get_urls(self):
         ]
         return urls + super().get_urls()
 
-    def automatic_date(self, obj):
-        """Display automatically generated date/date range for an event as a formatted string"""
-        return standard_date_display(obj.documents_date_range)
+    def active_dates(self, obj):
+        """Display automatically generated active date/date range for a person as a formatted string"""
+        return standard_date_display(obj.active_date_range)
+
+    def deceased_mention_dates(self, obj):
+        """Display automatically generated deceased date/date range for a person as a formatted string"""
+        return standard_date_display(obj.deceased_date_range)
 
     actions = (export_to_csv, merge_people)
 
diff --git a/geniza/entities/metadata_export.py b/geniza/entities/metadata_export.py
index 9ec032121..a07c7e92b 100644
--- a/geniza/entities/metadata_export.py
+++ b/geniza/entities/metadata_export.py
@@ -114,7 +114,8 @@ def get_export_data_dict(self, person):
             ),
             "gender": person.get_gender_display(),
             "social_role": str(person.role),
-            "auto_date_range": standard_date_display(person.documents_date_range),
+            "active_date_range": standard_date_display(person.active_date_range),
+            "deceased_date_range": standard_date_display(person.deceased_date_range),
             "manual_date_range": person.date,
             "description": person.description,
             "related_people_count": person.related_people_count,
diff --git a/geniza/entities/models.py b/geniza/entities/models.py
index d91399bb2..62851c8f3 100644
--- a/geniza/entities/models.py
+++ b/geniza/entities/models.py
@@ -107,9 +107,13 @@ class DocumentDatableMixin:
 
     @property
     def documents_date_range(self):
-        """Standardized range of dates across associated documents"""
+        """Compute the total range of dates across all associated documents"""
+        return self.get_date_range(self.documents.all())
+
+    def get_date_range(self, doc_set):
+        """Standardized range of dates across a set of documents"""
         full_range = [None, None]
-        for doc in self.documents.all():
+        for doc in doc_set:
             # get each doc's full range, including inferred and on-document
             doc_range = doc.dating_range()
             # if doc has a range, and the range is not [None, None], compare
@@ -121,7 +125,6 @@ def documents_date_range(self):
                 full_range = PartialDate.get_date_range(
                     old_range=full_range, new_range=[start, end]
                 )
-
         # prune Nones and use isoformat for standardized representation
         full_range = [d.isoformat() for d in full_range if d]
         if len(full_range) == 2 and full_range[0] == full_range[1]:
@@ -414,22 +417,27 @@ def __str__(self):
 
     @property
     def date_str(self):
-        """Return a formatted string for the person's date range, for use in public site.
+        """Return a formatted string for the person's active date range, for use in public site.
         CE date override takes highest precedence, then fallback to computed date range from
         associated documents if override is unset.
         """
         return (
             standard_date_display(self.date)
-            or standard_date_display(self.documents_date_range)
+            or standard_date_display(self.active_date_range)
             or ""
         )
 
+    @property
+    def deceased_date_str(self):
+        """Return a formatted string for the person's mentioned as deceased date range."""
+        return standard_date_display(self.deceased_date_range) or ""
+
     def solr_date_range(self):
         """Return the person's date range as a Solr date range."""
         if self.date:
             solr_dating_range = self.date.split("/")
         else:
-            solr_dating_range = self.documents_date_range.split("/")
+            solr_dating_range = self.active_date_range.split("/")
         if solr_dating_range:
             # if a single date instead of a range, just return that date
             if (
@@ -647,6 +655,27 @@ def related_people(self):
 
         return relation_list
 
+    @property
+    def active_date_range(self):
+        """Standardized range of dates across documents where a person is (presumed) alive"""
+        relations = self.persondocumentrelation_set.exclude(
+            type__name__icontains="deceased"
+        )
+        doc_ids = relations.values_list("document__pk", flat=True)
+        docs = Document.objects.filter(pk__in=doc_ids)
+        return self.get_date_range(docs)
+
+    @property
+    def deceased_date_range(self):
+        """Standardized range of dates across associated documents where the relationship is
+        'Mentioned (deceased)'"""
+        relations = self.persondocumentrelation_set.filter(
+            type__name__icontains="deceased"
+        )
+        doc_ids = relations.values_list("document__pk", flat=True)
+        docs = Document.objects.filter(pk__in=doc_ids)
+        return self.get_date_range(docs)
+
     def merge_with(self, merge_people, user=None):
         """Merge the specified people into this one. Combines all metadata
         into this person and creates a log entry documenting the merge.
@@ -903,7 +932,7 @@ def index_data(self):
                 for date in (
                     self.date.split("/")
                     if self.date
-                    else self.documents_date_range.split("/")
+                    else self.active_date_range.split("/")
                 )
             ]
             index_data.update(
diff --git a/geniza/entities/templates/entities/person_detail.html b/geniza/entities/templates/entities/person_detail.html
index 0aca1533f..8cf768214 100644
--- a/geniza/entities/templates/entities/person_detail.html
+++ b/geniza/entities/templates/entities/person_detail.html
@@ -33,10 +33,23 @@ <h2 class="sr-only">
                 {# Translators: label for a person's gender #}
                 <dt>{% translate 'Gender' %}</dt>
                 <dd>{{ person.get_gender_display }}</dd>
-                {% if person.date_str %}
-                    {# Translators: label for a person's active dates in the PGP #}
-                    <dt>{% translate 'Active dates' %}</dt>
-                    <dd>{{ person.date_str }}</dd>
+                {% if person.date_str or person.deceased_date_str %}
+                    {# Translators: label for the dates of a person's appearances in PGP documents #}
+                    <dt>{% translate 'Dates' %}</dt>
+                    <dd>
+                        <dl class="person-dates">
+                            {% if person.date_str %}
+                                {# Translators: label for a person's active dates in the PGP #}
+                                <dt>{% translate 'Active dates' %}</dt>
+                                <dd>{{ person.date_str }}</dd>
+                            {% endif %}
+                            {% if person.deceased_date_str %}
+                                {# Translators: label for a person's date range when mentioned after death in PGP documents #}
+                                <dt>{% translate 'Posthumous mentions' %}</dt>
+                                <dd>{{ person.deceased_date_str }}</dd>
+                            {% endif %}
+                        </dl>
+                    </dd>
                 {% endif %}
                 {% if person.role %}
                     <dt>
diff --git a/geniza/entities/tests/test_entities_admin.py b/geniza/entities/tests/test_entities_admin.py
index c26a13620..691fdfc1d 100644
--- a/geniza/entities/tests/test_entities_admin.py
+++ b/geniza/entities/tests/test_entities_admin.py
@@ -7,6 +7,7 @@
 from django.urls import reverse
 from pytest_django.asserts import assertContains, assertNotContains
 
+from geniza.corpus.dates import standard_date_display
 from geniza.corpus.models import Dating, Document, LanguageScript
 from geniza.entities.admin import (
     NameInlineFormSet,
@@ -230,6 +231,30 @@ def test_export_relations_to_csv(self, person, person_multiname):
         assert str(person_multiname) in content
         assert "Partner" in content
 
+    def test_date_ranges(self, person, document, join):
+        document.doc_date_standard = "1200/1300"
+        document.save()
+        (pdrtype, _) = PersonDocumentRelationType.objects.get_or_create(name="test")
+        PersonDocumentRelation.objects.create(
+            person=person, document=document, type=pdrtype
+        )
+        (deceased, _) = PersonDocumentRelationType.objects.get_or_create(
+            name="Mentioned (deceased)"
+        )
+        join.doc_date_standard = "1310/1312"
+        join.save()
+        PersonDocumentRelation.objects.create(
+            person=person, document=join, type=deceased
+        )
+
+        person_admin = PersonAdmin(model=Person, admin_site=admin.site)
+        assert person_admin.active_dates(person) == standard_date_display(
+            document.doc_date_standard
+        )
+        assert person_admin.deceased_mention_dates(person) == standard_date_display(
+            join.doc_date_standard
+        )
+
 
 @pytest.mark.django_db
 class TestNameInlineFormSet:
diff --git a/geniza/entities/tests/test_entities_metadata_export.py b/geniza/entities/tests/test_entities_metadata_export.py
index b5a806af6..23a14fdca 100644
--- a/geniza/entities/tests/test_entities_metadata_export.py
+++ b/geniza/entities/tests/test_entities_metadata_export.py
@@ -94,9 +94,17 @@ def test_person_iter_dicts(person, person_diacritic, person_multiname, document,
         person=person_diacritic, place=fustat, type=roots
     )
 
-    person.documents.add(document)
-    person.documents.add(join)
-    person_multiname.documents.add(document)
+    document.doc_date_standard = "1200/1300"
+    document.save()
+    PersonDocumentRelation.objects.create(person=person, document=document)
+    PersonDocumentRelation.objects.create(person=person_multiname, document=document)
+    (deceased, _) = PersonDocumentRelationType.objects.get_or_create(
+        name="Mentioned (deceased)"
+    )
+    join.doc_date_standard = "1310/1312"
+    join.save()
+    PersonDocumentRelation.objects.create(person=person, document=join, type=deceased)
+
     person.tags.add("test")
     person.tags.add("example")
     person_multiname.tags.add("test")
@@ -128,6 +136,12 @@ def test_person_iter_dicts(person, person_diacritic, person_multiname, document,
             assert "Mosul" in export_data.get("home_base")
             assert "test" in export_data.get("tags")
             assert "example" in export_data.get("tags")
+            assert export_data.get("active_date_range") == standard_date_display(
+                "1200/1300"
+            )
+            assert export_data.get("deceased_date_range") == standard_date_display(
+                "1310/1312"
+            )
         elif str(pers) == str(person_multiname):
             assert export_data.get("related_people_count") == 0
             assert export_data.get("related_documents_count") == 1
diff --git a/geniza/entities/tests/test_entities_models.py b/geniza/entities/tests/test_entities_models.py
index 823e16ff8..adbc6c451 100644
--- a/geniza/entities/tests/test_entities_models.py
+++ b/geniza/entities/tests/test_entities_models.py
@@ -439,7 +439,7 @@ def test_date_str(self, person, document):
         person.save()
         assert person.date_str == standard_date_display("1255")
 
-    def test_solr_date_range(self, person, document):
+    def test_solr_date_range(self, person, document, join):
         # no date: returns None
         assert not person.solr_date_range()
         # document dates: should use those
@@ -447,6 +447,18 @@ def test_solr_date_range(self, person, document):
         document.save()
         PersonDocumentRelation.objects.create(person=person, document=document)
         assert person.solr_date_range() == "[1200 TO 1300]"
+
+        # should NOT include mentioned (deceased)
+        (deceased, _) = PersonDocumentRelationType.objects.get_or_create(
+            name="Mentioned (deceased)"
+        )
+        join.doc_date_standard = "1310/1312"
+        join.save()
+        PersonDocumentRelation.objects.create(
+            person=person, document=join, type=deceased
+        )
+        assert person.solr_date_range() == "[1200 TO 1300]"
+
         # person date override
         person.date = "1255"
         person.save()
@@ -455,13 +467,24 @@ def test_solr_date_range(self, person, document):
     def test_total_to_index(self, person, person_multiname):
         assert Person.total_to_index() == 2
 
-    def test_index_data(self, person, person_multiname, document):
+    def test_index_data(self, person, person_multiname, document, join):
         document.doc_date_standard = "1200/1300"
         document.save()
         (pdrtype, _) = PersonDocumentRelationType.objects.get_or_create(name="test")
         PersonDocumentRelation.objects.create(
             person=person, document=document, type=pdrtype
         )
+
+        # these dates should be ignored (deceased)
+        (deceased, _) = PersonDocumentRelationType.objects.get_or_create(
+            name="Mentioned (deceased)"
+        )
+        join.doc_date_standard = "1310/1312"
+        join.save()
+        PersonDocumentRelation.objects.create(
+            person=person, document=join, type=deceased
+        )
+
         tags = ["testtag", "tag2"]
         for t in tags:
             person.tags.add(t)
@@ -478,9 +501,10 @@ def test_index_data(self, person, person_multiname, document):
         index_data = person.index_data()
         assert index_data["url_s"] == person.get_absolute_url()
         assert index_data["has_page_b"] == True
-        assert index_data["documents_i"] == 1
+        assert index_data["documents_i"] == 2
         assert index_data["people_i"] == index_data["places_i"] == 0
-        assert index_data["document_relation_ss"] == [str(pdrtype)]
+        assert str(pdrtype) in index_data["document_relation_ss"]
+        assert str(deceased) in index_data["document_relation_ss"]
         assert index_data["tags_ss_lower"] == tags
         assert index_data["date_dr"] == person.solr_date_range()
         assert index_data["date_str_s"] == person.date_str
@@ -495,6 +519,44 @@ def test_index_data(self, person, person_multiname, document):
             in index_data["other_names_ss"]
         )
 
+    def test_active_date_range(self, person, document, join):
+        # these dates should be used (active)
+        document.doc_date_standard = "1200/1300"
+        document.save()
+        (pdrtype, _) = PersonDocumentRelationType.objects.get_or_create(name="test")
+        PersonDocumentRelation.objects.create(
+            person=person, document=document, type=pdrtype
+        )
+        # these dates should be ignored (deceased)
+        (deceased, _) = PersonDocumentRelationType.objects.get_or_create(
+            name="Mentioned (deceased)"
+        )
+        join.doc_date_standard = "1310/1312"
+        join.save()
+        PersonDocumentRelation.objects.create(
+            person=person, document=join, type=deceased
+        )
+        assert person.active_date_range == document.doc_date_standard
+
+    def test_deceased_date_range(self, person, document, join):
+        # these dates should be ignored (active)
+        document.doc_date_standard = "1200/1300"
+        document.save()
+        (pdrtype, _) = PersonDocumentRelationType.objects.get_or_create(name="test")
+        PersonDocumentRelation.objects.create(
+            person=person, document=document, type=pdrtype
+        )
+        # these dates should be used (deceased)
+        (deceased, _) = PersonDocumentRelationType.objects.get_or_create(
+            name="Mentioned (deceased)"
+        )
+        join.doc_date_standard = "1310/1312"
+        join.save()
+        PersonDocumentRelation.objects.create(
+            person=person, document=join, type=deceased
+        )
+        assert person.deceased_date_range == join.doc_date_standard
+
 
 class TestPersonSolrQuerySet:
     def test_keyword_search(self):
diff --git a/geniza/locale/ar/LC_MESSAGES/django.po b/geniza/locale/ar/LC_MESSAGES/django.po
index bc99bf726..eafbff6d8 100644
--- a/geniza/locale/ar/LC_MESSAGES/django.po
+++ b/geniza/locale/ar/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: princeton-geniza-project\n"
 "Report-Msgid-Bugs-To: cdhdevteam@princeton.edu\n"
-"POT-Creation-Date: 2024-11-06 13:42-0500\n"
+"POT-Creation-Date: 2025-01-29 10:50-0500\n"
 "PO-Revision-Date: 2024-11-06 19:02\n"
 "Last-Translator: \n"
 "Language-Team: Arabic\n"
@@ -10,7 +10,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"
+"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"
 "X-Crowdin-Project: princeton-geniza-project\n"
 "X-Crowdin-Project-ID: 520356\n"
 "X-Crowdin-Language: ar\n"
@@ -28,7 +29,7 @@ msgid "Keyword or Phrase"
 msgstr "الكلمة المفتاحية أو العبارة"
 
 #. Translators: label for sort by relevance
-#: corpus/forms.py:226
+#: corpus/forms.py:226 entities/forms.py:211
 msgid "Relevance"
 msgstr "الصلة"
 
@@ -93,14 +94,16 @@ msgid "RegEx"
 msgstr ""
 
 #. Translators: label for form sort field
-#: corpus/forms.py:262 entities/forms.py:140 entities/forms.py:260
+#: corpus/forms.py:262 entities/forms.py:228 entities/forms.py:349
 msgid "Sort by"
 msgstr "الترتيب حسب"
 
 #. Translators: label for filter documents by date range
+#. Translators: label for the dates of a person's appearances in PGP documents
 #. Translators: Person "dates of activity" column header on the browse page
-#: corpus/forms.py:269 entities/forms.py:121
-#: entities/templates/entities/person_list.html:109
+#: corpus/forms.py:269 entities/forms.py:207
+#: entities/templates/entities/person_detail.html:38
+#: entities/templates/entities/person_list.html:126
 msgid "Dates"
 msgstr ""
 
@@ -111,7 +114,6 @@ msgstr ""
 
 #. Translators: label for document type search form filter
 #: corpus/forms.py:285
-#| msgid "Input date"
 msgid "Document type"
 msgstr ""
 
@@ -150,14 +152,13 @@ msgstr ""
 
 #. Translators: label for "search mode" (general or regex)
 #: corpus/forms.py:312
-#| msgid "Search Documents"
 msgid "Search mode"
 msgstr ""
 
 #. Translators: Default label when document does not have a type
-#: corpus/forms.py:348 corpus/solr_queryset.py:293
+#: corpus/forms.py:348 corpus/models.py:1005 corpus/solr_queryset.py:332
 #: corpus/templates/corpus/snippets/document_header.html:17
-#: corpus/templates/corpus/snippets/document_transcription.html:237
+#: corpus/templates/corpus/snippets/document_transcription.html:243
 msgid "Unknown type"
 msgstr "نوع غير معروف"
 
@@ -167,47 +168,56 @@ msgstr "ترتيب الصلة غير متوفر بدون مصطلح البحث 
 
 #: corpus/forms.py:411
 #, python-format
-msgid "Regular expression cannot contain { without a preceding character, without an integer afterwards, or without a closing }. %s"
+msgid ""
+"Regular expression cannot contain { without a preceding character, without "
+"an integer afterwards, or without a closing }. %s"
 msgstr ""
 
 #: corpus/forms.py:420
 #, python-format
-msgid "Regular expression cannot contain * without a preceding character, or multiple times in a row. %s"
+msgid ""
+"Regular expression cannot contain * without a preceding character, or "
+"multiple times in a row. %s"
 msgstr ""
 
 #: corpus/forms.py:429
 #, python-format
-msgid "Regular expression cannot contain + without a preceding character, or multiple times in a row. %s"
+msgid ""
+"Regular expression cannot contain + without a preceding character, or "
+"multiple times in a row. %s"
 msgstr ""
 
 #: corpus/forms.py:438
 #, python-format
-msgid "Regular expression cannot contain < or use a negative lookbehind query. %s"
+msgid ""
+"Regular expression cannot contain < or use a negative lookbehind query. %s"
 msgstr ""
 
 #: corpus/forms.py:448
 #, python-format
-msgid "Regular expression cannot contain the escape character \\ followed by an alphanumeric character other than one of DdSsWw, or at the end of a query. %s"
+msgid ""
+"Regular expression cannot contain the escape character \\ followed by an "
+"alphanumeric character other than one of DdSsWw, or at the end of a query. %s"
 msgstr ""
 
-#: corpus/models.py:1119 templates/base.html:21
+#: corpus/models.py:1128 templates/base.html:21
 msgid "Princeton Geniza Project"
 msgstr "Princeton Geniza Project"
 
 #. Translators: attribution for local IIIF manifests
-#: corpus/models.py:1121
+#: corpus/models.py:1130
 #, python-format
 msgid "Compilation by %(pgp)s."
 msgstr "تجميع بواسطة %(pgp)s."
 
 #. Translators: attribution for local IIIF manifests that include transcription
-#: corpus/models.py:1124
+#: corpus/models.py:1133
 #, python-format
 msgid "Compilation and transcription by %(pgp)s."
 msgstr "التجميع والنسخ بواسطة %(pgp)s."
 
 #. Translators: manifest attribution note that content from other institutions may have restrictions
-#: corpus/models.py:1126
+#: corpus/models.py:1135
 msgid "Additional restrictions may apply."
 msgstr "قد تطبق قيود إضافية."
 
@@ -324,8 +334,8 @@ msgstr "الوصف"
 #. Translators: accessibility label for people list
 #: corpus/templates/corpus/document_detail.html:153
 #: corpus/templates/corpus/snippets/document_result.html:108
-#: entities/forms.py:133 entities/forms.py:255
-#: entities/templates/entities/person_list.html:146
+#: entities/forms.py:221 entities/forms.py:344
+#: entities/templates/entities/person_list.html:190
 #: entities/templates/entities/place_list.html:80
 #: entities/templates/entities/place_related_people.html:28
 msgid "Related People"
@@ -334,10 +344,12 @@ msgstr ""
 #. Translators: heading label for document related places
 #. Translators: label for sort by number of related places
 #. Translators: accessibility label for place list
+#. Translators: heading label for document related places
 #: corpus/templates/corpus/document_detail.html:172
 #: corpus/templates/corpus/snippets/document_result.html:112
-#: entities/forms.py:135 entities/templates/entities/person_list.html:150
+#: entities/forms.py:223 entities/templates/entities/person_list.html:194
 #: entities/templates/entities/person_related_places.html:56
+#: entities/templates/entities/place_detail.html:93
 msgid "Related Places"
 msgstr ""
 
@@ -376,20 +388,35 @@ msgstr "تاريخ الإدخال"
 #. Translators: Date document was first added to the PGP
 #: corpus/templates/corpus/document_detail.html:234
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "                    In PGP since %(date)s\n"
 "                "
 msgstr ""
 
+#. Translators: label for a citation for a document detail page
+#. Translators: label for a citation for a person page
+#: corpus/templates/corpus/document_detail.html:249
+#: entities/templates/entities/person_detail.html:131
+msgid "How to cite this record:"
+msgstr ""
+
+#. Translators: accessibility label for a citation for a document
+#. Translators: accessibility label for a citation for a person
+#: corpus/templates/corpus/document_detail.html:253
+#: entities/templates/entities/person_detail.html:135
+msgid "Citation"
+msgstr ""
+
 #. Translators: label for permanent link to a document
-#: corpus/templates/corpus/document_detail.html:247
+#: corpus/templates/corpus/document_detail.html:258
 msgid "Link to this document:"
 msgstr ""
 
 #. Translators: accessibility label for permanent link to a document
 #. Translators: accessibility label for permanent link to a person
-#: corpus/templates/corpus/document_detail.html:254
-#: entities/templates/entities/person_detail.html:133
+#: corpus/templates/corpus/document_detail.html:265
+#: entities/templates/entities/person_detail.html:146
 msgid "Permalink"
 msgstr "رابط دائم"
 
@@ -409,25 +436,26 @@ msgstr ""
 
 #. Translators: Search submit button
 #: corpus/templates/corpus/document_list.html:31
+#: entities/templates/entities/person_list.html:15
 msgid "Submit search"
 msgstr "إرسال البحث"
 
 #: corpus/templates/corpus/document_list.html:37
 #: corpus/templates/corpus/document_list.html:64
-#: entities/templates/entities/person_list.html:22
-#: entities/templates/entities/person_list.html:49
+#: entities/templates/entities/person_list.html:29
+#: entities/templates/entities/person_list.html:56
 msgid "Filters"
 msgstr "عوامل التصفية"
 
 #. Translators: label for button to clear all applied filters
 #: corpus/templates/corpus/document_list.html:58
-#: entities/templates/entities/person_list.html:43
+#: entities/templates/entities/person_list.html:50
 msgid "Clear all"
 msgstr ""
 
 #. Translators: label for 'filters' close button for mobile navigation
 #: corpus/templates/corpus/document_list.html:67
-#: entities/templates/entities/person_list.html:52
+#: entities/templates/entities/person_list.html:59
 msgid "Close filter options"
 msgstr "إغلاق خيارات التصفية"
 
@@ -437,14 +465,14 @@ msgstr ""
 
 #. Translators: search results section header
 #: corpus/templates/corpus/document_list.html:135
-#: entities/templates/entities/person_list.html:78
+#: entities/templates/entities/person_list.html:93
 msgid "Results"
 msgstr ""
 
 #. Translators: number of search results
 #. Translators: number of results
 #: corpus/templates/corpus/document_list.html:139
-#: entities/templates/entities/person_list.html:82
+#: entities/templates/entities/person_list.html:97
 #, python-format
 msgid "1 result"
 msgid_plural "%(count_humanized)s results"
@@ -455,6 +483,10 @@ msgstr[3] "%(count_humanized)s نتائج"
 msgstr[4] "%(count_humanized)s نتائج"
 msgstr[5] "%(count_humanized)s مجموع النتائج"
 
+#: corpus/templates/corpus/document_list.html:163
+msgid "View results in the Arabic Papyrology Database"
+msgstr ""
+
 #. Translators: accessibility label for a footnote source citation in scholarship records view
 #: corpus/templates/corpus/document_scholarship.html:21
 msgid "Bibliographic citation"
@@ -492,13 +524,11 @@ msgid "Jewish Theological Seminary logo"
 msgstr "شعار Jewish Theological Seminary"
 
 #: corpus/templates/corpus/snippets/document_result.html:23
-#| msgid "Input date"
 msgid "Document date"
 msgstr ""
 
 #. Translators: label for inferred date on a document
 #: corpus/templates/corpus/snippets/document_result.html:33
-#| msgid "Input date"
 msgid "Inferred date"
 msgstr ""
 
@@ -515,14 +545,14 @@ msgstr[5] ""
 
 #. Translators: label for sort by number of related documents
 #: corpus/templates/corpus/snippets/document_result.html:116
-#: entities/forms.py:131 entities/forms.py:253
-#: entities/templates/entities/person_list.html:142
+#: entities/forms.py:219 entities/forms.py:342
+#: entities/templates/entities/person_list.html:186
 #: entities/templates/entities/place_list.html:75
-#| msgid "Search Documents"
 msgid "Related Documents"
 msgstr ""
 
 #: corpus/templates/corpus/snippets/document_result.html:132
+#: entities/templates/entities/person_list.html:180
 msgid "more"
 msgstr "المزيد"
 
@@ -604,8 +634,10 @@ msgstr ""
 
 #. Translators: general search help text
 #: corpus/templates/corpus/snippets/document_search_helptext.html:7
-msgid "\n"
-"        Use keywords or phrases in any language to return matching or similar\n"
+msgid ""
+"\n"
+"        Use keywords or phrases in any language to return matching or "
+"similar\n"
 "        results across all fields. Arabic script searches will return both\n"
 "        Arabic and Judaeo-Arabic transcription content.\n"
 "    "
@@ -619,7 +651,8 @@ msgstr ""
 #. Translators: regular expressions search mode help text
 #: corpus/templates/corpus/snippets/document_search_helptext.html:18
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        Use Hebrew or Arabic script to find precise matches in the\n"
 "        transcriptions. See\n"
 "        <a data-turbo=\"false\" href=\"%(howto_url)s\">How to Search</a>\n"
@@ -634,10 +667,13 @@ msgstr ""
 
 #. Translators: regular expression tip 1
 #: corpus/templates/corpus/snippets/document_search_helptext.html:31
-msgid "\n"
+msgid ""
+"\n"
 "            If you're looking for a word with one missing letter, use a\n"
-"            period. Two missing letters, use two periods or <code>{2}</code>.\n"
-"            Increase the number in the curly brackets to increase the number of\n"
+"            period. Two missing letters, use two periods or <code>{2}</"
+"code>.\n"
+"            Increase the number in the curly brackets to increase the number "
+"of\n"
 "            characters, or insert a range with a comma in between, ex.\n"
 "            <code>{0,5}</code>.\n"
 "        "
@@ -645,7 +681,8 @@ msgstr ""
 
 #. Translators: regular expression tip 2
 #: corpus/templates/corpus/snippets/document_search_helptext.html:41
-msgid "\n"
+msgid ""
+"\n"
 "            If you don't know how many characters are missing, use\n"
 "            <code>.*</code>.\n"
 "        "
@@ -653,8 +690,10 @@ msgstr ""
 
 #. Translators: regular expression tip 3
 #: corpus/templates/corpus/snippets/document_search_helptext.html:48
-msgid "\n"
-"            If you know which characters you want, use square brackets to find\n"
+msgid ""
+"\n"
+"            If you know which characters you want, use square brackets to "
+"find\n"
 "            multiple spellings, ex. <code>[יו]</code> for yud or vav.\n"
 "        "
 msgstr ""
@@ -709,7 +748,7 @@ msgstr "عرض الترجمة"
 
 #. Translators: Label for editors of a transcription
 #: corpus/templates/corpus/snippets/document_transcription.html:92
-#: corpus/templates/corpus/snippets/document_transcription.html:107
+#: corpus/templates/corpus/snippets/document_transcription.html:110
 #, python-format
 msgid "Editor: %(eds)s"
 msgid_plural "Editors: %(eds)s"
@@ -721,8 +760,8 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. Translators: Label for authors of a translation
-#: corpus/templates/corpus/snippets/document_transcription.html:134
-#: corpus/templates/corpus/snippets/document_transcription.html:148
+#: corpus/templates/corpus/snippets/document_transcription.html:140
+#: corpus/templates/corpus/snippets/document_transcription.html:154
 #, python-format
 msgid "Translator: %(eds)s"
 msgid_plural "Translators: %(eds)s"
@@ -733,11 +772,11 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: corpus/templates/corpus/snippets/document_transcription.html:204
+#: corpus/templates/corpus/snippets/document_transcription.html:210
 msgid "Zoom and Rotate"
 msgstr "تكبير و تدوير"
 
-#: corpus/templates/corpus/snippets/document_transcription.html:240
+#: corpus/templates/corpus/snippets/document_transcription.html:246
 #, python-format
 msgid "View %(related_doc)s"
 msgstr "عرض %(related_doc)s"
@@ -770,37 +809,38 @@ msgstr "التالي"
 
 #. Translators: title of document search page
 #. Translators: label for link to document search page in main navigation
-#: corpus/views.py:81 templates/snippets/menu.html:11
-#| msgid "Input date"
+#: corpus/views.py:82 templates/snippets/menu.html:11
 msgid "Documents"
 msgstr ""
 
 #. Translators: description of document search page, for search engines
-#: corpus/views.py:83
+#: corpus/views.py:84
 msgid "Search and browse Geniza documents."
 msgstr "البحث في وثائق جنيزا وتصفحها."
 
-#: corpus/views.py:325 entities/views.py:601
+#: corpus/views.py:326 entities/views.py:721
 #, python-format
 msgid "After %s"
 msgstr ""
 
-#: corpus/views.py:327 entities/views.py:603
+#: corpus/views.py:328 entities/views.py:723
 #, python-format
 msgid "Before %s"
 msgstr ""
 
-#: corpus/views.py:378
-msgid "Error retrieving search results. Check regular expression for errors such as unescaped or unclosed brackets or parentheses."
+#: corpus/views.py:399
+msgid ""
+"Error retrieving search results. Check regular expression for errors such as "
+"unescaped or unclosed brackets or parentheses."
 msgstr ""
 
 #. Translators: title of document scholarship page
-#: corpus/views.py:509
+#: corpus/views.py:531
 #, python-format
 msgid "Scholarship on %(doc)s"
 msgstr "منحة في %(doc)s"
 
-#: corpus/views.py:516
+#: corpus/views.py:538
 #, python-format
 msgid "%(count)d scholarship record"
 msgid_plural "%(count)d scholarship records"
@@ -812,12 +852,12 @@ msgstr[4] "%(count)d سجلات منح دراسية"
 msgstr[5] "%(count)d سجلات منح دراسية"
 
 #. Translators: title of related documents page
-#: corpus/views.py:557
+#: corpus/views.py:579
 #, python-format
 msgid "Related documents for %(doc)s"
 msgstr "المستندات ذات الصلة لـ %(doc)s"
 
-#: corpus/views.py:564 entities/views.py:210
+#: corpus/views.py:586 entities/views.py:317
 #, python-format
 msgid "%(count)d related document"
 msgid_plural "%(count)d related documents"
@@ -828,21 +868,37 @@ msgstr[3] "%(count)d مستندات ذات صلة"
 msgstr[4] "%(count)d مستندات ذات صلة"
 msgstr[5] "%(count)d مستندات ذات صلة"
 
+#. Translators: placeholder for people keyword search input
+#: entities/forms.py:195
+msgid "Search for people by name"
+msgstr ""
+
+#. Translators: accessible label for people keyword search input
+#: entities/forms.py:197
+#, fuzzy
+#| msgid "Keyword or Phrase"
+msgid "word or phrase"
+msgstr "الكلمة المفتاحية أو العبارة"
+
 #. Translators: label for a person's gender
 #. Translators: Person "gender" column header on the browse page
-#: entities/forms.py:117 entities/templates/entities/person_detail.html:34
-#: entities/templates/entities/person_list.html:107
+#: entities/forms.py:202 entities/templates/entities/person_detail.html:34
+#: entities/templates/entities/person_list.html:124
 msgid "Gender"
 msgstr ""
 
+#: entities/forms.py:203 entities/views.py:737
+msgid "Detail page available"
+msgstr ""
+
 #. Translators: Label for a person's social role
 #. Translators: Person "social role" column header on the browse page
-#: entities/forms.py:118 entities/templates/entities/person_detail.html:44
-#: entities/templates/entities/person_list.html:111
+#: entities/forms.py:204 entities/templates/entities/person_detail.html:57
+#: entities/templates/entities/person_list.html:128
 msgid "Social role"
 msgstr ""
 
-#: entities/forms.py:119
+#: entities/forms.py:205
 msgid "Relation to documents"
 msgstr ""
 
@@ -851,9 +907,9 @@ msgstr ""
 #. Translators: table header for person name
 #. Translators: table header for place name
 #. Translators: table header for person name
-#: entities/forms.py:125 entities/forms.py:251
-#: entities/templates/entities/person_list.html:105
-#: entities/templates/entities/person_related_people.html:34
+#: entities/forms.py:213 entities/forms.py:340
+#: entities/templates/entities/person_list.html:120
+#: entities/templates/entities/person_related_people.html:35
 #: entities/templates/entities/person_related_places.html:65
 #: entities/templates/entities/place_list.html:57
 #: entities/templates/entities/place_related_people.html:37
@@ -862,66 +918,71 @@ msgstr ""
 
 #. Translators: label for sort by person activity dates
 #. Translators: table header for document date
-#: entities/forms.py:127
+#: entities/forms.py:215
 #: entities/templates/entities/snippets/related_documents_table.html:31
 msgid "Date"
 msgstr ""
 
 #. Translators: label for sort by social role
-#: entities/forms.py:129
+#: entities/forms.py:217
 msgid "Social Role"
 msgstr ""
 
 #. Translators: label for ascending sort
-#: entities/forms.py:148 entities/forms.py:268
+#: entities/forms.py:236 entities/forms.py:357
 msgid "Ascending"
 msgstr ""
 
 #. Translators: label for descending sort
-#: entities/forms.py:150 entities/forms.py:270
+#: entities/forms.py:238 entities/forms.py:359
 msgid "Descending"
 msgstr ""
 
-#: entities/models.py:367
+#: entities/models.py:375
 msgid "Male"
 msgstr ""
 
-#: entities/models.py:368
+#: entities/models.py:376
 msgid "Female"
 msgstr ""
 
-#: entities/models.py:369
+#: entities/models.py:377
 msgid "Unknown"
 msgstr ""
 
-#: entities/models.py:1063
+#: entities/models.py:1220
 msgid "Immediate family relations"
 msgstr ""
 
-#: entities/models.py:1064
+#: entities/models.py:1221
 msgid "Extended family"
 msgstr ""
 
-#: entities/models.py:1065
+#: entities/models.py:1222
 msgid "Relatives by marriage"
 msgstr ""
 
-#: entities/models.py:1066
+#: entities/models.py:1223
 msgid "Business and property relationships"
 msgstr ""
 
-#: entities/models.py:1067
+#: entities/models.py:1224
 msgid "Ambiguity"
 msgstr ""
 
 #. Translators: label for a person's active dates in the PGP
-#: entities/templates/entities/person_detail.html:38
+#: entities/templates/entities/person_detail.html:43
 msgid "Active dates"
 msgstr ""
 
+#. Translators: label for a person's date range when mentioned after death in PGP documents
+#: entities/templates/entities/person_detail.html:48
+msgid "Posthumous mentions"
+msgstr ""
+
 #. Translators: label for alternative names for a person
 #. Translators: label for alternative names for a place
-#: entities/templates/entities/person_detail.html:54
+#: entities/templates/entities/person_detail.html:67
 #: entities/templates/entities/place_detail.html:68
 msgid "Other name"
 msgid_plural "Other names"
@@ -934,62 +995,69 @@ msgstr[5] ""
 
 #. Translators: label for person description / bio
 #. Translators: Person "description / bio" column header on the browse page
-#: entities/templates/entities/person_detail.html:70
-#: entities/templates/entities/person_list.html:113
+#: entities/templates/entities/person_detail.html:83
+#: entities/templates/entities/person_list.html:130
 msgid "Description / Bio"
 msgstr ""
 
 #. Translators: label for person's life events timeline
-#: entities/templates/entities/person_detail.html:79
+#: entities/templates/entities/person_detail.html:92
 msgid "Life events"
 msgstr ""
 
 #. Translators: label for person bibliography
-#: entities/templates/entities/person_detail.html:102
+#: entities/templates/entities/person_detail.html:115
 msgid "Select bibliography"
 msgstr ""
 
-#. Translators: label for a citation for a person page
-#: entities/templates/entities/person_detail.html:118
-msgid "How to cite this record:"
-msgstr ""
-
-#. Translators: accessibility label for a citation for a person
-#: entities/templates/entities/person_detail.html:122
-msgid "Citation"
-msgstr ""
-
 #. Translators: label for permanent link to a person
-#: entities/templates/entities/person_detail.html:129
+#: entities/templates/entities/person_detail.html:142
 msgid "Link to this person:"
 msgstr ""
 
 #. Translators: label for people browse page list view
-#: entities/templates/entities/person_list.html:14
+#: entities/templates/entities/person_list.html:21
 msgid "Toggle list view"
 msgstr ""
 
+#: entities/templates/entities/person_list.html:72
+#, fuzzy
+#| msgid "Document Details"
+msgid "Details"
+msgstr "تفاصيل المستند"
+
+#. Translators: Person "other names" column header on the browse page
+#: entities/templates/entities/person_list.html:122
+#: entities/templates/entities/place_list.html:66
+msgid "Other names"
+msgstr ""
+
 #. Translators: Person "document count" column header on the browse page
 #. Translators: table header for count of shared documents between people
-#: entities/templates/entities/person_list.html:116
-#: entities/templates/entities/person_related_people.html:48
+#: entities/templates/entities/person_list.html:133
+#: entities/templates/entities/person_related_people.html:49
 msgid "Number of related documents"
 msgstr ""
 
 #. Translators: Person "related people count" column header on the browse page
-#: entities/templates/entities/person_list.html:120
+#: entities/templates/entities/person_list.html:137
 msgid "Number of related people"
 msgstr ""
 
 #. Translators: Person "related place count" column header on the browse page
-#: entities/templates/entities/person_list.html:124
+#: entities/templates/entities/person_list.html:141
 msgid "Number of related places"
 msgstr ""
 
+#: entities/templates/entities/person_list.html:159
+msgid "Also known as: "
+msgstr ""
+
 #. Translators: range of search results on the current page, out of total
-#: entities/templates/entities/person_list.html:161
+#: entities/templates/entities/person_list.html:205
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "            <div>%(start)s – %(end)s of %(count_humanized)s</div>\n"
 "        "
 msgstr ""
@@ -997,7 +1065,7 @@ msgstr ""
 #. Translators: table header for relationship types between people
 #. Translators: table header for person-place relation type
 #. Translators: table header for document relation (with a person or place)
-#: entities/templates/entities/person_related_people.html:41
+#: entities/templates/entities/person_related_people.html:42
 #: entities/templates/entities/person_related_places.html:72
 #: entities/templates/entities/snippets/related_documents_table.html:24
 msgid "Relation"
@@ -1005,7 +1073,7 @@ msgstr ""
 
 #. Translators: table header for notes on a relationship between people
 #. Translators: label for place notes
-#: entities/templates/entities/person_related_people.html:54
+#: entities/templates/entities/person_related_people.html:55
 #: entities/templates/entities/person_related_places.html:76
 #: entities/templates/entities/place_detail.html:84
 #: entities/templates/entities/place_related_people.html:48
@@ -1030,10 +1098,6 @@ msgstr ""
 msgid "metadata"
 msgstr ""
 
-#: entities/templates/entities/place_list.html:66
-msgid "Other names"
-msgstr ""
-
 #. Translators: accessible label for section showing counts of entries related to an entity
 #: entities/templates/entities/place_list.html:73
 msgid "Related entries"
@@ -1042,7 +1106,8 @@ msgstr ""
 #. Translators: range of search results on the current page, out of total
 #: entities/templates/entities/place_list.html:90
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "                    <div>%(start)s – %(end)s of %(count_humanized)s</div>\n"
 "                "
 msgstr ""
@@ -1090,7 +1155,6 @@ msgstr ""
 
 #. Translators: table header for document name (shelfmark)
 #: entities/templates/entities/snippets/related_documents_table.html:10
-#| msgid "Input date"
 msgid "Document"
 msgstr ""
 
@@ -1100,18 +1164,18 @@ msgid "Type"
 msgstr ""
 
 #. Translators: title of entity "related documents" page
-#: entities/views.py:202
+#: entities/views.py:309
 #, python-format
 msgid "Related documents for %(p)s"
 msgstr ""
 
 #. Translators: title of entity "related people" page
-#: entities/views.py:292
+#: entities/views.py:399
 #, python-format
 msgid "Related people for %(p)s"
 msgstr ""
 
-#: entities/views.py:300 entities/views.py:370
+#: entities/views.py:407 entities/views.py:477
 #, python-format
 msgid "%(count)d related person"
 msgid_plural "%(count)d related people"
@@ -1123,12 +1187,12 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. Translators: title of person "related places" page
-#: entities/views.py:429
+#: entities/views.py:536
 #, python-format
 msgid "Related places for %(p)s"
 msgstr ""
 
-#: entities/views.py:437
+#: entities/views.py:544
 #, python-format
 msgid "%(count)d related place"
 msgid_plural "%(count)d related places"
@@ -1141,23 +1205,23 @@ msgstr[5] ""
 
 #. Translators: title of people list/browse page
 #. Translators: label for link to people browse page in main navigation
-#: entities/views.py:539 templates/snippets/menu.html:19
+#: entities/views.py:649 templates/snippets/menu.html:19
 msgid "People"
 msgstr ""
 
 #. Translators: description of people list/browse page
-#: entities/views.py:541
+#: entities/views.py:651
 msgid "Browse people present in Geniza documents."
 msgstr ""
 
 #. Translators: title of places list/browse page
 #. Translators: label for link to places browse page in main navigation
-#: entities/views.py:694 templates/snippets/menu.html:26
+#: entities/views.py:827 templates/snippets/menu.html:26
 msgid "Places"
 msgstr ""
 
 #. Translators: description of places list/browse page
-#: entities/views.py:696
+#: entities/views.py:829
 msgid "Browse places present in Geniza documents."
 msgstr ""
 
@@ -1171,14 +1235,21 @@ msgid "Edition"
 msgstr "الطبعة"
 
 #: pages/models.py:13
-msgid "Alternative text for visually impaired users to\n"
+msgid ""
+"Alternative text for visually impaired users to\n"
 "briefly communicate the intended message of the image in this context."
-msgstr "نص بديل للمستخدمين ضعاف البصر\n"
+msgstr ""
+"نص بديل للمستخدمين ضعاف البصر\n"
 "لإيصال الرسالة المقصودة للصورة في هذا السياق بإيجاز."
 
 #: pages/models.py:44
-msgid "This text will only be read to     non-sighted users and should describe the major insights or     takeaways from the graphic. Multiple paragraphs are allowed."
-msgstr "هذا النص سوف يقرأ فقط للمستخدمين غير المبصرين ويجب أن يصف الرؤى أو الأفكار الرئيسية من الرسوم. يسمح بفقرات متعددة."
+msgid ""
+"This text will only be read to     non-sighted users and should describe the "
+"major insights or     takeaways from the graphic. Multiple paragraphs are "
+"allowed."
+msgstr ""
+"هذا النص سوف يقرأ فقط للمستخدمين غير المبصرين ويجب أن يصف الرؤى أو الأفكار "
+"الرئيسية من الرسوم. يسمح بفقرات متعددة."
 
 #. Translators: title for Not Found (404) error page
 #: templates/404.html:5 templates/404.html:13
diff --git a/geniza/locale/en/LC_MESSAGES/django.po b/geniza/locale/en/LC_MESSAGES/django.po
index 449b171d5..66612d633 100644
--- a/geniza/locale/en/LC_MESSAGES/django.po
+++ b/geniza/locale/en/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geniza\n"
 "Report-Msgid-Bugs-To: cdhdevteam@princeton.edu\n"
-"POT-Creation-Date: 2024-11-06 13:42-0500\n"
+"POT-Creation-Date: 2025-01-29 10:50-0500\n"
 "PO-Revision-Date: 2022-08-01 14:25\n"
 "Last-Translator: \n"
 "Language-Team: English\n"
@@ -28,7 +28,7 @@ msgid "Keyword or Phrase"
 msgstr ""
 
 #. Translators: label for sort by relevance
-#: corpus/forms.py:226
+#: corpus/forms.py:226 entities/forms.py:211
 msgid "Relevance"
 msgstr ""
 
@@ -93,14 +93,16 @@ msgid "RegEx"
 msgstr ""
 
 #. Translators: label for form sort field
-#: corpus/forms.py:262 entities/forms.py:140 entities/forms.py:260
+#: corpus/forms.py:262 entities/forms.py:228 entities/forms.py:349
 msgid "Sort by"
 msgstr ""
 
 #. Translators: label for filter documents by date range
+#. Translators: label for the dates of a person's appearances in PGP documents
 #. Translators: Person "dates of activity" column header on the browse page
-#: corpus/forms.py:269 entities/forms.py:121
-#: entities/templates/entities/person_list.html:109
+#: corpus/forms.py:269 entities/forms.py:207
+#: entities/templates/entities/person_detail.html:38
+#: entities/templates/entities/person_list.html:126
 msgid "Dates"
 msgstr ""
 
@@ -157,9 +159,9 @@ msgid "Search mode"
 msgstr "Search Documents"
 
 #. Translators: Default label when document does not have a type
-#: corpus/forms.py:348 corpus/solr_queryset.py:293
+#: corpus/forms.py:348 corpus/models.py:1005 corpus/solr_queryset.py:332
 #: corpus/templates/corpus/snippets/document_header.html:17
-#: corpus/templates/corpus/snippets/document_transcription.html:237
+#: corpus/templates/corpus/snippets/document_transcription.html:243
 msgid "Unknown type"
 msgstr ""
 
@@ -201,24 +203,24 @@ msgid ""
 "alphanumeric character other than one of DdSsWw, or at the end of a query. %s"
 msgstr ""
 
-#: corpus/models.py:1119 templates/base.html:21
+#: corpus/models.py:1128 templates/base.html:21
 msgid "Princeton Geniza Project"
 msgstr ""
 
 #. Translators: attribution for local IIIF manifests
-#: corpus/models.py:1121
+#: corpus/models.py:1130
 #, python-format
 msgid "Compilation by %(pgp)s."
 msgstr ""
 
 #. Translators: attribution for local IIIF manifests that include transcription
-#: corpus/models.py:1124
+#: corpus/models.py:1133
 #, python-format
 msgid "Compilation and transcription by %(pgp)s."
 msgstr ""
 
 #. Translators: manifest attribution note that content from other institutions may have restrictions
-#: corpus/models.py:1126
+#: corpus/models.py:1135
 msgid "Additional restrictions may apply."
 msgstr ""
 
@@ -307,8 +309,8 @@ msgstr ""
 #. Translators: accessibility label for people list
 #: corpus/templates/corpus/document_detail.html:153
 #: corpus/templates/corpus/snippets/document_result.html:108
-#: entities/forms.py:133 entities/forms.py:255
-#: entities/templates/entities/person_list.html:146
+#: entities/forms.py:221 entities/forms.py:344
+#: entities/templates/entities/person_list.html:190
 #: entities/templates/entities/place_list.html:80
 #: entities/templates/entities/place_related_people.html:28
 msgid "Related People"
@@ -317,10 +319,12 @@ msgstr ""
 #. Translators: heading label for document related places
 #. Translators: label for sort by number of related places
 #. Translators: accessibility label for place list
+#. Translators: heading label for document related places
 #: corpus/templates/corpus/document_detail.html:172
 #: corpus/templates/corpus/snippets/document_result.html:112
-#: entities/forms.py:135 entities/templates/entities/person_list.html:150
+#: entities/forms.py:223 entities/templates/entities/person_list.html:194
 #: entities/templates/entities/person_related_places.html:56
+#: entities/templates/entities/place_detail.html:93
 msgid "Related Places"
 msgstr ""
 
@@ -361,15 +365,29 @@ msgid ""
 "                "
 msgstr ""
 
+#. Translators: label for a citation for a document detail page
+#. Translators: label for a citation for a person page
+#: corpus/templates/corpus/document_detail.html:249
+#: entities/templates/entities/person_detail.html:131
+msgid "How to cite this record:"
+msgstr ""
+
+#. Translators: accessibility label for a citation for a document
+#. Translators: accessibility label for a citation for a person
+#: corpus/templates/corpus/document_detail.html:253
+#: entities/templates/entities/person_detail.html:135
+msgid "Citation"
+msgstr ""
+
 #. Translators: label for permanent link to a document
-#: corpus/templates/corpus/document_detail.html:247
+#: corpus/templates/corpus/document_detail.html:258
 msgid "Link to this document:"
 msgstr ""
 
 #. Translators: accessibility label for permanent link to a document
 #. Translators: accessibility label for permanent link to a person
-#: corpus/templates/corpus/document_detail.html:254
-#: entities/templates/entities/person_detail.html:133
+#: corpus/templates/corpus/document_detail.html:265
+#: entities/templates/entities/person_detail.html:146
 msgid "Permalink"
 msgstr ""
 
@@ -389,25 +407,26 @@ msgstr ""
 
 #. Translators: Search submit button
 #: corpus/templates/corpus/document_list.html:31
+#: entities/templates/entities/person_list.html:15
 msgid "Submit search"
 msgstr ""
 
 #: corpus/templates/corpus/document_list.html:37
 #: corpus/templates/corpus/document_list.html:64
-#: entities/templates/entities/person_list.html:22
-#: entities/templates/entities/person_list.html:49
+#: entities/templates/entities/person_list.html:29
+#: entities/templates/entities/person_list.html:56
 msgid "Filters"
 msgstr ""
 
 #. Translators: label for button to clear all applied filters
 #: corpus/templates/corpus/document_list.html:58
-#: entities/templates/entities/person_list.html:43
+#: entities/templates/entities/person_list.html:50
 msgid "Clear all"
 msgstr ""
 
 #. Translators: label for 'filters' close button for mobile navigation
 #: corpus/templates/corpus/document_list.html:67
-#: entities/templates/entities/person_list.html:52
+#: entities/templates/entities/person_list.html:59
 msgid "Close filter options"
 msgstr ""
 
@@ -417,20 +436,24 @@ msgstr ""
 
 #. Translators: search results section header
 #: corpus/templates/corpus/document_list.html:135
-#: entities/templates/entities/person_list.html:78
+#: entities/templates/entities/person_list.html:93
 msgid "Results"
 msgstr ""
 
 #. Translators: number of search results
 #. Translators: number of results
 #: corpus/templates/corpus/document_list.html:139
-#: entities/templates/entities/person_list.html:82
+#: entities/templates/entities/person_list.html:97
 #, python-format
 msgid "1 result"
 msgid_plural "%(count_humanized)s results"
 msgstr[0] ""
 msgstr[1] ""
 
+#: corpus/templates/corpus/document_list.html:163
+msgid "View results in the Arabic Papyrology Database"
+msgstr ""
+
 #. Translators: accessibility label for a footnote source citation in scholarship records view
 #: corpus/templates/corpus/document_scholarship.html:21
 msgid "Bibliographic citation"
@@ -489,8 +512,8 @@ msgstr[1] ""
 
 #. Translators: label for sort by number of related documents
 #: corpus/templates/corpus/snippets/document_result.html:116
-#: entities/forms.py:131 entities/forms.py:253
-#: entities/templates/entities/person_list.html:142
+#: entities/forms.py:219 entities/forms.py:342
+#: entities/templates/entities/person_list.html:186
 #: entities/templates/entities/place_list.html:75
 #, fuzzy
 #| msgid "Search Documents"
@@ -498,6 +521,7 @@ msgid "Related Documents"
 msgstr "Search Documents"
 
 #: corpus/templates/corpus/snippets/document_result.html:132
+#: entities/templates/entities/person_list.html:180
 msgid "more"
 msgstr ""
 
@@ -681,7 +705,7 @@ msgstr ""
 
 #. Translators: Label for editors of a transcription
 #: corpus/templates/corpus/snippets/document_transcription.html:92
-#: corpus/templates/corpus/snippets/document_transcription.html:107
+#: corpus/templates/corpus/snippets/document_transcription.html:110
 #, python-format
 msgid "Editor: %(eds)s"
 msgid_plural "Editors: %(eds)s"
@@ -689,19 +713,19 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. Translators: Label for authors of a translation
-#: corpus/templates/corpus/snippets/document_transcription.html:134
-#: corpus/templates/corpus/snippets/document_transcription.html:148
+#: corpus/templates/corpus/snippets/document_transcription.html:140
+#: corpus/templates/corpus/snippets/document_transcription.html:154
 #, python-format
 msgid "Translator: %(eds)s"
 msgid_plural "Translators: %(eds)s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: corpus/templates/corpus/snippets/document_transcription.html:204
+#: corpus/templates/corpus/snippets/document_transcription.html:210
 msgid "Zoom and Rotate"
 msgstr ""
 
-#: corpus/templates/corpus/snippets/document_transcription.html:240
+#: corpus/templates/corpus/snippets/document_transcription.html:246
 #, python-format
 msgid "View %(related_doc)s"
 msgstr ""
@@ -734,40 +758,40 @@ msgstr ""
 
 #. Translators: title of document search page
 #. Translators: label for link to document search page in main navigation
-#: corpus/views.py:81 templates/snippets/menu.html:11
+#: corpus/views.py:82 templates/snippets/menu.html:11
 #, fuzzy
 #| msgid "Input date"
 msgid "Documents"
 msgstr "Input date"
 
 #. Translators: description of document search page, for search engines
-#: corpus/views.py:83
+#: corpus/views.py:84
 msgid "Search and browse Geniza documents."
 msgstr ""
 
-#: corpus/views.py:325 entities/views.py:601
+#: corpus/views.py:326 entities/views.py:721
 #, python-format
 msgid "After %s"
 msgstr ""
 
-#: corpus/views.py:327 entities/views.py:603
+#: corpus/views.py:328 entities/views.py:723
 #, python-format
 msgid "Before %s"
 msgstr ""
 
-#: corpus/views.py:378
+#: corpus/views.py:399
 msgid ""
 "Error retrieving search results. Check regular expression for errors such as "
 "unescaped or unclosed brackets or parentheses."
 msgstr ""
 
 #. Translators: title of document scholarship page
-#: corpus/views.py:509
+#: corpus/views.py:531
 #, python-format
 msgid "Scholarship on %(doc)s"
 msgstr ""
 
-#: corpus/views.py:516
+#: corpus/views.py:538
 #, python-format
 msgid "%(count)d scholarship record"
 msgid_plural "%(count)d scholarship records"
@@ -775,33 +799,47 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. Translators: title of related documents page
-#: corpus/views.py:557
+#: corpus/views.py:579
 #, python-format
 msgid "Related documents for %(doc)s"
 msgstr ""
 
-#: corpus/views.py:564 entities/views.py:210
+#: corpus/views.py:586 entities/views.py:317
 #, python-format
 msgid "%(count)d related document"
 msgid_plural "%(count)d related documents"
 msgstr[0] ""
 msgstr[1] ""
 
+#. Translators: placeholder for people keyword search input
+#: entities/forms.py:195
+msgid "Search for people by name"
+msgstr ""
+
+#. Translators: accessible label for people keyword search input
+#: entities/forms.py:197
+msgid "word or phrase"
+msgstr ""
+
 #. Translators: label for a person's gender
 #. Translators: Person "gender" column header on the browse page
-#: entities/forms.py:117 entities/templates/entities/person_detail.html:34
-#: entities/templates/entities/person_list.html:107
+#: entities/forms.py:202 entities/templates/entities/person_detail.html:34
+#: entities/templates/entities/person_list.html:124
 msgid "Gender"
 msgstr ""
 
+#: entities/forms.py:203 entities/views.py:737
+msgid "Detail page available"
+msgstr ""
+
 #. Translators: Label for a person's social role
 #. Translators: Person "social role" column header on the browse page
-#: entities/forms.py:118 entities/templates/entities/person_detail.html:44
-#: entities/templates/entities/person_list.html:111
+#: entities/forms.py:204 entities/templates/entities/person_detail.html:57
+#: entities/templates/entities/person_list.html:128
 msgid "Social role"
 msgstr ""
 
-#: entities/forms.py:119
+#: entities/forms.py:205
 msgid "Relation to documents"
 msgstr ""
 
@@ -810,9 +848,9 @@ msgstr ""
 #. Translators: table header for person name
 #. Translators: table header for place name
 #. Translators: table header for person name
-#: entities/forms.py:125 entities/forms.py:251
-#: entities/templates/entities/person_list.html:105
-#: entities/templates/entities/person_related_people.html:34
+#: entities/forms.py:213 entities/forms.py:340
+#: entities/templates/entities/person_list.html:120
+#: entities/templates/entities/person_related_people.html:35
 #: entities/templates/entities/person_related_places.html:65
 #: entities/templates/entities/place_list.html:57
 #: entities/templates/entities/place_related_people.html:37
@@ -821,66 +859,71 @@ msgstr ""
 
 #. Translators: label for sort by person activity dates
 #. Translators: table header for document date
-#: entities/forms.py:127
+#: entities/forms.py:215
 #: entities/templates/entities/snippets/related_documents_table.html:31
 msgid "Date"
 msgstr ""
 
 #. Translators: label for sort by social role
-#: entities/forms.py:129
+#: entities/forms.py:217
 msgid "Social Role"
 msgstr ""
 
 #. Translators: label for ascending sort
-#: entities/forms.py:148 entities/forms.py:268
+#: entities/forms.py:236 entities/forms.py:357
 msgid "Ascending"
 msgstr ""
 
 #. Translators: label for descending sort
-#: entities/forms.py:150 entities/forms.py:270
+#: entities/forms.py:238 entities/forms.py:359
 msgid "Descending"
 msgstr ""
 
-#: entities/models.py:367
+#: entities/models.py:375
 msgid "Male"
 msgstr ""
 
-#: entities/models.py:368
+#: entities/models.py:376
 msgid "Female"
 msgstr ""
 
-#: entities/models.py:369
+#: entities/models.py:377
 msgid "Unknown"
 msgstr ""
 
-#: entities/models.py:1063
+#: entities/models.py:1220
 msgid "Immediate family relations"
 msgstr ""
 
-#: entities/models.py:1064
+#: entities/models.py:1221
 msgid "Extended family"
 msgstr ""
 
-#: entities/models.py:1065
+#: entities/models.py:1222
 msgid "Relatives by marriage"
 msgstr ""
 
-#: entities/models.py:1066
+#: entities/models.py:1223
 msgid "Business and property relationships"
 msgstr ""
 
-#: entities/models.py:1067
+#: entities/models.py:1224
 msgid "Ambiguity"
 msgstr ""
 
 #. Translators: label for a person's active dates in the PGP
-#: entities/templates/entities/person_detail.html:38
+#: entities/templates/entities/person_detail.html:43
 msgid "Active dates"
 msgstr ""
 
+#. Translators: label for a person's date range when mentioned after death in PGP documents
+#: entities/templates/entities/person_detail.html:48
+msgid "Posthumous mentions"
+msgstr ""
+
 #. Translators: label for alternative names for a person
 #. Translators: label for alternative names for a place
-#: entities/templates/entities/person_detail.html:54
+#: entities/templates/entities/person_detail.html:67
 #: entities/templates/entities/place_detail.html:68
 msgid "Other name"
 msgid_plural "Other names"
@@ -889,60 +932,64 @@ msgstr[1] ""
 
 #. Translators: label for person description / bio
 #. Translators: Person "description / bio" column header on the browse page
-#: entities/templates/entities/person_detail.html:70
-#: entities/templates/entities/person_list.html:113
+#: entities/templates/entities/person_detail.html:83
+#: entities/templates/entities/person_list.html:130
 msgid "Description / Bio"
 msgstr ""
 
 #. Translators: label for person's life events timeline
-#: entities/templates/entities/person_detail.html:79
+#: entities/templates/entities/person_detail.html:92
 msgid "Life events"
 msgstr ""
 
 #. Translators: label for person bibliography
-#: entities/templates/entities/person_detail.html:102
+#: entities/templates/entities/person_detail.html:115
 msgid "Select bibliography"
 msgstr ""
 
-#. Translators: label for a citation for a person page
-#: entities/templates/entities/person_detail.html:118
-msgid "How to cite this record:"
-msgstr ""
-
-#. Translators: accessibility label for a citation for a person
-#: entities/templates/entities/person_detail.html:122
-msgid "Citation"
-msgstr ""
-
 #. Translators: label for permanent link to a person
-#: entities/templates/entities/person_detail.html:129
+#: entities/templates/entities/person_detail.html:142
 msgid "Link to this person:"
 msgstr ""
 
 #. Translators: label for people browse page list view
-#: entities/templates/entities/person_list.html:14
+#: entities/templates/entities/person_list.html:21
 msgid "Toggle list view"
 msgstr ""
 
+#: entities/templates/entities/person_list.html:72
+msgid "Details"
+msgstr ""
+
+#. Translators: Person "other names" column header on the browse page
+#: entities/templates/entities/person_list.html:122
+#: entities/templates/entities/place_list.html:66
+msgid "Other names"
+msgstr ""
+
 #. Translators: Person "document count" column header on the browse page
 #. Translators: table header for count of shared documents between people
-#: entities/templates/entities/person_list.html:116
-#: entities/templates/entities/person_related_people.html:48
+#: entities/templates/entities/person_list.html:133
+#: entities/templates/entities/person_related_people.html:49
 msgid "Number of related documents"
 msgstr ""
 
 #. Translators: Person "related people count" column header on the browse page
-#: entities/templates/entities/person_list.html:120
+#: entities/templates/entities/person_list.html:137
 msgid "Number of related people"
 msgstr ""
 
 #. Translators: Person "related place count" column header on the browse page
-#: entities/templates/entities/person_list.html:124
+#: entities/templates/entities/person_list.html:141
 msgid "Number of related places"
 msgstr ""
 
+#: entities/templates/entities/person_list.html:159
+msgid "Also known as: "
+msgstr ""
+
 #. Translators: range of search results on the current page, out of total
-#: entities/templates/entities/person_list.html:161
+#: entities/templates/entities/person_list.html:205
 #, python-format
 msgid ""
 "\n"
@@ -953,7 +1000,7 @@ msgstr ""
 #. Translators: table header for relationship types between people
 #. Translators: table header for person-place relation type
 #. Translators: table header for document relation (with a person or place)
-#: entities/templates/entities/person_related_people.html:41
+#: entities/templates/entities/person_related_people.html:42
 #: entities/templates/entities/person_related_places.html:72
 #: entities/templates/entities/snippets/related_documents_table.html:24
 msgid "Relation"
@@ -961,7 +1008,7 @@ msgstr ""
 
 #. Translators: table header for notes on a relationship between people
 #. Translators: label for place notes
-#: entities/templates/entities/person_related_people.html:54
+#: entities/templates/entities/person_related_people.html:55
 #: entities/templates/entities/person_related_places.html:76
 #: entities/templates/entities/place_detail.html:84
 #: entities/templates/entities/place_related_people.html:48
@@ -986,10 +1033,6 @@ msgstr ""
 msgid "metadata"
 msgstr ""
 
-#: entities/templates/entities/place_list.html:66
-msgid "Other names"
-msgstr ""
-
 #. Translators: accessible label for section showing counts of entries related to an entity
 #: entities/templates/entities/place_list.html:73
 msgid "Related entries"
@@ -1058,18 +1101,18 @@ msgid "Type"
 msgstr ""
 
 #. Translators: title of entity "related documents" page
-#: entities/views.py:202
+#: entities/views.py:309
 #, python-format
 msgid "Related documents for %(p)s"
 msgstr ""
 
 #. Translators: title of entity "related people" page
-#: entities/views.py:292
+#: entities/views.py:399
 #, python-format
 msgid "Related people for %(p)s"
 msgstr ""
 
-#: entities/views.py:300 entities/views.py:370
+#: entities/views.py:407 entities/views.py:477
 #, python-format
 msgid "%(count)d related person"
 msgid_plural "%(count)d related people"
@@ -1077,12 +1120,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. Translators: title of person "related places" page
-#: entities/views.py:429
+#: entities/views.py:536
 #, python-format
 msgid "Related places for %(p)s"
 msgstr ""
 
-#: entities/views.py:437
+#: entities/views.py:544
 #, python-format
 msgid "%(count)d related place"
 msgid_plural "%(count)d related places"
@@ -1091,23 +1134,23 @@ msgstr[1] ""
 
 #. Translators: title of people list/browse page
 #. Translators: label for link to people browse page in main navigation
-#: entities/views.py:539 templates/snippets/menu.html:19
+#: entities/views.py:649 templates/snippets/menu.html:19
 msgid "People"
 msgstr ""
 
 #. Translators: description of people list/browse page
-#: entities/views.py:541
+#: entities/views.py:651
 msgid "Browse people present in Geniza documents."
 msgstr ""
 
 #. Translators: title of places list/browse page
 #. Translators: label for link to places browse page in main navigation
-#: entities/views.py:694 templates/snippets/menu.html:26
+#: entities/views.py:827 templates/snippets/menu.html:26
 msgid "Places"
 msgstr ""
 
 #. Translators: description of places list/browse page
-#: entities/views.py:696
+#: entities/views.py:829
 msgid "Browse places present in Geniza documents."
 msgstr ""
 
diff --git a/geniza/locale/he/LC_MESSAGES/django.po b/geniza/locale/he/LC_MESSAGES/django.po
index 55675c95f..00351de83 100644
--- a/geniza/locale/he/LC_MESSAGES/django.po
+++ b/geniza/locale/he/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: princeton-geniza-project\n"
 "Report-Msgid-Bugs-To: cdhdevteam@princeton.edu\n"
-"POT-Creation-Date: 2024-11-06 13:42-0500\n"
+"POT-Creation-Date: 2025-01-29 10:50-0500\n"
 "PO-Revision-Date: 2024-11-06 19:02\n"
 "Last-Translator: \n"
 "Language-Team: Hebrew\n"
@@ -10,7 +10,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;\n"
+"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3;\n"
 "X-Crowdin-Project: princeton-geniza-project\n"
 "X-Crowdin-Project-ID: 520356\n"
 "X-Crowdin-Language: he\n"
@@ -28,7 +29,7 @@ msgid "Keyword or Phrase"
 msgstr "מילת מפתח או ביטוי"
 
 #. Translators: label for sort by relevance
-#: corpus/forms.py:226
+#: corpus/forms.py:226 entities/forms.py:211
 msgid "Relevance"
 msgstr "רלוונטיות"
 
@@ -93,14 +94,16 @@ msgid "RegEx"
 msgstr ""
 
 #. Translators: label for form sort field
-#: corpus/forms.py:262 entities/forms.py:140 entities/forms.py:260
+#: corpus/forms.py:262 entities/forms.py:228 entities/forms.py:349
 msgid "Sort by"
 msgstr "מיון לפי"
 
 #. Translators: label for filter documents by date range
+#. Translators: label for the dates of a person's appearances in PGP documents
 #. Translators: Person "dates of activity" column header on the browse page
-#: corpus/forms.py:269 entities/forms.py:121
-#: entities/templates/entities/person_list.html:109
+#: corpus/forms.py:269 entities/forms.py:207
+#: entities/templates/entities/person_detail.html:38
+#: entities/templates/entities/person_list.html:126
 msgid "Dates"
 msgstr ""
 
@@ -111,7 +114,6 @@ msgstr ""
 
 #. Translators: label for document type search form filter
 #: corpus/forms.py:285
-#| msgid "Input date"
 msgid "Document type"
 msgstr ""
 
@@ -150,14 +152,13 @@ msgstr ""
 
 #. Translators: label for "search mode" (general or regex)
 #: corpus/forms.py:312
-#| msgid "Search Documents"
 msgid "Search mode"
 msgstr ""
 
 #. Translators: Default label when document does not have a type
-#: corpus/forms.py:348 corpus/solr_queryset.py:293
+#: corpus/forms.py:348 corpus/models.py:1005 corpus/solr_queryset.py:332
 #: corpus/templates/corpus/snippets/document_header.html:17
-#: corpus/templates/corpus/snippets/document_transcription.html:237
+#: corpus/templates/corpus/snippets/document_transcription.html:243
 msgid "Unknown type"
 msgstr "סוג לא ידוע"
 
@@ -167,47 +168,56 @@ msgstr "מיון על פי רלוונטיות אינו זמין ללא מילת
 
 #: corpus/forms.py:411
 #, python-format
-msgid "Regular expression cannot contain { without a preceding character, without an integer afterwards, or without a closing }. %s"
+msgid ""
+"Regular expression cannot contain { without a preceding character, without "
+"an integer afterwards, or without a closing }. %s"
 msgstr ""
 
 #: corpus/forms.py:420
 #, python-format
-msgid "Regular expression cannot contain * without a preceding character, or multiple times in a row. %s"
+msgid ""
+"Regular expression cannot contain * without a preceding character, or "
+"multiple times in a row. %s"
 msgstr ""
 
 #: corpus/forms.py:429
 #, python-format
-msgid "Regular expression cannot contain + without a preceding character, or multiple times in a row. %s"
+msgid ""
+"Regular expression cannot contain + without a preceding character, or "
+"multiple times in a row. %s"
 msgstr ""
 
 #: corpus/forms.py:438
 #, python-format
-msgid "Regular expression cannot contain < or use a negative lookbehind query. %s"
+msgid ""
+"Regular expression cannot contain < or use a negative lookbehind query. %s"
 msgstr ""
 
 #: corpus/forms.py:448
 #, python-format
-msgid "Regular expression cannot contain the escape character \\ followed by an alphanumeric character other than one of DdSsWw, or at the end of a query. %s"
+msgid ""
+"Regular expression cannot contain the escape character \\ followed by an "
+"alphanumeric character other than one of DdSsWw, or at the end of a query. %s"
 msgstr ""
 
-#: corpus/models.py:1119 templates/base.html:21
+#: corpus/models.py:1128 templates/base.html:21
 msgid "Princeton Geniza Project"
 msgstr "Princeton Geniza Project"
 
 #. Translators: attribution for local IIIF manifests
-#: corpus/models.py:1121
+#: corpus/models.py:1130
 #, python-format
 msgid "Compilation by %(pgp)s."
 msgstr "קובץ על-ידי %(pgp)s."
 
 #. Translators: attribution for local IIIF manifests that include transcription
-#: corpus/models.py:1124
+#: corpus/models.py:1133
 #, python-format
 msgid "Compilation and transcription by %(pgp)s."
 msgstr "קובץ ותועתק על-ידי %(pgp)s."
 
 #. Translators: manifest attribution note that content from other institutions may have restrictions
-#: corpus/models.py:1126
+#: corpus/models.py:1135
 msgid "Additional restrictions may apply."
 msgstr "ייתכנו מגבלות נוספות."
 
@@ -310,8 +320,8 @@ msgstr "תיאור"
 #. Translators: accessibility label for people list
 #: corpus/templates/corpus/document_detail.html:153
 #: corpus/templates/corpus/snippets/document_result.html:108
-#: entities/forms.py:133 entities/forms.py:255
-#: entities/templates/entities/person_list.html:146
+#: entities/forms.py:221 entities/forms.py:344
+#: entities/templates/entities/person_list.html:190
 #: entities/templates/entities/place_list.html:80
 #: entities/templates/entities/place_related_people.html:28
 msgid "Related People"
@@ -320,10 +330,12 @@ msgstr ""
 #. Translators: heading label for document related places
 #. Translators: label for sort by number of related places
 #. Translators: accessibility label for place list
+#. Translators: heading label for document related places
 #: corpus/templates/corpus/document_detail.html:172
 #: corpus/templates/corpus/snippets/document_result.html:112
-#: entities/forms.py:135 entities/templates/entities/person_list.html:150
+#: entities/forms.py:223 entities/templates/entities/person_list.html:194
 #: entities/templates/entities/person_related_places.html:56
+#: entities/templates/entities/place_detail.html:93
 msgid "Related Places"
 msgstr ""
 
@@ -360,20 +372,35 @@ msgstr "תאריך קלט"
 #. Translators: Date document was first added to the PGP
 #: corpus/templates/corpus/document_detail.html:234
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "                    In PGP since %(date)s\n"
 "                "
 msgstr ""
 
+#. Translators: label for a citation for a document detail page
+#. Translators: label for a citation for a person page
+#: corpus/templates/corpus/document_detail.html:249
+#: entities/templates/entities/person_detail.html:131
+msgid "How to cite this record:"
+msgstr ""
+
+#. Translators: accessibility label for a citation for a document
+#. Translators: accessibility label for a citation for a person
+#: corpus/templates/corpus/document_detail.html:253
+#: entities/templates/entities/person_detail.html:135
+msgid "Citation"
+msgstr ""
+
 #. Translators: label for permanent link to a document
-#: corpus/templates/corpus/document_detail.html:247
+#: corpus/templates/corpus/document_detail.html:258
 msgid "Link to this document:"
 msgstr ""
 
 #. Translators: accessibility label for permanent link to a document
 #. Translators: accessibility label for permanent link to a person
-#: corpus/templates/corpus/document_detail.html:254
-#: entities/templates/entities/person_detail.html:133
+#: corpus/templates/corpus/document_detail.html:265
+#: entities/templates/entities/person_detail.html:146
 msgid "Permalink"
 msgstr "קישור קבוע"
 
@@ -393,25 +420,26 @@ msgstr ""
 
 #. Translators: Search submit button
 #: corpus/templates/corpus/document_list.html:31
+#: entities/templates/entities/person_list.html:15
 msgid "Submit search"
 msgstr "חיפוש"
 
 #: corpus/templates/corpus/document_list.html:37
 #: corpus/templates/corpus/document_list.html:64
-#: entities/templates/entities/person_list.html:22
-#: entities/templates/entities/person_list.html:49
+#: entities/templates/entities/person_list.html:29
+#: entities/templates/entities/person_list.html:56
 msgid "Filters"
 msgstr "מסננים"
 
 #. Translators: label for button to clear all applied filters
 #: corpus/templates/corpus/document_list.html:58
-#: entities/templates/entities/person_list.html:43
+#: entities/templates/entities/person_list.html:50
 msgid "Clear all"
 msgstr ""
 
 #. Translators: label for 'filters' close button for mobile navigation
 #: corpus/templates/corpus/document_list.html:67
-#: entities/templates/entities/person_list.html:52
+#: entities/templates/entities/person_list.html:59
 msgid "Close filter options"
 msgstr "סגור אפשרויות סינון"
 
@@ -421,14 +449,14 @@ msgstr ""
 
 #. Translators: search results section header
 #: corpus/templates/corpus/document_list.html:135
-#: entities/templates/entities/person_list.html:78
+#: entities/templates/entities/person_list.html:93
 msgid "Results"
 msgstr ""
 
 #. Translators: number of search results
 #. Translators: number of results
 #: corpus/templates/corpus/document_list.html:139
-#: entities/templates/entities/person_list.html:82
+#: entities/templates/entities/person_list.html:97
 #, python-format
 msgid "1 result"
 msgid_plural "%(count_humanized)s results"
@@ -437,6 +465,10 @@ msgstr[1] "%(count_humanized)s תוצאות"
 msgstr[2] "%(count_humanized)s תוצאות"
 msgstr[3] "%(count_humanized)s תוצאות"
 
+#: corpus/templates/corpus/document_list.html:163
+msgid "View results in the Arabic Papyrology Database"
+msgstr ""
+
 #. Translators: accessibility label for a footnote source citation in scholarship records view
 #: corpus/templates/corpus/document_scholarship.html:21
 msgid "Bibliographic citation"
@@ -474,13 +506,11 @@ msgid "Jewish Theological Seminary logo"
 msgstr "סמל Jewish Theological Seminary"
 
 #: corpus/templates/corpus/snippets/document_result.html:23
-#| msgid "Input date"
 msgid "Document date"
 msgstr ""
 
 #. Translators: label for inferred date on a document
 #: corpus/templates/corpus/snippets/document_result.html:33
-#| msgid "Input date"
 msgid "Inferred date"
 msgstr ""
 
@@ -495,14 +525,14 @@ msgstr[3] ""
 
 #. Translators: label for sort by number of related documents
 #: corpus/templates/corpus/snippets/document_result.html:116
-#: entities/forms.py:131 entities/forms.py:253
-#: entities/templates/entities/person_list.html:142
+#: entities/forms.py:219 entities/forms.py:342
+#: entities/templates/entities/person_list.html:186
 #: entities/templates/entities/place_list.html:75
-#| msgid "Search Documents"
 msgid "Related Documents"
 msgstr ""
 
 #: corpus/templates/corpus/snippets/document_result.html:132
+#: entities/templates/entities/person_list.html:180
 msgid "more"
 msgstr "עוד"
 
@@ -578,8 +608,10 @@ msgstr ""
 
 #. Translators: general search help text
 #: corpus/templates/corpus/snippets/document_search_helptext.html:7
-msgid "\n"
-"        Use keywords or phrases in any language to return matching or similar\n"
+msgid ""
+"\n"
+"        Use keywords or phrases in any language to return matching or "
+"similar\n"
 "        results across all fields. Arabic script searches will return both\n"
 "        Arabic and Judaeo-Arabic transcription content.\n"
 "    "
@@ -593,7 +625,8 @@ msgstr ""
 #. Translators: regular expressions search mode help text
 #: corpus/templates/corpus/snippets/document_search_helptext.html:18
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        Use Hebrew or Arabic script to find precise matches in the\n"
 "        transcriptions. See\n"
 "        <a data-turbo=\"false\" href=\"%(howto_url)s\">How to Search</a>\n"
@@ -608,10 +641,13 @@ msgstr ""
 
 #. Translators: regular expression tip 1
 #: corpus/templates/corpus/snippets/document_search_helptext.html:31
-msgid "\n"
+msgid ""
+"\n"
 "            If you're looking for a word with one missing letter, use a\n"
-"            period. Two missing letters, use two periods or <code>{2}</code>.\n"
-"            Increase the number in the curly brackets to increase the number of\n"
+"            period. Two missing letters, use two periods or <code>{2}</"
+"code>.\n"
+"            Increase the number in the curly brackets to increase the number "
+"of\n"
 "            characters, or insert a range with a comma in between, ex.\n"
 "            <code>{0,5}</code>.\n"
 "        "
@@ -619,7 +655,8 @@ msgstr ""
 
 #. Translators: regular expression tip 2
 #: corpus/templates/corpus/snippets/document_search_helptext.html:41
-msgid "\n"
+msgid ""
+"\n"
 "            If you don't know how many characters are missing, use\n"
 "            <code>.*</code>.\n"
 "        "
@@ -627,8 +664,10 @@ msgstr ""
 
 #. Translators: regular expression tip 3
 #: corpus/templates/corpus/snippets/document_search_helptext.html:48
-msgid "\n"
-"            If you know which characters you want, use square brackets to find\n"
+msgid ""
+"\n"
+"            If you know which characters you want, use square brackets to "
+"find\n"
 "            multiple spellings, ex. <code>[יו]</code> for yud or vav.\n"
 "        "
 msgstr ""
@@ -683,7 +722,7 @@ msgstr "הצג תרגום"
 
 #. Translators: Label for editors of a transcription
 #: corpus/templates/corpus/snippets/document_transcription.html:92
-#: corpus/templates/corpus/snippets/document_transcription.html:107
+#: corpus/templates/corpus/snippets/document_transcription.html:110
 #, python-format
 msgid "Editor: %(eds)s"
 msgid_plural "Editors: %(eds)s"
@@ -693,8 +732,8 @@ msgstr[2] ""
 msgstr[3] ""
 
 #. Translators: Label for authors of a translation
-#: corpus/templates/corpus/snippets/document_transcription.html:134
-#: corpus/templates/corpus/snippets/document_transcription.html:148
+#: corpus/templates/corpus/snippets/document_transcription.html:140
+#: corpus/templates/corpus/snippets/document_transcription.html:154
 #, python-format
 msgid "Translator: %(eds)s"
 msgid_plural "Translators: %(eds)s"
@@ -703,11 +742,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: corpus/templates/corpus/snippets/document_transcription.html:204
+#: corpus/templates/corpus/snippets/document_transcription.html:210
 msgid "Zoom and Rotate"
 msgstr "הגדל וסובב"
 
-#: corpus/templates/corpus/snippets/document_transcription.html:240
+#: corpus/templates/corpus/snippets/document_transcription.html:246
 #, python-format
 msgid "View %(related_doc)s"
 msgstr "ראה %(related_doc)s"
@@ -740,37 +779,38 @@ msgstr "הבא"
 
 #. Translators: title of document search page
 #. Translators: label for link to document search page in main navigation
-#: corpus/views.py:81 templates/snippets/menu.html:11
-#| msgid "Input date"
+#: corpus/views.py:82 templates/snippets/menu.html:11
 msgid "Documents"
 msgstr ""
 
 #. Translators: description of document search page, for search engines
-#: corpus/views.py:83
+#: corpus/views.py:84
 msgid "Search and browse Geniza documents."
 msgstr "חיפוש וצפיה במסמכי הגניזה."
 
-#: corpus/views.py:325 entities/views.py:601
+#: corpus/views.py:326 entities/views.py:721
 #, python-format
 msgid "After %s"
 msgstr ""
 
-#: corpus/views.py:327 entities/views.py:603
+#: corpus/views.py:328 entities/views.py:723
 #, python-format
 msgid "Before %s"
 msgstr ""
 
-#: corpus/views.py:378
-msgid "Error retrieving search results. Check regular expression for errors such as unescaped or unclosed brackets or parentheses."
+#: corpus/views.py:399
+msgid ""
+"Error retrieving search results. Check regular expression for errors such as "
+"unescaped or unclosed brackets or parentheses."
 msgstr ""
 
 #. Translators: title of document scholarship page
-#: corpus/views.py:509
+#: corpus/views.py:531
 #, python-format
 msgid "Scholarship on %(doc)s"
 msgstr "רשומה קשורה ל-%(doc)s"
 
-#: corpus/views.py:516
+#: corpus/views.py:538
 #, python-format
 msgid "%(count)d scholarship record"
 msgid_plural "%(count)d scholarship records"
@@ -780,12 +820,12 @@ msgstr[2] "%(count)d רשומות קשורות"
 msgstr[3] "%(count)d רשומות קשורות"
 
 #. Translators: title of related documents page
-#: corpus/views.py:557
+#: corpus/views.py:579
 #, python-format
 msgid "Related documents for %(doc)s"
 msgstr "מסמכים קשורים %(doc)s"
 
-#: corpus/views.py:564 entities/views.py:210
+#: corpus/views.py:586 entities/views.py:317
 #, python-format
 msgid "%(count)d related document"
 msgid_plural "%(count)d related documents"
@@ -794,21 +834,37 @@ msgstr[1] "%(count)d מסמכים קשורים"
 msgstr[2] "%(count)d מסמכים קשורים"
 msgstr[3] "%(count)d מסמכים קשורים"
 
+#. Translators: placeholder for people keyword search input
+#: entities/forms.py:195
+msgid "Search for people by name"
+msgstr ""
+
+#. Translators: accessible label for people keyword search input
+#: entities/forms.py:197
+#, fuzzy
+#| msgid "Keyword or Phrase"
+msgid "word or phrase"
+msgstr "מילת מפתח או ביטוי"
+
 #. Translators: label for a person's gender
 #. Translators: Person "gender" column header on the browse page
-#: entities/forms.py:117 entities/templates/entities/person_detail.html:34
-#: entities/templates/entities/person_list.html:107
+#: entities/forms.py:202 entities/templates/entities/person_detail.html:34
+#: entities/templates/entities/person_list.html:124
 msgid "Gender"
 msgstr ""
 
+#: entities/forms.py:203 entities/views.py:737
+msgid "Detail page available"
+msgstr ""
+
 #. Translators: Label for a person's social role
 #. Translators: Person "social role" column header on the browse page
-#: entities/forms.py:118 entities/templates/entities/person_detail.html:44
-#: entities/templates/entities/person_list.html:111
+#: entities/forms.py:204 entities/templates/entities/person_detail.html:57
+#: entities/templates/entities/person_list.html:128
 msgid "Social role"
 msgstr ""
 
-#: entities/forms.py:119
+#: entities/forms.py:205
 msgid "Relation to documents"
 msgstr ""
 
@@ -817,9 +873,9 @@ msgstr ""
 #. Translators: table header for person name
 #. Translators: table header for place name
 #. Translators: table header for person name
-#: entities/forms.py:125 entities/forms.py:251
-#: entities/templates/entities/person_list.html:105
-#: entities/templates/entities/person_related_people.html:34
+#: entities/forms.py:213 entities/forms.py:340
+#: entities/templates/entities/person_list.html:120
+#: entities/templates/entities/person_related_people.html:35
 #: entities/templates/entities/person_related_places.html:65
 #: entities/templates/entities/place_list.html:57
 #: entities/templates/entities/place_related_people.html:37
@@ -828,66 +884,71 @@ msgstr ""
 
 #. Translators: label for sort by person activity dates
 #. Translators: table header for document date
-#: entities/forms.py:127
+#: entities/forms.py:215
 #: entities/templates/entities/snippets/related_documents_table.html:31
 msgid "Date"
 msgstr ""
 
 #. Translators: label for sort by social role
-#: entities/forms.py:129
+#: entities/forms.py:217
 msgid "Social Role"
 msgstr ""
 
 #. Translators: label for ascending sort
-#: entities/forms.py:148 entities/forms.py:268
+#: entities/forms.py:236 entities/forms.py:357
 msgid "Ascending"
 msgstr ""
 
 #. Translators: label for descending sort
-#: entities/forms.py:150 entities/forms.py:270
+#: entities/forms.py:238 entities/forms.py:359
 msgid "Descending"
 msgstr ""
 
-#: entities/models.py:367
+#: entities/models.py:375
 msgid "Male"
 msgstr ""
 
-#: entities/models.py:368
+#: entities/models.py:376
 msgid "Female"
 msgstr ""
 
-#: entities/models.py:369
+#: entities/models.py:377
 msgid "Unknown"
 msgstr ""
 
-#: entities/models.py:1063
+#: entities/models.py:1220
 msgid "Immediate family relations"
 msgstr ""
 
-#: entities/models.py:1064
+#: entities/models.py:1221
 msgid "Extended family"
 msgstr ""
 
-#: entities/models.py:1065
+#: entities/models.py:1222
 msgid "Relatives by marriage"
 msgstr ""
 
-#: entities/models.py:1066
+#: entities/models.py:1223
 msgid "Business and property relationships"
 msgstr ""
 
-#: entities/models.py:1067
+#: entities/models.py:1224
 msgid "Ambiguity"
 msgstr ""
 
 #. Translators: label for a person's active dates in the PGP
-#: entities/templates/entities/person_detail.html:38
+#: entities/templates/entities/person_detail.html:43
 msgid "Active dates"
 msgstr ""
 
+#. Translators: label for a person's date range when mentioned after death in PGP documents
+#: entities/templates/entities/person_detail.html:48
+msgid "Posthumous mentions"
+msgstr ""
+
 #. Translators: label for alternative names for a person
 #. Translators: label for alternative names for a place
-#: entities/templates/entities/person_detail.html:54
+#: entities/templates/entities/person_detail.html:67
 #: entities/templates/entities/place_detail.html:68
 msgid "Other name"
 msgid_plural "Other names"
@@ -898,62 +959,69 @@ msgstr[3] ""
 
 #. Translators: label for person description / bio
 #. Translators: Person "description / bio" column header on the browse page
-#: entities/templates/entities/person_detail.html:70
-#: entities/templates/entities/person_list.html:113
+#: entities/templates/entities/person_detail.html:83
+#: entities/templates/entities/person_list.html:130
 msgid "Description / Bio"
 msgstr ""
 
 #. Translators: label for person's life events timeline
-#: entities/templates/entities/person_detail.html:79
+#: entities/templates/entities/person_detail.html:92
 msgid "Life events"
 msgstr ""
 
 #. Translators: label for person bibliography
-#: entities/templates/entities/person_detail.html:102
+#: entities/templates/entities/person_detail.html:115
 msgid "Select bibliography"
 msgstr ""
 
-#. Translators: label for a citation for a person page
-#: entities/templates/entities/person_detail.html:118
-msgid "How to cite this record:"
-msgstr ""
-
-#. Translators: accessibility label for a citation for a person
-#: entities/templates/entities/person_detail.html:122
-msgid "Citation"
-msgstr ""
-
 #. Translators: label for permanent link to a person
-#: entities/templates/entities/person_detail.html:129
+#: entities/templates/entities/person_detail.html:142
 msgid "Link to this person:"
 msgstr ""
 
 #. Translators: label for people browse page list view
-#: entities/templates/entities/person_list.html:14
+#: entities/templates/entities/person_list.html:21
 msgid "Toggle list view"
 msgstr ""
 
+#: entities/templates/entities/person_list.html:72
+#, fuzzy
+#| msgid "Document Details"
+msgid "Details"
+msgstr "פרטי מסמך"
+
+#. Translators: Person "other names" column header on the browse page
+#: entities/templates/entities/person_list.html:122
+#: entities/templates/entities/place_list.html:66
+msgid "Other names"
+msgstr ""
+
 #. Translators: Person "document count" column header on the browse page
 #. Translators: table header for count of shared documents between people
-#: entities/templates/entities/person_list.html:116
-#: entities/templates/entities/person_related_people.html:48
+#: entities/templates/entities/person_list.html:133
+#: entities/templates/entities/person_related_people.html:49
 msgid "Number of related documents"
 msgstr ""
 
 #. Translators: Person "related people count" column header on the browse page
-#: entities/templates/entities/person_list.html:120
+#: entities/templates/entities/person_list.html:137
 msgid "Number of related people"
 msgstr ""
 
 #. Translators: Person "related place count" column header on the browse page
-#: entities/templates/entities/person_list.html:124
+#: entities/templates/entities/person_list.html:141
 msgid "Number of related places"
 msgstr ""
 
+#: entities/templates/entities/person_list.html:159
+msgid "Also known as: "
+msgstr ""
+
 #. Translators: range of search results on the current page, out of total
-#: entities/templates/entities/person_list.html:161
+#: entities/templates/entities/person_list.html:205
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "            <div>%(start)s – %(end)s of %(count_humanized)s</div>\n"
 "        "
 msgstr ""
@@ -961,7 +1029,7 @@ msgstr ""
 #. Translators: table header for relationship types between people
 #. Translators: table header for person-place relation type
 #. Translators: table header for document relation (with a person or place)
-#: entities/templates/entities/person_related_people.html:41
+#: entities/templates/entities/person_related_people.html:42
 #: entities/templates/entities/person_related_places.html:72
 #: entities/templates/entities/snippets/related_documents_table.html:24
 msgid "Relation"
@@ -969,7 +1037,7 @@ msgstr ""
 
 #. Translators: table header for notes on a relationship between people
 #. Translators: label for place notes
-#: entities/templates/entities/person_related_people.html:54
+#: entities/templates/entities/person_related_people.html:55
 #: entities/templates/entities/person_related_places.html:76
 #: entities/templates/entities/place_detail.html:84
 #: entities/templates/entities/place_related_people.html:48
@@ -994,10 +1062,6 @@ msgstr ""
 msgid "metadata"
 msgstr ""
 
-#: entities/templates/entities/place_list.html:66
-msgid "Other names"
-msgstr ""
-
 #. Translators: accessible label for section showing counts of entries related to an entity
 #: entities/templates/entities/place_list.html:73
 msgid "Related entries"
@@ -1006,7 +1070,8 @@ msgstr ""
 #. Translators: range of search results on the current page, out of total
 #: entities/templates/entities/place_list.html:90
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "                    <div>%(start)s – %(end)s of %(count_humanized)s</div>\n"
 "                "
 msgstr ""
@@ -1054,7 +1119,6 @@ msgstr ""
 
 #. Translators: table header for document name (shelfmark)
 #: entities/templates/entities/snippets/related_documents_table.html:10
-#| msgid "Input date"
 msgid "Document"
 msgstr ""
 
@@ -1064,18 +1128,18 @@ msgid "Type"
 msgstr ""
 
 #. Translators: title of entity "related documents" page
-#: entities/views.py:202
+#: entities/views.py:309
 #, python-format
 msgid "Related documents for %(p)s"
 msgstr ""
 
 #. Translators: title of entity "related people" page
-#: entities/views.py:292
+#: entities/views.py:399
 #, python-format
 msgid "Related people for %(p)s"
 msgstr ""
 
-#: entities/views.py:300 entities/views.py:370
+#: entities/views.py:407 entities/views.py:477
 #, python-format
 msgid "%(count)d related person"
 msgid_plural "%(count)d related people"
@@ -1085,12 +1149,12 @@ msgstr[2] ""
 msgstr[3] ""
 
 #. Translators: title of person "related places" page
-#: entities/views.py:429
+#: entities/views.py:536
 #, python-format
 msgid "Related places for %(p)s"
 msgstr ""
 
-#: entities/views.py:437
+#: entities/views.py:544
 #, python-format
 msgid "%(count)d related place"
 msgid_plural "%(count)d related places"
@@ -1101,23 +1165,23 @@ msgstr[3] ""
 
 #. Translators: title of people list/browse page
 #. Translators: label for link to people browse page in main navigation
-#: entities/views.py:539 templates/snippets/menu.html:19
+#: entities/views.py:649 templates/snippets/menu.html:19
 msgid "People"
 msgstr ""
 
 #. Translators: description of people list/browse page
-#: entities/views.py:541
+#: entities/views.py:651
 msgid "Browse people present in Geniza documents."
 msgstr ""
 
 #. Translators: title of places list/browse page
 #. Translators: label for link to places browse page in main navigation
-#: entities/views.py:694 templates/snippets/menu.html:26
+#: entities/views.py:827 templates/snippets/menu.html:26
 msgid "Places"
 msgstr ""
 
 #. Translators: description of places list/browse page
-#: entities/views.py:696
+#: entities/views.py:829
 msgid "Browse places present in Geniza documents."
 msgstr ""
 
@@ -1131,13 +1195,21 @@ msgid "Edition"
 msgstr "מהדורה"
 
 #: pages/models.py:13
-msgid "Alternative text for visually impaired users to\n"
+msgid ""
+"Alternative text for visually impaired users to\n"
 "briefly communicate the intended message of the image in this context."
-msgstr "טקסט אלטרנטיבי למשתמשים כבדי ראייה שמטרתו להעביר בתמצית את המסר של התצלום בהקשר זה."
+msgstr ""
+"טקסט אלטרנטיבי למשתמשים כבדי ראייה שמטרתו להעביר בתמצית את המסר של התצלום "
+"בהקשר זה."
 
 #: pages/models.py:44
-msgid "This text will only be read to     non-sighted users and should describe the major insights or     takeaways from the graphic. Multiple paragraphs are allowed."
-msgstr "טקסט זה יוקרא למשתמשים עיוורים בלבד ותכליתו לתאר את התובנות והמסרים המרכזיים שעולים מהתוכן הגרפי. ניתן לכלול מספר פסקאות."
+msgid ""
+"This text will only be read to     non-sighted users and should describe the "
+"major insights or     takeaways from the graphic. Multiple paragraphs are "
+"allowed."
+msgstr ""
+"טקסט זה יוקרא למשתמשים עיוורים בלבד ותכליתו לתאר את התובנות והמסרים המרכזיים "
+"שעולים מהתוכן הגרפי. ניתן לכלול מספר פסקאות."
 
 #. Translators: title for Not Found (404) error page
 #: templates/404.html:5 templates/404.html:13
diff --git a/sitemedia/scss/pages/_person.scss b/sitemedia/scss/pages/_person.scss
index 6e3025d4c..6bc5d26ea 100644
--- a/sitemedia/scss/pages/_person.scss
+++ b/sitemedia/scss/pages/_person.scss
@@ -96,18 +96,32 @@ main.place {
                 padding-right: 0;
                 margin: 0 0 0;
             }
-            dd {
+            & > dd {
                 margin-left: 20px;
             }
-            dd + dt {
+            & > dd + dt {
                 margin-top: spacing.$spacing-md;
                 @include breakpoints.for-tablet-landscape-up {
                     margin-top: spacing.$spacing-lg;
                 }
             }
-            dd + dd {
+            & > dd + dd {
                 margin-top: spacing.$spacing-xs;
             }
+            dl.person-dates {
+                dt,
+                dd {
+                    display: inline;
+                }
+                dt:after {
+                    content: ":";
+                }
+                dd + dt:before {
+                    // wrap to newline
+                    content: "\a";
+                    white-space: pre;
+                }
+            }
         }
         dl.metadata-list.primary + dl.metadata-list.secondary {
             margin-top: 0;
@@ -184,7 +198,7 @@ main.place {
             }
         }
 
-        section.metadata dt,
+        section.metadata > dl > dt,
         section.description h2,
         section.events h2,
         section.notes h2,
@@ -425,11 +439,15 @@ main.person {
 html[dir="rtl"] main.person,
 html[dir="rtl"] main.place,
 html[dir="rtl"] main.document {
-    .container dl.metadata-list dt::before,
+    .container dl.metadata-list > dt::before,
     .container section > h2::before {
         margin-right: 0;
         margin-left: 12px;
     }
+    .container dl.metadata-list > dd {
+        margin-left: 0;
+        margin-right: 20px;
+    }
     dl.metadata-list.tertiary dt#citation,
     dl.metadata-list.tertiary dt#permalink {
         i {

From 6778e2fb0c94363b5e0c307b62bf1a4e2999f3b1 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Wed, 29 Jan 2025 11:29:21 -0500
Subject: [PATCH 21/26] Add deploy note about reindexing people (#1687)

---
 DEPLOYNOTES.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/DEPLOYNOTES.md b/DEPLOYNOTES.md
index 304e17ba7..9982ad235 100644
--- a/DEPLOYNOTES.md
+++ b/DEPLOYNOTES.md
@@ -1,5 +1,10 @@
 # Deploy Notes
 
+## 4.20
+
+-   Indexing logic for people has changed. Reindex all people:
+    `python manage.py index -i person`.
+
 ## 4.19
 
 -   Indexing logic has changed. Reindex all content: `python manage.py index`.

From 4120098c0f14c02d70bfaaa8f32eed5fadc4a74c Mon Sep 17 00:00:00 2001
From: Rebecca Sutton Koeser <rlskoeser@users.noreply.github.com>
Date: Wed, 29 Jan 2025 11:29:58 -0500
Subject: [PATCH 22/26] New translations django.po (Arabic) [ci skip]

---
 geniza/locale/ar/LC_MESSAGES/django.po | 115 +++++++------------------
 1 file changed, 33 insertions(+), 82 deletions(-)

diff --git a/geniza/locale/ar/LC_MESSAGES/django.po b/geniza/locale/ar/LC_MESSAGES/django.po
index eafbff6d8..b2c7bebc1 100644
--- a/geniza/locale/ar/LC_MESSAGES/django.po
+++ b/geniza/locale/ar/LC_MESSAGES/django.po
@@ -3,15 +3,14 @@ msgstr ""
 "Project-Id-Version: princeton-geniza-project\n"
 "Report-Msgid-Bugs-To: cdhdevteam@princeton.edu\n"
 "POT-Creation-Date: 2025-01-29 10:50-0500\n"
-"PO-Revision-Date: 2024-11-06 19:02\n"
+"PO-Revision-Date: 2025-01-29 16:29\n"
 "Last-Translator: \n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"
+"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"
 "X-Crowdin-Project: princeton-geniza-project\n"
 "X-Crowdin-Project-ID: 520356\n"
 "X-Crowdin-Language: ar\n"
@@ -114,6 +113,7 @@ msgstr ""
 
 #. Translators: label for document type search form filter
 #: corpus/forms.py:285
+#| msgid "Input date"
 msgid "Document type"
 msgstr ""
 
@@ -152,6 +152,7 @@ msgstr ""
 
 #. Translators: label for "search mode" (general or regex)
 #: corpus/forms.py:312
+#| msgid "Search Documents"
 msgid "Search mode"
 msgstr ""
 
@@ -168,36 +169,27 @@ msgstr "ترتيب الصلة غير متوفر بدون مصطلح البحث 
 
 #: corpus/forms.py:411
 #, python-format
-msgid ""
-"Regular expression cannot contain { without a preceding character, without "
-"an integer afterwards, or without a closing }. %s"
+msgid "Regular expression cannot contain { without a preceding character, without an integer afterwards, or without a closing }. %s"
 msgstr ""
 
 #: corpus/forms.py:420
 #, python-format
-msgid ""
-"Regular expression cannot contain * without a preceding character, or "
-"multiple times in a row. %s"
+msgid "Regular expression cannot contain * without a preceding character, or multiple times in a row. %s"
 msgstr ""
 
 #: corpus/forms.py:429
 #, python-format
-msgid ""
-"Regular expression cannot contain + without a preceding character, or "
-"multiple times in a row. %s"
+msgid "Regular expression cannot contain + without a preceding character, or multiple times in a row. %s"
 msgstr ""
 
 #: corpus/forms.py:438
 #, python-format
-msgid ""
-"Regular expression cannot contain < or use a negative lookbehind query. %s"
+msgid "Regular expression cannot contain < or use a negative lookbehind query. %s"
 msgstr ""
 
 #: corpus/forms.py:448
 #, python-format
-msgid ""
-"Regular expression cannot contain the escape character \\ followed by an "
-"alphanumeric character other than one of DdSsWw, or at the end of a query. %s"
+msgid "Regular expression cannot contain the escape character \\ followed by an alphanumeric character other than one of DdSsWw, or at the end of a query. %s"
 msgstr ""
 
 #: corpus/models.py:1128 templates/base.html:21
@@ -388,8 +380,7 @@ msgstr "تاريخ الإدخال"
 #. Translators: Date document was first added to the PGP
 #: corpus/templates/corpus/document_detail.html:234
 #, python-format
-msgid ""
-"\n"
+msgid "\n"
 "                    In PGP since %(date)s\n"
 "                "
 msgstr ""
@@ -524,11 +515,13 @@ msgid "Jewish Theological Seminary logo"
 msgstr "شعار Jewish Theological Seminary"
 
 #: corpus/templates/corpus/snippets/document_result.html:23
+#| msgid "Input date"
 msgid "Document date"
 msgstr ""
 
 #. Translators: label for inferred date on a document
 #: corpus/templates/corpus/snippets/document_result.html:33
+#| msgid "Input date"
 msgid "Inferred date"
 msgstr ""
 
@@ -548,6 +541,7 @@ msgstr[5] ""
 #: entities/forms.py:219 entities/forms.py:342
 #: entities/templates/entities/person_list.html:186
 #: entities/templates/entities/place_list.html:75
+#| msgid "Search Documents"
 msgid "Related Documents"
 msgstr ""
 
@@ -634,10 +628,8 @@ msgstr ""
 
 #. Translators: general search help text
 #: corpus/templates/corpus/snippets/document_search_helptext.html:7
-msgid ""
-"\n"
-"        Use keywords or phrases in any language to return matching or "
-"similar\n"
+msgid "\n"
+"        Use keywords or phrases in any language to return matching or similar\n"
 "        results across all fields. Arabic script searches will return both\n"
 "        Arabic and Judaeo-Arabic transcription content.\n"
 "    "
@@ -651,8 +643,7 @@ msgstr ""
 #. Translators: regular expressions search mode help text
 #: corpus/templates/corpus/snippets/document_search_helptext.html:18
 #, python-format
-msgid ""
-"\n"
+msgid "\n"
 "        Use Hebrew or Arabic script to find precise matches in the\n"
 "        transcriptions. See\n"
 "        <a data-turbo=\"false\" href=\"%(howto_url)s\">How to Search</a>\n"
@@ -667,13 +658,10 @@ msgstr ""
 
 #. Translators: regular expression tip 1
 #: corpus/templates/corpus/snippets/document_search_helptext.html:31
-msgid ""
-"\n"
+msgid "\n"
 "            If you're looking for a word with one missing letter, use a\n"
-"            period. Two missing letters, use two periods or <code>{2}</"
-"code>.\n"
-"            Increase the number in the curly brackets to increase the number "
-"of\n"
+"            period. Two missing letters, use two periods or <code>{2}</code>.\n"
+"            Increase the number in the curly brackets to increase the number of\n"
 "            characters, or insert a range with a comma in between, ex.\n"
 "            <code>{0,5}</code>.\n"
 "        "
@@ -681,8 +669,7 @@ msgstr ""
 
 #. Translators: regular expression tip 2
 #: corpus/templates/corpus/snippets/document_search_helptext.html:41
-msgid ""
-"\n"
+msgid "\n"
 "            If you don't know how many characters are missing, use\n"
 "            <code>.*</code>.\n"
 "        "
@@ -690,10 +677,8 @@ msgstr ""
 
 #. Translators: regular expression tip 3
 #: corpus/templates/corpus/snippets/document_search_helptext.html:48
-msgid ""
-"\n"
-"            If you know which characters you want, use square brackets to "
-"find\n"
+msgid "\n"
+"            If you know which characters you want, use square brackets to find\n"
 "            multiple spellings, ex. <code>[יו]</code> for yud or vav.\n"
 "        "
 msgstr ""
@@ -810,6 +795,7 @@ msgstr "التالي"
 #. Translators: title of document search page
 #. Translators: label for link to document search page in main navigation
 #: corpus/views.py:82 templates/snippets/menu.html:11
+#| msgid "Input date"
 msgid "Documents"
 msgstr ""
 
@@ -829,9 +815,7 @@ msgid "Before %s"
 msgstr ""
 
 #: corpus/views.py:399
-msgid ""
-"Error retrieving search results. Check regular expression for errors such as "
-"unescaped or unclosed brackets or parentheses."
+msgid "Error retrieving search results. Check regular expression for errors such as unescaped or unclosed brackets or parentheses."
 msgstr ""
 
 #. Translators: title of document scholarship page
@@ -875,10 +859,8 @@ msgstr ""
 
 #. Translators: accessible label for people keyword search input
 #: entities/forms.py:197
-#, fuzzy
-#| msgid "Keyword or Phrase"
 msgid "word or phrase"
-msgstr "الكلمة المفتاحية أو العبارة"
+msgstr ""
 
 #. Translators: label for a person's gender
 #. Translators: Person "gender" column header on the browse page
@@ -1021,10 +1003,8 @@ msgid "Toggle list view"
 msgstr ""
 
 #: entities/templates/entities/person_list.html:72
-#, fuzzy
-#| msgid "Document Details"
 msgid "Details"
-msgstr "تفاصيل المستند"
+msgstr ""
 
 #. Translators: Person "other names" column header on the browse page
 #: entities/templates/entities/person_list.html:122
@@ -1056,8 +1036,7 @@ msgstr ""
 #. Translators: range of search results on the current page, out of total
 #: entities/templates/entities/person_list.html:205
 #, python-format
-msgid ""
-"\n"
+msgid "\n"
 "            <div>%(start)s – %(end)s of %(count_humanized)s</div>\n"
 "        "
 msgstr ""
@@ -1106,8 +1085,7 @@ msgstr ""
 #. Translators: range of search results on the current page, out of total
 #: entities/templates/entities/place_list.html:90
 #, python-format
-msgid ""
-"\n"
+msgid "\n"
 "                    <div>%(start)s – %(end)s of %(count_humanized)s</div>\n"
 "                "
 msgstr ""
@@ -1155,6 +1133,7 @@ msgstr ""
 
 #. Translators: table header for document name (shelfmark)
 #: entities/templates/entities/snippets/related_documents_table.html:10
+#| msgid "Input date"
 msgid "Document"
 msgstr ""
 
@@ -1235,21 +1214,14 @@ msgid "Edition"
 msgstr "الطبعة"
 
 #: pages/models.py:13
-msgid ""
-"Alternative text for visually impaired users to\n"
+msgid "Alternative text for visually impaired users to\n"
 "briefly communicate the intended message of the image in this context."
-msgstr ""
-"نص بديل للمستخدمين ضعاف البصر\n"
+msgstr "نص بديل للمستخدمين ضعاف البصر\n"
 "لإيصال الرسالة المقصودة للصورة في هذا السياق بإيجاز."
 
 #: pages/models.py:44
-msgid ""
-"This text will only be read to     non-sighted users and should describe the "
-"major insights or     takeaways from the graphic. Multiple paragraphs are "
-"allowed."
-msgstr ""
-"هذا النص سوف يقرأ فقط للمستخدمين غير المبصرين ويجب أن يصف الرؤى أو الأفكار "
-"الرئيسية من الرسوم. يسمح بفقرات متعددة."
+msgid "This text will only be read to     non-sighted users and should describe the major insights or     takeaways from the graphic. Multiple paragraphs are allowed."
+msgstr "هذا النص سوف يقرأ فقط للمستخدمين غير المبصرين ويجب أن يصف الرؤى أو الأفكار الرئيسية من الرسوم. يسمح بفقرات متعددة."
 
 #. Translators: title for Not Found (404) error page
 #: templates/404.html:5 templates/404.html:13
@@ -1384,24 +1356,3 @@ msgstr "العودة إلى القائمة الرئيسية"
 msgid "Enable dark mode"
 msgstr "تفعيل الوضع المظلم"
 
-#, fuzzy
-#~| msgid "Unknown type"
-#~ msgid "Unknown collection"
-#~ msgstr "نوع غير معروف"
-
-#~ msgid "Document Dates (CE)"
-#~ msgstr "تواريخ المستند (التقويم الميلادي)"
-
-#~ msgid "Has Discussion"
-#~ msgstr "لديه مناقشة"
-
-#~ msgid "Apply"
-#~ msgstr "تطبيق"
-
-#, python-format
-#~ msgid "for %(relation)s see"
-#~ msgstr "لرؤية %(relation)s"
-
-#, python-format
-#~ msgid "includes %(relation)s"
-#~ msgstr "يشمل %(relation)s"

From a21c20d09a1e9b240b3913d51c14a9ace685cc3a Mon Sep 17 00:00:00 2001
From: Rebecca Sutton Koeser <rlskoeser@users.noreply.github.com>
Date: Wed, 29 Jan 2025 11:29:59 -0500
Subject: [PATCH 23/26] New translations django.po (Hebrew) [ci skip]

---
 geniza/locale/he/LC_MESSAGES/django.po | 116 +++++++------------------
 1 file changed, 33 insertions(+), 83 deletions(-)

diff --git a/geniza/locale/he/LC_MESSAGES/django.po b/geniza/locale/he/LC_MESSAGES/django.po
index 00351de83..a18bac859 100644
--- a/geniza/locale/he/LC_MESSAGES/django.po
+++ b/geniza/locale/he/LC_MESSAGES/django.po
@@ -3,15 +3,14 @@ msgstr ""
 "Project-Id-Version: princeton-geniza-project\n"
 "Report-Msgid-Bugs-To: cdhdevteam@princeton.edu\n"
 "POT-Creation-Date: 2025-01-29 10:50-0500\n"
-"PO-Revision-Date: 2024-11-06 19:02\n"
+"PO-Revision-Date: 2025-01-29 16:29\n"
 "Last-Translator: \n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
-"n%100==4 ? 2 : 3;\n"
+"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;\n"
 "X-Crowdin-Project: princeton-geniza-project\n"
 "X-Crowdin-Project-ID: 520356\n"
 "X-Crowdin-Language: he\n"
@@ -114,6 +113,7 @@ msgstr ""
 
 #. Translators: label for document type search form filter
 #: corpus/forms.py:285
+#| msgid "Input date"
 msgid "Document type"
 msgstr ""
 
@@ -152,6 +152,7 @@ msgstr ""
 
 #. Translators: label for "search mode" (general or regex)
 #: corpus/forms.py:312
+#| msgid "Search Documents"
 msgid "Search mode"
 msgstr ""
 
@@ -168,36 +169,27 @@ msgstr "מיון על פי רלוונטיות אינו זמין ללא מילת
 
 #: corpus/forms.py:411
 #, python-format
-msgid ""
-"Regular expression cannot contain { without a preceding character, without "
-"an integer afterwards, or without a closing }. %s"
+msgid "Regular expression cannot contain { without a preceding character, without an integer afterwards, or without a closing }. %s"
 msgstr ""
 
 #: corpus/forms.py:420
 #, python-format
-msgid ""
-"Regular expression cannot contain * without a preceding character, or "
-"multiple times in a row. %s"
+msgid "Regular expression cannot contain * without a preceding character, or multiple times in a row. %s"
 msgstr ""
 
 #: corpus/forms.py:429
 #, python-format
-msgid ""
-"Regular expression cannot contain + without a preceding character, or "
-"multiple times in a row. %s"
+msgid "Regular expression cannot contain + without a preceding character, or multiple times in a row. %s"
 msgstr ""
 
 #: corpus/forms.py:438
 #, python-format
-msgid ""
-"Regular expression cannot contain < or use a negative lookbehind query. %s"
+msgid "Regular expression cannot contain < or use a negative lookbehind query. %s"
 msgstr ""
 
 #: corpus/forms.py:448
 #, python-format
-msgid ""
-"Regular expression cannot contain the escape character \\ followed by an "
-"alphanumeric character other than one of DdSsWw, or at the end of a query. %s"
+msgid "Regular expression cannot contain the escape character \\ followed by an alphanumeric character other than one of DdSsWw, or at the end of a query. %s"
 msgstr ""
 
 #: corpus/models.py:1128 templates/base.html:21
@@ -372,8 +364,7 @@ msgstr "תאריך קלט"
 #. Translators: Date document was first added to the PGP
 #: corpus/templates/corpus/document_detail.html:234
 #, python-format
-msgid ""
-"\n"
+msgid "\n"
 "                    In PGP since %(date)s\n"
 "                "
 msgstr ""
@@ -506,11 +497,13 @@ msgid "Jewish Theological Seminary logo"
 msgstr "סמל Jewish Theological Seminary"
 
 #: corpus/templates/corpus/snippets/document_result.html:23
+#| msgid "Input date"
 msgid "Document date"
 msgstr ""
 
 #. Translators: label for inferred date on a document
 #: corpus/templates/corpus/snippets/document_result.html:33
+#| msgid "Input date"
 msgid "Inferred date"
 msgstr ""
 
@@ -528,6 +521,7 @@ msgstr[3] ""
 #: entities/forms.py:219 entities/forms.py:342
 #: entities/templates/entities/person_list.html:186
 #: entities/templates/entities/place_list.html:75
+#| msgid "Search Documents"
 msgid "Related Documents"
 msgstr ""
 
@@ -608,10 +602,8 @@ msgstr ""
 
 #. Translators: general search help text
 #: corpus/templates/corpus/snippets/document_search_helptext.html:7
-msgid ""
-"\n"
-"        Use keywords or phrases in any language to return matching or "
-"similar\n"
+msgid "\n"
+"        Use keywords or phrases in any language to return matching or similar\n"
 "        results across all fields. Arabic script searches will return both\n"
 "        Arabic and Judaeo-Arabic transcription content.\n"
 "    "
@@ -625,8 +617,7 @@ msgstr ""
 #. Translators: regular expressions search mode help text
 #: corpus/templates/corpus/snippets/document_search_helptext.html:18
 #, python-format
-msgid ""
-"\n"
+msgid "\n"
 "        Use Hebrew or Arabic script to find precise matches in the\n"
 "        transcriptions. See\n"
 "        <a data-turbo=\"false\" href=\"%(howto_url)s\">How to Search</a>\n"
@@ -641,13 +632,10 @@ msgstr ""
 
 #. Translators: regular expression tip 1
 #: corpus/templates/corpus/snippets/document_search_helptext.html:31
-msgid ""
-"\n"
+msgid "\n"
 "            If you're looking for a word with one missing letter, use a\n"
-"            period. Two missing letters, use two periods or <code>{2}</"
-"code>.\n"
-"            Increase the number in the curly brackets to increase the number "
-"of\n"
+"            period. Two missing letters, use two periods or <code>{2}</code>.\n"
+"            Increase the number in the curly brackets to increase the number of\n"
 "            characters, or insert a range with a comma in between, ex.\n"
 "            <code>{0,5}</code>.\n"
 "        "
@@ -655,8 +643,7 @@ msgstr ""
 
 #. Translators: regular expression tip 2
 #: corpus/templates/corpus/snippets/document_search_helptext.html:41
-msgid ""
-"\n"
+msgid "\n"
 "            If you don't know how many characters are missing, use\n"
 "            <code>.*</code>.\n"
 "        "
@@ -664,10 +651,8 @@ msgstr ""
 
 #. Translators: regular expression tip 3
 #: corpus/templates/corpus/snippets/document_search_helptext.html:48
-msgid ""
-"\n"
-"            If you know which characters you want, use square brackets to "
-"find\n"
+msgid "\n"
+"            If you know which characters you want, use square brackets to find\n"
 "            multiple spellings, ex. <code>[יו]</code> for yud or vav.\n"
 "        "
 msgstr ""
@@ -780,6 +765,7 @@ msgstr "הבא"
 #. Translators: title of document search page
 #. Translators: label for link to document search page in main navigation
 #: corpus/views.py:82 templates/snippets/menu.html:11
+#| msgid "Input date"
 msgid "Documents"
 msgstr ""
 
@@ -799,9 +785,7 @@ msgid "Before %s"
 msgstr ""
 
 #: corpus/views.py:399
-msgid ""
-"Error retrieving search results. Check regular expression for errors such as "
-"unescaped or unclosed brackets or parentheses."
+msgid "Error retrieving search results. Check regular expression for errors such as unescaped or unclosed brackets or parentheses."
 msgstr ""
 
 #. Translators: title of document scholarship page
@@ -841,10 +825,8 @@ msgstr ""
 
 #. Translators: accessible label for people keyword search input
 #: entities/forms.py:197
-#, fuzzy
-#| msgid "Keyword or Phrase"
 msgid "word or phrase"
-msgstr "מילת מפתח או ביטוי"
+msgstr ""
 
 #. Translators: label for a person's gender
 #. Translators: Person "gender" column header on the browse page
@@ -985,10 +967,8 @@ msgid "Toggle list view"
 msgstr ""
 
 #: entities/templates/entities/person_list.html:72
-#, fuzzy
-#| msgid "Document Details"
 msgid "Details"
-msgstr "פרטי מסמך"
+msgstr ""
 
 #. Translators: Person "other names" column header on the browse page
 #: entities/templates/entities/person_list.html:122
@@ -1020,8 +1000,7 @@ msgstr ""
 #. Translators: range of search results on the current page, out of total
 #: entities/templates/entities/person_list.html:205
 #, python-format
-msgid ""
-"\n"
+msgid "\n"
 "            <div>%(start)s – %(end)s of %(count_humanized)s</div>\n"
 "        "
 msgstr ""
@@ -1070,8 +1049,7 @@ msgstr ""
 #. Translators: range of search results on the current page, out of total
 #: entities/templates/entities/place_list.html:90
 #, python-format
-msgid ""
-"\n"
+msgid "\n"
 "                    <div>%(start)s – %(end)s of %(count_humanized)s</div>\n"
 "                "
 msgstr ""
@@ -1119,6 +1097,7 @@ msgstr ""
 
 #. Translators: table header for document name (shelfmark)
 #: entities/templates/entities/snippets/related_documents_table.html:10
+#| msgid "Input date"
 msgid "Document"
 msgstr ""
 
@@ -1195,21 +1174,13 @@ msgid "Edition"
 msgstr "מהדורה"
 
 #: pages/models.py:13
-msgid ""
-"Alternative text for visually impaired users to\n"
+msgid "Alternative text for visually impaired users to\n"
 "briefly communicate the intended message of the image in this context."
-msgstr ""
-"טקסט אלטרנטיבי למשתמשים כבדי ראייה שמטרתו להעביר בתמצית את המסר של התצלום "
-"בהקשר זה."
+msgstr "טקסט אלטרנטיבי למשתמשים כבדי ראייה שמטרתו להעביר בתמצית את המסר של התצלום בהקשר זה."
 
 #: pages/models.py:44
-msgid ""
-"This text will only be read to     non-sighted users and should describe the "
-"major insights or     takeaways from the graphic. Multiple paragraphs are "
-"allowed."
-msgstr ""
-"טקסט זה יוקרא למשתמשים עיוורים בלבד ותכליתו לתאר את התובנות והמסרים המרכזיים "
-"שעולים מהתוכן הגרפי. ניתן לכלול מספר פסקאות."
+msgid "This text will only be read to     non-sighted users and should describe the major insights or     takeaways from the graphic. Multiple paragraphs are allowed."
+msgstr "טקסט זה יוקרא למשתמשים עיוורים בלבד ותכליתו לתאר את התובנות והמסרים המרכזיים שעולים מהתוכן הגרפי. ניתן לכלול מספר פסקאות."
 
 #. Translators: title for Not Found (404) error page
 #: templates/404.html:5 templates/404.html:13
@@ -1344,24 +1315,3 @@ msgstr "חזרה לתפריט הראשי"
 msgid "Enable dark mode"
 msgstr "הפעלת מצב כהה"
 
-#, fuzzy
-#~| msgid "Unknown type"
-#~ msgid "Unknown collection"
-#~ msgstr "סוג לא ידוע"
-
-#~ msgid "Document Dates (CE)"
-#~ msgstr "תאריכי המסמך (CE)"
-
-#~ msgid "Has Discussion"
-#~ msgstr "קיים דיון"
-
-#~ msgid "Apply"
-#~ msgstr "החל"
-
-#, python-format
-#~ msgid "for %(relation)s see"
-#~ msgstr "ל%(relation)s ראה"
-
-#, python-format
-#~ msgid "includes %(relation)s"
-#~ msgstr "כולל %(relation)s"

From c5cd5581fe9fe88d101a4a487c39800f553dc984 Mon Sep 17 00:00:00 2001
From: Rebecca Sutton Koeser <rlskoeser@users.noreply.github.com>
Date: Wed, 29 Jan 2025 12:57:16 -0500
Subject: [PATCH 24/26] New translations django.po (Arabic) [ci skip]

---
 geniza/locale/ar/LC_MESSAGES/django.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/geniza/locale/ar/LC_MESSAGES/django.po b/geniza/locale/ar/LC_MESSAGES/django.po
index b2c7bebc1..febf181fc 100644
--- a/geniza/locale/ar/LC_MESSAGES/django.po
+++ b/geniza/locale/ar/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: princeton-geniza-project\n"
 "Report-Msgid-Bugs-To: cdhdevteam@princeton.edu\n"
 "POT-Creation-Date: 2025-01-29 10:50-0500\n"
-"PO-Revision-Date: 2025-01-29 16:29\n"
+"PO-Revision-Date: 2025-01-29 17:57\n"
 "Last-Translator: \n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
@@ -797,7 +797,7 @@ msgstr "التالي"
 #: corpus/views.py:82 templates/snippets/menu.html:11
 #| msgid "Input date"
 msgid "Documents"
-msgstr ""
+msgstr "وثائق"
 
 #. Translators: description of document search page, for search engines
 #: corpus/views.py:84
@@ -1186,7 +1186,7 @@ msgstr[5] ""
 #. Translators: label for link to people browse page in main navigation
 #: entities/views.py:649 templates/snippets/menu.html:19
 msgid "People"
-msgstr ""
+msgstr "اشخاص"
 
 #. Translators: description of people list/browse page
 #: entities/views.py:651
@@ -1197,7 +1197,7 @@ msgstr ""
 #. Translators: label for link to places browse page in main navigation
 #: entities/views.py:827 templates/snippets/menu.html:26
 msgid "Places"
-msgstr ""
+msgstr "أَماكِن"
 
 #. Translators: description of places list/browse page
 #: entities/views.py:829

From 41aa81c570d1cd5a1b8fd288b112e12d8b643fd0 Mon Sep 17 00:00:00 2001
From: Rebecca Sutton Koeser <rlskoeser@users.noreply.github.com>
Date: Wed, 29 Jan 2025 12:57:17 -0500
Subject: [PATCH 25/26] New translations django.po (Hebrew) [ci skip]

---
 geniza/locale/he/LC_MESSAGES/django.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/geniza/locale/he/LC_MESSAGES/django.po b/geniza/locale/he/LC_MESSAGES/django.po
index a18bac859..be652ffc0 100644
--- a/geniza/locale/he/LC_MESSAGES/django.po
+++ b/geniza/locale/he/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: princeton-geniza-project\n"
 "Report-Msgid-Bugs-To: cdhdevteam@princeton.edu\n"
 "POT-Creation-Date: 2025-01-29 10:50-0500\n"
-"PO-Revision-Date: 2025-01-29 16:29\n"
+"PO-Revision-Date: 2025-01-29 17:57\n"
 "Last-Translator: \n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
@@ -104,7 +104,7 @@ msgstr "מיון לפי"
 #: entities/templates/entities/person_detail.html:38
 #: entities/templates/entities/person_list.html:126
 msgid "Dates"
-msgstr ""
+msgstr "מסמכים"
 
 #. Translators: label for "exclude inferred dates" search form filter
 #: corpus/forms.py:278
@@ -767,7 +767,7 @@ msgstr "הבא"
 #: corpus/views.py:82 templates/snippets/menu.html:11
 #| msgid "Input date"
 msgid "Documents"
-msgstr ""
+msgstr "מסמכים"
 
 #. Translators: description of document search page, for search engines
 #: corpus/views.py:84
@@ -1146,7 +1146,7 @@ msgstr[3] ""
 #. Translators: label for link to people browse page in main navigation
 #: entities/views.py:649 templates/snippets/menu.html:19
 msgid "People"
-msgstr ""
+msgstr "אנשים"
 
 #. Translators: description of people list/browse page
 #: entities/views.py:651
@@ -1157,7 +1157,7 @@ msgstr ""
 #. Translators: label for link to places browse page in main navigation
 #: entities/views.py:827 templates/snippets/menu.html:26
 msgid "Places"
-msgstr ""
+msgstr "מקומות"
 
 #. Translators: description of places list/browse page
 #: entities/views.py:829

From f39f5e458802e893e827a1e02e377852b3a4a0f0 Mon Sep 17 00:00:00 2001
From: Ben Silverman <ben@performantsoftware.com>
Date: Mon, 3 Feb 2025 10:54:08 -0500
Subject: [PATCH 26/26] Set version to 4.20 and document changes

---
 CHANGELOG.rst      | 17 +++++++++++++++++
 DEPLOYNOTES.md     |  4 ++--
 geniza/__init__.py |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index bd727ffd3..9d6c4fac1 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,23 @@
 Change Log
 ==========
 
+4.20
+----
+
+- public site
+    - As a public user, I want a keyword search in the people module so that I can easily find people entries.
+    - As a public user, I want to see related places on a place page on the main individual place page (not in a separate tab) so that I can see associated neighborhoods and also places that have similar names but are distinct
+    - As a public site user, I want any JA or Arabic search to link to the equivalent search on the Arabic Papyrology Database website, so that I can find additional content not present in the PGP.
+    - As a public user and content admin, I want to see two separate automatic date fields for people: one of only documents where they are mentioned as deceased and one with all other dated person-doc relations, so that I have a better understanding of a person's active dates and their afterlives in the documentary record.
+    - bugfix: Translations in Hebrew script do not pick up correct Hebrew font
+
+- admin
+    - As a content admin, I want to be able to merge person-to-person relationship types, so that I can combine duplicates or revise categorization.
+    - As a content admin, I want to merge person-document relationship types, so that I can keep the website current as our thinking changes (but without losing data)
+    - As a content editor, I want to be able to tag people with various group names so that I can sort them in another way/portray more information on the public site.
+    - As a content admin, I want the ability to enter asymmetrical place-place relations, so that I can adapt to changes in the way we sort and represent data (e.g. representing a neighborhood within a place).
+    - As a content admin, when merging documents (for joins) I want to see image thumbnails of each document so I can be sure the join is correct.
+
 4.19
 ----
 
diff --git a/DEPLOYNOTES.md b/DEPLOYNOTES.md
index 9982ad235..a862144ab 100644
--- a/DEPLOYNOTES.md
+++ b/DEPLOYNOTES.md
@@ -2,8 +2,8 @@
 
 ## 4.20
 
--   Indexing logic for people has changed. Reindex all people:
-    `python manage.py index -i person`.
+-   Solr configuration has changed. Ensure Solr configset has been updated
+    and then reindex all content: `python manage.py index`
 
 ## 4.19
 
diff --git a/geniza/__init__.py b/geniza/__init__.py
index 4fbc09881..18c6f94b9 100644
--- a/geniza/__init__.py
+++ b/geniza/__init__.py
@@ -1,4 +1,4 @@
-__version_info__ = (4, 20, 0, "dev")
+__version_info__ = (4, 20, 0, None)
 
 
 # Dot-connect all but the last. Last is dash-connected if not None.