diff --git a/src/Controller/Actor.php b/src/Controller/Actor.php index 790e8e1779..961af956fa 100644 --- a/src/Controller/Actor.php +++ b/src/Controller/Actor.php @@ -45,6 +45,7 @@ class Actor extends ActorController fn ($actor) => [ '_template' => 'actor/view.html.twig', 'actor' => $actor, + 'nickname' => $actor->getNickname(), ], ); } @@ -56,6 +57,7 @@ class Actor extends ActorController fn ($actor) => [ '_template' => 'actor/view.html.twig', 'actor' => $actor, + 'nickname' => $actor->getNickname(), 'notes' => \App\Entity\Note::getAllNotesByActor($actor), ], ); diff --git a/src/Routes/Actor.php b/src/Routes/Actor.php index b9b7a37312..4d47e24412 100644 --- a/src/Routes/Actor.php +++ b/src/Routes/Actor.php @@ -46,7 +46,7 @@ abstract class Actor public static function load(RouteLoader $r): void { $r->connect(id: 'actor_view_id', uri_path: '/actor/{id<\d+>}', target: [C\Actor::class, 'actorViewId']); - $r->connect(id: 'actor_view_nickname', uri_path: '/@{nickname<' . Nickname::DISPLAY_FMT . '>}', target: [C\Actor::class, 'actorViewId'], options: ['is_system_path' => false]); + $r->connect(id: 'actor_view_nickname', uri_path: '/@{nickname<' . Nickname::DISPLAY_FMT . '>}', target: [C\Actor::class, 'actorViewNickname'], options: ['is_system_path' => false]); $r->connect(id: 'group_actor_view_id', uri_path: '/group/{id<\d+>}', target: [C\Actor::class, 'groupViewId']); $r->connect(id: 'group_actor_view_nickname', uri_path: '/!{nickname<' . Nickname::DISPLAY_FMT . '>}', target: [C\Actor::class, 'groupViewNickname'], options: ['is_system_path' => false]); } diff --git a/templates/actor/view.html.twig b/templates/actor/view.html.twig index 6428d0f0b5..bbb9a2b464 100644 --- a/templates/actor/view.html.twig +++ b/templates/actor/view.html.twig @@ -3,7 +3,7 @@ {% set nickname = nickname|escape %} -{% block title %}{% trans with {'%nick%': actor.getNickname()} %}%nick%'s profile{% endtrans %}{% endblock %}y +{% block title %}{% trans %}%nickname%'s profile{% endtrans %}{% endblock %} {% block stylesheets %} {{ parent() }}