From 3fdb71c00be691334bf136ca24f2fcc441fb58ba Mon Sep 17 00:00:00 2001
From: RadioPotin <laradiopotin@gmail.com>
Date: Fri, 20 Sep 2024 11:40:56 +0200
Subject: [PATCH] fix translations in range expressions in deliverables page

---
 hugo.toml                      |  6 ++-
 layouts/page/deliverables.html | 76 +++++++++++++++++-----------------
 2 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/hugo.toml b/hugo.toml
index eb589bf..669609b 100644
--- a/hugo.toml
+++ b/hugo.toml
@@ -13,13 +13,15 @@ Paginate = 10
 [languages]
   [languages.fr]
     contentDir = "content/fr"
-    languageCode = 'fr'
+    languageCode = "fr"
+    languageName = "Français"
     weight = 1
     [languages.fr.params]
       legal = "DéCySif est financé par l'appel à projet i-Démo et la région Ile-de-France."
   [languages.en]
     contentDir = "content/en"
-    languageCode = 'en'
+    languageCode = "en"
+    languageName = "English"
     weight = 2
     [languages.en.params]
       legal = "DéCySif is a project funded by the i-Démo call and the Ile-de-France region."
diff --git a/layouts/page/deliverables.html b/layouts/page/deliverables.html
index 3fabbea..ca7b10d 100644
--- a/layouts/page/deliverables.html
+++ b/layouts/page/deliverables.html
@@ -17,7 +17,7 @@ <h3 class="f4 fw6 ttu tracked dark-gray ph4 tc">
       {{ end }}
     </h3>
     <a href="{{ .Params.project_deliverables.repository }}" class="link dim blue f6 underline db tc mb3" target="_blank">
-      {{ if (eq .Site.Language.Lang "fr") }}
+      {{ if (eq .Lang "fr") }}
         Dépôt
       {{ else }}
         Repository
@@ -25,47 +25,48 @@ <h3 class="f4 fw6 ttu tracked dark-gray ph4 tc">
     </a>
 
     <div class="lots mt4">
-      {{ range .Params.project_deliverables.lots }}
+    {{ $parent := . }} <!-- Save the parent context -->
+    {{ range .Params.project_deliverables.lots }}
       <div class="lot mv4">
         <h4 class="f5 fw6 ttu dark-gray tc">{{ .lot }}</h4>
         <div class="papers">
           {{ range .papers }}
-          <div class="paper ba b--light-gray pa3 mb3 br2">
-            <h5 class="f6 fw6 dark-blue">{{ .id }} - {{ .name }}</h5>
-            <p class="f6">{{ .synopsys }}</p>
-            <p class="f6 i">
-              {{ if (eq .Site.Language.Lang "fr") }}
-                Dirigé par: {{ .leader }}
-              {{ else }}
-                Led by: {{ .leader }}
-              {{ end }}
-            </p>
-            <p class="f6">
-              {{ if (eq .Site.Language.Lang "fr") }}
-                Auteurs:
-              {{ else }}
-                Authors:
-              {{ end }}
-            </p>
-            <ul class="list pl0">
-              {{ range .authors }}
-              <li class="f6">{{ . }}</li>
-              {{ end }}
-            </ul>
-            <a href="{{ .pdf_url }}" class="link dim blue underline f6 fw5" target="_blank">
-              {{ if (eq .Site.Language.Lang "fr") }}
-                Télécharger la version PDF
-              {{ else }}
-                Download PDF version (French)
-              {{ end }}
-            </a>
-          </div>
+            <div class="paper ba b--light-gray pa3 mb3 br2">
+              <h5 class="f6 fw6 dark-blue">{{ .id }} - {{ .name }}</h5>
+              <p class="f6">{{ .synopsys }}</p>
+              <p class="f6 i">
+                {{ if eq $parent.Lang "fr" }} <!-- Use the parent context -->
+                  Dirigé par: {{ .leader }}
+                {{ else }}
+                  Led by: {{ .leader }}
+                {{ end }}
+              </p>
+              <p class="f6">
+                {{ if eq $parent.Lang "fr" }} <!-- Use the parent context -->
+                  Auteurs:
+                {{ else }}
+                  Authors:
+                {{ end }}
+              </p>
+              <ul class="list pl0">
+                {{ range .authors }}
+                  <li class="f6">{{ . }}</li>
+                {{ end }}
+              </ul>
+              <a href="{{ .pdf_url }}" class="link dim blue underline f6 fw5" target="_blank">
+                {{ if eq $parent.Site.Language.Lang "fr" }}
+                  Télécharger la version PDF
+                {{ else }}
+                  Download PDF version (French)
+                {{ end }}
+              </a>
+            </div>
           {{ end }}
         </div>
       </div>
-      {{ end }}
-    </div>
+    {{ end }}
   </div>
+</div>
 
   <!-- Publications Section -->
   <div class="publications mt5 mw8 center">
@@ -74,18 +75,19 @@ <h3 class="f4 fw6 ttu tracked dark-gray tc">
     </h3>
 
     <div class="publication-list">
+      {{ $parent := . }}
       {{ range .Params.publications }}
       <div class="publication ba b--light-gray pa3 mb3 br2">
         <h4 class="f5 fw6 dark-blue">{{ .papername }}</h4>
         <p class="f6">
-          {{ if (eq .Site.Language.Lang "fr") }}
+          {{ if eq $parent.Lang "fr" }}
             Publié: {{ .date }}
           {{ else }}
             Published: {{ .date }}
           {{ end }}
         </p>
         <p class="f6">
-          {{ if (eq .Site.Language.Lang "fr") }}
+          {{ if eq $parent.Lang "fr" }}
             Auteurs:
           {{ else }}
             Authors:
@@ -97,7 +99,7 @@ <h4 class="f5 fw6 dark-blue">{{ .papername }}</h4>
           {{ end }}
         </ul>
         <a href="{{ .url }}" class="link dim blue underline f6 fw5" target="_blank">
-          {{ if (eq .Site.Language.Lang "fr") }}
+          {{ if eq $parent.Lang "fr" }}
             Lire la publication
           {{ else }}
             Read Publication