Skip to content

The vocabulary list on the frontpage shows the vocabulary names in th… #1259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
miguelvaara wants to merge 2 commits into
base: skosmos-2
Choose a base branch
from
Open

The vocabulary list on the frontpage shows the vocabulary names in th… #1259

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a3f732
The vocabulary list on the frontpage shows the vocabulary names in th…
miguelvaara Dec 22, 2021
7d99329
A more elegant way to check if the default language should be used in…
miguelvaara Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion view/vocabularylist.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@
<h3>{{ vocabClassName }}</h3>
<ul>
{% for vocab in vocabArray %}
<li><a class="navigation-font" href="{{ vocab.id }}/{{ request.lang }}/{% if request.contentLang != request.lang and request.contentLang != '' and request.contentLang in vocab.config.languages %}?clang={{ request.contentLang }}{% endif %}">{{ vocab.title }}</a></li>
{% set useDefaultLanguage = request.contentLang not in vocab.config.languages and request.contentLang != '' %}
<li><a class="navigation-font" href="{{ vocab.id }}/{{ request.lang }}/{% if useDefaultLanguage %}?clang={{ vocab.config.defaultLanguage }}{% endif %}">
{% if useDefaultLanguage %}
{{ vocab.title(vocab.config.defaultLanguage) }}
{% else %}
{{ vocab.title(request.contentLang) }}
{% endif %} </a></li>
{% endfor %}
</ul>
</div>
Expand All @@ -24,3 +30,8 @@
</div>
{% endif %}
</div>

Copy link
Member

@osma osma Jan 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess the newlines are not needed?