diff --git a/app/assets/templates/admin/events/monitoring.html.erb b/app/assets/templates/admin/events/monitoring.html.erb index 339f933c5..ea0955f4e 100644 --- a/app/assets/templates/admin/events/monitoring.html.erb +++ b/app/assets/templates/admin/events/monitoring.html.erb @@ -50,7 +50,7 @@ {{ event.nb_total_places - event.nb_free_places }} / {{ event.nb_total_places }} - {{ 'cancelled' }} + {{ 'cancelled' }} {{ 'free_entry' }} @@ -72,4 +72,4 @@
{{ 'load_the_next_events' }}
- \ No newline at end of file + diff --git a/app/assets/templates/events/index.html.erb b/app/assets/templates/events/index.html.erb index f440f8abc..341b53910 100644 --- a/app/assets/templates/events/index.html.erb +++ b/app/assets/templates/events/index.html.erb @@ -55,13 +55,22 @@

{{event.start_date | amDateFormat:'L'}}

{{event.start_date | amDateFormat:'L'}} {{ 'to_date' }} {{event.end_date | amDateFormat:'L'}}

+
{{ 'free_admission' }}
{{ 'full_price_' | translate }} {{event.amount | currency}} / {{ price.category.name }} {{price.amount | currency}}
{{event.event_themes[0].name}} {{event.age_range.name}}
+ +
+ {{event.nb_free_places}} {{ 'still_available' | translate }} + {{ 'sold_out' }} + {{ 'cancelled' }} + {{ 'free_entry' }} +
+
diff --git a/app/assets/templates/events/show.html.erb b/app/assets/templates/events/show.html.erb index 17b611282..382fe0f85 100644 --- a/app/assets/templates/events/show.html.erb +++ b/app/assets/templates/events/show.html.erb @@ -98,7 +98,8 @@
{{ 'tickets_still_availables' | translate }} {{event.nb_free_places}}
-
{{ 'sold_out' }}
+
{{ 'sold_out' }}
+
{{ 'cancelled' }}
{{ 'free_entry' }}
diff --git a/app/assets/templates/home.html.erb b/app/assets/templates/home.html.erb index 2109fd532..0f44dd80d 100644 --- a/app/assets/templates/home.html.erb +++ b/app/assets/templates/home.html.erb @@ -116,18 +116,26 @@ {{ 'from_time_to_time' | translate:{START:(event.start_date | amDateFormat:'LT'), END:(event.end_date | amDateFormat:'LT')} }}
-
- -
- {{ 'free_entry' }} - {{ 'free_admission' }} - {{event.amount | currency}} {{ 'full_price' | translate }} -
{{ 'event_full' }}
-
- -
-
+ +
+
+ +
+ {{ 'still_available' | translate }} {{event.nb_free_places}} + {{ 'free_entry' }} + {{ 'event_full' }} +
+
+
+ +
+ {{ 'free_admission' }} + {{ 'full_price' | translate }} {{event.amount | currency}} +
+
+
+
{{ 'consult' }}
diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml index e045fea49..185a30cc7 100644 --- a/config/locales/app.public.en.yml +++ b/config/locales/app.public.en.yml @@ -134,6 +134,7 @@ en: free_admission: "Free admission" full_price: "Full price" event_full: "Event full" + still_available: "Available place(s)" projects_list: # projects gallery @@ -228,6 +229,11 @@ en: the_fablab_s_events: "The Fablab's events" all_categories: "All categories" for_all: "For all" + sold_out: "Sold Out" + cancelled: "Cancelled" + free_admission: "Free admission" + still_available: "available place(s)" + free_entry: "Free entry" events_show: # details and booking of an event @@ -240,6 +246,7 @@ en: tickets_still_availables: "Tickets still available:" sold_out: "Sold out." free_entry: "Free entry" + cancelled: "Cancelled" ticket: "{NUMBER, plural, one{ticket} other{tickets}}" # messageFormat interpolation make_a_gift_of_this_reservation: "Make a gift of this reservation" you_can_find_your_reservation_s_details_on_your_: "You can find your reservation's details on your" @@ -274,4 +281,4 @@ en: the_space_cant_be_deleted_because_it_is_already_reserved_by_some_users: "Unable to delete this space, because it is already reserved by some users." characteristics: "Characteristics" files_to_download: "Files to download" - projects_using_the_space: "Projects using the space" \ No newline at end of file + projects_using_the_space: "Projects using the space" diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index 62dfe62eb..37067daf9 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -127,13 +127,14 @@ fr: # résumé des prochains évènements sur la page d'acceuil fablab_s_next_events: "Les prochains évènements du Fab Lab" every_events: "Tous les évènements" - from_date_to_date: "Du {{START}} au {{END}}" # angular interpolation - on_the_date: "Le {{DATE}}" # angular interpolation - from_time_to_time: "De {{START}} à {{END}}" # angular interpolation - free_entry: "Entrée libre" + from_date_to_date: "du {{START}} au {{END}}" # angular interpolation + on_the_date: "le {{DATE}}" # angular interpolation + from_time_to_time: "de {{START}} à {{END}}" # angular interpolation + free_entry: "Accès libre" free_admission: "Entrée gratuite" - full_price: "Plein tarif" + full_price: "Plein tarif : " event_full: "Événement complet" + still_available: "Place(s) disponible(s) :" projects_list: # galerie des projets @@ -230,6 +231,11 @@ fr: the_fablab_s_events: "Les évènements du Fab Lab" all_categories: "Toutes les catégories" for_all: "Tout public" + sold_out: "Complet" + cancelled: "Annulé" + free_admission: "Gratuit" + still_available: "place(s) disponible(s)" + free_entry: "Accès libre" events_show: # détails d'un événement et réservation @@ -240,8 +246,9 @@ fr: ending: "Fin :" opening_hours: "Horaires :" tickets_still_availables: "Places encore disponibles :" - sold_out: "Événement complet." - free_entry: "Entrée libre" + sold_out: "Événement complet" + free_entry: "Accès libre" + cancelled: "Annulé" ticket: "{NUMBER, plural, =0{place} one{place} other{places}}" # messageFormat interpolation make_a_gift_of_this_reservation: "Offrir cette réservation" you_can_find_your_reservation_s_details_on_your_: "Vous pouvez retrouver le détail de votre réservation sur votre" diff --git a/config/locales/app.public.pt.yml b/config/locales/app.public.pt.yml index d5788e3d5..6ad4514b1 100755 --- a/config/locales/app.public.pt.yml +++ b/config/locales/app.public.pt.yml @@ -127,13 +127,14 @@ pt: # next events summary on the home page fablab_s_next_events: "Próximos eventos do FabLab" every_events: "Todos Eventos" - from_date_to_date: "De {{START}} até {{END}}" # angular interpolation - on_the_date: "Em {{DATE}}" # angular interpolation + from_date_to_date: "De {{START}} até {{END}}" # angular interpolation + on_the_date: "Em {{DATE}}" # angular interpolation from_time_to_time: "Das {{START}} até {{END}}" # angular interpolation free_entry: "Entrada franca" free_admission: "Admissão grátis" full_price: "Valor inteira" event_full: "Evento lotado" + still_available: "Available place(s)" # traduction_missing projects_list: # projects gallery @@ -228,6 +229,11 @@ pt: the_fablab_s_events: "Eventos do Fablab" all_categories: "Todas categorias" for_all: "Para todos" + sold_out: "Esgotado." + cancelled: "Cancelled" #translation_missing + free_admission: "Admissão grátis" + still_available: "available place(s)" #translation_missing + free_entry: "Entrada franca" events_show: # details and booking of an event @@ -240,6 +246,7 @@ pt: tickets_still_availables: "Tickets ainda disponíveis:" sold_out: "Esgotado." free_entry: "Entrada franca" + cancelled: "Cancelled" #translation_missing ticket: "{NUMBER, plural, one{ticket} other{tickets}}" # messageFormat interpolation make_a_gift_of_this_reservation: "Doe esta reserva" you_can_find_your_reservation_s_details_on_your_: "Você pode encontrar detalhes da sua reserva em seu" @@ -274,4 +281,4 @@ pt: the_space_cant_be_deleted_because_it_is_already_reserved_by_some_users: "Impossível remover este espaço, pois ele já foi reservado por alguns usuários." characteristics: "Características" files_to_download: "Arquivo para download" - projects_using_the_space: "Projetos usando espaço" \ No newline at end of file + projects_using_the_space: "Projetos usando espaço"