diff options
| author | Julien Papasian <papjul@users.noreply.github.com> | 2023-03-20 23:29:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-20 22:29:28 +0000 |
| commit | 91a9794531f7721db2d116fad931978721b93210 (patch) | |
| tree | 4149c3f4314fa953ea0fd398a75c3f2f73f790a7 /app/Module | |
| parent | f315390b2ef3b402a974292b894bb8d92201eb00 (diff) | |
| download | webtrees-91a9794531f7721db2d116fad931978721b93210.tar.gz webtrees-91a9794531f7721db2d116fad931978721b93210.tar.bz2 webtrees-91a9794531f7721db2d116fad931978721b93210.zip | |
Fix sorting of menus with first letter accentuated (#4797)
Diffstat (limited to 'app/Module')
| -rw-r--r-- | app/Module/ChartsMenuModule.php | 2 | ||||
| -rw-r--r-- | app/Module/ListsMenuModule.php | 2 | ||||
| -rw-r--r-- | app/Module/ReportsMenuModule.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/Module/ChartsMenuModule.php b/app/Module/ChartsMenuModule.php index e1754086cc..35ccd4db6b 100644 --- a/app/Module/ChartsMenuModule.php +++ b/app/Module/ChartsMenuModule.php @@ -99,7 +99,7 @@ class ChartsMenuModule extends AbstractModule implements ModuleMenuInterface return $module->chartMenu($individual); }) ->sort(static function (Menu $x, Menu $y): int { - return $x->getLabel() <=> $y->getLabel(); + return I18N::comparator()($x->getLabel(), $y->getLabel()); }); if ($submenus->isEmpty()) { diff --git a/app/Module/ListsMenuModule.php b/app/Module/ListsMenuModule.php index 96807b1203..2c9f48e7bf 100644 --- a/app/Module/ListsMenuModule.php +++ b/app/Module/ListsMenuModule.php @@ -91,7 +91,7 @@ class ListsMenuModule extends AbstractModule implements ModuleMenuInterface }) ->filter() ->sort(static function (Menu $x, Menu $y): int { - return $x->getLabel() <=> $y->getLabel(); + return I18N::comparator()($x->getLabel(), $y->getLabel()); }); if ($submenus->isEmpty()) { diff --git a/app/Module/ReportsMenuModule.php b/app/Module/ReportsMenuModule.php index c816151437..b6c733283a 100644 --- a/app/Module/ReportsMenuModule.php +++ b/app/Module/ReportsMenuModule.php @@ -100,7 +100,7 @@ class ReportsMenuModule extends AbstractModule implements ModuleMenuInterface return $module->getReportMenu($individual); }) ->sort(static function (Menu $x, Menu $y): int { - return $x->getLabel() <=> $y->getLabel(); + return I18N::comparator()($x->getLabel(), $y->getLabel()); }); if ($submenus->isEmpty()) { |