Fix language when someone is still alive and has one surviving child

nigelhorne · Oct 14, 2024 · 7b45199 · 7b45199
1 parent d4602fe
commit 7b45199
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/dynamic-site/templates/en/web/Ged2site/Display/surnames.tmpl b/dynamic-site/templates/en/web/Ged2site/Display/surnames.tmpl
@@ -64,6 +64,7 @@
 				[% FOREACH surname IN surnames %]
 					[% IF surname.surname.substr(0,1) != initial %]
 						[% IF initial %]
+							</ul>
 							</div>
 						[% END %]
 						[% IF surname.surname == 'UNKNOWN' %]
@@ -78,7 +79,7 @@
 						<br>
 						<button class="collapsible">[% initial %]</button>
                                                 <div class="content">
-						<p>
+						<ul id="nav">
 					[% END %]
 					<li>
 						<a href="?page=surnames&amp;surname=[%- surname.surname | uri -%]">[% surname.surname %]</a>

diff --git a/ged2site b/ged2site
@@ -6565,8 +6565,12 @@ sub print_person
 				my $s = ', ';
 				if(scalar(@residencestringarray) < 3) {
 					$s .= lcfirst($pronoun);
-					if(is_alive($person) && !$first->date()) {
-						$s .= i18n(' has lived');
+					if(is_alive($person)) {
+						if($first->date()) {
+							$s .= i18n(' was living');
+						} else {
+							$s .= i18n(' has lived');
+						}
 					} else {
 						$s .= ' lived';
 					}