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 72d80b3..e5c24cf 100644 --- a/src/main/java/fyloz/trial/ColorRecipesExplorer/core/configuration/LocaleConfiguration.java +++ b/src/main/java/fyloz/trial/ColorRecipesExplorer/core/configuration/LocaleConfiguration.java @@ -18,7 +18,7 @@ public class LocaleConfiguration implements WebMvcConfigurer { @Bean public MessageSource messageSource() { ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource(); - messageSource.setBasename("classpath:lang/messages"); + messageSource.setBasenames("classpath:lang/messages", "classpath:lang/errors"); messageSource.setDefaultEncoding("UTF-8"); return messageSource; } diff --git a/src/main/resources/lang/responses_en.properties b/src/main/resources/lang/responses_en.properties new file mode 100644 index 0000000..0f2939c --- /dev/null +++ b/src/main/resources/lang/responses_en.properties @@ -0,0 +1,9 @@ +response.1=The quantities of each material used have been deducted from the inventory +response.2=The recipe's informations have been saved +response.3=An error has occurred while saving +response.4=An error has occurred while saving the image +response.5=An error has occurred while saving the SIMDUT file +response.6=Your password is not valid +response.7=Any recipe with the identifier {0} has been found +response.8=Any mix with the identifier {0} has been found +response.9=Any material with the identifier {0} has been found \ No newline at end of file diff --git a/src/main/resources/lang/responses_fr.properties b/src/main/resources/lang/responses_fr.properties new file mode 100644 index 0000000..5fa1b4d --- /dev/null +++ b/src/main/resources/lang/responses_fr.properties @@ -0,0 +1,9 @@ +response.1=Les quantités de chaque produits utilisés ont été déduites de l'inventaire +response.2=Les informations de la recette ont été sauvegardées +response.3=Une erreur est survenue lors de l'enregistrement +response.4=Une erreur est survenue lors de l'enregistrement de l'image +response.5=Une erreur est survenue lors de l'enregistrement du fichier SIMDUT +response.6=Votre mot de passe n'est pas valide +response.7=Aucune recette ayant l'identifiant {0} n'a été trouvée +response.8=Aucun mélange ayant l'identifiant {0} n'a été trouvé +response.9=Aucun produit ayant l'identifiant {0} n'a été trouvé \ No newline at end of file diff --git a/src/main/resources/templates/recipe/edit.html b/src/main/resources/templates/recipe/edit.html index d9ded02..95bae9a 100644 --- a/src/main/resources/templates/recipe/edit.html +++ b/src/main/resources/templates/recipe/edit.html @@ -45,7 +45,8 @@ - - + - - + - @@ -88,11 +89,10 @@ - +
+
+
+
-

+ - +
@@ -128,7 +128,7 @@
@@ -143,17 +143,15 @@ - - - - - - + + + + - + diff --git a/workdir/recipes.mv.db b/workdir/recipes.mv.db index e17e206..3cff0f9 100644 Binary files a/workdir/recipes.mv.db and b/workdir/recipes.mv.db differ
- Image supprimée ou corrompue - - -
+ Image supprimée ou corrompue + + +