Skip to content

Commit 5db4e06

Browse files
Merge pull request #1068 from SuffolkLITLab/full_names_i18n
Avoid calling in the function signature, defer to when the function …
2 parents 068f579 + 0b83991 commit 5db4e06

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

docassemble/AssemblyLine/al_general.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,9 @@ def short_list(self, limit: int, truncate_string: str = ", et al.") -> str:
838838
else:
839839
return comma_and_list(self)
840840

841-
def full_names(self, comma_string=", ", and_string=word("and")) -> str:
841+
def full_names(
842+
self, comma_string: str = ", ", and_string: Optional[str] = None
843+
) -> str:
842844
"""Return a formatted list of full names of individuals.
843845
844846
Args:
@@ -848,6 +850,8 @@ def full_names(self, comma_string=", ", and_string=word("and")) -> str:
848850
Returns:
849851
str: Formatted string of full names.
850852
"""
853+
if not and_string:
854+
and_string = word("and")
851855
return comma_and_list(
852856
[
853857
(

0 commit comments

Comments
 (0)