Merge remote-tracking branch 'origin/develop'

Author: desoindx

.github/workflows/e2e.yml

@@ -26,6 +26,9 @@ jobs:
       - name: Enable Corepack
         shell: bash
         run: corepack enable
+      - name: Pin pnpm 10
+        shell: bash
+        run: corepack prepare pnpm@10 --activate
       - uses: actions/setup-node@v6
         with:
           node-version: 22

.github/workflows/iframes.yml

@@ -15,6 +15,9 @@ jobs:
       - name: Enable Corepack
         shell: bash
         run: corepack enable
+      - name: Pin pnpm 10
+        shell: bash
+        run: corepack prepare pnpm@10 --activate
       - uses: actions/setup-node@v6
         with:
           node-version: 22

src/components/Notion/utils.ts

@@ -8,7 +8,8 @@ export const getNotionContentProps = unstable_cache(
     try {
       const result = await notion.getPage(id)
       return result
-    } catch {
+    } catch (e) {
+      console.error('Unable to get content from Notion', e)
       return undefined
     }
   },

src/components/faq/FaqsOverscreen.tsx

@@ -17,20 +17,10 @@ import styles from './FAQsList.module.css'
 
 const faqCategoriesOrder: Record<FAQCategory, number> = {
   [FAQCategory.QuestionsGenerales]: 1,
-  [FAQCategory.GeneralQuestions]: 1,
-  [FAQCategory.PreguntasGenerales]: 1,
   [FAQCategory.ComprendreLeCalcul]: 2,
-  [FAQCategory.AboutTheCalculation]: 2,
-  [FAQCategory.EntenderElCálculo]: 2,
   [FAQCategory.CestÉtonnant]: 3,
-  [FAQCategory.ItsSurprising]: 3,
-  [FAQCategory.EsSorprendente]: 3,
   [FAQCategory.IdéesPourAgir]: 4,
-  [FAQCategory.IdeasForAction]: 4,
-  [FAQCategory.IdeasParaActuar]: 4,
   [FAQCategory.ÀProposDesOutils]: 5,
-  [FAQCategory.AboutTheTools]: 5,
-  [FAQCategory.AcercaDeLasHerramientas]: 5,
 }
 
 const FaqsOverscreen = ({ filter, page, slug }: { filter: string; slug: string } & Omit<FAQSListProps, 'faqs'>) => {
@@ -115,7 +105,7 @@ const FaqsOverscreen = ({ filter, page, slug }: { filter: string; slug: string }
             <ul className={styles.categories}>
               {faqsByCategory.map(([category, faqs]) => (
                 <li key={category} className={styles.category}>
-                  <h2 className={styles.categoryTitle}>{category}</h2>
+                  <h2 className={styles.categoryTitle}>{t(category)}</h2>
                   <ul>
                     {faqs.map((faq) => (
                       <FAQ key={faq.title} faq={faq} page={page} loadingText={t('loading')} withAnchor />

src/components/faq/faqsOrder.ts

@@ -2,18 +2,8 @@ import { FAQCategory } from 'types/faq'
 
 export const faqCategoriesOrder: Record<FAQCategory, number> = {
   [FAQCategory.QuestionsGenerales]: 2,
-  [FAQCategory.GeneralQuestions]: 2,
-  [FAQCategory.PreguntasGenerales]: 2,
   [FAQCategory.ComprendreLeCalcul]: 3,
-  [FAQCategory.AboutTheCalculation]: 3,
-  [FAQCategory.EntenderElCálculo]: 3,
   [FAQCategory.CestÉtonnant]: 4,
-  [FAQCategory.ItsSurprising]: 4,
-  [FAQCategory.EsSorprendente]: 4,
   [FAQCategory.IdéesPourAgir]: 5,
-  [FAQCategory.IdeasForAction]: 5,
-  [FAQCategory.IdeasParaActuar]: 5,
   [FAQCategory.ÀProposDesOutils]: 1,
-  [FAQCategory.AboutTheTools]: 1,
-  [FAQCategory.AcercaDeLasHerramientas]: 1,
 }

src/components/form/Select.tsx

@@ -40,14 +40,12 @@ const Select = ({
           data-testid={`text-select-${id}`}
           {...selectProps}
           id={`text-select-${id}`}>
-          <>
-            {selectProps.required && (
-              <option value='' disabled hidden>
-                Choisir une option
-              </option>
-            )}
-            {children}
-          </>
+          {selectProps.required && (
+            <option value='' disabled hidden>
+              Choisir une option
+            </option>
+          )}
+          {children}
         </select>
       </div>
     </div>

src/components/outils/FruitsEtLegumesSimulator.tsx

@@ -24,6 +24,7 @@ const FruitsEtLegumesSimulator = () => {
 
   const t = useTranslations('flds')
   const tMonth = useTranslations('overscreen.month')
+
   return (
     <>
       <div className={styles.simulator}>
@@ -36,9 +37,9 @@ const FruitsEtLegumesSimulator = () => {
             trackOnce('Mois')
             setMonth(Number(e.target.value))
           }}>
-          {monthsOptions.map((month) => (
-            <option key={month.value} value={month.value}>
-              {tMonth(month.label)}
+          {monthsOptions.map(({ value, label }) => (
+            <option key={value} value={value}>
+              {tMonth(label)}
             </option>
           ))}
         </Select>

src/components/outils/equivalents/EquivalentCardContent.tsx

@@ -25,7 +25,7 @@ const EquivalentCardContent = ({
   return (
     <div className={styles.content}>
       <div>
-        <p className={styles.title}>{getName(language, equivalent, equivalent.category === 8)}</p>
+        <p className={styles.title}>{getName(language, equivalent, equivalent.category === 8, 1, false, true)}</p>
         <Result form={output}>
           <CO2Quantity
             quantity={equivalent.carpool ? equivalent.value / (equivalent.carpool + 1) : equivalent.value}

src/providers/locales/en.json

@@ -6,6 +6,11 @@
     "allFAQs": "All questions",
     "search": "Search for a topic, a question...",
     "exemple": "For example:",
+    "Questions générales": "General questions",
+    "Comprendre le calcul": "About the calculations",
+    "C'est étonnant !": "It’s surprising!",
+    "Idées pour agir": "Ideas for action",
+    "À propos des outils": "About the tools",
     "Transport": {
       "exemple-1": "construction",
       "exemple-2": "occupancy rate",

src/providers/locales/es.json

@@ -6,6 +6,11 @@
     "allFAQs": "Todas las preguntas",
     "search": "Buscar un tema, una pregunta...",
     "exemple": "Por ejemplo:",
+    "Questions générales": "Preguntas generales",
+    "Comprendre le calcul": "Entender los cálculos",
+    "C'est étonnant !": "¡Es sorprendente!",
+    "Idées pour agir": "Ideas para actuar",
+    "À propos des outils": "Acerca de las herramientas",
     "Transport": {
       "exemple-1": "construcción",
       "exemple-2": "índice de ocupación",