Skip to content
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

Jump to bottom

feat: new language switch behaviour #1159

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: new language switch behaviour #1159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0016f5
feat: new language switch behaviour, always listing all languages by …
Feb 13, 2023
8bcc837
Merge branch 'master' into HarisDotParis-language-switch
HarisDotParis Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
- Social Icons (home-info and profile-mode)
- Social-Media Share buttons on posts.
- Menu location indicator.
- Multilingual support. (with language selector)
- Multilingual support (with improved language selector)
- Taxonomies
- Cover image for each post (with Responsive image support).
- Light/Dark theme (automatic theme switch a/c to browser theme and theme-switch button).
Expand Down
8 changes: 4 additions & 4 deletions layouts/_default/search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ <h1>{{- (printf "%s&nbsp;" .Title ) | htmlUnescape -}}
{{ .Description }}
</div>
{{- end }}
{{- if not (.Param "hideMeta") }}
<div class="post-meta">
{{- partial "translation_list.html" . -}}
</div>
{{- if and (.Param "showTranslationListInPosts") (not (.Param "hideMeta")) }}
<div class="post-meta">
{{- partial "translation_list.html" . -}}
</div>
{{- end }}
</header>

Expand Down
4 changes: 3 additions & 1 deletion layouts/_default/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ <h1 class="post-title">
{{- if not (.Param "hideMeta") }}
<div class="post-meta">
{{- partial "post_meta.html" . -}}
{{- partial "translation_list.html" . -}}
{{- if .Param "showTranslationListInPosts" }}
{{- partial "translation_list.html" . -}}
{{- end }}
{{- partial "edit_post.html" . -}}
{{- partial "post_canonical.html" . -}}
</div>
Expand Down
57 changes: 36 additions & 21 deletions layouts/partials/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,27 +96,42 @@
</button>
{{- end }}

{{- $lang := .Lang}}
{{- $separator := or $label_text (not site.Params.disableThemeToggle)}}
{{- with site.Home.AllTranslations }}
<ul class="lang-switch">
{{- if $separator }}<li>|</li>{{ end }}
{{- range . -}}
{{- if ne $lang .Lang }}
<li>
<a href="{{- .Permalink -}}" title="{{ .Language.Params.languageAltTitle | default (.Language.LanguageName | emojify) | default (.Lang | title) }}"
aria-label="{{ .Language.LanguageName | default (.Lang | title) }}">
{{- if (and site.Params.displayFullLangName (.Language.LanguageName)) }}
{{- .Language.LanguageName | emojify -}}
{{- else }}
{{- .Lang | title -}}
{{- end -}}
</a>
</li>
{{- end -}}
{{- end}}
</ul>
{{- end }}
{{/* LANGUAGE SELECTOR */}}
{{ if .Site.IsMultiLingual }}
{{/* set vars with page data */}}
{{ $currentLang := .Lang }}
{{ $allTranslations := .Translations }}

{{ $separator := or $label_text (not site.Params.disableThemeToggle)}}

<ul class="lang-switch">
{{ if $separator }}<li>|</li>{{ end }}
{{ range $anySiteLang := .Site.Home.AllTranslations }}

{{/* code here can only access page-related data via vars set above */}}
{{ if ne $currentLang $anySiteLang.Lang }}
{{ $translationLink := .Permalink }}
{{ range $translation := $allTranslations }}
{{ if eq $anySiteLang.Lang $translation.Lang }}
{{ $translationLink = $translation.Permalink }}
{{ end }}
{{ end }}

<li>
<a href="{{ $translationLink }}"
title="{{ .Language.Params.languageAltTitle | default (.Language.LanguageName ) | default (.Lang | upper) }}"
aria-label="{{ .Language.LanguageName | default (.Lang | upper) }}">
{{ if site.Params.DisplayFullLangName }}
{{ .Language.LanguageName }}
{{ else }}
{{ .Lang | upper }}
{{ end }}
</a>
</li>
{{ end }}
{{ end }}
</ul>
{{ end }}
</div>
</div>
{{- $currentPage := . }}
Expand Down