From 68b60acd6daada9afc09a3edd85c4afa50ebb937 Mon Sep 17 00:00:00 2001 From: William Nolin Date: Fri, 23 Aug 2019 16:39:11 -0400 Subject: [PATCH] =?UTF-8?q?Langues=20backend=20d=C3=A9but?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/LocaleConfiguration.java | 2 +- .../resources/lang/responses_en.properties | 9 ++++ .../resources/lang/responses_fr.properties | 9 ++++ src/main/resources/templates/recipe/edit.html | 44 +++++++++--------- .../resources/templates/recipe/explore.html | 5 +- workdir/recipes.mv.db | Bin 40960 -> 32768 bytes 6 files changed, 42 insertions(+), 27 deletions(-) create mode 100644 src/main/resources/lang/responses_en.properties create mode 100644 src/main/resources/lang/responses_fr.properties 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 e17e206589ea13d36d243a8dc375cade99795a59..3cff0f9bfb89130afd568728968415345ef1109c 100644 GIT binary patch delta 2276 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

- Image supprimée ou corrompue - - -
+ Image supprimée ou corrompue + + +