1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-17 06:52:27 +01:00

rename Courses/Workshops to Events

This commit is contained in:
Sylvain 2016-06-28 11:42:20 +02:00
parent 7126843eda
commit 7d02fa9d9a
26 changed files with 74 additions and 63 deletions

View File

@ -15,7 +15,7 @@
## v2.2.2 2016 June 23 ## v2.2.2 2016 June 23
- Fix some bugs: users with uncompleted account (sso imported) won't appear in statistics, in listings and in searches. Moreover, they won't block statistics generation - Fix some bugs: users with uncompleted account (sso imported) won't appear in statistics, in listings and in searches. Moreover, they won't block statistics generation
- Fix a bug: unable to display next results in statistics tables - Fix a bug: unable to display next results in statistics tables
- Admin: Category is mandatory when creating a course/workshop (event) - Admin: Category is mandatory when creating an event
## v2.2.1 2016 June 22 ## v2.2.1 2016 June 22
- Fix a bug: field User.merged_at should not be allowed to be mapped in SSO - Fix a bug: field User.merged_at should not be allowed to be mapped in SSO

View File

@ -25,7 +25,7 @@
class EventsController class EventsController
constructor: ($scope, $state, Event, Category) -> constructor: ($scope, $state, Event, Category) ->
## Retrieve the list of categories from the server (stage, atelier, ...) ## Retrieve the list of categories from the server (course, workshop, ...)
Category.query().$promise.then (data)-> Category.query().$promise.then (data)->
$scope.categories = data.map (d) -> $scope.categories = data.map (d) ->
id: d.id id: d.id

View File

@ -353,7 +353,7 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", "
# Create an hash map implementing the Reservation specs # Create an hash map implementing the Reservation specs
# @param member {Object} User as retreived from the API: current user / selected user if current is admin # @param member {Object} User as retreived from the API: current user / selected user if current is admin
# @param reserve {Object} Reservation parameters (places...) # @param reserve {Object} Reservation parameters (places...)
# @param event {Object} Current event (Atelier/Stage) # @param event {Object} Current event
# @return {{user_id:Number, reservable_id:Number, reservable_type:String, slots_attributes:Array<Object>, nb_reserve_places:Number, nb_reserve_reduced_places:Number}} # @return {{user_id:Number, reservable_id:Number, reservable_type:String, slots_attributes:Array<Object>, nb_reserve_places:Number, nb_reserve_reduced_places:Number}}
## ##
mkReservation = (member, reserve, event) -> mkReservation = (member, reserve, event) ->

View File

