Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
desoindx committed Dec 4, 2024
2 parents 3b3d7f2 + de943c1 commit 4ed1b43
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 6 deletions.
Binary file removed public/images/osez-changer-deuxieme-vie.jpg
Binary file not shown.
Binary file added public/images/osez-changer-deuxieme-vie.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/osez-changer-fast-fashion.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/images/osez-changer-questions.jpg
Binary file not shown.
Binary file added public/images/osez-changer-questions.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/images/osez-changer-tri.jpeg
Binary file not shown.
Binary file added public/images/osez-changer-tri.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 9 additions & 3 deletions src/components/shareable/overScreens/Values.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -161,19 +161,25 @@ export const overScreenOsezChangerValues: () => Record<string, OverScreenInfo> =
children: (
<div className={styles.ressourceContainer}>
<Resource
image='/images/osez-changer-tri.jpeg'
image='/images/osez-changer-fast-fashion.png'
text='fast-fashion'
href='https://librairie.ademe.fr/consommer-autrement/7747-tout-comprendre-les-impacts-de-la-mode-et-de-la-fast-fashion.html'
tracking='OsezChanger'
/>
<Resource
image='/images/osez-changer-tri.png'
text='tri'
href='https://librairie.ademe.fr/consommer-autrement/5271-comment-faire-de-la-place-chez-soi-.html'
tracking='OsezChanger'
/>
<Resource
image='/images/osez-changer-questions.jpg'
image='/images/osez-changer-questions.png'
text='questions'
href='https://librairie.ademe.fr/cadic/1529/le-revers-de-mon-look.pdf'
tracking='OsezChanger'
/>
<Resource
image='/images/osez-changer-deuxieme-vie.jpg'
image='/images/osez-changer-deuxieme-vie.png'
text='deuxieme-vie'
href='https://longuevieauxobjets.ademe.fr/'
tracking='OsezChanger'
Expand Down
2 changes: 1 addition & 1 deletion src/providers/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@
"recherche": "search"
},
"ressources": {
"agir": "Eat better: get rid of false ideas!",
"fast-fashion": "Understand everything: the impacts of fashion and fast fashion",
"tri": "Sort through your cupboards to make more space at home",
"questions": "Ask yourself the right questions before buying: Do I really need it?",
"deuxieme-vie": "Give a second life to unused clothes and shoes",
Expand Down
2 changes: 1 addition & 1 deletion src/providers/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@
"recherche": "búsqueda"
},
"ressources": {
"agir": "Come mejor: ¡ahuyenta las ideas falsas!",
"fast-fashion": "Entendiéndolo todo: los impactos de la moda y la moda rápida",
"tri": "Ordenar tus armarios para ganar espacio en casa",
"questions": "Hacerse las preguntas correctas antes de comprar: ¿realmente lo necesito?",
"deuxieme-vie": "Dar una segunda vida a la ropa y zapatos no utilizados",
Expand Down
2 changes: 1 addition & 1 deletion src/providers/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@
"recherche": "recherche"
},
"ressources": {
"agir": "Mieux manger : chassez les fausses idées !",
"fast-fashion": "Tout comprendre : les impacts de la mode et de la fast-fashion",
"tri": "Faire le tri dans ses placards pour gagner de la place chez soi",
"questions": "Se poser les bonnes questions avant d’acheter : en ai-je vraiment besoin ?",
"deuxieme-vie": "Donner une seconde vie aux vêtements et chaussures non utilisées",
Expand Down

0 comments on commit 4ed1b43

Please sign in to comment.