aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpl2016-10-10 17:22:56 +0200
committerjpl2016-10-10 17:22:56 +0200
commit1e5230e9d3366516763a43197a63da51762282d9 (patch)
treeed31060d98d056b78a440edb8d923dd5b7ddb11f
parentb2001ba74720f7351fa14e84aba96434e18242d1 (diff)
downloadchouette-core-1e5230e9d3366516763a43197a63da51762282d9.tar.bz2
updating sync historical views + i18n
-rw-r--r--app/views/line_referentials/show.html.slim4
-rw-r--r--app/views/stop_area_referentials/show.html.slim4
-rw-r--r--config/locales/line_referential_syncs.fr.yml4
-rw-r--r--config/locales/stop_area_referential_syncs.fr.yml4
4 files changed, 12 insertions, 4 deletions
diff --git a/app/views/line_referentials/show.html.slim b/app/views/line_referentials/show.html.slim
index ec1ff02d8..0ad88ecc8 100644
--- a/app/views/line_referentials/show.html.slim
+++ b/app/views/line_referentials/show.html.slim
@@ -31,6 +31,10 @@
- if log.criticity = log.criticity
li.alert class="alert-#{log.criticity}"
strong = l(log.created_at, format: :short) + " : "
+ / [:processing_time] unit conversion
+ - data = log.message_attributs.symbolize_keys!
+ - data[:processing_time] = distance_of_time_in_words(data[:processing_time].to_i)
+
= t("line_referential_sync.message.#{log.message_key}", log.message_attributs.symbolize_keys!)
- content_for :sidebar do
diff --git a/app/views/stop_area_referentials/show.html.slim b/app/views/stop_area_referentials/show.html.slim
index 625dcada9..e9fa17fa6 100644
--- a/app/views/stop_area_referentials/show.html.slim
+++ b/app/views/stop_area_referentials/show.html.slim
@@ -19,6 +19,10 @@
- if log.criticity = log.criticity
li.alert class="alert-#{log.criticity}"
strong = l(log.created_at, format: :short) + " : "
+ / [:processing_time] unit conversion
+ - data = log.message_attributs.symbolize_keys!
+ - data[:processing_time] = distance_of_time_in_words(data[:processing_time].to_i)
+
= t("stop_area_referential_sync.message.#{log.message_key}", log.message_attributs.symbolize_keys!)
- content_for :sidebar do
diff --git a/config/locales/line_referential_syncs.fr.yml b/config/locales/line_referential_syncs.fr.yml
index a6ed1940e..48b5df190 100644
--- a/config/locales/line_referential_syncs.fr.yml
+++ b/config/locales/line_referential_syncs.fr.yml
@@ -10,8 +10,8 @@ fr:
message:
new: "Synchronisation en attente"
pending: "Synchronisation en cours"
- successful: "Synchronisation réussie après %{processing_time} secondes avec %{imported} éléments importés. %{deleted} éléments ont été supprimés."
- failed: "Synchronisation interrompue après %{processing_time} secondes avec l'erreur : %{error}."
+ successful: "Synchronisation réussie après %{processing_time}, avec %{imported} éléments importés. %{deleted} éléments ont été supprimés."
+ failed: "Synchronisation interrompue après %{processing_time}, avec l'erreur : %{error}."
notice:
line_referential_sync:
created: 'Votre demande de synchronisation a bien été créée'
diff --git a/config/locales/stop_area_referential_syncs.fr.yml b/config/locales/stop_area_referential_syncs.fr.yml
index 5095aa195..d0b79a8db 100644
--- a/config/locales/stop_area_referential_syncs.fr.yml
+++ b/config/locales/stop_area_referential_syncs.fr.yml
@@ -10,8 +10,8 @@ fr:
message:
new: "Synchronisation en attente"
pending: "Synchronisation en cours"
- successful: "Synchronisation réussie après %{processing_time} secondes avec %{imported} éléments importés. %{deleted} éléments ont été supprimés."
- failed: "Synchronisation interrompue après %{processing_time} secondes avec l'erreur : %{error}."
+ successful: "Synchronisation réussie après %{processing_time}, avec %{imported} éléments importés. %{deleted} éléments ont été supprimés."
+ failed: "Synchronisation interrompue après %{processing_time}, avec l'erreur : %{error}."
notice:
stop_area_referential_sync:
created: 'Votre demande de synchronisation a bien été créée'