Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docassemble/AssemblyLine/al_general.py
Original file line number Diff line number Diff line change
Expand Up @@ -1914,7 +1914,7 @@ def pronoun_possessive(self, target, **kwargs) -> str:
if len(pronouns_to_use) > 0:
output = "/".join(pronouns_to_use)
else:
output = default
output = f"{default}'s {target}"
elif hasattr(self, "person_type") and self.person_type in [
"business",
"organization",
Expand All @@ -1928,7 +1928,7 @@ def pronoun_possessive(self, target, **kwargs) -> str:
else:
output = their(target, **kwargs)
else:
output = default
output = f"{default}'s {target}"

if "capitalize" in kwargs and kwargs["capitalize"]:
return capitalize(output)
Expand Down
13 changes: 13 additions & 0 deletions docassemble/AssemblyLine/test_al_general.py
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,19 @@ def test_pronoun_possessive(self):
self.individual.pronoun_possessive(item, capitalize=True), "Its fish"
)

# Test for when user provides a pronoun string that cannot be parsed
# (doesn't follow the required 2-3 slash format), should fall back to using name's target
self.individual.pronouns = "custom"
self.individual.person_type = "individual"
self.individual.name.first = "John"
self.individual.name.last = "Smith"
# When pronouns can't be parsed, should use "{name}'s {target}"
self.assertEqual(self.individual.pronoun_possessive(item), "John Smith's fish")
self.assertEqual(
self.individual.pronoun_possessive(item, capitalize=True),
"John Smith's fish",
)

def test_pronoun_subjective(self):
self.individual.pronouns = None
self.individual.person_type = "individual"
Expand Down
Loading