diff --git a/src/main/java/fyloz/trial/ColorRecipesExplorer/core/configuration/LocaleConfiguration.java b/src/main/java/fyloz/trial/ColorRecipesExplorer/core/configuration/LocaleConfiguration.java index 8116b78..72d80b3 100644 --- a/src/main/java/fyloz/trial/ColorRecipesExplorer/core/configuration/LocaleConfiguration.java +++ b/src/main/java/fyloz/trial/ColorRecipesExplorer/core/configuration/LocaleConfiguration.java @@ -26,7 +26,7 @@ public class LocaleConfiguration implements WebMvcConfigurer { @Bean public LocaleResolver localeResolver() { SessionLocaleResolver localeResolver = new SessionLocaleResolver(); - localeResolver.setDefaultLocale(Locale.ENGLISH); + localeResolver.setDefaultLocale(Locale.FRENCH); return localeResolver; } diff --git a/src/main/resources/lang/messages_en.properties b/src/main/resources/lang/messages_en.properties index 94047a7..ecb4d71 100644 --- a/src/main/resources/lang/messages_en.properties +++ b/src/main/resources/lang/messages_en.properties @@ -6,7 +6,7 @@ menu.delete=Delete menu.inventory=Inventory menu.others=Others recipe.color=Color -recipe.description=Short description +recipe.description=Description recipe.sample=Sample recipe.approbationDate=Approbation date recipe.remark=Remark @@ -71,4 +71,13 @@ error.serverError=An error occurred while sending data to the server. recipe.add.title=Add a recipe recipe.sucess.saved=The recipe {0} has been saved. You can now add ingredients. keyword.continue=Continue -recipe.edit.title=Editing {0} \ No newline at end of file +recipe.editing.title=Editing {0} +recipe.edit.addMix=Add a mix +recipe.edit.addImage=Add an image +recipe.success.edit=The recipe {0} has been saved. +recipe.edit.title=Edit a recipe +recipe.explore.title={0} color +recipe.warning.notApproved.short=Not approved +recipe.image.corrupted=Image deleted or corrupted +recipe.remove.title=Delete recipes +recipe.success.deleted=The recipe {0} has been deleted. \ No newline at end of file diff --git a/src/main/resources/lang/messages_fr.properties b/src/main/resources/lang/messages_fr.properties index 72b30c2..5c60891 100644 --- a/src/main/resources/lang/messages_fr.properties +++ b/src/main/resources/lang/messages_fr.properties @@ -5,7 +5,7 @@ menu.delete=Supprimer menu.inventory=Inventaire menu.others=Autres recipe.color=Couleur -recipe.description=Courte description +recipe.description=Description recipe.sample=Échantillon recipe.approbationDate=Date d'approbation recipe.remark=Remarque @@ -71,4 +71,13 @@ error.serverError=Une erreur est survenue lors de l'envoie des informations vers recipe.add.title=Ajout d'une recette recipe.sucess.saved=La recette {0} à été enregistrée. Vous pouvez maintenant ajouter les ingrédients. keyword.continue=Continuer -recipe.edit.title=Modification de {0} +recipe.editing.title=Modification de {0} +recipe.edit.addMix=Ajouter un mélange +recipe.edit.addImage=Ajouter une image +recipe.success.edit=La recette {0} a bien été sauvegardée. +recipe.edit.title=Modifier une recette +recipe.explore.title=Couleur {0} +recipe.warning.notApproved.short=Non approuvée +recipe.image.corrupted=Image supprimée ou corrompue +recipe.remove.title=Supprimer des recettes +recipe.success.deleted=La recette {0} a bien été supprimée. diff --git a/src/main/resources/templates/fragments.html b/src/main/resources/templates/fragments.html index 598b277..2851498 100644 --- a/src/main/resources/templates/fragments.html +++ b/src/main/resources/templates/fragments.html @@ -50,6 +50,12 @@ +
+ +
+ +
+
diff --git a/src/main/resources/templates/material/edit.html b/src/main/resources/templates/material/edit.html index b19d41e..3f410e0 100644 --- a/src/main/resources/templates/material/edit.html +++ b/src/main/resources/templates/material/edit.html @@ -38,7 +38,7 @@ - + - + + - + diff --git a/src/main/resources/templates/recipe/creator.html b/src/main/resources/templates/recipe/creator.html index 5643cbc..8d2edeb 100644 --- a/src/main/resources/templates/recipe/creator.html +++ b/src/main/resources/templates/recipe/creator.html @@ -18,30 +18,32 @@
- + - + - + - + - + - + diff --git a/src/main/resources/templates/recipe/edit.html b/src/main/resources/templates/recipe/edit.html index af43d98..d9ded02 100644 --- a/src/main/resources/templates/recipe/edit.html +++ b/src/main/resources/templates/recipe/edit.html @@ -1,7 +1,7 @@ - + @@ -30,7 +30,7 @@

-

+



@@ -56,46 +56,29 @@
+ - + + + + + + + - - + + + - - - - - - - - - - - - - - - - - - -
-
+
-
+
-
-
-
-
+
@@ -117,47 +100,35 @@ - - - + + + + + + + + - - - - - - -
ProduitTypeQuantité
+

+
-

-
- - -
- - + - + + - -
- - - - - Étapes - + @@ -178,22 +149,23 @@ Image supprimée ou corrompue
- +
- +
- + - +
@@ -206,7 +178,7 @@ diff --git a/src/main/resources/templates/recipe/remover.html b/src/main/resources/templates/recipe/remover.html index 695b477..c5423d7 100644 --- a/src/main/resources/templates/recipe/remover.html +++ b/src/main/resources/templates/recipe/remover.html @@ -1,11 +1,7 @@ - - Supprimer des recettes - - - +