Skip to content

Commit b55cc80

Browse files
committed
Merge branch 'development' into release
2 parents 304ade4 + fa566f1 commit b55cc80

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1025
-848
lines changed

.github/translators.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,3 +478,9 @@ Alexandar Cavdarovski (ace.200112) :: Swedish
478478
Onur Oskay (o.oskay) :: Turkish
479479
Sébastien Merveille (SebastienMerv) :: French
480480
Maxim Kouznetsov (masya.work) :: Hebrew
481+
neodvisnost :: Slovenian
482+
Soubi Agatsuma (bisouya) :: Hebrew
483+
Ilya Shaulov (ishaulov) :: Russian
484+
Konstantin Bobkov (b.konstantv) :: Russian
485+
Ruben Sutter (rubensutter) :: German
486+
jellium :: French

app/Sorting/SortSetOperationComparisons.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace BookStack\Sorting;
44

5+
use voku\helper\ASCII;
56
use BookStack\Entities\Models\Chapter;
67
use BookStack\Entities\Models\Entity;
78

@@ -13,12 +14,12 @@ class SortSetOperationComparisons
1314
{
1415
public static function nameAsc(Entity $a, Entity $b): int
1516
{
16-
return strtolower($a->name) <=> strtolower($b->name);
17+
return strtolower(ASCII::to_transliterate($a->name, null)) <=> strtolower(ASCII::to_transliterate($b->name, null));
1718
}
1819

1920
public static function nameDesc(Entity $a, Entity $b): int
2021
{
21-
return strtolower($b->name) <=> strtolower($a->name);
22+
return strtolower(ASCII::to_transliterate($b->name, null)) <=> strtolower(ASCII::to_transliterate($a->name, null));
2223
}
2324

2425
public static function nameNumericAsc(Entity $a, Entity $b): int

0 commit comments

Comments
 (0)