rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-28 09:24:24 +01:00
Code Issues Releases Activity

(bug) missing translations

Browse Source
This commit is contained in:
Sylvain 2022-07-20 15:27:01 +02:00
parent 165b3e17b9
commit 2bd84e623a
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -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

4
app/frontend/templates/dashboard/trainings.html
View File

@ -39,7 +39,7 @@
</div>
<div class="widget-content bg-light wrapper r-b">
<ul class="list-unstyled" ng-if="user.training_reservations.length > 0">
<li ng-repeat="r in user.training_reservations | trainingReservationsFilter:'future'" class="m-b" data-label="{{ 'app.admin.event_reservations.canceled' | translate}}" ng-class="{'reservation-canceled':r.canceled_at}">
<li ng-repeat="r in user.training_reservations | trainingReservationsFilter:'future'" class="m-b" data-label="{{ 'app.logged.dashboard.trainings.canceled' | translate}}" ng-class="{'reservation-canceled':r.canceled_at}">
<span class="font-sbold">{{r.reservable.name}}</span> - <span class="label label-warning wrapper-sm">{{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }}</span>
</li>
</ul>
@ -54,7 +54,7 @@
</div>
<div class="widget-content bg-light auto wrapper r-b">
<ul class="list-unstyled" ng-if="user.training_reservations.length > 0">
<li ng-repeat="r in user.training_reservations | trainingReservationsFilter:'passed'" class="m-b" data-label="{{ 'app.admin.event_reservations.canceled' | translate}}" ng-class="{'reservation-canceled':r.canceled_at}">
<li ng-repeat="r in user.training_reservations | trainingReservationsFilter:'passed'" class="m-b" data-label="{{ 'app.logged.dashboard.trainings.canceled' | translate}}" ng-class="{'reservation-canceled':r.canceled_at}">
<span class="font-sbold">{{r.reservable.name}}</span> - <span class="label label-info text-white wrapper-sm">{{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }}</span>
</li>
</ul>

2
app/models/event.rb
View File

@ -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 }

1
config/locales/app.logged.en.yml
View File

@ -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"