Skip to content

Commit 7cac3f4

Browse files
ssddanbrownssddanbrown
committed
Merge branch 'development' into release
2 parents 92cd11d + c4839c7 commit 7cac3f4

Some content is hidden

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

51 files changed

+511
-300
lines changed

‎.github/translators.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,3 +487,5 @@ jellium :: French
487487
Qxlkdr :: Swedish
488488
Hari (muhhari) :: Indonesian
489489
仙君御 (xjy) :: Chinese Simplified
490+
TapioM :: Finnish
491+
lingb58 :: Chinese Traditional

‎app/Search/SearchIndex.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,9 @@ protected function generateTermScoreMapFromHtml(string $html): array
160160
/** @var DOMNode $child */
161161
foreach ($doc->getBodyChildren() as $child) {
162162
$nodeName = $child->nodeName;
163-
$termCounts = $this->textToTermCountMap(trim($child->textContent));
163+
$text = trim($child->textContent);
164+
$text = str_replace("\u{00A0}", ' ', $text);
165+
$termCounts = $this->textToTermCountMap($text);
164166
foreach ($termCounts as $term => $count) {
165167
$scoreChange = $count * ($elementScoreAdjustmentMap[$nodeName] ?? 1);
166168
$scoresByTerm[$term] = ($scoresByTerm[$term] ?? 0) + $scoreChange;

‎composer.lock‎

Lines changed: 90 additions & 104 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/licensing/php-library-licenses.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ Link: https://github.com/ramsey/collection.git
486486
ramsey/uuid
487487
License: MIT
488488
License File: vendor/ramsey/uuid/LICENSE
489-
Copyright: Copyright (c) 2012-2023 Ben Ramsey <***@*********.***>
489+
Copyright: Copyright (c) 2012-2025 Ben Ramsey <***@*********.***>
490490
Source: https://github.com/ramsey/uuid.git
491491
Link: https://github.com/ramsey/uuid.git
492492
-----------

‎lang/cs/common.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
'create' => 'Vytvořit',
3131
'update' => 'Aktualizovat',
3232
'edit' => 'Upravit',
33-
'archive' => 'Archive',
34-
'unarchive' => 'Un-Archive',
33+
'archive' => 'Archivovat',
34+
'unarchive' => 'Od-Archivovat',
3535
'sort' => 'Seřadit',
3636
'move' => 'Přesunout',
3737
'copy' => 'Kopírovat',

‎lang/cs/entities.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248
'pages_edit_switch_to_markdown_stable' => '(Stabilní obsah)',
249249
'pages_edit_switch_to_wysiwyg' => 'Přepnout na WYSIWYG Editor',
250250
'pages_edit_switch_to_new_wysiwyg' => 'Přepnout na nový WYSIWYG',
251-
'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
251+
'pages_edit_switch_to_new_wysiwyg_desc' => '(V beta testování)',
252252
'pages_edit_set_changelog' => 'Nastavit protokol změn',
253253
'pages_edit_enter_changelog_desc' => 'Zadejte stručný popis změn, které jste provedli',
254254
'pages_edit_enter_changelog' => 'Zadejte protokol změn',
@@ -392,11 +392,11 @@
392392
'comment' => 'Komentář',
393393
'comments' => 'Komentáře',
394394
'comment_add' => 'Přidat komentář',
395-
'comment_none' => 'No comments to display',
395+
'comment_none' => 'Žádné komentáře k zobrazení',
396396
'comment_placeholder' => 'Zde zadejte komentář',
397-
'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
398-
'comment_archived_count' => ':count Archived',
399-
'comment_archived_threads' => 'Archived Threads',
397+
'comment_thread_count' => ':count vlákno komentáře|:count vláken komentářů',
398+
'comment_archived_count' => ':count archivováno',
399+
'comment_archived_threads' => 'Archivovaná vlákna',
400400
'comment_save' => 'Uložit komentář',
401401
'comment_new' => 'Nový komentář',
402402
'comment_created' => 'komentováno :createDiff',
@@ -405,14 +405,14 @@
405405
'comment_deleted_success' => 'Komentář odstraněn',
406406
'comment_created_success' => 'Komentář přidán',
407407
'comment_updated_success' => 'Komentář aktualizován',
408-
'comment_archive_success' => 'Comment archived',
409-
'comment_unarchive_success' => 'Comment un-archived',
410-
'comment_view' => 'View comment',
411-
'comment_jump_to_thread' => 'Jump to thread',
408+
'comment_archive_success' => 'Komentář archivován',
409+
'comment_unarchive_success' => 'Komentář od-archivován',
410+
'comment_view' => 'Zobrazit komentář',
411+
'comment_jump_to_thread' => 'Přejít na vlákno',
412412
'comment_delete_confirm' => 'Opravdu chcete odstranit tento komentář?',
413413
'comment_in_reply_to' => 'Odpověď na :commentId',
414-
'comment_reference' => 'Reference',
415-
'comment_reference_outdated' => '(Outdated)',
414+
'comment_reference' => 'Odkaz',
415+
'comment_reference_outdated' => '(Zastaralý)',
416416
'comment_editor_explain' => 'Zde jsou komentáře, které zůstaly na této stránce. Komentáře lze přidat a spravovat při prohlížení uložené stránky.',
417417

418418
// Revision

‎lang/de/common.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
'create' => 'Erstellen',
3131
'update' => 'Aktualisieren',
3232
'edit' => 'Bearbeiten',
33-
'archive' => 'Archive',
34-
'unarchive' => 'Un-Archive',
33+
'archive' => 'Archivieren',
34+
'unarchive' => 'Nicht mehr archivieren',
3535
'sort' => 'Sortieren',
3636
'move' => 'Verschieben',
3737
'copy' => 'Kopieren',

‎lang/de/entities.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248
'pages_edit_switch_to_markdown_stable' => '(Stabiler Inhalt)',
249249
'pages_edit_switch_to_wysiwyg' => 'Zum WYSIWYG-Editor wechseln',
250250
'pages_edit_switch_to_new_wysiwyg' => 'Zum neuen WYSIWYG wechseln',
251-
'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
251+
'pages_edit_switch_to_new_wysiwyg_desc' => '(Im Beta-Test)',
252252
'pages_edit_set_changelog' => 'Änderungsprotokoll hinzufügen',
253253
'pages_edit_enter_changelog_desc' => 'Bitte geben Sie eine kurze Zusammenfassung Ihrer Änderungen ein',
254254
'pages_edit_enter_changelog' => 'Änderungsprotokoll eingeben',
@@ -392,11 +392,11 @@
392392
'comment' => 'Kommentar',
393393
'comments' => 'Kommentare',
394394
'comment_add' => 'Kommentieren',
395-
'comment_none' => 'No comments to display',
395+
'comment_none' => 'Keine Kommentare vorhanden',
396396
'comment_placeholder' => 'Geben Sie hier Ihre Kommentare ein',
397-
'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
398-
'comment_archived_count' => ':count Archived',
399-
'comment_archived_threads' => 'Archived Threads',
397+
'comment_thread_count' => ':count Thema|:count Themen',
398+
'comment_archived_count' => ':count archiviert',
399+
'comment_archived_threads' => 'Archivierte Themen',
400400
'comment_save' => 'Kommentar speichern',
401401
'comment_new' => 'Neuer Kommentar',
402402
'comment_created' => ':createDiff kommentiert',
@@ -405,14 +405,14 @@
405405
'comment_deleted_success' => 'Kommentar gelöscht',
406406
'comment_created_success' => 'Kommentar hinzugefügt',
407407
'comment_updated_success' => 'Kommentar aktualisiert',
408-
'comment_archive_success' => 'Comment archived',
409-
'comment_unarchive_success' => 'Comment un-archived',
410-
'comment_view' => 'View comment',
411-
'comment_jump_to_thread' => 'Jump to thread',
408+
'comment_archive_success' => 'Kommentar archiviert',
409+
'comment_unarchive_success' => 'Kommentar nicht mehr archiviert',
410+
'comment_view' => 'Kommentar ansehen',
411+
'comment_jump_to_thread' => 'Zum Thema springen',
412412
'comment_delete_confirm' => 'Möchten Sie diesen Kommentar wirklich löschen?',
413413
'comment_in_reply_to' => 'Antwort auf :commentId',
414-
'comment_reference' => 'Reference',
415-
'comment_reference_outdated' => '(Outdated)',
414+
'comment_reference' => 'Referenz',
415+
'comment_reference_outdated' => '(Veraltet)',
416416
'comment_editor_explain' => 'Hier sind die Kommentare, die auf dieser Seite hinterlassen wurden. Kommentare können hinzugefügt und verwaltet werden, wenn die gespeicherte Seite angezeigt wird.',
417417

418418
// Revision

‎lang/de_informal/common.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
'create' => 'Anlegen',
3131
'update' => 'Aktualisieren',
3232
'edit' => 'Bearbeiten',
33-
'archive' => 'Archive',
34-
'unarchive' => 'Un-Archive',
33+
'archive' => 'Archivieren',
34+
'unarchive' => 'Nicht mehr archivieren',
3535
'sort' => 'Sortieren',
3636
'move' => 'Verschieben',
3737
'copy' => 'Kopieren',

‎lang/de_informal/entities.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248
'pages_edit_switch_to_markdown_stable' => '(Stabiler Inhalt)',
249249
'pages_edit_switch_to_wysiwyg' => 'Zum WYSIWYG-Editor wechseln',
250250
'pages_edit_switch_to_new_wysiwyg' => 'Zum neuen WYSIWYG wechseln',
251-
'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
251+
'pages_edit_switch_to_new_wysiwyg_desc' => '(Im Beta-Test)',
252252
'pages_edit_set_changelog' => 'Änderungsprotokoll hinzufügen',
253253
'pages_edit_enter_changelog_desc' => 'Bitte gib eine kurze Zusammenfassung deiner Änderungen ein',
254254
'pages_edit_enter_changelog' => 'Änderungsprotokoll eingeben',
@@ -392,11 +392,11 @@
392392
'comment' => 'Kommentar',
393393
'comments' => 'Kommentare',
394394
'comment_add' => 'Kommentieren',
395-
'comment_none' => 'No comments to display',
395+
'comment_none' => 'Keine Kommentare vorhanden',
396396
'comment_placeholder' => 'Gib hier deine Kommentare ein',
397-
'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
398-
'comment_archived_count' => ':count Archived',
399-
'comment_archived_threads' => 'Archived Threads',
397+
'comment_thread_count' => ':count Thema|:count Themen',
398+
'comment_archived_count' => ':count archiviert',
399+
'comment_archived_threads' => 'Archivierte Themen',
400400
'comment_save' => 'Kommentar speichern',
401401
'comment_new' => 'Neuer Kommentar',
402402
'comment_created' => ':createDiff kommentiert',
@@ -405,14 +405,14 @@
405405
'comment_deleted_success' => 'Kommentar gelöscht',
406406
'comment_created_success' => 'Kommentar hinzugefügt',
407407
'comment_updated_success' => 'Kommentar aktualisiert',
408-
'comment_archive_success' => 'Comment archived',
409-
'comment_unarchive_success' => 'Comment un-archived',
410-
'comment_view' => 'View comment',
411-
'comment_jump_to_thread' => 'Jump to thread',
408+
'comment_archive_success' => 'Kommentar archiviert',
409+
'comment_unarchive_success' => 'Kommentar nicht mehr archiviert',
410+
'comment_view' => 'Kommentar ansehen',
411+
'comment_jump_to_thread' => 'Zum Thema springen',
412412
'comment_delete_confirm' => 'Möchtst du diesen Kommentar wirklich löschen?',
413413
'comment_in_reply_to' => 'Antwort auf :commentId',
414-
'comment_reference' => 'Reference',
415-
'comment_reference_outdated' => '(Outdated)',
414+
'comment_reference' => 'Referenz',
415+
'comment_reference_outdated' => '(Veraltet)',
416416
'comment_editor_explain' => 'Hier sind die Kommentare, die auf dieser Seite hinterlassen wurden. Kommentare können hinzugefügt und verwaltet werden, wenn die gespeicherte Seite angezeigt wird.',
417417

418418
// Revision

0 commit comments

Comments
 (0)