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

[miguelvaara]

…e default language of the vocabulary

Thanks @henriyli, @osma and @kouralex for your contribution :-)

Reasons for creating this PR

To follow wishes mentioned in the PR #747

Link to relevant issue(s), if any

#731

• Closes #

Description of the changes in this PR

The vocabulary list on the front page shows the vocabulary names in the default language of the vocabulary

Known problems or uncertainties in this PR

Checklist

1. For the vocabulary of your choice, point out the default language in the config.ttl (make sure the dc:title is also defined with respect to the default language)
2. In Skosmos, select the content language not used in the vocabulary
3. On the Skosmos front page check if the vocabulary name in the list is shown in the default language

When it comes to the phpUnit tests, at the moment I am investigating ways to run PHPUnit tests for Symphony Twig templates. Tests are coming a bit later.

• phpUnit tests pass locally with my changes
• I have added tests that prove my fix is effective or that my feature works (if not, explain why below)
• The PR doesn't introduce unintended code changes (e.g. empty lines or useless reindentation)

[codecov]

Codecov Report

Merging #1259 (7d99329) into master (a770d4c) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master    #1259   +/-   ##
=========================================
  Coverage     69.26%   69.26%           
  Complexity     1646     1646           
=========================================
  Files            32       32           
  Lines          4041     4041           
=========================================
  Hits           2799     2799           
  Misses         1242     1242           

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a770d4c...7d99329. Read the comment docs.

[kinow]

Couldn't we use something like (not tested) this?

Suggested change

	{% set useDefaultLanguage = null %}
	{% if request.contentLang not in vocab.config.languages and request.contentLang != '' %}
	{% set useDefaultLanguage = true %}
	{% endif %}
	<li><a class="navigation-font" href="{{ vocab.id }}/{{ request.lang }}/{% if request.contentLang not in vocab.config.languages and request.contentLang != '' %}?clang={{ vocab.config.defaultLanguage }}{% endif %}">
	{% if useDefaultLanguage is not null %} {{ vocab.title(vocab.config.defaultLanguage) }}
	{% else %} {{ vocab.title(request.contentLang) }}
	{% endif %} </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>

I think we have the same condition in two places, so maybe storing the true or false value of that condition in that variable would simplify it?

[miguelvaara]

The way you proposed was clearly more elegant, I changed the code. Thanks a lot @kinow

[sonarqubecloud]

Kudos, SonarCloud Quality Gate passed!   

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
No Duplication information

[miguelvaara]

Another question is where the business logic is located. For instance, I think it is also possible to modify a request according to the needs mentioned in the original issue. The configuration and therefore the default language of the vocabulary could be checked before accessing the data depending on the request.

[osma]

I guess the newlines are not needed?