Skip to content

Add check against site language to navItem language to determine href… #175

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
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Add check against site language to navItem language to determine href… #175

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
919f2cd
Add check against site language to navItem language to determine href…
JamieC24 Jul 25, 2025
b84234f
Remove funky if-checks to see if data comes through
JamieC24 Jul 25, 2025
0863c00
Just add an echo to see if language is coming through or whether it's…
JamieC24 Jul 25, 2025
5fb0a70
Add support for targetLinkLanguage field
JamieC24 Jul 25, 2025
bc677ff
Add support for labels when pages are in a different language
JamieC24 Aug 5, 2025
1f95108
Fix highlighted issues on markup and remove homepage_href block
JamieC24 Aug 14, 2025
934b99e
Genericise targetLinkLanguage setting
JamieC24 Sep 8, 2025
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
10 changes: 7 additions & 3 deletions templates/components/styles/global_nav.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<nav id="global-nav" aria-label="Main">
<div class="global-nav__inner l-center">
<a class="logo-link" href="{% block homepage_link %}/{% endblock %}" hreflang="{% block homepage_hreflang %}en{% endblock %}">
{% set siteLang %} {% block homepage_hreflang %}en{% endblock %} {% endset %}
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think the block is useful here.

Suggested change
{% set siteLang %} {% block homepage_hreflang %}en{% endblock %} {% endset %}
{% set siteLang = site.locale|default('en') %}

<a class="logo-link" href="{% block homepage_link %}/{% endblock %}" hreflang="{{ siteLang }}">
<span class="logo">
<img src="{{ absolute_url(asset('w3c/w3c-no-bars.svg', 'logos')) }}" alt="{{ 'header.logo_alt'|trans({}, 'w3c_website_templates_bundle') }}" role="img"/>
</span>
Expand All @@ -11,7 +12,9 @@
<ul data-component="nav-double-intro">
{%~ for navItem in navigation %}
<li class="top-nav-item has-children">
<a href="{{ navItem.titleLink }}" class="nav-link">{{ navItem.title }}</a>
{% set langDiff = siteLang is same as navItem.targetLinkLanguage ? false : true %}
Copy link
Contributor

Choose a reason for hiding this comment

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

This can be simplified to:

Suggested change
{% set langDiff = siteLang is same as navItem.targetLinkLanguage ? false : true %}
{% set langDiff = siteLang != navItem.targetLinkLanguage %}

{% if navItem.language is defined %}{{ navItem.language }}{% endif %}
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like some debug information

Suggested change
{% if navItem.language is defined %}{{ navItem.language }}{% endif %}

<a href="{{ navItem.titleLink }}" class="nav-link"{% if langDiff %}hreflang="{{ navItem.targetLinkLanguage }}"{% endif %}>{{ navItem.title }}</a>
Copy link
Contributor

Choose a reason for hiding this comment

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

Space mising:

Suggested change
<a href="{{ navItem.titleLink }}" class="nav-link"{% if langDiff %}hreflang="{{ navItem.targetLinkLanguage }}"{% endif %}>{{ navItem.title }}</a>
<a href="{{ navItem.titleLink }}" class="nav-link"{% if langDiff %} hreflang="{{ navItem.targetLinkLanguage }}"{% endif %}>{{ navItem.title }}</a>

<div class="nav__submenu" data-nav="submenu" style="display: none;">
<div class="l-center">
<div class="nav__submenu__intro">
Expand All @@ -28,8 +31,9 @@
{% if navItem.children is defined and navItem.children|length > 0 -%}
<ul>
{%~ for child in navItem.children %}
{% set childLangDiff = siteLang is same as child.targetLinkLanguage ? false : true %}
Copy link
Contributor

Choose a reason for hiding this comment

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

Can be simplified:

Suggested change
{% set childLangDiff = siteLang is same as child.targetLinkLanguage ? false : true %}
{% set childLangDiff = siteLang != child.targetLinkLanguage %}

<li{{ child.startNewColumn is defined and child.startNewColumn ? ' class="break-after"' : '' }}>{# -#}
<a href="{{ child.url }}">{{ child.title }}</a>{# -#}
<a href="{{ child.url }}{% if childLangDiff %}hreflang="{{ child.targetLinkLanguage }}"{% endif %}">{{ child.title }}</a>{# -#}
Copy link
Contributor

Choose a reason for hiding this comment

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

Missing space and wrong quoting:

Suggested change
<a href="{{ child.url }}{% if childLangDiff %}hreflang="{{ child.targetLinkLanguage }}"{% endif %}">{{ child.title }}</a>{# -#}
<a href="{{ child.url }}"{% if childLangDiff %} hreflang="{{ child.targetLinkLanguage }}"{% endif %}>{{ child.title }}</a>{# -#}

</li>
{%~ endfor %}
</ul>
Expand Down