@ -25,7 +25,7 @@ Application.Controllers.controller "MainNavController", ["$scope", "$location",
} }
{ {
state: 'app.public.events_list' state: 'app.public.events_list'
linkText: 'courses_and_workshops_registrations' linkText: 'events_registrations'
linkIcon: 'tags' linkIcon: 'tags'
} }
{ {
@ -73,7 +73,7 @@ Application.Controllers.controller "MainNavController", ["$scope", "$location",
} }
{ {
state: 'app.admin.events' state: 'app.admin.events'
linkText: 'courses_and_workshops_monitoring' linkText: 'events_monitoring'
linkIcon: 'tags' linkIcon: 'tags'
} }
{ {

View File

@ -7,7 +7,7 @@
</div> </div>
<div class="col-xs-10 col-sm-10 col-md-8 b-l b-r-md"> <div class="col-xs-10 col-sm-10 col-md-8 b-l b-r-md">
<section class="heading-title"> <section class="heading-title">
<h1 translate>{{ 'fablab_courses_and_workshops' }}</h1> <h1 translate>{{ 'fablab_events' }}</h1>
</section> </section>
</div> </div>
@ -71,7 +71,7 @@
<div class="row"> <div class="row">
<div class="col-lg-12 text-center"> <div class="col-lg-12 text-center">
<a class="btn btn-warning" ng-click="loadMoreEvents()" ng-if="paginateActive" translate>{{ 'load_the_next_courses_and_workshops' }}</a> <a class="btn btn-warning" ng-click="loadMoreEvents()" ng-if="paginateActive" translate>{{ 'load_the_next_events' }}</a>
</div> </div>
</div> </div>
</section> </section>

View File

@ -138,11 +138,11 @@
</div> </div>
</uib-tab> </uib-tab>
<uib-tab heading="{{ 'courses_and_workshops' | translate }}"> <uib-tab heading="{{ 'events' | translate }}">
<div class="col-md-6"> <div class="col-md-6">
<div class="widget panel b-a m m-t-lg"> <div class="widget panel b-a m m-t-lg">
<div class="panel-heading b-b"> <div class="panel-heading b-b">
<h4 class="text-u-c"><i class="fa fa-tag m-r-xs"></i> {{ 'next_courses_and_workshops' | translate }}</h4> <h4 class="text-u-c"><i class="fa fa-tag m-r-xs"></i> {{ 'next_events' | translate }}</h4>
</div> </div>
<div class="widget-content bg-light wrapper r-b"> <div class="widget-content bg-light wrapper r-b">
<ul class="list-unstyled" ng-if="user.events_reservations.length > 0"> <ul class="list-unstyled" ng-if="user.events_reservations.length > 0">
@ -158,14 +158,14 @@
</span> </span>
</li> </li>
</ul> </ul>
<div ng-if="(user.events_reservations | eventsReservationsFilter:'future').length == 0" translate>{{ 'no_upcomning_courses_or_workshops'}}</div> <div ng-if="(user.events_reservations | eventsReservationsFilter:'future').length == 0" translate>{{ 'no_upcoming_events' }}</div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="widget panel b-a m m-t-lg"> <div class="widget panel b-a m m-t-lg">
<div class="panel-heading b-b"> <div class="panel-heading b-b">
<h4 class="text-u-c"><i class="fa fa-tag m-r-xs"></i> {{ 'passed_courses_and_workshops' | translate }}</h4> <h4 class="text-u-c"><i class="fa fa-tag m-r-xs"></i> {{ 'passed_events' | translate }}</h4>
</div> </div>
<div class="widget-content bg-light auto wrapper r-b"> <div class="widget-content bg-light auto wrapper r-b">
<ul class="list-unstyled" ng-if="user.events_reservations.length > 0"> <ul class="list-unstyled" ng-if="user.events_reservations.length > 0">
@ -173,7 +173,7 @@
<span class="font-sbold">{{r.reservable.title}}</span> - <span class="label label-info text-white wrapper-sm">{{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }}</span> <span class="font-sbold">{{r.reservable.title}}</span> - <span class="label label-info text-white wrapper-sm">{{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }}</span>
</li> </li>
</ul> </ul>
<div ng-if="(user.events_reservations | eventsReservationsFilter:'passed').length == 0" translate>{{ 'no_passed_courses_or_workshop' }}</div> <div ng-if="(user.events_reservations | eventsReservationsFilter:'passed').length == 0" translate>{{ 'no_passed_events' }}</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -13,7 +13,7 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="widget panel b-a m m-t-lg"> <div class="widget panel b-a m m-t-lg">
<div class="panel-heading b-b"> <div class="panel-heading b-b">
<h4 class="text-u-c"><i class="fa fa-tag m-r-xs"></i> {{ 'your_next_courses_and_workshops' | translate }}</h4> <h4 class="text-u-c"><i class="fa fa-tag m-r-xs"></i> {{ 'your_next_events' | translate }}</h4>
</div> </div>
<div class="widget-content bg-light wrapper r-b"> <div class="widget-content bg-light wrapper r-b">
<ul class="list-unstyled" ng-if="user.events_reservations.length > 0"> <ul class="list-unstyled" ng-if="user.events_reservations.length > 0">
@ -23,14 +23,14 @@
<br/><span translate translate-values="{NUMBER: r.nb_reserve_reduced_places}" translate-interpolation="messageformat">{{ 'NUMBER_reduced_fare_places_reserved' }}</span> <br/><span translate translate-values="{NUMBER: r.nb_reserve_reduced_places}" translate-interpolation="messageformat">{{ 'NUMBER_reduced_fare_places_reserved' }}</span>
</li> </li>
</ul> </ul>
<div ng-if="(user.events_reservations | eventsReservationsFilter:'future').length == 0" translate>{{ 'no_courses_or_workshops_to_come' }}</div> <div ng-if="(user.events_reservations | eventsReservationsFilter:'future').length == 0" translate>{{ 'no_events_to_come' }}</div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="widget panel b-a m m-t-lg"> <div class="widget panel b-a m m-t-lg">
<div class="panel-heading b-b"> <div class="panel-heading b-b">
<h4 class="text-u-c"><i class="fa fa-tag m-r-xs"></i> {{ 'your_previous_courses_and_workshops' | translate }}</h4> <h4 class="text-u-c"><i class="fa fa-tag m-r-xs"></i> {{ 'your_previous_events' | translate }}</h4>
</div> </div>
<div class="widget-content bg-light auto wrapper r-b"> <div class="widget-content bg-light auto wrapper r-b">
<ul class="list-unstyled" ng-if="user.events_reservations.length > 0"> <ul class="list-unstyled" ng-if="user.events_reservations.length > 0">
@ -38,7 +38,7 @@
<span class="font-sbold">{{r.reservable.title}}</span> - <span class="label label-info text-white wrapper-sm">{{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }}</span> <span class="font-sbold">{{r.reservable.title}}</span> - <span class="label label-info text-white wrapper-sm">{{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }}</span>
</li> </li>
</ul> </ul>
<div ng-if="(user.events_reservations | eventsReservationsFilter:'passed').length == 0" translate>{{ 'no_passed_courses_or_workshops' }}</div> <div ng-if="(user.events_reservations | eventsReservationsFilter:'passed').length == 0" translate>{{ 'no_passed_events' }}</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -14,7 +14,7 @@
<li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.settings" translate>{{ 'my_settings' }}</a></li> <li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.settings" translate>{{ 'my_settings' }}</a></li>
<li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.projects" translate>{{ 'my_projects' }}</a></li> <li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.projects" translate>{{ 'my_projects' }}</a></li>
<li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.trainings" translate>{{ 'my_trainings' }}</a></li> <li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.trainings" translate>{{ 'my_trainings' }}</a></li>
<li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.events" translate>{{ 'my_courses_and_workshops' }}</a></li> <li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.events" translate>{{ 'my_events' }}</a></li>
<li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.invoices" translate>{{ 'my_invoices' }}</a></li> <li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.invoices" translate>{{ 'my_invoices' }}</a></li>
</ul> </ul>
</section> </section>

View File

@ -7,7 +7,7 @@
</div> </div>
<div class="col-xs-10 col-sm-10 col-md-8 b-l b-r-md"> <div class="col-xs-10 col-sm-10 col-md-8 b-l b-r-md">
<section class="heading-title"> <section class="heading-title">
<h1 translate>{{ 'the_fablab_s_courses_and_workshops' }}</h1> <h1 translate>{{ 'the_fablab_s_events' }}</h1>
</section> </section>
</div> </div>
@ -51,7 +51,7 @@
<div class="row"> <div class="row">
<div class="col-lg-12 text-center m-t-md"> <div class="col-lg-12 text-center m-t-md">
<a class="btn btn-warning" ng-click="loadMoreEvents()" ng-if="paginateActive" translate>{{ 'load_the_next_courses_and_workshops' }}</a> <a class="btn btn-warning" ng-click="loadMoreEvents()" ng-if="paginateActive" translate>{{ 'load_the_next_events' }}</a>
</div> </div>
</div> </div>

View File

@ -80,7 +80,7 @@
</div> </div>
<section class="col-lg-12 wrapper"> <section class="col-lg-12 wrapper">
<h4 class="text-sm m-t-sm">{{ 'fablab_s_next_courses_and_workshops' | translate }} <a ui-sref="app.public.events_list" class="pull-right"><i class="fa fa-tags"></i> {{ 'every_events' | translate }}</a></h4> <h4 class="text-sm m-t-sm">{{ 'fablab_s_next_events' | translate }} <a ui-sref="app.public.events_list" class="pull-right"><i class="fa fa-tags"></i> {{ 'every_events' | translate }}</a></h4>
<div class="row" ng-repeat="event in (upcomingEvents.length/3 | array)"> <div class="row" ng-repeat="event in (upcomingEvents.length/3 | array)">

View File

@ -38,7 +38,7 @@
<li><a href="#" ui-sref="app.logged.dashboard.settings" translate>{{ 'my_settings' }}</a></li> <li><a href="#" ui-sref="app.logged.dashboard.settings" translate>{{ 'my_settings' }}</a></li>
<li><a href="#" ui-sref="app.logged.dashboard.projects" translate>{{ 'my_projects' }}</a></li> <li><a href="#" ui-sref="app.logged.dashboard.projects" translate>{{ 'my_projects' }}</a></li>
<li><a href="#" ui-sref="app.logged.dashboard.trainings" translate>{{ 'my_trainings' }}</a></li> <li><a href="#" ui-sref="app.logged.dashboard.trainings" translate>{{ 'my_trainings' }}</a></li>
<li><a href="#" ui-sref="app.logged.dashboard.events" translate>{{ 'my_courses_and_workshops' }}</a></li> <li><a href="#" ui-sref="app.logged.dashboard.events" translate>{{ 'my_events' }}</a></li>
<li><a href="#" ui-sref="app.logged.dashboard.invoices" translate>{{ 'my_invoices' }}</a></li> <li><a href="#" ui-sref="app.logged.dashboard.invoices" translate>{{ 'my_invoices' }}</a></li>
<li class="divider"></li> <li class="divider"></li>

View File

@ -53,7 +53,7 @@
</li> </li>
<li class="hidden-sm hidden-md hidden-lg"> <li class="hidden-sm hidden-md hidden-lg">
<a href="#" ui-sref="app.logged.dashboard.events"> <a href="#" ui-sref="app.logged.dashboard.events">
<i class="fa fa-calendar-o"></i> <span translate>{{ 'my_courses_and_workshops' }}</span> <i class="fa fa-calendar-o"></i> <span translate>{{ 'my_events' }}</span>
</a> </a>
</li> </li>
<li class="hidden-sm hidden-md hidden-lg" ng-if-end> <li class="hidden-sm hidden-md hidden-lg" ng-if-end>

View File

@ -110,9 +110,9 @@ module PDF
### Training reservation ### Training reservation
when 'Training' when 'Training'
details += I18n.t('invoices.training_reservation_DESCRIPTION', DESCRIPTION: item.description) details += I18n.t('invoices.training_reservation_DESCRIPTION', DESCRIPTION: item.description)
### courses and workshops reservation ### events reservation
when 'Event' when 'Event'
details += I18n.t('invoices.courses_and_workshops_reservation_DESCRIPTION', DESCRIPTION: item.description) details += I18n.t('invoices.event_reservation_DESCRIPTION', DESCRIPTION: item.description)
# details of the number of tickets # details of the number of tickets
details += "\n "+I18n.t('invoices.full_price_ticket', count: invoice.invoiced.nb_reserve_places) if invoice.invoiced.nb_reserve_places > 0 details += "\n "+I18n.t('invoices.full_price_ticket', count: invoice.invoiced.nb_reserve_places) if invoice.invoiced.nb_reserve_places > 0
details += "\n "+I18n.t('invoices.reduced_rate_ticket', count: invoice.invoiced.nb_reserve_reduced_places) if invoice.invoiced.nb_reserve_reduced_places > 0 details += "\n "+I18n.t('invoices.reduced_rate_ticket', count: invoice.invoiced.nb_reserve_reduced_places) if invoice.invoiced.nb_reserve_reduced_places > 0

View File

@ -69,8 +69,8 @@ en:
unable_to_delete_the_training_because_some_users_alredy_booked_it: "Unable to delete the training because some users already booked it." unable_to_delete_the_training_because_some_users_alredy_booked_it: "Unable to delete the training because some users already booked it."
events: events:
# courses and workshops tracking and management # events tracking and management
fablab_courses_and_workshops: "Fablab courses and workshops" fablab_events: "Fablab events"
all_events: "All events" all_events: "All events"
passed_events: "Passed events" passed_events: "Passed events"
events_to_come: "Events to come" events_to_come: "Events to come"
@ -79,7 +79,7 @@ en:
view_reservations: "View reservations" view_reservations: "View reservations"
events_new: events_new:
# add a new workshop/course # add a new event
none: "None" none: "None"
every_days: "Every days" every_days: "Every days"
every_week: "Every week" every_week: "Every week"
@ -318,13 +318,12 @@ en:
next_trainings: "Next trainings" next_trainings: "Next trainings"
passed_trainings: "Passed trainings" passed_trainings: "Passed trainings"
validated_trainings: "Validated trainings" validated_trainings: "Validated trainings"
courses_and_workshops: "Courses and workshops" events: "Events"
next_courses_and_workshops: "Next courses and workshops" next_events: "Next events"
no_upcomning_courses_or_workshops: "No upcoming courses and workshops" no_upcoming_events: "No upcoming events"
NUMBER_full_price_tickets_reserved: "{NUMBER, plural, =0{} one{1 full price ticket reserved} other{{NUMBER} full price tickets reserved}}" # messageFormat interpolation NUMBER_full_price_tickets_reserved: "{NUMBER, plural, =0{} one{1 full price ticket reserved} other{{NUMBER} full price tickets reserved}}" # messageFormat interpolation
NUMBER_reduced_rate_tickets_reserved: "{NUMBER, plural, =0{} one{1 reduced rate ticket reserved} other{{NUMBER} reduced rate tickets reserved}}" # messageFormat interpolation NUMBER_reduced_rate_tickets_reserved: "{NUMBER, plural, =0{} one{1 reduced rate ticket reserved} other{{NUMBER} reduced rate tickets reserved}}" # messageFormat interpolation
passed_courses_and_workshops: "Passed courses and workshops" passed_events: "Passed events"
no_passed_courses_or_workshop: "No passed courses or workshops"
invoices: "Invoices" invoices: "Invoices"
invoice_#: "Invoice #" invoice_#: "Invoice #"
download_the_refund_invoice: "Download the refund invoice" download_the_refund_invoice: "Download the refund invoice"

View File

@ -70,7 +70,7 @@ fr:
events: events:
# gestion et suivi des stages et ateliers # gestion et suivi des stages et ateliers
fablab_courses_and_workshops: "Les Stages et ateliers du Fab Lab" fablab_events: "Les évènements du Fab Lab"
all_events: "Tous les évènements" all_events: "Tous les évènements"
passed_events: "Les évènements déjà passés" passed_events: "Les évènements déjà passés"
events_to_come: "Les évènements à venir" events_to_come: "Les évènements à venir"
@ -318,13 +318,12 @@ fr:
next_trainings: "Les prochaines formations" next_trainings: "Les prochaines formations"
passed_trainings: "Les formations passées" passed_trainings: "Les formations passées"
validated_trainings: "Les formations validées" validated_trainings: "Les formations validées"
courses_and_workshops: "Ateliers et stages" events: "Évènements"
next_courses_and_workshops: "Les prochains stages et ateliers" next_events: "Les prochains évènements"
no_upcomning_courses_or_workshops: "Aucun stage ou atelier à venir" no_upcoming_events: "Aucun évènement à venir"
NUMBER_full_price_tickets_reserved: "{NUMBER, plural, =0{} one{1 place plein tarif réservée} other{{NUMBER} places plein tarif réservées}}" # messageFormat interpolation NUMBER_full_price_tickets_reserved: "{NUMBER, plural, =0{} one{1 place plein tarif réservée} other{{NUMBER} places plein tarif réservées}}" # messageFormat interpolation
NUMBER_reduced_rate_tickets_reserved: "{NUMBER, plural, =0{} one{1 place à tarif réduit réservée} other{{NUMBER} places à tarif réduit réservées}}" # messageFormat interpolation NUMBER_reduced_rate_tickets_reserved: "{NUMBER, plural, =0{} one{1 place à tarif réduit réservée} other{{NUMBER} places à tarif réduit réservées}}" # messageFormat interpolation
passed_courses_and_workshops: "Les stages et ateliers passés" passed_events: "Les évènements passés"
no_passed_courses_or_workshop: "Aucun stage ou atelier passé"
invoices: "Factures" invoices: "Factures"
invoice_#: "Facture n°" invoice_#: "Facture n°"
download_the_refund_invoice: "Télécharger l'avoir" download_the_refund_invoice: "Télécharger l'avoir"

View File

@ -59,10 +59,9 @@ en:
your_approved_trainings: "Your approved trainings" your_approved_trainings: "Your approved trainings"
events: events:
# dashboard: my events # dashboard: my events
your_next_courses_and_workshops: "Your next courses and workshops" your_next_events: "Your next events"
no_courses_or_workshops_to_come: "No courses or workshops to come" no_events_to_come: "No events to come"
your_previous_courses_and_workshops: "Your previous courses and workshops" your_previous_events: "Your previous events"
no_passed_courses_or_workshops: "No passed courses or workshops"
NUMBER_normal_places_reserved: "{NUMBER} {NUMBER, plural, =1{normal place reserved}, other{normal places reserved}}" # messageFormat interpolation NUMBER_normal_places_reserved: "{NUMBER} {NUMBER, plural, =1{normal place reserved}, other{normal places reserved}}" # messageFormat interpolation
NUMBER_reduced_fare_places_reserved: "{NUMBER} {NUMBER, plural, =1{reduced fare place reserved}, other{reduced fare places reserved}" # messageFormat interpolation NUMBER_reduced_fare_places_reserved: "{NUMBER} {NUMBER, plural, =1{reduced fare place reserved}, other{reduced fare places reserved}" # messageFormat interpolation
invoices: invoices:

View File

@ -59,10 +59,9 @@ fr:
your_approved_trainings: "Vos formations validées" your_approved_trainings: "Vos formations validées"
events: events:
# tableau de bord : mes évènements # tableau de bord : mes évènements
your_next_courses_and_workshops: "Vos prochains stages et ateliers" your_next_events: "Vos prochains évènements"
no_courses_or_workshops_to_come: "Aucun stage ou atelier à venir" no_events_to_come: "Aucun évènement à venir"
your_previous_courses_and_workshops: "Vos stages et ateliers passés" your_previous_events: "Vos évènements passés"
no_passed_courses_or_workshops: "Aucun stage ou atelier passé"
NUMBER_normal_places_reserved: "{NUMBER} {NUMBER, plural, =1{place normale réservée}, other{places normales réservées}}" # messageFormat interpolation NUMBER_normal_places_reserved: "{NUMBER} {NUMBER, plural, =1{place normale réservée}, other{places normales réservées}}" # messageFormat interpolation
NUMBER_reduced_fare_places_reserved: "{NUMBER} {NUMBER, plural, =1{place réservée à tarif réduit}, other{places réservées à tarif réduit}" # messageFormat interpolation NUMBER_reduced_fare_places_reserved: "{NUMBER} {NUMBER, plural, =1{place réservée à tarif réduit}, other{places réservées à tarif réduit}" # messageFormat interpolation
invoices: invoices:

View File

@ -12,7 +12,7 @@ en:
my_settings: "My Settings" my_settings: "My Settings"
my_projects: "My Projects" my_projects: "My Projects"
my_trainings: "My Trainings" my_trainings: "My Trainings"
my_courses_and_workshops: "My Courses and Workshops" my_events: "My Events"
my_invoices: "My Invoices" my_invoices: "My Invoices"
# login/logout # login/logout
@ -29,7 +29,7 @@ en:
home: "Home" home: "Home"
reserve_a_machine: "Reserve a Machine" reserve_a_machine: "Reserve a Machine"
trainings_registrations: "Trainings registrations" trainings_registrations: "Trainings registrations"
courses_and_workshops_registrations: "Courses and Workshops registrations" events_registrations: "Events registrations"
projects_gallery: "Projects gallery" projects_gallery: "Projects gallery"
subscriptions: "Subscriptions" subscriptions: "Subscriptions"
@ -40,7 +40,7 @@ en:
manage_the_users: "Manage the Users" manage_the_users: "Manage the Users"
manage_the_invoices: "Manage the invoices" manage_the_invoices: "Manage the invoices"
subscriptions_and_prices: "Subscriptions and Prices" subscriptions_and_prices: "Subscriptions and Prices"
courses_and_workshops_monitoring: "Courses and Workshops monitoring" events_monitoring: "Events monitoring"
manage_the_machines: "Manage the Machines" manage_the_machines: "Manage the Machines"
manage_the_projects_elements: "Manage the Projects Elements" manage_the_projects_elements: "Manage the Projects Elements"
statistics: "Statistics" statistics: "Statistics"
@ -108,7 +108,7 @@ en:
discover_members: "Discover members" discover_members: "Discover members"
# next events summary on the home page # next events summary on the home page
fablab_s_next_courses_and_workshops: "Fablab's next courses and workshops" fablab_s_next_events: "Fablab's next events"
every_events: "Every events" every_events: "Every events"
from_date_to_date: "From {{START}} to {{END}}" # angular interpolation from_date_to_date: "From {{START}} to {{END}}" # angular interpolation
on_the_date: "On the {{DATE}}" # angular interpolation on_the_date: "On the {{DATE}}" # angular interpolation
@ -199,7 +199,7 @@ en:
events_list: events_list:
# Fablab's events list # Fablab's events list
the_fablab_s_courses_and_workshops: "The Fablab's courses and workshops" the_fablab_s_events: "The Fablab's events"
events_show: events_show:
# details and booking of an event # details and booking of an event

View File

@ -12,7 +12,7 @@ fr:
my_settings: "Mes paramètres" my_settings: "Mes paramètres"
my_projects: "Mes projets" my_projects: "Mes projets"
my_trainings: "Mes formations" my_trainings: "Mes formations"
my_courses_and_workshops: "Mes stages et ateliers" my_events: "Mes évènements"
my_invoices: "Mes factures" my_invoices: "Mes factures"
# connexion / déconnexion # connexion / déconnexion
@ -29,7 +29,7 @@ fr:
home: "Accueil" home: "Accueil"
reserve_a_machine: "Réserver une machine" reserve_a_machine: "Réserver une machine"
trainings_registrations: "Inscriptions formations" trainings_registrations: "Inscriptions formations"
courses_and_workshops_registrations: "Inscriptions stages et ateliers" events_registrations: "Inscriptions aux évènements"
projects_gallery: "Galerie de projets" projects_gallery: "Galerie de projets"
subscriptions: "Abonnements" subscriptions: "Abonnements"
@ -40,7 +40,7 @@ fr:
manage_the_users: "Gérer les utilisateurs" manage_the_users: "Gérer les utilisateurs"
manage_the_invoices: "Gérer les factures" manage_the_invoices: "Gérer les factures"
subscriptions_and_prices: "Abonnements & Tarifs" subscriptions_and_prices: "Abonnements & Tarifs"
courses_and_workshops_monitoring: "Suivi stages et ateliers" events_monitoring: "Suivi des évènements"
manage_the_machines: "Gérer les machines" manage_the_machines: "Gérer les machines"
manage_the_projects_elements: "Gérer les éléments projets" manage_the_projects_elements: "Gérer les éléments projets"
statistics: "Statistiques" statistics: "Statistiques"
@ -108,7 +108,7 @@ fr:
discover_members: "Découvrir les membres" discover_members: "Découvrir les membres"
# résumé des prochains évènements sur la page d'acceuil # résumé des prochains évènements sur la page d'acceuil
fablab_s_next_courses_and_workshops: "Les prochains ateliers et stages du Fab Lab" fablab_s_next_events: "Les prochains évènements du Fab Lab"
every_events: "Tous les évènements" every_events: "Tous les évènements"
from_date_to_date: "Du {{START}} au {{END}}" # angular interpolation from_date_to_date: "Du {{START}} au {{END}}" # angular interpolation
on_the_date: "Le {{DATE}}" # angular interpolation on_the_date: "Le {{DATE}}" # angular interpolation
@ -199,7 +199,7 @@ fr:
events_list: events_list:
# liste des évènements du fablab # liste des évènements du fablab
the_fablab_s_courses_and_workshops: "Les Stages et ateliers du Fab Lab" the_fablab_s_events: "Les évènements du Fab Lab"
events_show: events_show:
# détails d'un événement et réservation # détails d'un événement et réservation

View File

@ -54,7 +54,8 @@ en:
confirm_and_pay: "Confirm and pay" confirm_and_pay: "Confirm and pay"
your_invoice_will_be_available_soon_from_your_: "Your invoice will be available soon form your" your_invoice_will_be_available_soon_from_your_: "Your invoice will be available soon form your"
add_an_event: "Add an event" add_an_event: "Add an event"
load_the_next_courses_and_workshops: "Load the next courses and workshops..." load_the_next_events: "Load the next events..."
no_passed_events: "No passed events"
dates: "Dates:" dates: "Dates:"
thank_you_your_payment_has_been_successfully_registered: "Thank you. Your payment has been successfully registered !" thank_you_your_payment_has_been_successfully_registered: "Thank you. Your payment has been successfully registered !"
surname: "Surname" surname: "Surname"
@ -162,7 +163,7 @@ en:
here_is_the_summary_of_the_slots_to_book_for_the_current_user: "Here is the summary of the slots to book for the current user:" here_is_the_summary_of_the_slots_to_book_for_the_current_user: "Here is the summary of the slots to book for the current user:"
event: event:
# event edition form (courses/workshops) # event edition form
title_is_required: "Title is required." title_is_required: "Title is required."
matching_visual: "Matching visual" matching_visual: "Matching visual"
choose_a_picture: "Choose a picture" choose_a_picture: "Choose a picture"

View File

@ -54,7 +54,8 @@ fr:
confirm_and_pay: "Valider et payer" confirm_and_pay: "Valider et payer"
your_invoice_will_be_available_soon_from_your_: "Votre facture sera bientôt disponible depuis votre" your_invoice_will_be_available_soon_from_your_: "Votre facture sera bientôt disponible depuis votre"
add_an_event: "Ajouter un évènement" add_an_event: "Ajouter un évènement"
load_the_next_courses_and_workshops: "Charger les stages et ateliers suivants ..." load_the_next_events: "Charger les évènements suivants ..."
no_passed_events: "Aucun évènement passé"
dates: "Dates :" dates: "Dates :"
thank_you_your_payment_has_been_successfully_registered: "Merci. Votre paiement a bien été pris en compte !" thank_you_your_payment_has_been_successfully_registered: "Merci. Votre paiement a bien été pris en compte !"
surname: "Nom" surname: "Nom"

View File

@ -75,7 +75,7 @@ en:
subscription_NAME_from_START_to_END: "Subscription - From %{START} to %{END}" subscription_NAME_from_START_to_END: "Subscription - From %{START} to %{END}"
machine_reservation_DESCRIPTION: "Machine reservation - %{DESCRIPTION}" machine_reservation_DESCRIPTION: "Machine reservation - %{DESCRIPTION}"
training_reservation_DESCRIPTION: "Training reservation - %{DESCRIPTION}" training_reservation_DESCRIPTION: "Training reservation - %{DESCRIPTION}"
courses_and_workshops_reservation_DESCRIPTION: "Courses and Workshops reservation - %{DESCRIPTION}" event_reservation_DESCRIPTION: "Event reservation - %{DESCRIPTION}"
full_price_ticket: full_price_ticket:
one: "One full price ticket" one: "One full price ticket"
other: "%{count} full price tickets" other: "%{count} full price tickets"

View File

@ -75,7 +75,7 @@ fr:
subscription_NAME_from_START_to_END: "Abonnement - Du %{START} au %{END}" subscription_NAME_from_START_to_END: "Abonnement - Du %{START} au %{END}"
machine_reservation_DESCRIPTION: "Réservation Machine - %{DESCRIPTION}" machine_reservation_DESCRIPTION: "Réservation Machine - %{DESCRIPTION}"
training_reservation_DESCRIPTION: "Réservation Formation - %{DESCRIPTION}" training_reservation_DESCRIPTION: "Réservation Formation - %{DESCRIPTION}"
courses_and_workshops_reservation_DESCRIPTION: "Réservation Ateliers et Stages - %{DESCRIPTION}" event_reservation_DESCRIPTION: "Réservation Évènement - %{DESCRIPTION}"
full_price_ticket: full_price_ticket:
one: "Une place plein tarif" one: "Une place plein tarif"
other: "%{count} places plein tarif" other: "%{count} places plein tarif"

View File

@ -0,0 +1,13 @@
class RenameCoursesWorkshopsToEvents < ActiveRecord::Migration
def up
execute "UPDATE statistic_indices
SET label='Évènements'
WHERE es_type_key='event';"
end
def down
execute "UPDATE statistic_indices
SET label='Ateliers/Stages'
WHERE es_type_key='event';"
end
end

View File

@ -11,7 +11,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20160613093842) do ActiveRecord::Schema.define(version: 20160628092931) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"

View File

@ -5,7 +5,7 @@ if StatisticIndex.count == 0
{id:1, es_type_key:'subscription', label:'Abonnements'}, {id:1, es_type_key:'subscription', label:'Abonnements'},
{id:2, es_type_key:'machine', label:'Heures machines'}, {id:2, es_type_key:'machine', label:'Heures machines'},
{id:3, es_type_key:'training', label:'Formations'}, {id:3, es_type_key:'training', label:'Formations'},
{id:4, es_type_key:'event', label:'Ateliers/Stages'}, {id:4, es_type_key:'event', label:'Évènements'},
{id:5, es_type_key:'account', label:'Inscriptions', ca: false}, {id:5, es_type_key:'account', label:'Inscriptions', ca: false},
{id:6, es_type_key:'project', label:'Projets', ca: false}, {id:6, es_type_key:'project', label:'Projets', ca: false},
{id:7, es_type_key:'user', label:'Utilisateurs', table: false, ca: false} {id:7, es_type_key:'user', label:'Utilisateurs', table: false, ca: false}