diff --git a/public/theme/skeleton/partials/_sub_taxonomylinks.twig b/public/theme/skeleton/partials/_sub_taxonomylinks.twig index 3abfaecf6..9651935dc 100644 --- a/public/theme/skeleton/partials/_sub_taxonomylinks.twig +++ b/public/theme/skeleton/partials/_sub_taxonomylinks.twig @@ -1,8 +1,8 @@ {% for type, taxonomies in record|taxonomies %} - {% if taxonomies|length < 2 %} + {% if taxonomies|length == 1 %} {{ config.get('taxonomies')[type].singular_name }}: - {% else %} + {% elseif taxonomies|length > 1 %} {{ config.get('taxonomies')[type].name }}: {% endif %} diff --git a/src/Twig/ContentExtension.php b/src/Twig/ContentExtension.php index a8b65d634..b0efa1b81 100644 --- a/src/Twig/ContentExtension.php +++ b/src/Twig/ContentExtension.php @@ -430,6 +430,15 @@ private function generateLink(string $route, array $params, $canonical = false): public function getTaxonomies(Content $content): Collection { $taxonomies = []; + + $definition = $content->getDefinition(); + + if ($definition && is_iterable($definition->get('taxonomy'))) { + foreach ($definition->get('taxonomy') as $taxonomy) { + $taxonomies[$taxonomy] = []; + } + } + foreach ($content->getTaxonomies() as $taxonomy) { $taxonomies[$taxonomy->getType()][$taxonomy->getSlug()] = $taxonomy; }