From 6921c5d93dc3a4bca2f8035c046206ff1b5615f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Brunet?= <maelbrunet@gmail.com>
Date: Sun, 6 Jun 2021 10:27:24 +0200
Subject: [PATCH] Make all labels translatable

---
 src/_data/site.json                    | 4 +++-
 src/_includes/components/taglist.njk   | 4 ++--
 src/_includes/layouts/recipe.njk       | 4 ++--
 src/_includes/layouts/recipes-list.njk | 2 +-
 src/admin/config.yml                   | 9 ++++++++-
 src/tag.md                             | 1 +
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/_data/site.json b/src/_data/site.json
index 9781e7e..004b770 100644
--- a/src/_data/site.json
+++ b/src/_data/site.json
@@ -4,5 +4,7 @@
     "author": "John Doe",
     "primaryColor": "#ffdb70",
     "secondaryColor": "#32816e",
-    "searchLabel": "Find recipes by name or ingredients"
+    "searchLabel": "Find recipes by name or ingredients",
+    "servingsLabel": "servings",
+    "ingredientsLabel": "Ingredients"
 }
\ No newline at end of file
diff --git a/src/_includes/components/taglist.njk b/src/_includes/components/taglist.njk
index a0373ef..bae78fe 100644
--- a/src/_includes/components/taglist.njk
+++ b/src/_includes/components/taglist.njk
@@ -1,9 +1,9 @@
 <nav>
     <ul class="c-tags">
         {% if page.fileSlug == "recipes" %}
-            <li class="c-tags__tag c-tag__tag--selected">All recipes</li>
+            <li class="c-tags__tag c-tag__tag--selected">{{ title }}{{ allRecipesLabel }}</li>
         {% else %}
-            <li><a class="c-tags__tag" href="/recipes">All recipes</a></li>
+            <li><a class="c-tags__tag" href="/recipes">{{ title }}{{ allRecipesLabel }}</a></li>
         {% endif %}
         {% for tagItem in collections.tagList %}
             {% if selectedTag == tagItem %}
diff --git a/src/_includes/layouts/recipe.njk b/src/_includes/layouts/recipe.njk
index eeeb5a8..9d9e603 100644
--- a/src/_includes/layouts/recipe.njk
+++ b/src/_includes/layouts/recipe.njk
@@ -30,13 +30,13 @@
                                         +
                                         <span class="u-sr-only">Add 1 serving</span>
                                     </button>
-                                    <span> servings</span>
+                                    <span>{{ site.servingsLabel }}</span>
                                 </p>
                             {% endif %}
                         </div>
                     {% endif %}
 
-                    <h3>Ingredients</h3>
+                    <h3>{{ site.ingredientsLabel }}</h3>
                     <template x-if="currentServings">
                         <ul class="c-recipe__ingredients-list">
                             <template x-for="(ingredient, index) in ingredients" :key="index">
diff --git a/src/_includes/layouts/recipes-list.njk b/src/_includes/layouts/recipes-list.njk
index 6e1b2d4..603a250 100644
--- a/src/_includes/layouts/recipes-list.njk
+++ b/src/_includes/layouts/recipes-list.njk
@@ -4,7 +4,7 @@
     <main>
         <section>
             <div class="l-container">
-                <h1>{{ selectedTag }}{{ " " if selectedTag }}{{title}}</h1>
+                <h1>{{ selectedTag }}{{ title }}</h1>
 
                 {% if not selectedTag %}
                     {% include 'components/taglist.njk' %}
diff --git a/src/admin/config.yml b/src/admin/config.yml
index e9f8e96..a093f22 100644
--- a/src/admin/config.yml
+++ b/src/admin/config.yml
@@ -41,7 +41,9 @@ collections:
           - {label: "Author", name: "author", widget: "string"}
           - {label: "Primary color", name: "primaryColor", widget: "color", hint: "make sure to choose a color that is light enough to display as a background behind dark text"}
           - {label: "Secondary color", name: "secondaryColor", widget: "color", hint: "used for links and focus styles"}
-          - {label: "Search label", name: "searchLabel", widget: "string"}
+          - {label: "Search (label)", name: "searchLabel", widget: "string"}
+          - {label: "Servings (label)", name: "servingsLabel", widget: "string"}
+          - {label: "Ingredients (label)", name: "ingredientsLabel", widget: "string"}
       - name: "nav"
         label: "Navigation"
         delete: false
@@ -70,6 +72,11 @@ collections:
       file: "src/recipes.md"
       fields:
         - {label: "Title", name: "title", widget: "string"}
+    - name: "tags"
+      label: "Tags pages"
+      file: "src/tag.md"
+      fields:
+        - {label: "All recipes (label)", name: "allRecipesLabel", widget: "string"}
     - name: "about"
       label: "About page"
       file: "src/about.md"
diff --git a/src/tag.md b/src/tag.md
index 59dfd9c..c2a42f7 100644
--- a/src/tag.md
+++ b/src/tag.md
@@ -5,6 +5,7 @@ pagination:
   alias: selectedTag
 permalink: /tags/{{ selectedTag | noEmoji | slug }}/
 layout: layouts/recipes-list.njk
+allRecipesLabel: All recipes
 eleventyComputed:
   metaTitle: "{{ selectedTag | noEmoji }}"
 ---