diff --git a/CHANGELOG.md b/CHANGELOG.md
index b04aa1b52..c40ff8638 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
- Refactored and documented the availability-slot-reservation data model
- Display bookers names to connected users now apply to all resources
- Fix a bug: for admins and managers, the current password is not requested before changing their own password
-- Fix a bug: missing translation for avatar changing
+- Fix a bug: missing translations
- Fix a bug: unable to book a space's slot with an existing reservation
- Fix a bug: Unable to import accounts from SSO when the transformation modal was opened but leaved empty
- Fix a bug: Unable to change the group of a user
diff --git a/app/frontend/templates/dashboard/trainings.html b/app/frontend/templates/dashboard/trainings.html
index 9516ac27a..e5d1184bb 100644
--- a/app/frontend/templates/dashboard/trainings.html
+++ b/app/frontend/templates/dashboard/trainings.html
@@ -39,7 +39,7 @@
- -
+
-
{{r.reservable.name}} - {{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }}
@@ -54,7 +54,7 @@
- -
+
-
{{r.reservable.name}} - {{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }}
diff --git a/app/models/event.rb b/app/models/event.rb
index ebc838c77..392cc865e 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -25,8 +25,8 @@ class Event < ApplicationRecord
attr_accessor :recurrence, :recurrence_end_at
- after_create :event_recurrence
before_save :update_nb_free_places
+ after_create :event_recurrence
# update event updated_at for index cache
after_save -> { touch }
diff --git a/config/locales/app.logged.en.yml b/config/locales/app.logged.en.yml
index 762485fd7..ed7164c3a 100644
--- a/config/locales/app.logged.en.yml
+++ b/config/locales/app.logged.en.yml
@@ -112,6 +112,7 @@ en:
subscribe_for_credits: "Subscribe to benefit from free trainings"
register_for_free: "Register for free to the following trainings:"
book_here: "Book here"
+ canceled: "Canceled"
#dashboard: my events
events:
your_next_events: "Your next events"