From 34fc3980f55a4c21931d31adc3d90e0e7c793a3c Mon Sep 17 00:00:00 2001
From: Franz Frese <arbor95@gmx.de>
Date: Fri, 26 Jul 2024 15:00:39 +0200
Subject: [PATCH 1/3] solving issue #5002

* setting correct title
* Solution for issue #5002
---
 app/Module/AbstractIndividualListModule.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Module/AbstractIndividualListModule.php b/app/Module/AbstractIndividualListModule.php
index ec1e6bb786..f6856ce463 100644
--- a/app/Module/AbstractIndividualListModule.php
+++ b/app/Module/AbstractIndividualListModule.php
@@ -383,7 +383,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
 
                         if ($surname !== '' || $show_all === 'yes') {
                             if ($show_all !== 'yes') {
-                                echo '<h2 class="wt-page-title">', I18N::translate('Individuals with surname %s', $legend), '</h2>';
+                                echo '<h2 class="wt-page-title">', I18N::translate('Given names'), '</h2>';
                             }
                             // Don't show the list until we have some filter criteria
                             $show = $falpha !== '' || $show_all_firstnames === 'yes' ? 'indi' : 'none';
@@ -720,7 +720,7 @@ protected function individuals(Tree $tree, array $surns_to_show, string $galpha,
             // The name from the database may be private - check the filtered list...
             foreach ($individual->getAllNames() as $n => $name) {
                 if ($name['givn'] === $row->n_givn && $name['surn'] === $row->n_surn) {
-                    if ($galpha === '' || I18N::strtoupper(I18N::language()->initialLetter($row->n_givn)) === $galpha) {
+                    if ($galpha === '' || I18N::language()->initialLetter(I18N::language()->normalize(I18N::strtoupper($row->n_givn))) === $galpha) {
                         $individual->setPrimaryName($n);
                         // We need to clone $individual, as we may have multiple references to the
                         // same individual in this list, and the "primary name" would otherwise

From daaa8ca5774ae9d87105d8c537dd6486e74dcce7 Mon Sep 17 00:00:00 2001
From: Franz Frese <arbor95@gmx.de>
Date: Wed, 7 Aug 2024 09:02:46 +0200
Subject: [PATCH 2/3] Update AbstractIndividualListModule.php

* Show first names title on selected all surnames.
* removed braces
---
 app/Module/AbstractIndividualListModule.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/Module/AbstractIndividualListModule.php b/app/Module/AbstractIndividualListModule.php
index f6856ce463..097bda26b7 100644
--- a/app/Module/AbstractIndividualListModule.php
+++ b/app/Module/AbstractIndividualListModule.php
@@ -382,9 +382,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                         $givn_initials = $this->givenNameInitials($tree, $all_surnames, $show_marnm === 'yes', $this->showFamilies());
 
                         if ($surname !== '' || $show_all === 'yes') {
-                            if ($show_all !== 'yes') {
-                                echo '<h2 class="wt-page-title">', I18N::translate('Given names'), '</h2>';
-                            }
+                            echo '<h2 class="wt-page-title">', I18N::translate('Given names'), '</h2>';
                             // Don't show the list until we have some filter criteria
                             $show = $falpha !== '' || $show_all_firstnames === 'yes' ? 'indi' : 'none';
                             echo '<ul class="d-flex flex-wrap list-unstyled justify-content-center wt-initials-list wt-initials-list-given-names">';
@@ -718,8 +716,8 @@ protected function individuals(Tree $tree, array $surns_to_show, string $galpha,
             assert($individual instanceof Individual);
 
             // The name from the database may be private - check the filtered list...
-            foreach ($individual->getAllNames() as $n => $name) {
-                if ($name['givn'] === $row->n_givn && $name['surn'] === $row->n_surn) {
+            foreach ($individual->getAllNames() as $n => $name)
+                if ($name['givn'] === $row->n_givn && $name['surn'] === $row->n_surn)
                     if ($galpha === '' || I18N::language()->initialLetter(I18N::language()->normalize(I18N::strtoupper($row->n_givn))) === $galpha) {
                         $individual->setPrimaryName($n);
                         // We need to clone $individual, as we may have multiple references to the
@@ -728,8 +726,6 @@ protected function individuals(Tree $tree, array $surns_to_show, string $galpha,
                         $individuals->push(clone $individual);
                         break;
                     }
-                }
-            }
         }
 
         return $individuals;

From 6c816d87f22ec2abb8ca9d4543488de5d92b1557 Mon Sep 17 00:00:00 2001
From: Franz Frese <arbor95@gmx.de>
Date: Wed, 7 Aug 2024 09:08:02 +0200
Subject: [PATCH 3/3] Update AbstractIndividualListModule.php

readd { } to foreach
---
 app/Module/AbstractIndividualListModule.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Module/AbstractIndividualListModule.php b/app/Module/AbstractIndividualListModule.php
index 097bda26b7..6b8bf7cd3c 100644
--- a/app/Module/AbstractIndividualListModule.php
+++ b/app/Module/AbstractIndividualListModule.php
@@ -716,7 +716,7 @@ protected function individuals(Tree $tree, array $surns_to_show, string $galpha,
             assert($individual instanceof Individual);
 
             // The name from the database may be private - check the filtered list...
-            foreach ($individual->getAllNames() as $n => $name)
+            foreach ($individual->getAllNames() as $n => $name) {
                 if ($name['givn'] === $row->n_givn && $name['surn'] === $row->n_surn)
                     if ($galpha === '' || I18N::language()->initialLetter(I18N::language()->normalize(I18N::strtoupper($row->n_givn))) === $galpha) {
                         $individual->setPrimaryName($n);
@@ -726,6 +726,7 @@ protected function individuals(Tree $tree, array $surns_to_show, string $galpha,
                         $individuals->push(clone $individual);
                         break;
                     }
+            }
         }
 
         return $individuals;