From 73e4439036160f868d42d6b721c2d82ae5358d5a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 9 Nov 2016 17:07:48 +0100 Subject: [PATCH 001/135] front-end modifications to cancel a booked event --- .../javascripts/controllers/events.coffee.erb | 58 ++++++++++++++++--- app/assets/javascripts/router.coffee.erb | 2 +- app/assets/templates/events/show.html.erb | 3 + app/models/reservation.rb | 8 ++- config/locales/app.logged.en.yml | 2 +- config/locales/app.public.en.yml | 3 + config/locales/app.public.fr.yml | 3 + 7 files changed, 66 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/controllers/events.coffee.erb b/app/assets/javascripts/controllers/events.coffee.erb index 39083272f..88408a28b 100644 --- a/app/assets/javascripts/controllers/events.coffee.erb +++ b/app/assets/javascripts/controllers/events.coffee.erb @@ -132,8 +132,8 @@ Application.Controllers.controller "EventsController", ["$scope", "$state", 'Eve -Application.Controllers.controller "ShowEventController", ["$scope", "$state", "$stateParams", "Event", '$uibModal', 'Member', 'Reservation', 'Price', 'CustomAsset', 'eventPromise', 'growl', '_t', 'Wallet', 'helpers', 'priceCategoriesPromise', 'settingsPromise', -($scope, $state, $stateParams, Event, $uibModal, Member, Reservation, Price, CustomAsset, eventPromise, growl, _t, Wallet, helpers, priceCategoriesPromise, settingsPromise) -> +Application.Controllers.controller "ShowEventController", ["$scope", "$state", "$stateParams", "Event", '$uibModal', 'Member', 'Reservation', 'Price', 'CustomAsset', 'Slot', 'eventPromise', 'growl', '_t', 'Wallet', 'helpers', 'priceCategoriesPromise', 'settingsPromise', 'dialogs', +($scope, $state, $stateParams, Event, $uibModal, Member, Reservation, Price, CustomAsset, Slot, eventPromise, growl, _t, Wallet, helpers, priceCategoriesPromise, settingsPromise, dialogs) -> @@ -169,9 +169,15 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", " ## Global config: is the user authorized to change his bookings slots? $scope.enableBookingMove = (settingsPromise.booking_move_enable == "true") - ## Global config: delay in hours before a booking while changing the booking slot is forbidden + ## Global config: delay in hours from now while changing the booking slot is forbidden $scope.moveBookingDelay = parseInt(settingsPromise.booking_move_delay) + ## Global config: is the user authorized to cancel his booking slots? + $scope.enableBookingCancel = (settingsPromise.booking_cancel_enable == "true") + + ## Global config: delay in hours from now when rectrictions occurs about cancelling reservations + $scope.cancelBookingDelay = parseInt(settingsPromise.booking_cancel_delay) + ## @@ -236,7 +242,7 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", " - ## + ##reservationCanCan # Callback to deal with the reservations of the user selected in the dropdown list instead of the current user's # reservations. (admins only) ## @@ -311,6 +317,29 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", " + ## + # + # @param reservation {{id:number, reservable_id:number, nb_reserve_places:number}} + # @param e {Object} see https://docs.angularjs.org/guide/expression#-event- + ## + $scope.cancelReservation = (reservation, e)-> + e.preventDefault() + e.stopPropagation() + + dialogs.confirm + resolve: + object: -> + title: _t('cancel_the_reservation') + msg: _t('do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets') + , -> # cancel confirmed + Slot.cancel {id: reservation.slots[0].id}, -> # successfully canceled + growl.success _t('reservation_was_successfully_cancelled') + index = $scope.reservations.indexOf(reservation) + $scope.event.nb_free_places = $scope.event.nb_free_places + reservation.total_booked_seats + $scope.reservations.splice(index, 1) + , (error)-> + growl.warning(_t('cancellation_failed')) + ## # Callback to alter an already booked reservation date. A modal window will be opened to allow the user to choose # a new date for his reservation (if any available) @@ -333,9 +362,9 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", " $scope.reservation = angular.copy reservation # set the reservable_id to the first available event - for e in event.recurrence_events - if e.nb_free_places > reservation.total_booked_seats - $scope.reservation.reservable_id = e.id + for evt in event.recurrence_events + if evt.nb_free_places > reservation.total_booked_seats + $scope.reservation.reservable_id = evt.id break # Callback to validate the new reservation's date @@ -377,7 +406,7 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", " ## # Checks if the provided reservation is able to be moved (date change) - # @param reservation {{total_booked_seats:number}} + # @param reservation {{slots:[], total_booked_seats:number}} ## $scope.reservationCanModify = (reservation)-> slotStart = moment(reservation.slots[0].start_at) @@ -390,6 +419,17 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", " + ## + # Checks if the provided reservation is able to be cancelled + # @param reservation {{slots:[]}} + ## + $scope.reservationCanCancel = (reservation)-> + slotStart = moment(reservation.slots[0].start_at) + now = moment() + + return ($scope.enableBookingCancel and slotStart.diff(now, "hours") >= $scope.cancelBookingDelay) + + ## # Compute the total amount for the current reservation according to the previously set parameters # and assign the result in $scope.reserve.amountTotal @@ -516,7 +556,7 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", " ## - # Set the current reservation to the default values. This implies to reservation form to be hidden. + # Set the current reservation to the default values. This implies the reservation form to be hidden. ## resetEventReserve = -> if $scope.event diff --git a/app/assets/javascripts/router.coffee.erb b/app/assets/javascripts/router.coffee.erb index 5d7f16cc0..85bc1d820 100644 --- a/app/assets/javascripts/router.coffee.erb +++ b/app/assets/javascripts/router.coffee.erb @@ -522,7 +522,7 @@ angular.module('application.router', ['ui.router']). PriceCategory.query().$promise ] settingsPromise: ['Setting', (Setting)-> - Setting.query(names: "['booking_move_enable', 'booking_move_delay']").$promise + Setting.query(names: "['booking_move_enable', 'booking_move_delay', 'booking_cancel_enable', 'booking_cancel_delay']").$promise ] translations: [ 'Translations', (Translations) -> Translations.query(['app.public.events_show', 'app.shared.member_select', 'app.shared.stripe', diff --git a/app/assets/templates/events/show.html.erb b/app/assets/templates/events/show.html.erb index 6ccf877e7..858c46182 100644 --- a/app/assets/templates/events/show.html.erb +++ b/app/assets/templates/events/show.html.erb @@ -159,6 +159,9 @@
{{ 'change' }}
+
+ {{ 'cancel' }} +
diff --git a/app/models/reservation.rb b/app/models/reservation.rb index 61f0713b6..c2d480430 100644 --- a/app/models/reservation.rb +++ b/app/models/reservation.rb @@ -327,7 +327,11 @@ class Reservation < ActiveRecord::Base end def total_booked_seats - total = nb_reserve_places + total = 0 + unless slots.first.canceled_at + total = nb_reserve_places + end + if tickets.count > 0 total += tickets.map(&:booked).map(&:to_i).reduce(:+) end @@ -356,7 +360,7 @@ class Reservation < ActiveRecord::Base def training_not_fully_reserved slot = self.slots.first - errors.add(:training, "already fully reserved") if Availability.find(slot.availability_id).is_completed + errors.add(:training, 'already fully reserved') if Availability.find(slot.availability_id).is_completed end private diff --git a/config/locales/app.logged.en.yml b/config/locales/app.logged.en.yml index b0195a92f..bfa3c7f2d 100644 --- a/config/locales/app.logged.en.yml +++ b/config/locales/app.logged.en.yml @@ -119,7 +119,7 @@ en: i_reserve: "I reserve" i_shift: "I shift" i_change: "I change" - do_you_really_want_to_cancel_this_reservation: "So you really want to cancel this reservation?" + do_you_really_want_to_cancel_this_reservation: "Do you really want to cancel this reservation?" reservation_was_cancelled_successfully: "Reservation was cancelled successfully." cancellation_failed: "Cancellation failed." a_problem_occured_during_the_payment_process_please_try_again_later: "A problem occurred during the payment process. Please try again later." diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml index e85c74001..00ae95794 100644 --- a/config/locales/app.public.en.yml +++ b/config/locales/app.public.en.yml @@ -241,6 +241,9 @@ en: book: "Book" change_the_reservation: "Change the reservation" you_can_shift_this_reservation_on_the_following_slots: "You can shift this reservation on the following slots:" + cancel_the_reservation: "Cancel the reservation" + do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." + cancellation_failed: "Cancellation failed." calendar: calendar: "Calendar" diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index 0a3d8b083..3c1a479c1 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -242,6 +242,9 @@ fr: book: "Réserver" change_the_reservation: "Modifier la réservation" you_can_shift_this_reservation_on_the_following_slots: "Vous pouvez déplacer cette réservation sur les créneaux suivants :" + cancel_the_reservation: "Annuler la réservation" + do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Êtes vous sur de vouloir annuler cette réservation? Ceci s'applique à TOUTES les places réservées." + cancellation_failed: "L'annulation a échoué." calendar: calendar: "Calendrier" From c0acfe0f1ca8006f708c4099e0471b7b99fc8ef7 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 22 Oct 2019 16:46:40 +0200 Subject: [PATCH 002/135] handle ctrl-c in upgrade scripts --- scripts/elastic-upgrade.sh | 10 ++++++++-- scripts/postgre-upgrade.sh | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/scripts/elastic-upgrade.sh b/scripts/elastic-upgrade.sh index 9d856c6c2..9a06fc4e4 100755 --- a/scripts/elastic-upgrade.sh +++ b/scripts/elastic-upgrade.sh @@ -629,13 +629,19 @@ start_upgrade() esac } +function trap_ctrlc() +{ + echo "Ctrl^C, exiting..." + exit 2 +} + upgrade_elastic() { config detect_installation read -rp "Continue with upgrading? (y/n) " confirm Date: Tue, 22 Oct 2019 16:47:22 +0200 Subject: [PATCH 003/135] updated dev version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 506e35655..6941783fa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fab-manager", - "version": "4.2.3", + "version": "4.2.4-dev", "description": "FabManager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.", "keywords": [ "fablab", From 398af2e8e08fad6e6592431f24f1f0cba5804b2c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 23 Oct 2019 10:20:07 +0200 Subject: [PATCH 004/135] updated moment-timezone --- CHANGELOG.md | 3 +++ yarn.lock | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfd8da9f7..0502791a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog Fab Manager +- Handle Ctrl^C in upgrade scripts +- Updated moment-timezone + ## v4.2.3 2019 October 22 - Ability to set the default view in project gallery: openLab or local diff --git a/yarn.lock b/yarn.lock index b1eecf9a4..0869938f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -994,17 +994,22 @@ mkdirp@~0.3.5: integrity sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc= moment-timezone@0.5: - version "0.5.23" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.23.tgz#7cbb00db2c14c71b19303cb47b0fb0a6d8651463" - integrity sha512-WHFH85DkCfiNMDX5D3X7hpNH3/PUhjTGcD0U1SgfBGZxJ3qUmJh5FdvaFjcClxOvB3rzdfj4oRffbI38jEnC1w== + version "0.5.27" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.27.tgz#73adec8139b6fe30452e78f210f27b1f346b8877" + integrity sha512-EIKQs7h5sAsjhPCqN6ggx6cEbs94GK050254TIJySD1bzoM5JTYDwAU1IoVOeTOL6Gm27kYJ51/uuvq1kIlrbw== dependencies: moment ">= 2.9.0" -moment@2.22, "moment@>= 2.9.0", moment@>=2.5.0, "moment@>=2.8.0 <3.0.0": +moment@2.22, moment@>=2.5.0, "moment@>=2.8.0 <3.0.0": version "2.22.2" resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66" integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y= +"moment@>= 2.9.0": + version "2.24.0" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" + integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" From d7aed3fa1f66cc45d316e9ffb75cd4ccfe3b4bff Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 23 Oct 2019 11:43:42 +0200 Subject: [PATCH 005/135] Improved notification email to the member when a rolling subscription is taken --- CHANGELOG.md | 1 + .../notify_member_subscribed_plan.html.erb | 7 ++++++- config/locales/mails.en.yml | 3 ++- config/locales/mails.es.yml | 3 ++- config/locales/mails.fr.yml | 3 ++- config/locales/mails.pt.yml | 3 ++- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0502791a2..463df1220 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Changelog Fab Manager +- Improved notification email to the member when a rolling subscription is taken - Handle Ctrl^C in upgrade scripts - Updated moment-timezone diff --git a/app/views/notifications_mailer/notify_member_subscribed_plan.html.erb b/app/views/notifications_mailer/notify_member_subscribed_plan.html.erb index 327a0e9f2..808231770 100644 --- a/app/views/notifications_mailer/notify_member_subscribed_plan.html.erb +++ b/app/views/notifications_mailer/notify_member_subscribed_plan.html.erb @@ -2,4 +2,9 @@

<%= t('.body.plan_subscribed_html', PLAN: @attached_object.plan.human_readable_name) %>

-

<%= t('.body.subscription_stops_on', DATE: I18n.l(@attached_object.expired_at.to_date)) %>

+<% if @attached_object.plan.is_rolling && @recipient.trainings.count.zero? %> + <% duration = I18n.t("duration.#{@attached_object.plan.interval}", count: @attached_object.plan.interval_count) %> +

<%= t('.body.rolling_subscription_stops_on', DURATION: duration, DATE: I18n.l(@attached_object.expired_at.to_date)) %>

+<% else %> +

<%= t('.body.subscription_stops_on', DATE: I18n.l(@attached_object.expired_at.to_date)) %>

+<% end %> diff --git a/config/locales/mails.en.yml b/config/locales/mails.en.yml index 9aea143be..e50ef8934 100644 --- a/config/locales/mails.en.yml +++ b/config/locales/mails.en.yml @@ -80,7 +80,8 @@ en: subject: "Your subscription has been successfully purchased" body: plan_subscribed_html: "You have subscribed the plan: %{PLAN}." - subscription_stops_on: "Your subscription plan will end on %{DATE}" + rolling_subscription_stops_on: "Your subscription will end %{DURATION} after your first training. Otherwise, it will stop on %{DATE}." + subscription_stops_on: "Your subscription will end on %{DATE}." notify_member_create_reservation: subject: "Your reservation has been successfully saved" diff --git a/config/locales/mails.es.yml b/config/locales/mails.es.yml index 98c80b22a..0341c8b66 100644 --- a/config/locales/mails.es.yml +++ b/config/locales/mails.es.yml @@ -80,7 +80,8 @@ es: subject: "Su suscripción ha sido correctamente comprada" body: plan_subscribed_html: "Se ha suscrito al plan: %{PLAN}." - subscription_stops_on: "Su suscripción terminará el %{DATE}" + rolling_subscription_stops_on: "Su suscripción terminará %{DURATION} después de su primer entrenamiento. De lo contrario, se detendrá el %{DATE}." + subscription_stops_on: "Su suscripción terminará el %{DATE}." notify_member_create_reservation: subject: "Su reserva se ha registrado correctamente" diff --git a/config/locales/mails.fr.yml b/config/locales/mails.fr.yml index b70eaa751..5f1601c6a 100644 --- a/config/locales/mails.fr.yml +++ b/config/locales/mails.fr.yml @@ -80,7 +80,8 @@ fr: subject: "Votre abonnement a bien été souscrit" body: plan_subscribed_html: "Vous avez souscrit à l'abonnement : %{PLAN}." - subscription_stops_on: "Votre abonnement s'arrêtera automatiquement le %{DATE}" + rolling_subscription_stops_on: "Votre abonnement s'arrêtera automatiquement %{DURATION} après votre première formation. À défaut, il s'arrêtera le %{DATE}." + subscription_stops_on: "Votre abonnement s'arrêtera automatiquement le %{DATE}." notify_member_create_reservation: subject: "Votre réservation a bien été enregistrée" diff --git a/config/locales/mails.pt.yml b/config/locales/mails.pt.yml index 20db2994f..ae2c14662 100755 --- a/config/locales/mails.pt.yml +++ b/config/locales/mails.pt.yml @@ -80,7 +80,8 @@ pt: subject: "Sua assinatura foi adquirida com êxito" body: plan_subscribed_html: "Você assinou o plano: %{PLAN}." - subscription_stops_on: "Seu plano de assinatura termina em %{DATE}" + rolling_subscription_stops_on: "Sua assinatura encerrará %{DURATION} após seu primeiro treinamento. Caso contrário, ele será interrompido em %{DATE}." + subscription_stops_on: "Sua assinatura será encerrada em %{DATE}." notify_member_create_reservation: subject: "Sua reserva foi salva com sucesso" From 35fb991cdbc0592b00d62dea373f6dac32842d9d Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 23 Oct 2019 17:48:31 +0200 Subject: [PATCH 006/135] Improved user experience in defining slots in the calendar management --- CHANGELOG.md | 1 + .../controllers/admin/calendar.js.erb | 86 +++++++++++-------- config/locales/app.admin.en.yml | 1 + config/locales/app.admin.es.yml | 1 + config/locales/app.admin.fr.yml | 1 + config/locales/app.admin.pt.yml | 1 + 6 files changed, 53 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 463df1220..81a724711 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Changelog Fab Manager +- Improved user experience in defining slots in the calendar management - Improved notification email to the member when a rolling subscription is taken - Handle Ctrl^C in upgrade scripts - Updated moment-timezone diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index 6e35d5a91..ee4620858 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -275,46 +275,56 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state var calendarSelectCb = function (start, end, jsEvent, view) { start = moment.tz(start.toISOString(), Fablab.timezone); end = moment.tz(end.toISOString(), Fablab.timezone); - // first we check that the selected slot is an N-hours multiple (ie. not decimal) - if (Number.isInteger(parseInt((end.valueOf() - start.valueOf()) / (SLOT_MULTIPLE * 1000), 10) / SLOT_MULTIPLE)) { - const today = new Date(); - if (parseInt((start.valueOf() - today) / (60 * 1000), 10) >= 0) { - // then we open a modal window to let the admin specify the slot type - const modalInstance = $uibModal.open({ - templateUrl: '<%= asset_path "admin/calendar/eventModal.html" %>', - controller: 'CreateEventModalController', - resolve: { - start () { return start; }, - end () { return end; }, - machinesPromise: ['Machine', function (Machine) { return Machine.query().$promise; }], - trainingsPromise: ['Training', function (Training) { return Training.query().$promise; }], - spacesPromise: ['Space', function (Space) { return Space.query().$promise; }] - } }); - // when the modal is closed, we send the slot to the server for saving - modalInstance.result.then( - function (availability) { - uiCalendarConfig.calendars.calendar.fullCalendar( - 'renderEvent', - { - id: availability.id, - title: availability.title, - start: availability.start_at, - end: availability.end_at, - textColor: 'black', - backgroundColor: availability.backgroundColor, - borderColor: availability.borderColor, - tag_ids: availability.tag_ids, - tags: availability.tags, - machine_ids: availability.machine_ids - }, - true - ); - }, - function () { uiCalendarConfig.calendars.calendar.fullCalendar('unselect'); } - ); - } + + // check if slot is not in the past + const today = new Date(); + if (Math.trunc((start.valueOf() - today) / (60 * 1000)) < 0) { + growl.warning(_t('admin_calendar.event_in_the_past')); + return uiCalendarConfig.calendars.calendar.fullCalendar('unselect'); } + // check that the selected slot is an N-hours multiple (ie. not decimal) + const slots = Math.trunc((end.valueOf() - start.valueOf()) / (60 * 1000)) / SLOT_MULTIPLE; + if (!Number.isInteger(slots)) { + // otherwise, round it to nearest decimal + const nearest = Math.round(slots) * SLOT_MULTIPLE; + end = moment(start).add(nearest, 'minutes'); + } + + // then we open a modal window to let the admin specify the slot type + const modalInstance = $uibModal.open({ + templateUrl: '<%= asset_path "admin/calendar/eventModal.html" %>', + controller: 'CreateEventModalController', + resolve: { + start () { return start; }, + end () { return end; }, + machinesPromise: ['Machine', function (Machine) { return Machine.query().$promise; }], + trainingsPromise: ['Training', function (Training) { return Training.query().$promise; }], + spacesPromise: ['Space', function (Space) { return Space.query().$promise; }] + } }); + // when the modal is closed, we send the slot to the server for saving + modalInstance.result.then( + function (availability) { + uiCalendarConfig.calendars.calendar.fullCalendar( + 'renderEvent', + { + id: availability.id, + title: availability.title, + start: availability.start_at, + end: availability.end_at, + textColor: 'black', + backgroundColor: availability.backgroundColor, + borderColor: availability.borderColor, + tag_ids: availability.tag_ids, + tags: availability.tags, + machine_ids: availability.machine_ids + }, + true + ); + }, + function () { uiCalendarConfig.calendars.calendar.fullCalendar('unselect'); } + ); + return uiCalendarConfig.calendars.calendar.fullCalendar('unselect'); }; diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index eb9ee6fcd..2074af2a8 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -61,6 +61,7 @@ en: unlockable_because_reservations: "Unable to block booking on this slot because some uncancelled reservations exist on it." delete_slot: "Delete this slot" do_you_really_want_to_delete_this_slot: "Do you really want to delete this slot?" + event_in_the_past: "Unable to create a slot in the past." project_elements: # management of the projects' components diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 6e8bcadb2..9c498fe3d 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -61,6 +61,7 @@ es: unlockable_because_reservations: "No se puede bloquear la reserva en esta ranura porque existen algunas reservas no canceladas." delete_slot: "Delete this slot" # translation_missing do_you_really_want_to_delete_this_slot: "Do you really want to delete this slot?" + event_in_the_past: "Unable to create a slot in the past." # translation_missing project_elements: # management of the projects' components diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 3e8d9c517..7bb2a932f 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -61,6 +61,7 @@ fr: unlockable_because_reservations: "Impossible de bloquer les réservations sur ce créneau car il existe des réservations non annulées sur celui-ci." delete_slot: "Supprimer le créneau" do_you_really_want_to_delete_this_slot: "Êtes vous sur de vouloir supprimer ce créneau ?" + event_in_the_past: "Impossible de créer un créneau dans le passé." project_elements: # gestion des éléments constituant les projets diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 4958bcf95..75f0b58a6 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -61,6 +61,7 @@ pt: unlockable_because_reservations: "Não é possível bloquear a reserva neste slot porque existem algumas reservas não cancelados nele." delete_slot: "Exclua o slot" do_you_really_want_to_delete_this_slot: "Você realmente quer excluir esse slot?" + event_in_the_past: "Unable to create a slot in the past." # translation_missing project_elements: # management of the projects' components From f94d8feba6f793c5d3cb5271d37c96b01f086023 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 29 Oct 2019 09:59:21 +0100 Subject: [PATCH 007/135] [feature] admin can delete an user --- CHANGELOG.md | 1 + .../controllers/admin/members.js.erb | 43 ++++++++++++++++--- .../templates/admin/members/members.html.erb | 5 ++- app/controllers/api/members_controller.rb | 2 +- app/policies/user_policy.rb | 6 +-- config/locales/app.admin.en.yml | 3 ++ config/locales/app.admin.es.yml | 3 ++ config/locales/app.admin.fr.yml | 3 ++ config/locales/app.admin.pt.yml | 3 ++ 9 files changed, 57 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81a724711..0d40ef7fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Changelog Fab Manager +- An administrator can delete a member - Improved user experience in defining slots in the calendar management - Improved notification email to the member when a rolling subscription is taken - Handle Ctrl^C in upgrade scripts diff --git a/app/assets/javascripts/controllers/admin/members.js.erb b/app/assets/javascripts/controllers/admin/members.js.erb index 023f53dfe..2e95fd0c1 100644 --- a/app/assets/javascripts/controllers/admin/members.js.erb +++ b/app/assets/javascripts/controllers/admin/members.js.erb @@ -182,6 +182,35 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce', } }; + /** + * Ask for confirmation then delete the specified user + * @param memberId {number} identifier of the user to delete + */ + $scope.deleteMember = function(memberId) { + dialogs.confirm( + { + resolve: { + object () { + return { + title: _t('confirmation_required'), + msg: $sce.trustAsHtml(_t('confirm_delete_member') + '

' + _t('this_may_take_a_while_please_wait')) + }; + } + } + }, + function () { // cancel confirmed + Member.delete( + { id: memberId }, + function () { + $scope.members.splice(findItemIdxById($scope.members, memberId), 1); + return growl.success(_t('member_successfully_deleted')); + }, + function (error) { growl.error(_t('unable_to_delete_the_member')); } + ); + } + ); + } + /** * Ask for confirmation then delete the specified administrator * @param admins {Array} full list of administrators @@ -203,7 +232,7 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce', Admin.delete( { id: admin.id }, function () { - admins.splice(findAdminIdxById(admins, admin.id), 1); + admins.splice(findItemIdxById(admins, admin.id), 1); return growl.success(_t('administrator_successfully_deleted')); }, function (error) { growl.error(_t('unable_to_delete_the_administrator')); } @@ -261,13 +290,13 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce', var searchTimeout = null; /** - * Iterate through the provided array and return the index of the requested admin - * @param admins {Array} full list of users with role 'admin' - * @param id {Number} user id of the admin to retrieve in the list - * @returns {Number} index of the requested admin, in the provided array + * Iterate through the provided array and return the index of the requested item + * @param items {Array} full list of users with role 'admin' + * @param id {Number} id of the item to retrieve in the list + * @returns {Number} index of the requested item, in the provided array */ - var findAdminIdxById = function (admins, id) { - return (admins.map(function (admin) { return admin.id; })).indexOf(id); + var findItemIdxById = function (items, id) { + return (items.map(function (item) { return item.id; })).indexOf(id); }; /** diff --git a/app/assets/templates/admin/members/members.html.erb b/app/assets/templates/admin/members/members.html.erb index 8da4bf427..150b4d5e6 100644 --- a/app/assets/templates/admin/members/members.html.erb +++ b/app/assets/templates/admin/members/members.html.erb @@ -45,7 +45,10 @@
+ {{ 'incomplete_profile' }}
diff --git a/app/controllers/api/members_controller.rb b/app/controllers/api/members_controller.rb index 039280418..08cdce20b 100644 --- a/app/controllers/api/members_controller.rb +++ b/app/controllers/api/members_controller.rb @@ -66,7 +66,7 @@ class API::MembersController < API::ApiController def destroy authorize @member @member.destroy - sign_out(@member) + sign_out(@member) if @member.id == current_user.id head :no_content end diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb index a794ee3dd..18b3c58cf 100644 --- a/app/policies/user_policy.rb +++ b/app/policies/user_policy.rb @@ -16,15 +16,15 @@ class UserPolicy < ApplicationPolicy end def show? - user.admin? or (record.is_allow_contact and record.member?) or (user.id == record.id) + user.admin? || (record.is_allow_contact && record.member?) || (user.id == record.id) end def update? - user.admin? or (user.id == record.id) + user.admin? || (user.id == record.id) end def destroy? - user.id == record.id + user.admin? || (user.id == record.id) end def merge? diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 2074af2a8..b37d2a823 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -521,6 +521,9 @@ en: add_a_new_administrator: "Add a new administrator" groups: "Groups" authentication: "Authentication" + confirm_delete_member: "Do you really want to delete this member? This cannot be undone." + member_successfully_deleted: "Member successfully deleted." + unable_to_delete_the_member: "Unable to delete the member." do_you_really_want_to_delete_this_administrator_this_cannot_be_undone: "Do you really want to delete this administrator? This cannot be undone." this_may_take_a_while_please_wait: "Warning: this may take a while, please be patient." administrator_successfully_deleted: "Administrator successfully deleted." diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 9c498fe3d..bd7b2c14d 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -521,6 +521,9 @@ es: add_a_new_administrator: "Agregar un nuevo administrador" groups: "Grupos" authentication: "Autenticación" + confirm_delete_member: "¿Desea realmente eliminar este usario? Esto no se puede deshacer." + member_successfully_deleted: "Usario eliminado correctamente." + unable_to_delete_the_member: "No se puede eliminar el usario." do_you_really_want_to_delete_this_administrator_this_cannot_be_undone: "¿Desea realmente eliminar este administrador? Esto no se puede deshacer." this_may_take_a_while_please_wait: "Advertencia: esto puede tomar un tiempo, por favor, tenga paciencia." administrator_successfully_deleted: "Administrador eliminado correctamente." diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 7bb2a932f..c94baefa1 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -522,6 +522,9 @@ fr: add_a_new_administrator: "Ajouter un nouvel administrateur" groups: "Groupes" authentication: "Authentification" + confirm_delete_member: "Êtes-vous sûr de vouloir supprimer ce membre ? Cette opération est irréversible." + member_successfully_deleted: "Le membre a bien été supprimé." + unable_to_delete_the_member: "Le membre n'a pas pu être supprimé." do_you_really_want_to_delete_this_administrator_this_cannot_be_undone: "Êtes-vous sûr de vouloir supprimer cet administrateur ? Cette opération est irréversible." this_may_take_a_while_please_wait: "Attention : ceci peut prendre un certain temps, merci de patienter." administrator_successfully_deleted: "L'administrateur a bien été supprimé." diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 75f0b58a6..ad46a610d 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -521,6 +521,9 @@ pt: add_a_new_administrator: "Adicionar novo administrador" groups: "Grupos" authentication: "Autenticação" + confirm_delete_member: "Você realmente deseja excluir este usuário? Isso não pode ser revertido." + member_successfully_deleted: "Usuário excluído com sucesso." + unable_to_delete_the_member: "Impossível excluir membro." do_you_really_want_to_delete_this_administrator_this_cannot_be_undone: "Você realmente deseja excluir este administrador? Isso não pode ser revertido." this_may_take_a_while_please_wait: "Atenção: Isso pode demorar um pouco, por favor, seja paciente." administrator_successfully_deleted: "Administrator excluído com sucesso." From 1ed3eba1295d7bfa7ba20b8966787c2cc66bd45a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 29 Oct 2019 11:09:17 +0100 Subject: [PATCH 008/135] [feature] export last connection date to members.xlsx --- README.md | 2 ++ app/controllers/api/members_controller.rb | 10 +++++++++- app/views/exports/users_members.xlsx.axlsx | 6 ++++-- config/locales/en.yml | 1 + config/locales/es.yml | 1 + config/locales/fr.yml | 1 + config/locales/pt.yml | 1 + 7 files changed, 19 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d3fbc31cc..458c69baf 100644 --- a/README.md +++ b/README.md @@ -435,6 +435,8 @@ Developers may find information on how to implement their own authentication pro - In some cases, the invoices won't be generated. This can be due to the image included in the invoice header not being supported. To fix this issue, change the image in the administrator interface (manage the invoices / invoices settings). See [this thread](https://forum.fab-manager.com/t/resolu-erreur-generation-facture/428) for more info. + +- In the excel exports, if the cells expected to contain dates are showing strange numbers, check that you have correctly configured the [EXCEL_DATE_FORMAT](doc/environment.md#EXCEL_DATE_FORMAT) variable. ## Related Documentation diff --git a/app/controllers/api/members_controller.rb b/app/controllers/api/members_controller.rb index 08cdce20b..4949158fd 100644 --- a/app/controllers/api/members_controller.rb +++ b/app/controllers/api/members_controller.rb @@ -115,8 +115,16 @@ class API::MembersController < API::ApiController def export_members authorize :export + last_update = [ + User.with_role(:member).maximum('updated_at'), + Profile.where(user_id: User.with_role(:member)).maximum('updated_at'), + InvoicingProfile.where(user_id: User.with_role(:member)).maximum('updated_at'), + StatisticProfile.where(user_id: User.with_role(:member)).maximum('updated_at'), + Subscription.maximum('updated_at') + ].max + export = Export.where(category: 'users', export_type: 'members') - .where('created_at > ?', User.with_role(:member).maximum('updated_at')) + .where('created_at > ?', last_update) .last if export.nil? || !FileTest.exist?(export.file) @export = Export.new(category: 'users', export_type: 'members', user: current_user) diff --git a/app/views/exports/users_members.xlsx.axlsx b/app/views/exports/users_members.xlsx.axlsx index 2c4b2588e..bd170e5ea 100644 --- a/app/views/exports/users_members.xlsx.axlsx +++ b/app/views/exports/users_members.xlsx.axlsx @@ -14,6 +14,7 @@ wb.add_worksheet(name: t('export_members.members')) do |sheet| t('export_members.first_name'), t('export_members.email'), t('export_members.newsletter'), + t('export_members.last_login'), t('export_members.gender'), t('export_members.age'), t('export_members.address'), @@ -45,6 +46,7 @@ wb.add_worksheet(name: t('export_members.members')) do |sheet| member.profile.first_name, member.email, member.is_allow_newsletter, + member.last_sign_in_at&.to_date, member.statistic_profile.gender ? t('export_members.man') : t('export_members.woman'), member.statistic_profile.age, member.invoicing_profile&.address&.address || '', @@ -66,10 +68,10 @@ wb.add_worksheet(name: t('export_members.members')) do |sheet| member.invoicing_profile&.organization&.name || '', member.invoicing_profile&.organization&.address&.address || '' ] - styles = [nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + styles = [nil, nil, nil, nil, nil, date, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, date, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil] - types = %i[integer string string string boolean string integer string string string string string + types = %i[integer string string string boolean date string integer string string string string string string string string date string string integer string string string string string string string] sheet.add_row data, style: styles, types: types diff --git a/config/locales/en.yml b/config/locales/en.yml index 022a2625e..1bf554024 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -167,6 +167,7 @@ en: first_name: "First name" email: "E-mail" newsletter: "Newsletter" + last_login: "Last login" gender: "Gender" age: "Age" address: "Address" diff --git a/config/locales/es.yml b/config/locales/es.yml index 6e6d2ae60..4dc9dcc30 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -167,6 +167,7 @@ es: first_name: "Nombre" email: "E-mail" newsletter: "Hoja informativa" + last_login: "Último acceso" gender: "Genero" age: "Edad" address: "Dirección" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 533802553..120a624d7 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -167,6 +167,7 @@ fr: first_name: "Prénom" email: "Courriel" newsletter: "Lettre d'informations" + last_login: "Dernière connexion" gender: "Genre" age: "Âge" address: "Adresse" diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 155a3aaa6..813e004ff 100755 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -167,6 +167,7 @@ pt: first_name: "Primeiro nome" email: "E-mail" newsletter: "Newsletter" + last_login: "Último login" gender: "Gênero" age: "Idade" address: "Endereço" From 12b9155b43dc182e0ba51c03705b4bd0b51be340 Mon Sep 17 00:00:00 2001 From: Nicolas Florentin Date: Tue, 29 Oct 2019 15:20:25 +0100 Subject: [PATCH 009/135] try to fix edge cases of VatHistoryService, related to issue #156 --- app/services/vat_history_service.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/services/vat_history_service.rb b/app/services/vat_history_service.rb index 320f62d69..ef8cf60d4 100644 --- a/app/services/vat_history_service.rb +++ b/app/services/vat_history_service.rb @@ -32,9 +32,10 @@ class VatHistoryService chronology.push(start: v.created_at, end: end_date, enabled: v.value == 'true') end_date = v.created_at end + chronology.push(start: DateTime.new(0), end: end_date, enabled: false) date_rates = [] Setting.find_by(name: 'invoice_VAT-rate').history_values.order(created_at: 'ASC').each do |rate| - range = chronology.select { |p| rate.created_at.between?(p[:start], p[:end]) }.first + range = chronology.select { |p| rate.created_at.to_i.between?(p[:start].to_i, p[:end].to_i) }.first date = range[:enabled] ? rate.created_at : range[:end] date_rates.push(date: date, rate: rate.value.to_i) end From cdc30e0da229aac2aac4be29c9ea60d3cc2f648c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 29 Oct 2019 16:52:52 +0100 Subject: [PATCH 010/135] configure the slots duration with an environment variable --- app/assets/javascripts/controllers/admin/calendar.js.erb | 2 +- app/helpers/application_helper.rb | 2 +- app/views/application/index.html.erb | 1 + config/application.yml.default | 2 ++ config/secrets.yml | 4 ++++ doc/environment.md | 6 ++++++ docker/env.example | 2 ++ 7 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index ee4620858..dba9d8ef1 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -30,7 +30,7 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state const BOOKING_SNAP = '00:30:00'; // We do not allow the creation of slots that are not a multiple of 60 minutes - const SLOT_MULTIPLE = 60; + const SLOT_MULTIPLE = Fablab.slotDuration; /* PUBLIC SCOPE */ diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ea6e2ab0b..88473e6e6 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -7,7 +7,7 @@ module ApplicationHelper require 'message_format' ## machine/spaces availabilities are divided in multiple slots of 60 minutes - SLOT_DURATION ||= 60 + SLOT_DURATION ||= Rails.application.secrets.slot_duration || 60 ## # Verify if the provided attribute is in the provided attributes array, whatever it exists or not diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb index 74a5210a0..123ad711b 100644 --- a/app/views/application/index.html.erb +++ b/app/views/application/index.html.erb @@ -20,6 +20,7 @@ Fablab.withoutSpaces = ('<%= Rails.application.secrets.fablab_without_spaces %>' !== 'false'); Fablab.withoutOnlinePayment = ('<%= Rails.application.secrets.fablab_without_online_payments %>' === 'true'); Fablab.withoutInvoices = ('<%= Rails.application.secrets.fablab_without_invoices %>' === 'true'); + Fablab.slotDuration = parseInt("<%= ApplicationHelper::SLOT_DURATION %>", 10); Fablab.disqusShortname = "<%= Rails.application.secrets.disqus_shortname %>"; Fablab.defaultHost = "<%= Rails.application.secrets.default_host %>"; Fablab.gaId = "<%= Rails.application.secrets.google_analytics_id %>"; diff --git a/config/application.yml.default b/config/application.yml.default index 96bbc8238..e8775cb29 100644 --- a/config/application.yml.default +++ b/config/application.yml.default @@ -21,6 +21,8 @@ FABLAB_WITHOUT_SPACES: 'true' FABLAB_WITHOUT_ONLINE_PAYMENT: 'false' FABLAB_WITHOUT_INVOICES: 'false' +SLOT_DURATION: '60' + DEFAULT_MAIL_FROM: Fab Manager Demo # Configure carefully! diff --git a/config/secrets.yml b/config/secrets.yml index d647b149f..87e05bab2 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -20,6 +20,7 @@ development: fablab_without_spaces: <%= ENV["FABLAB_WITHOUT_SPACES"] %> fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %> fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %> + slot_duration: <%= ENV["SLOT_DURATION"] %> default_host: <%= ENV["DEFAULT_HOST"] %> default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %> time_zone: <%= ENV["TIME_ZONE"] %> @@ -62,6 +63,7 @@ test: fablab_without_spaces: false fablab_without_online_payments: false fablab_without_invoices: false + slot_duration: <%= ENV["SLOT_DURATION"] %> default_host: <%= ENV["DEFAULT_HOST"] %> default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %> time_zone: Paris @@ -104,6 +106,7 @@ staging: fablab_without_spaces: <%= ENV["FABLAB_WITHOUT_SPACES"] %> fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %> fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %> + slot_duration: <%= ENV["SLOT_DURATION"] %> default_host: <%= ENV["DEFAULT_HOST"] %> default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %> delivery_method: <%= ENV['DELIVERY_METHOD'] %> @@ -157,6 +160,7 @@ production: fablab_without_spaces: <%= ENV["FABLAB_WITHOUT_SPACES"] %> fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %> fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %> + slot_duration: <%= ENV["SLOT_DURATION"] %> default_host: <%= ENV["DEFAULT_HOST"] %> default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %> delivery_method: <%= ENV['DELIVERY_METHOD'] %> diff --git a/doc/environment.md b/doc/environment.md index ccfd6a922..594c9cf17 100644 --- a/doc/environment.md +++ b/doc/environment.md @@ -102,6 +102,12 @@ Valid stripe API keys are still required, even if you don't require online payme If set to 'true', the invoices will be disabled. This is useful if you have your own invoicing system and you want to prevent Fab-manager from generating and sending invoices to members. **Very important**: if you disable invoices, you still have to configure VAT in the interface to prevent errors in accounting and prices. + + + SLOT_DURATION + +Machine and space availabilities are divided in multiple slots of the duration set by this variable. +Default value is 60 minutes (1 hour). DEFAULT_MAIL_FROM diff --git a/docker/env.example b/docker/env.example index 8f8333811..5460ef28c 100644 --- a/docker/env.example +++ b/docker/env.example @@ -14,6 +14,8 @@ FABLAB_WITHOUT_SPACES=true FABLAB_WITHOUT_ONLINE_PAYMENT=true FABLAB_WITHOUT_INVOICES=false +SLOT_DURATION=60 + DEFAULT_MAIL_FROM=Fab Manager Demo DEFAULT_HOST=demo.fab-manager.com DEFAULT_PROTOCOL=http From 96a2f6e426d84d0255acd6450ea9dd92af53ece6 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 30 Oct 2019 15:09:44 +0100 Subject: [PATCH 011/135] create availablities with slots duration ne 60 --- .../controllers/admin/calendar.js.erb | 24 +++++++++++-------- doc/environment.md | 2 ++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index dba9d8ef1..be492e2a0 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -283,12 +283,12 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state return uiCalendarConfig.calendars.calendar.fullCalendar('unselect'); } - // check that the selected slot is an N-hours multiple (ie. not decimal) + // check that the selected slot is an multiple of SLOT_MULTIPLE (ie. not decimal) const slots = Math.trunc((end.valueOf() - start.valueOf()) / (60 * 1000)) / SLOT_MULTIPLE; if (!Number.isInteger(slots)) { - // otherwise, round it to nearest decimal - const nearest = Math.round(slots) * SLOT_MULTIPLE; - end = moment(start).add(nearest, 'minutes'); + // otherwise, round it to upper decimal + const upper = Math.ceil(slots) * SLOT_MULTIPLE; + end = moment(start).add(upper, 'minutes'); } // then we open a modal window to let the admin specify the slot type @@ -507,21 +507,25 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui Tag.query().$promise.then(function (data) { $scope.tags = data; }); - // When we configure a machine availability, do not let the user change the end time, as the total - // time must be dividable by 60 minutes (base slot duration). For training availabilities, the user + // When we configure a machine/space availability, do not let the user change the end time, as the total + // time must be dividable by Fablab.slotDuration minutes (base slot duration). For training availabilities, the user // can configure any duration as it does not matters. $scope.$watch('availability.available_type', function (newValue, oldValue, scope) { if ((newValue === 'machines') || (newValue === 'space')) { $scope.endDateReadOnly = true; - const diff = moment($scope.end).diff($scope.start, 'hours'); // the result is rounded down by moment.js - $scope.end = moment($scope.start).add(diff, 'hours').toDate(); + const slots = Math.trunc(($scope.end.valueOf() - $scope.start.valueOf()) / (60 * 1000)) / Fablab.slotDuration; + if (!Number.isInteger(slots)) { + // otherwise, round it to upper decimal + const upper = Math.ceil(slots) * Fablab.slotDuration; + $scope.end = moment($scope.start).add(upper, 'minutes').toDate(); + } return $scope.availability.end_at = $scope.end; } else { return $scope.endDateReadOnly = false; } }); - // When the start date is changed, if we are configuring a machine availability, + // When the start date is changed, if we are configuring a machine/space availability, // maintain the relative length of the slot (ie. change the end time accordingly) $scope.$watch('start', function (newValue, oldValue, scope) { // for machine or space availabilities, adjust the end time @@ -542,7 +546,7 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui // Maintain consistency between the end time and the date object in the availability object return $scope.$watch('end', function (newValue, oldValue, scope) { // we prevent the admin from setting the end of the availability before its begining - if (moment($scope.start).add(1, 'hour').isAfter(newValue)) { + if (moment($scope.start).add(Fablab.slotDuration, 'minutes').isAfter(newValue)) { $scope.end = oldValue; } // update availability object diff --git a/doc/environment.md b/doc/environment.md index 594c9cf17..4fcfc5ada 100644 --- a/doc/environment.md +++ b/doc/environment.md @@ -108,6 +108,8 @@ This is useful if you have your own invoicing system and you want to prevent Fab Machine and space availabilities are divided in multiple slots of the duration set by this variable. Default value is 60 minutes (1 hour). + +⚠ You should not change this value during the application lifecycle! DEFAULT_MAIL_FROM From 8f04ea436ec2c4e220ef87fee52ed971622e92ee Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 30 Oct 2019 15:39:30 +0100 Subject: [PATCH 012/135] updated changelog --- CHANGELOG.md | 2 ++ doc/environment.md | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d40ef7fd..568c51c54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,12 @@ # Changelog Fab Manager - An administrator can delete a member +- Ability to configure the duration of a reservation slot. Previously, only 60 minutes slots were allowed - Improved user experience in defining slots in the calendar management - Improved notification email to the member when a rolling subscription is taken - Handle Ctrl^C in upgrade scripts - Updated moment-timezone +- [TODO DEPLOY] add the `SLOT_DURATION` environment variable (see [doc/environment.md](doc/environment.md#SLOT_DURATION) for configuration details) ## v4.2.3 2019 October 22 diff --git a/doc/environment.md b/doc/environment.md index 4fcfc5ada..5ba50d6ec 100644 --- a/doc/environment.md +++ b/doc/environment.md @@ -109,7 +109,8 @@ This is useful if you have your own invoicing system and you want to prevent Fab Machine and space availabilities are divided in multiple slots of the duration set by this variable. Default value is 60 minutes (1 hour). -⚠ You should not change this value during the application lifecycle! +⚠ Changing this value during the application life may cause serious issues. +Please ensure there's no machine/space availabilities opened to reservation or already reserved **in the future** when you change this value. DEFAULT_MAIL_FROM From a755f34372831c4423ba28c1f2c936e9023573f4 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 30 Oct 2019 15:44:00 +0100 Subject: [PATCH 013/135] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 568c51c54..72023a739 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Improved notification email to the member when a rolling subscription is taken - Handle Ctrl^C in upgrade scripts - Updated moment-timezone +- Fix a bug: in some cases, the invoices were not generated after deploying v4.2.0+. This can occurs if VAT was changed/enabled during the application life (#156) - [TODO DEPLOY] add the `SLOT_DURATION` environment variable (see [doc/environment.md](doc/environment.md#SLOT_DURATION) for configuration details) ## v4.2.3 2019 October 22 From a2597a982ed86fcd52824afd5c8ec1e232a05f1f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 30 Oct 2019 15:45:54 +0100 Subject: [PATCH 014/135] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72023a739..8b634ddca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Updated moment-timezone - Fix a bug: in some cases, the invoices were not generated after deploying v4.2.0+. This can occurs if VAT was changed/enabled during the application life (#156) - [TODO DEPLOY] add the `SLOT_DURATION` environment variable (see [doc/environment.md](doc/environment.md#SLOT_DURATION) for configuration details) +- [TODO DEPLOY] `rake fablab:maintenance:regenerate_invoices[2019,10]` only if you had download issues with your last invoices ## v4.2.3 2019 October 22 From 279e5f692b21a2b3db9b14945cd29350bae14542 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2019 18:00:54 +0000 Subject: [PATCH 015/135] Bump loofah from 2.3.0 to 2.3.1 Bumps [loofah](https://github.com/flavorjones/loofah) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md) - [Commits](https://github.com/flavorjones/loofah/compare/v2.3.0...v2.3.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0c1c06a6b..eec86b501 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -153,7 +153,7 @@ GEM execjs (2.7.0) faker (1.4.3) i18n (~> 0.5) - faraday (0.17) + faraday (0.17.0) multipart-post (>= 1.2, < 3) ffi (1.9.24) figaro (1.1.0) @@ -208,7 +208,7 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) libv8 (3.16.14.19) - loofah (2.3.0) + loofah (2.3.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -240,7 +240,7 @@ GEM multi_xml (0.6.0) multipart-post (2.1.1) naught (1.1.0) - nokogiri (1.10.4) + nokogiri (1.10.5) mini_portile2 (~> 2.4.0) notify_with (0.0.2) jbuilder (~> 2.0) From df26e4de4a89c435a36a1781708987efc156b80f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 7 Nov 2019 19:38:29 +0100 Subject: [PATCH 016/135] updated changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c908ce7ed..79ce9b6f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,9 @@ - Improved notification email to the member when a rolling subscription is taken - Handle Ctrl^C in upgrade scripts - Updated moment-timezone +- Fix a security issue: fixed [CVE-2019-15587](https://github.com/advisories/GHSA-c3gv-9cxf-6f57) - [TODO DEPLOY] add the `SLOT_DURATION` environment variable (see [doc/environment.md](doc/environment.md#SLOT_DURATION) for configuration details) +- [TODO DEPLOY] -> (only dev) `bundle install` ## v4.2.4 2019 October 30 From 2cccbd3486d2dfbf6738d87ec91d616cbe0501d0 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 12 Nov 2019 14:25:28 +0100 Subject: [PATCH 017/135] recurrence UI --- .../controllers/admin/calendar.js.erb | 38 +++++++++- .../admin/calendar/eventModal.html.erb | 69 ++++++++++++++++++- config/locales/app.admin.en.yml | 11 +++ config/locales/app.admin.es.yml | 11 +++ config/locales/app.admin.fr.yml | 11 +++ config/locales/app.admin.pt.yml | 11 +++ 6 files changed, 146 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index be492e2a0..538e4e755 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -468,6 +468,8 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui */ $scope.next = function () { if ($scope.step === 1) { $scope.setNbTotalPlaces(); } + if ($scope.step === 2) { return validateSelection(); } + if ($scope.step === 4) { return validateRecurrence(); } return $scope.step++; }; @@ -534,8 +536,8 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui end.add(moment(newValue).diff(oldValue), 'milliseconds'); $scope.end = end.toDate(); } else { // for training availabilities - // prevent the admin from setting the begining after the and - if (moment(newValue).add(1, 'hour').isAfter($scope.end)) { + // prevent the admin from setting the beginning after the end + if (moment(newValue).add(Fablab.slotDuration, 'minutes').isAfter($scope.end)) { $scope.start = oldValue; } } @@ -545,7 +547,7 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui // Maintain consistency between the end time and the date object in the availability object return $scope.$watch('end', function (newValue, oldValue, scope) { - // we prevent the admin from setting the end of the availability before its begining + // we prevent the admin from setting the end of the availability before its beginning if (moment($scope.start).add(Fablab.slotDuration, 'minutes').isAfter(newValue)) { $scope.end = oldValue; } @@ -554,6 +556,36 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui }); }; + /** + * Validates that a machine or more was/were selected before continuing to step 3 (adjust time + tags) + */ + const validateSelection = function () { + if ($scope.availability.available_type === 'machines') { + if ($scope.selectedMachines.length === 0) { + return growl.error(_t('admin_calendar.you_should_select_at_least_a_machine')); + } + } + $scope.step++; + }; + + /** + * Validates that the recurrence parameters were correctly set before continuing to step 5 (summary) + */ + const validateRecurrence = function () { + if ($scope.availability.is_recurrent) { + if (!$scope.availability.period) { + return growl.error(_t('admin_calendar.select_period')); + } + if (!$scope.availability.nb_periods) { + return growl.error(_t('admin_calendar.select_nb_period')); + } + if (!$scope.availability.end_date) { + return growl.error(_t('admin_calendar.select_end_date')); + } + } + $scope.step++; + }; + // !!! MUST BE CALLED AT THE END of the controller return initialize(); } diff --git a/app/assets/templates/admin/calendar/eventModal.html.erb b/app/assets/templates/admin/calendar/eventModal.html.erb index 938b91668..03477cb5c 100644 --- a/app/assets/templates/admin/calendar/eventModal.html.erb +++ b/app/assets/templates/admin/calendar/eventModal.html.erb @@ -93,12 +93,77 @@ -
+
+
+

{{ 'admin_calendar.recurrence' }}

+
+
+ + + +
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+

{{ 'admin_calendar.summary' }}

+
+ lorem ipsum +
+
+
+
-
+
diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index b37d2a823..1fc01beb8 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -44,6 +44,17 @@ en: adjust_the_opening_hours: "Adjust the opening hours" to_time: "to" # context: time. eg. "from 18:00 to 21:00" restrict_this_slot_with_labels_optional: "Restrict this slot with labels (optional)" + recurrence: "Recurrence" + enabled: "Enabled" + period: "Period" + week: "Week" + month: "Month" + number_of_periods: "Number of periods" + end_date: "End date" + summary: "Summary" + select_period: "Please select a period for the recurrence" + select_nb_period: "Please select a number of periods for the recurrence" + select_end_date: "Please select the date of the last occurrence" the_slot_START-END_has_been_successfully_deleted: "The slot {{START}} - {{END}} has been successfully deleted" # angular interpolation unable_to_delete_the_slot_START-END_because_it_s_already_reserved_by_a_member: "Unable to delete the slot {{START}} - {{END}} because it's already reserved by a member" # angular interpolation you_should_select_at_least_a_machine: "You should select at least one machine on this slot." diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index bd7b2c14d..5809dba58 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -44,6 +44,17 @@ es: adjust_the_opening_hours: "Ajustar el horario de apertura" to_time: "to" # context: hora. ej. "de 18:00 a 21:00" restrict_this_slot_with_labels_optional: "Restringir esta ranura con etiquetas (opcional)" + recurrence: "Recurrence" # translation_missing + enabled: "Enabled" # translation_missing + period: "Period" # translation_missing + week: "Week" # translation_missing + month: "Month" # translation_missing + number_of_periods: "Number of periods" # translation_missing + end_date: "End date" # translation_missing + summary: "Summary" # translation_missing + select_period: "Please select a period for the recurrence" # translation_missing + select_nb_period: "Please select a number of periods for the recurrence" # translation_missing + select_end_date: "Please select the date of the last occurrence" # translation_missing the_slot_START-END_has_been_successfully_deleted: "La ranura {{START}} - {{END}} se ha eliminado correctamente" # angular interpolation unable_to_delete_the_slot_START-END_because_it_s_already_reserved_by_a_member: "No se puede eliminar la ranura {{START}} - {{END}} porque ya está reservada por un miembror" # angular interpolation you_should_select_at_least_a_machine: "Debe seleccionar al menos una máquina en esta ranura." diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index c94baefa1..2c939bcf9 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -44,6 +44,17 @@ fr: adjust_the_opening_hours: "Ajuster l'horaire" to_time: "à" # context: time. eg. "from 18:00 to 21:00" restrict_this_slot_with_labels_optional: "Restreindre ce créneau avec des étiquettes (optionnel)" + recurrence: "Récurrence" + enabled: "Activée" + period: "Période" + week: "Semaine" + month: "Mois" + number_of_periods: "Nombre de périodes" + end_date: "Date de fin" + summary: "Récapitulatif" + select_period: "Veuillez choisir une période pour la récurrence" + select_nb_period: "Veuillez choisir un nombre de périodes pour la récurrence" + select_end_date: "Veuillez choisir la date de dernière occurrence" the_slot_START-END_has_been_successfully_deleted: "Le créneau {{START}} - {{END}} a bien été supprimé" # angular interpolation unable_to_delete_the_slot_START-END_because_it_s_already_reserved_by_a_member: "Le créneau {{START}} - {{END}} n'a pu être supprimé car il est déjà réservé par un membre" # angular interpolation you_should_select_at_least_a_machine: "Vous devriez sélectionner au moins une machine pour ce créneau." diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index ad46a610d..1b4322461 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -44,6 +44,17 @@ pt: adjust_the_opening_hours: "Ajustar o horário de funcionamento" to_time: "ás" # context: time. eg. "from 18:00 to 21:00" restrict_this_slot_with_labels_optional: "Restrinja este slot com etiquetas (opcional)" + recurrence: "Recurrence" # translation_missing + enabled: "Enabled" # translation_missing + period: "Period" # translation_missing + week: "Week" # translation_missing + month: "Month" # translation_missing + number_of_periods: "Number of periods" # translation_missing + end_date: "End date" # translation_missing + summary: "Summary" # translation_missing + select_period: "Please select a period for the recurrence" # translation_missing + select_nb_period: "Please select a number of periods for the recurrence" # translation_missing + select_end_date: "Please select the date of the last occurrence" # translation_missing the_slot_START-END_has_been_successfully_deleted: "O slot {{START}} - {{END}} foi deletado com sucesso" # angular interpolation unable_to_delete_the_slot_START-END_because_it_s_already_reserved_by_a_member: "Não é possível deletar o slot {{START}} - {{END}} porque já foi reservado por um membro" # angular interpolation you_should_select_at_least_a_machine: "Você deveria selecionar a última máquina neste slot." From 22251e65164ad4d5ac5a977031e3989a9fd99465 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 12 Nov 2019 16:28:10 +0100 Subject: [PATCH 018/135] summary screen TODO: eventModal.html.erb:167 --- .../controllers/admin/calendar.js.erb | 63 ++++++++++++++++++- .../admin/calendar/eventModal.html.erb | 13 +++- config/locales/app.admin.en.yml | 4 ++ config/locales/app.admin.es.yml | 4 ++ config/locales/app.admin.fr.yml | 4 ++ config/locales/app.admin.pt.yml | 4 ++ config/locales/app.shared.en.yml | 1 + config/locales/app.shared.es.yml | 1 + config/locales/app.shared.fr.yml | 1 + config/locales/app.shared.pt.yml | 1 + 10 files changed, 92 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index 538e4e755..5cb50c0aa 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -378,8 +378,8 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state /** * Controller used in the slot creation modal window */ -Application.Controllers.controller('CreateEventModalController', ['$scope', '$uibModalInstance', 'moment', 'start', 'end', 'machinesPromise', 'Availability', 'trainingsPromise', 'spacesPromise', 'Tag', 'growl', '_t', - function ($scope, $uibModalInstance, moment, start, end, machinesPromise, Availability, trainingsPromise, spacesPromise, Tag, growl, _t) { +Application.Controllers.controller('CreateEventModalController', ['$scope', '$uibModalInstance', '$sce', 'moment', 'start', 'end', 'machinesPromise', 'Availability', 'trainingsPromise', 'spacesPromise', 'Tag', 'growl', '_t', + function ($scope, $uibModalInstance, $sce, moment, start, end, machinesPromise, Availability, trainingsPromise, spacesPromise, Tag, growl, _t) { // $uibModal parameter $scope.start = start; @@ -426,9 +426,19 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui $scope.availability = { start_at: start, end_at: end, - available_type: 'machines' // default + available_type: 'machines', // default + is_recurrent: false, + period: 'week', + nb_periods: 1, + end_date: undefined // recurrence end }; + // recurrent slots + $scope.occurrences = []; + + // localized name(s) of the reservable item(s) + $scope.reservableName = ''; + /** * Adds or removes the provided machine from the current slot * @param machine {Object} @@ -583,9 +593,56 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui return growl.error(_t('admin_calendar.select_end_date')); } } + // settings are ok + computeOccurrences(); + computeName(); $scope.step++; }; + /** + * Compute the various occurrences of the availability, according to the recurrence settings + */ + const computeOccurrences = function () { + $scope.occurrences = []; + + if ($scope.availability.is_recurrent) { + const date = moment($scope.availability.start_at); + const diff = moment($scope.availability.start_at).diff($scope.availability.end_at); + const end = moment($scope.availability.end_date).endOf('day'); + while (date.isBefore(end)) { + const occur_end = moment(date).add(diff, 'ms'); + $scope.occurrences.push({ + start_at: date.toDate(), + end_at: occur_end.toDate() + }); + date.add($scope.availability.nb_periods, $scope.availability.period); + } + } else { + $scope.occurrences.push({ + start_at: $scope.availability.start_at, + end_at: $scope.availability.end_at + }); + } + }; + + const computeName = function () { + $scope.reservableName = ''; + switch ($scope.availability.available_type) { + case 'machines': + const reservableNames = $scope.selectedMachines.map(function (m) { return $sce.trustAsHtml(`${m.name}`); }); + $scope.reservableName = reservableNames.slice(0, -1).join(', ') + ` ${_t('and')} ` + reservableNames[reservableNames.length - 1]; + break; + case 'training': + $scope.reservableName = $scope.selectedTraining.name; + break; + case 'space': + $scope.reservableName = $scope.selectedSpace.name; + break; + default: + $scope.reservableName = ''; + } + } + // !!! MUST BE CALLED AT THE END of the controller return initialize(); } diff --git a/app/assets/templates/admin/calendar/eventModal.html.erb b/app/assets/templates/admin/calendar/eventModal.html.erb index 03477cb5c..867468330 100644 --- a/app/assets/templates/admin/calendar/eventModal.html.erb +++ b/app/assets/templates/admin/calendar/eventModal.html.erb @@ -154,7 +154,18 @@

{{ 'admin_calendar.summary' }}

- lorem ipsum + {{ 'admin_calendar.about_to_create' | translate:{NUMBER:occurrences.length,TYPE:availability.available_type}:'messageformat'}} +
    +
  • {{slot.start_at | amDateFormat:'L LT'}} - {{slot.end_at | amDateFormat:'LT'}}
    • +
+
+ {{ 'admin_calendar.reservable' }} + +
+
+ {{ 'admin_calendar.labels' }} + {{availability.tag_ids.join(', ') || ('admin_calendar.none' | translate)}} +
diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 1fc01beb8..d298da152 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -55,6 +55,10 @@ en: select_period: "Please select a period for the recurrence" select_nb_period: "Please select a number of periods for the recurrence" select_end_date: "Please select the date of the last occurrence" + about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}, {NAME}:" # messageFormat interpolation + reservable: "Reservable(s):" + labels: "Label(s):" + none: "None" the_slot_START-END_has_been_successfully_deleted: "The slot {{START}} - {{END}} has been successfully deleted" # angular interpolation unable_to_delete_the_slot_START-END_because_it_s_already_reserved_by_a_member: "Unable to delete the slot {{START}} - {{END}} because it's already reserved by a member" # angular interpolation you_should_select_at_least_a_machine: "You should select at least one machine on this slot." diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 5809dba58..024c73127 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -55,6 +55,10 @@ es: select_period: "Please select a period for the recurrence" # translation_missing select_nb_period: "Please select a number of periods for the recurrence" # translation_missing select_end_date: "Please select the date of the last occurrence" # translation_missing + about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}, {NAME}:" # messageFormat interpolation # translation_missing + reservable: "Reservable(s):" # translation_missing + labels: "Etiqueta(s):" + none: "Ninguna" the_slot_START-END_has_been_successfully_deleted: "La ranura {{START}} - {{END}} se ha eliminado correctamente" # angular interpolation unable_to_delete_the_slot_START-END_because_it_s_already_reserved_by_a_member: "No se puede eliminar la ranura {{START}} - {{END}} porque ya está reservada por un miembror" # angular interpolation you_should_select_at_least_a_machine: "Debe seleccionar al menos una máquina en esta ranura." diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 2c939bcf9..2015b063c 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -55,6 +55,10 @@ fr: select_period: "Veuillez choisir une période pour la récurrence" select_nb_period: "Veuillez choisir un nombre de périodes pour la récurrence" select_end_date: "Veuillez choisir la date de dernière occurrence" + about_to_create: "Vous vous apprêtez à créer {NUMBER, plural, one{le créneau} other{les créneaux}} {TYPE, select, machines{machine} training{formation} space{espace} other{autre}} {NAME} suivant :" # messageFormat interpolation + reservable: "Réservable(s) :" + labels: "Étiquette(s) :" + none: "Aucune" the_slot_START-END_has_been_successfully_deleted: "Le créneau {{START}} - {{END}} a bien été supprimé" # angular interpolation unable_to_delete_the_slot_START-END_because_it_s_already_reserved_by_a_member: "Le créneau {{START}} - {{END}} n'a pu être supprimé car il est déjà réservé par un membre" # angular interpolation you_should_select_at_least_a_machine: "Vous devriez sélectionner au moins une machine pour ce créneau." diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 1b4322461..a3e330dee 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -55,6 +55,10 @@ pt: select_period: "Please select a period for the recurrence" # translation_missing select_nb_period: "Please select a number of periods for the recurrence" # translation_missing select_end_date: "Please select the date of the last occurrence" # translation_missing + about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}, {NAME}:" # messageFormat interpolation # translation_missing + reservable: "Reservable(s) :" # translation_missing + labels: "Etiqueta(s):" + none: "Nenhuma" the_slot_START-END_has_been_successfully_deleted: "O slot {{START}} - {{END}} foi deletado com sucesso" # angular interpolation unable_to_delete_the_slot_START-END_because_it_s_already_reserved_by_a_member: "Não é possível deletar o slot {{START}} - {{END}} porque já foi reservado por um membro" # angular interpolation you_should_select_at_least_a_machine: "Você deveria selecionar a última máquina neste slot." diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index a35125a9d..efd840816 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -79,6 +79,7 @@ en: to_date: "to" # context: date. eg: "from 01/01 to 01/05" to_time: "to" # context: time. eg. "from 18:00 to 21:00" or: "or" + and: "and" change_my_data: "Change my data" sync_my_profile: "Sync my profile" once_your_data_are_up_to_date_: "Once your data are up to date," diff --git a/config/locales/app.shared.es.yml b/config/locales/app.shared.es.yml index 4b61ef146..4f3bbb25a 100644 --- a/config/locales/app.shared.es.yml +++ b/config/locales/app.shared.es.yml @@ -79,6 +79,7 @@ es: to_date: "Hasta" # context: date. eg: "Hasta 01/01 to 01/05" to_time: "Hasta" # context: time. eg. "Hasta 18:00 to 21:00" or: "ó" + and: "y" change_my_data: "Cambiar mis datos" sync_my_profile: "Sincronizar mi perfil" once_your_data_are_up_to_date_: "Una vez sus datos hayan sido actualizados," diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index f5de76751..9116b6daf 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -79,6 +79,7 @@ fr: to_date: "au" # context: date. eg: "from 01/01 to 01/05" to_time: "à" # context: time. eg. "from 18:00 to 21:00" or: "ou" + and: "et" change_my_data: "Modifier mes données" sync_my_profile: "Synchroniser mon profil" once_your_data_are_up_to_date_: "Une fois vos données à jour," diff --git a/config/locales/app.shared.pt.yml b/config/locales/app.shared.pt.yml index fd38215bd..725f06c58 100755 --- a/config/locales/app.shared.pt.yml +++ b/config/locales/app.shared.pt.yml @@ -79,6 +79,7 @@ pt: to_date: "até" # context: date. eg: "from 01/01 to 01/05" to_time: "até" # context: time. eg. "from 18:00 to 21:00" or: "ou" + and: "e" change_my_data: "Alterar meus dados" sync_my_profile: "Sincronizar meu perfil" once_your_data_are_up_to_date_: "Uma vez que seus dados estão atualizados," From 0d740c95a9d7b82b62a9caa707bb6e8a8f620e89 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 13 Nov 2019 10:59:10 +0100 Subject: [PATCH 019/135] recapitulative screen --- .../controllers/admin/calendar.js.erb | 42 +++++++++++++------ .../admin/calendar/eventModal.html.erb | 6 +-- config/locales/app.admin.en.yml | 2 +- config/locales/app.admin.es.yml | 2 +- config/locales/app.admin.fr.yml | 2 +- config/locales/app.admin.pt.yml | 2 +- 6 files changed, 37 insertions(+), 19 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index 5cb50c0aa..0f53a498f 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -300,7 +300,8 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state end () { return end; }, machinesPromise: ['Machine', function (Machine) { return Machine.query().$promise; }], trainingsPromise: ['Training', function (Training) { return Training.query().$promise; }], - spacesPromise: ['Space', function (Space) { return Space.query().$promise; }] + spacesPromise: ['Space', function (Space) { return Space.query().$promise; }], + tagsPromise: ['Tag', function (Tag) { return Tag.query().$promise; }] } }); // when the modal is closed, we send the slot to the server for saving modalInstance.result.then( @@ -378,8 +379,8 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state /** * Controller used in the slot creation modal window */ -Application.Controllers.controller('CreateEventModalController', ['$scope', '$uibModalInstance', '$sce', 'moment', 'start', 'end', 'machinesPromise', 'Availability', 'trainingsPromise', 'spacesPromise', 'Tag', 'growl', '_t', - function ($scope, $uibModalInstance, $sce, moment, start, end, machinesPromise, Availability, trainingsPromise, spacesPromise, Tag, growl, _t) { +Application.Controllers.controller('CreateEventModalController', ['$scope', '$uibModalInstance', '$sce', 'moment', 'start', 'end', 'machinesPromise', 'Availability', 'trainingsPromise', 'spacesPromise', 'tagsPromise', 'growl', '_t', + function ($scope, $uibModalInstance, $sce, moment, start, end, machinesPromise, Availability, trainingsPromise, spacesPromise, tagsPromise, growl, _t) { // $uibModal parameter $scope.start = start; @@ -395,6 +396,9 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui // spaces list $scope.spaces = spacesPromise.filter(function (s) { return !s.disabled; }); + // all tags list + $scope.tags = tagsPromise; + // machines associated with the created slot $scope.selectedMachines = []; @@ -427,6 +431,7 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui start_at: start, end_at: end, available_type: 'machines', // default + tag_ids: [], is_recurrent: false, period: 'week', nb_periods: 1, @@ -439,6 +444,9 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui // localized name(s) of the reservable item(s) $scope.reservableName = ''; + // localized name(s) of the selected tag(s) + $scope.tagsName = ''; + /** * Adds or removes the provided machine from the current slot * @param machine {Object} @@ -517,8 +525,6 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui $scope.selectedSpace = $scope.spaces[0]; } - Tag.query().$promise.then(function (data) { $scope.tags = data; }); - // When we configure a machine/space availability, do not let the user change the end time, as the total // time must be dividable by Fablab.slotDuration minutes (base slot duration). For training availabilities, the user // can configure any duration as it does not matters. @@ -595,7 +601,7 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui } // settings are ok computeOccurrences(); - computeName(); + computeNames(); $scope.step++; }; @@ -625,22 +631,34 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui } }; - const computeName = function () { + const computeNames = function () { $scope.reservableName = ''; switch ($scope.availability.available_type) { case 'machines': - const reservableNames = $scope.selectedMachines.map(function (m) { return $sce.trustAsHtml(`${m.name}`); }); - $scope.reservableName = reservableNames.slice(0, -1).join(', ') + ` ${_t('and')} ` + reservableNames[reservableNames.length - 1]; + $scope.reservableName = localizedList($scope.selectedMachines) break; case 'training': - $scope.reservableName = $scope.selectedTraining.name; + $scope.reservableName = `${$scope.selectedTraining.name}`; break; case 'space': - $scope.reservableName = $scope.selectedSpace.name; + $scope.reservableName = `${$scope.selectedSpace.name}`; break; default: - $scope.reservableName = ''; + $scope.reservableName = `${_t("admin_calendar.none")}`; } + const tags = $scope.tags.filter(function (t) { + return $scope.availability.tag_ids.indexOf(t.id) > -1; + }) + $scope.tagsName = localizedList(tags); + } + + const localizedList = function (items) { + if (items.length === 0) return `${_t("admin_calendar.none")}`; + + const names = items.map(function (i) { return $sce.trustAsHtml(`${i.name}`); }); + if (items.length > 1) return names.slice(0, -1).join(', ') + ` ${_t('and')} ` + names[names.length - 1]; + + return names[0]; } // !!! MUST BE CALLED AT THE END of the controller diff --git a/app/assets/templates/admin/calendar/eventModal.html.erb b/app/assets/templates/admin/calendar/eventModal.html.erb index 867468330..6dc0c822f 100644 --- a/app/assets/templates/admin/calendar/eventModal.html.erb +++ b/app/assets/templates/admin/calendar/eventModal.html.erb @@ -159,12 +159,12 @@
  • {{slot.start_at | amDateFormat:'L LT'}} - {{slot.end_at | amDateFormat:'LT'}}
    • - {{ 'admin_calendar.reservable' }} + {{ 'admin_calendar.reservable' }}
    - {{ 'admin_calendar.labels' }} - {{availability.tag_ids.join(', ') || ('admin_calendar.none' | translate)}} + {{ 'admin_calendar.labels' }} +
    diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index d298da152..d36dec8d0 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -55,7 +55,7 @@ en: select_period: "Please select a period for the recurrence" select_nb_period: "Please select a number of periods for the recurrence" select_end_date: "Please select the date of the last occurrence" - about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}, {NAME}:" # messageFormat interpolation + about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}:" # messageFormat interpolation reservable: "Reservable(s):" labels: "Label(s):" none: "None" diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 024c73127..036104dc3 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -55,7 +55,7 @@ es: select_period: "Please select a period for the recurrence" # translation_missing select_nb_period: "Please select a number of periods for the recurrence" # translation_missing select_end_date: "Please select the date of the last occurrence" # translation_missing - about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}, {NAME}:" # messageFormat interpolation # translation_missing + about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}:" # messageFormat interpolation # translation_missing reservable: "Reservable(s):" # translation_missing labels: "Etiqueta(s):" none: "Ninguna" diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 2015b063c..b7684d326 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -55,7 +55,7 @@ fr: select_period: "Veuillez choisir une période pour la récurrence" select_nb_period: "Veuillez choisir un nombre de périodes pour la récurrence" select_end_date: "Veuillez choisir la date de dernière occurrence" - about_to_create: "Vous vous apprêtez à créer {NUMBER, plural, one{le créneau} other{les créneaux}} {TYPE, select, machines{machine} training{formation} space{espace} other{autre}} {NAME} suivant :" # messageFormat interpolation + about_to_create: "Vous vous apprêtez à créer {NUMBER, plural, one{le créneau} other{les créneaux}} {TYPE, select, machines{machine} training{formation} space{espace} other{autre}} suivant :" # messageFormat interpolation reservable: "Réservable(s) :" labels: "Étiquette(s) :" none: "Aucune" diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index a3e330dee..e5c061bb5 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -55,7 +55,7 @@ pt: select_period: "Please select a period for the recurrence" # translation_missing select_nb_period: "Please select a number of periods for the recurrence" # translation_missing select_end_date: "Please select the date of the last occurrence" # translation_missing - about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}, {NAME}:" # messageFormat interpolation # translation_missing + about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}:" # messageFormat interpolation # translation_missing reservable: "Reservable(s) :" # translation_missing labels: "Etiqueta(s):" none: "Nenhuma" From a60a39ff9eb4ab37767457cf1d9112c6d57f4c6d Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 13 Nov 2019 12:13:22 +0100 Subject: [PATCH 020/135] [ongoing] create multiple availabilities according to UI --- CHANGELOG.md | 1 + .../controllers/admin/calendar.js.erb | 8 ++++-- .../api/availabilities_controller.rb | 3 +++ app/models/availability.rb | 8 +++--- .../create_availabilities_service.rb | 25 +++++++++++++++++++ config/locales/en.yml | 2 +- config/locales/es.yml | 2 +- config/locales/fr.yml | 2 +- config/locales/pt.yml | 2 +- ...103352_add_recurrence_to_availabilities.rb | 13 ++++++++++ db/schema.rb | 9 +++++-- 11 files changed, 64 insertions(+), 11 deletions(-) create mode 100644 app/services/availabilities/create_availabilities_service.rb create mode 100644 db/migrate/20191113103352_add_recurrence_to_availabilities.rb diff --git a/CHANGELOG.md b/CHANGELOG.md index 79ce9b6f5..562f6f662 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Fix a security issue: fixed [CVE-2019-15587](https://github.com/advisories/GHSA-c3gv-9cxf-6f57) - [TODO DEPLOY] add the `SLOT_DURATION` environment variable (see [doc/environment.md](doc/environment.md#SLOT_DURATION) for configuration details) - [TODO DEPLOY] -> (only dev) `bundle install` +- [TODO DEPLOY] `rake db:migrate` ## v4.2.4 2019 October 30 diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index 0f53a498f..d10a0550d 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -476,9 +476,13 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui } else if ($scope.availability.available_type === 'space') { $scope.availability.space_ids = [$scope.selectedSpace.id]; } + if ($scope.availability.is_recurrent) { + $scope.availability.occurrences = $scope.occurrences; + } return Availability.save( - { availability: $scope.availability } - , function (availability) { $uibModalInstance.close(availability); }); + { availability: $scope.availability }, + function (availability) { $uibModalInstance.close(availability); } + ); }; /** diff --git a/app/controllers/api/availabilities_controller.rb b/app/controllers/api/availabilities_controller.rb index f9e98f5c1..3bf9dfd29 100644 --- a/app/controllers/api/availabilities_controller.rb +++ b/app/controllers/api/availabilities_controller.rb @@ -47,6 +47,8 @@ class API::AvailabilitiesController < API::ApiController def create authorize Availability @availability = Availability.new(availability_params) + service = Availabilities::CreateAvailabilitiesService.new + service.create(@availability, params[:availability][:occurrences]) if @availability.save render :show, status: :created, location: @availability else @@ -140,6 +142,7 @@ class API::AvailabilitiesController < API::ApiController def availability_params params.require(:availability).permit(:start_at, :end_at, :available_type, :machine_ids, :training_ids, :nb_total_places, + :is_recurrent, :period, :nb_periods, :end_date, machine_ids: [], training_ids: [], space_ids: [], tag_ids: [], machines_attributes: %i[id _destroy]) end diff --git a/app/models/availability.rb b/app/models/availability.rb index 0951ddf19..13d48d253 100644 --- a/app/models/availability.rb +++ b/app/models/availability.rb @@ -36,7 +36,7 @@ class Availability < ActiveRecord::Base attr_accessor :is_reserved, :slot_id, :can_modify validates :start_at, :end_at, presence: true - validate :length_must_be_1h_minimum, unless: proc { end_at.blank? or start_at.blank? } + validate :length_must_be_slot_multiple, unless: proc { end_at.blank? or start_at.blank? } validate :should_be_associated ## elastic callbacks @@ -155,8 +155,10 @@ class Availability < ActiveRecord::Base private - def length_must_be_1h_minimum - errors.add(:end_at, I18n.t('availabilities.must_be_at_least_1_hour_after_the_start_date')) if end_at < (start_at + 1.hour) + def length_must_be_slot_multiple + if end_at < (start_at + Rails.application.secrets.slot_duration.minutes) + errors.add(:end_at, I18n.t('availabilities.length_must_be_slot_multiple', MIN: Rails.application.secrets.slot_duration)) + end end def should_be_associated diff --git a/app/services/availabilities/create_availabilities_service.rb b/app/services/availabilities/create_availabilities_service.rb new file mode 100644 index 000000000..f488d6449 --- /dev/null +++ b/app/services/availabilities/create_availabilities_service.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +# Provides helper methods toi create an Availability with multiple occurrences +class Availabilities::CreateAvailabilitiesService + def create(availability, occurrences) + availability.update_attributes(occurrence_id: availability.id) + + occurrences.each do |o| + Availability.new( + start_at: o[:start_at], + end_at: o[:end_at], + available_type: availability.available_type, + is_recurrent: availability.is_recurrent, + period: availability.period, + nb_periods: availability.nb_periods, + end_date: availability.end_date, + occurrence_id: availability.occurrence_id, + machine_ids: availability.machine_ids, + training_ids: availability.training_ids, + space_ids: availability.space_ids, + tag_ids: availability.tag_ids + ).save! + end + end +end diff --git a/config/locales/en.yml b/config/locales/en.yml index 1bf554024..ab0e1d645 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -62,7 +62,7 @@ en: # availability slots in the calendar not_available: "Not available" i_ve_reserved: "I've reserved" - must_be_at_least_1_hour_after_the_start_date: "must be at least 1 hour after the start date" + length_must_be_slot_multiple: "must be at least %{MIN} minutes after the start date" must_be_associated_with_at_least_1_machine: "must be associated with at least 1 machine" members: diff --git a/config/locales/es.yml b/config/locales/es.yml index 4dc9dcc30..a117f19a0 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -62,7 +62,7 @@ es: # availability slots in the calendar not_available: "No disponible" i_ve_reserved: "He reservado" - must_be_at_least_1_hour_after_the_start_date: "Debe ser al menos 1 hora después de la fecha de inicio" + length_must_be_slot_multiple: "Debe ser al menos %{MIN} minutos después de la fecha de inicio" must_be_associated_with_at_least_1_machine: "debe estar asociado con al menos 1 máquina" members: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 120a624d7..6a71f1e2c 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -62,7 +62,7 @@ fr: # créneaux de disponibilité dans le calendrier not_available: "Non disponible" i_ve_reserved: "J'ai réservé" - must_be_at_least_1_hour_after_the_start_date: "doit être au moins 1 heure après la date de début" + length_must_be_slot_multiple: "doit être au moins %{MIN} minutes après la date de début" must_be_associated_with_at_least_1_machine: "doit être associé avec au moins 1 machine" members: diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 813e004ff..6230f49a0 100755 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -62,7 +62,7 @@ pt: # availability slots in the calendar not_available: "Não disponível " i_ve_reserved: "Eu reservei" - must_be_at_least_1_hour_after_the_start_date: "deve ser pelo menos 1 hora após a data de início" + length_must_be_slot_multiple: "deve ser pelo menos %{MIN} minutos após a data de início" must_be_associated_with_at_least_1_machine: "deve estar associada a pelo menos uma máquina" members: diff --git a/db/migrate/20191113103352_add_recurrence_to_availabilities.rb b/db/migrate/20191113103352_add_recurrence_to_availabilities.rb new file mode 100644 index 000000000..c989f3a5c --- /dev/null +++ b/db/migrate/20191113103352_add_recurrence_to_availabilities.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +# From this migration, we store recurrence info into the availability object, the availability can be linked to others, which are +# its "children". +class AddRecurrenceToAvailabilities < ActiveRecord::Migration + def change + add_column :availabilities, :is_recurrent, :boolean + add_column :availabilities, :occurrence_id, :integer + add_column :availabilities, :period, :string + add_column :availabilities, :nb_periods, :integer + add_column :availabilities, :end_date, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index 3a3ac9fb4..6e2ed6b2c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,12 +11,12 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20190924140726) do +ActiveRecord::Schema.define(version: 20191113103352) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" - enable_extension "unaccent" enable_extension "pg_trgm" + enable_extension "unaccent" create_table "abuses", force: :cascade do |t| t.integer "signaled_id" @@ -92,6 +92,11 @@ ActiveRecord::Schema.define(version: 20190924140726) do t.integer "nb_total_places" t.boolean "destroying", default: false t.boolean "lock", default: false + t.boolean "is_recurrent" + t.integer "occurrence_id" + t.string "period" + t.integer "nb_periods" + t.datetime "end_date" end create_table "availability_tags", force: :cascade do |t| From 26738563bda4a5fe364c5d29f160a2ad1bc43af8 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 18 Nov 2019 11:50:20 +0100 Subject: [PATCH 021/135] create reccursive events --- app/assets/javascripts/controllers/admin/calendar.js.erb | 2 +- app/controllers/api/availabilities_controller.rb | 6 ++++-- .../availabilities/create_availabilities_service.rb | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index d10a0550d..812549c45 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -617,7 +617,7 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui if ($scope.availability.is_recurrent) { const date = moment($scope.availability.start_at); - const diff = moment($scope.availability.start_at).diff($scope.availability.end_at); + const diff = moment($scope.availability.end_at).diff($scope.availability.start_at); const end = moment($scope.availability.end_date).endOf('day'); while (date.isBefore(end)) { const occur_end = moment(date).add(diff, 'ms'); diff --git a/app/controllers/api/availabilities_controller.rb b/app/controllers/api/availabilities_controller.rb index 3bf9dfd29..b6c6da6c4 100644 --- a/app/controllers/api/availabilities_controller.rb +++ b/app/controllers/api/availabilities_controller.rb @@ -47,9 +47,11 @@ class API::AvailabilitiesController < API::ApiController def create authorize Availability @availability = Availability.new(availability_params) - service = Availabilities::CreateAvailabilitiesService.new - service.create(@availability, params[:availability][:occurrences]) if @availability.save + if params[:availability][:occurrences] + service = Availabilities::CreateAvailabilitiesService.new + service.create(@availability, params[:availability][:occurrences]) + end render :show, status: :created, location: @availability else render json: @availability.errors, status: :unprocessable_entity diff --git a/app/services/availabilities/create_availabilities_service.rb b/app/services/availabilities/create_availabilities_service.rb index f488d6449..f05a145ae 100644 --- a/app/services/availabilities/create_availabilities_service.rb +++ b/app/services/availabilities/create_availabilities_service.rb @@ -2,10 +2,12 @@ # Provides helper methods toi create an Availability with multiple occurrences class Availabilities::CreateAvailabilitiesService - def create(availability, occurrences) + def create(availability, occurrences = []) availability.update_attributes(occurrence_id: availability.id) occurrences.each do |o| + next if availability.start_at == o[:start_at] && availability.end_at == o[:end_at] + Availability.new( start_at: o[:start_at], end_at: o[:end_at], From 9ec736e6b5f56ba0c8047d365a0f8d9d1b050e3e Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 18 Nov 2019 17:29:51 +0100 Subject: [PATCH 022/135] delete recursive slots --- .../controllers/admin/calendar.js.erb | 112 ++++++++++++++---- .../controllers/admin/members.js.erb | 2 +- .../admin/calendar/deleteRecurrent.html | 26 ++++ .../api/availabilities_controller.rb | 10 +- .../create_availabilities_service.rb | 2 +- .../delete_availabilities_service.rb | 33 ++++++ .../api/availabilities/show.json.jbuilder | 8 +- config/locales/app.admin.en.yml | 7 +- config/locales/app.admin.es.yml | 11 +- config/locales/app.admin.fr.yml | 10 +- config/locales/app.admin.pt.yml | 7 +- 11 files changed, 183 insertions(+), 45 deletions(-) create mode 100644 app/assets/templates/admin/calendar/deleteRecurrent.html create mode 100644 app/services/availabilities/delete_availabilities_service.rb diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index 812549c45..6e1b19d1b 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -228,32 +228,24 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state */ $scope.removeSlot = function () { // open a confirmation dialog - dialogs.confirm( - { - resolve: { - object () { - return { - title: _t('admin_calendar.confirmation_required'), - msg: _t('admin_calendar.do_you_really_want_to_delete_this_slot') - }; - } - } - }, - function () { - // the admin has confirmed, delete the slot - Availability.delete( - { id: $scope.availability.id }, - function () { - uiCalendarConfig.calendars.calendar.fullCalendar('removeEvents', $scope.availability.id); - - growl.success(_t('admin_calendar.the_slot_START-END_has_been_successfully_deleted', { START: moment(event.start).format('LL LT'), END: moment(event.end).format('LT') })); - $scope.availability = null; - }, - function () { - growl.error(_t('admin_calendar.unable_to_delete_the_slot_START-END_because_it_s_already_reserved_by_a_member', { START: moment(event.start).format('LL LT'), END: moment(event.end).format('LT') })); - }); + const modalInstance = $uibModal.open({ + animation: true, + templateUrl: '<%= asset_path "admin/calendar/deleteRecurrent.html" %>', + size: 'md', + controller: 'DeleteRecurrentAvailabilityController', + resolve: { + availabilityPromise: ['Availability', function (Availability) { return Availability.get({ id: $scope.availability.id }).$promise; }] } - ); + }); + // once the dialog was closed, do things depending on the result + modalInstance.result.then(function (res) { + if (res.status == 'success') { + $scope.availability = null; + } + for (const availability of res.availabilities) { + uiCalendarConfig.calendars.calendar.fullCalendar('removeEvents', availability); + } + }); }; /* PRIVATE SCOPE */ @@ -669,3 +661,73 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui return initialize(); } ]); + +/** + * Controller used in the slot deletion modal window + */ +Application.Controllers.controller('DeleteRecurrentAvailabilityController', ['$scope', '$uibModalInstance', 'Availability', 'availabilityPromise', 'growl', '_t', + function ($scope, $uibModalInstance, Availability, availabilityPromise, growl, _t) { + + // is the current slot (to be deleted) recurrent? + $scope.isRecurrent = availabilityPromise.is_recurrent; + + // with recurrent slots: how many slots should we delete? + $scope.deleteMode = 'single'; + + /** + * Confirmation callback + */ + $scope.ok = function () { + const { id, start_at, end_at } = availabilityPromise; + // the admin has confirmed, delete the slot + Availability.delete( + { id, mode: $scope.deleteMode }, + function (res) { + // delete success + if (res.deleted > 1) { + growl.success(_t( + 'admin_calendar.slots_deleted', + {START: moment(start_at).format('LL LT'), COUNT: res.deleted - 1}, + 'messageformat' + )); + } else { + growl.success(_t( + 'admin_calendar.slot_successfully_deleted', + {START: moment(start_at).format('LL LT'), END: moment(end_at).format('LT')} + )); + } + $uibModalInstance.close({ + status: 'success', + availabilities: res.details.map(function (d) { return d.availability.id }) + }); + }, + function (res) { + // not everything was deleted + const { data } = res; + if (data.total > 1) { + growl.warning(_t( + 'admin_calendar.slots_not_deleted', + {TOTAL: data.total, COUNT: data.total - data.deleted}, + 'messageformat' + )); + } else { + growl.error(_t( + 'admin_calendar.unable_to_delete_the_slot', + {START: moment(start_at).format('LL LT'), END: moment(end_at).format('LT')} + )); + } + $uibModalInstance.close({ + status: 'failed', + availabilities: data.details.filter(function (d) { return d.status }).map(function (d) { return d.availability.id }) + }); + }); + } + + /** + * Cancellation callback + */ + $scope.cancel = function () { + $uibModalInstance.dismiss('cancel'); + } + } +]); diff --git a/app/assets/javascripts/controllers/admin/members.js.erb b/app/assets/javascripts/controllers/admin/members.js.erb index 2e95fd0c1..e9c9f77c9 100644 --- a/app/assets/javascripts/controllers/admin/members.js.erb +++ b/app/assets/javascripts/controllers/admin/members.js.erb @@ -487,7 +487,7 @@ Application.Controllers.controller('EditMemberController', ['$scope', '$state', $scope.cancel = function () { $uibModalInstance.dismiss('cancel'); }; }] }); - // once the form was validated succesfully ... + // once the form was validated successfully ... return modalInstance.result.then(function (subscription) { $scope.subscription = subscription; }); }; diff --git a/app/assets/templates/admin/calendar/deleteRecurrent.html b/app/assets/templates/admin/calendar/deleteRecurrent.html new file mode 100644 index 000000000..9baeb1799 --- /dev/null +++ b/app/assets/templates/admin/calendar/deleteRecurrent.html @@ -0,0 +1,26 @@ +
    + +

    {{ 'admin_calendar.confirmation_required' }}

    +
    +
    +

    {{ 'admin_calendar.do_you_really_want_to_delete_this_slot' }}

    +

    {{ 'admin_calendar.delete_recurring_slot' }}

    +
    + + + +
    +
    +
    + + +
    diff --git a/app/controllers/api/availabilities_controller.rb b/app/controllers/api/availabilities_controller.rb index b6c6da6c4..825d4104e 100644 --- a/app/controllers/api/availabilities_controller.rb +++ b/app/controllers/api/availabilities_controller.rb @@ -5,7 +5,7 @@ class API::AvailabilitiesController < API::ApiController include FablabConfiguration before_action :authenticate_user!, except: [:public] - before_action :set_availability, only: %i[show update destroy reservations lock] + before_action :set_availability, only: %i[show update reservations lock] before_action :define_max_visibility, only: %i[machine trainings spaces] respond_to :json @@ -69,10 +69,12 @@ class API::AvailabilitiesController < API::ApiController def destroy authorize Availability - if @availability.safe_destroy - head :no_content + service = Availabilities::DeleteAvailabilitiesService.new + res = service.delete(params[:id], params[:mode]) + if res.all? { |r| r[:status] } + render json: { deleted: res.length, details: res }, status: :ok else - head :unprocessable_entity + render json: { total: res.length, deleted: res.select { |r| r[:status] }.length, details: res }, status: :unprocessable_entity end end diff --git a/app/services/availabilities/create_availabilities_service.rb b/app/services/availabilities/create_availabilities_service.rb index f05a145ae..f848f0597 100644 --- a/app/services/availabilities/create_availabilities_service.rb +++ b/app/services/availabilities/create_availabilities_service.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -# Provides helper methods toi create an Availability with multiple occurrences +# Provides helper methods to create an Availability with multiple occurrences class Availabilities::CreateAvailabilitiesService def create(availability, occurrences = []) availability.update_attributes(occurrence_id: availability.id) diff --git a/app/services/availabilities/delete_availabilities_service.rb b/app/services/availabilities/delete_availabilities_service.rb new file mode 100644 index 000000000..9616b28b4 --- /dev/null +++ b/app/services/availabilities/delete_availabilities_service.rb @@ -0,0 +1,33 @@ +# frozen_string_literal: true + +# Provides helper methods to delete an Availability with multiple occurrences +class Availabilities::DeleteAvailabilitiesService + def delete(availability_id, mode = 'single') + + results = [] + availability = Availability.find(availability_id) + availabilities = case mode + when 'single' + [availability] + when 'next' + Availability.where( + 'start_at >= ? AND occurrence_id = ? AND is_recurrent = true', + availability.start_at, + availability.occurrence_id + ) + when 'all' + Availability.where( + 'occurrence_id = ? AND is_recurrent = true', + availability.occurrence_id + ) + else + [] + end + + availabilities.each do |a| + # here we use double negation because safe_destroy can return either a boolean (false) or an Availability (in case of delete success) + results.push status: !!a.safe_destroy, availability: a # rubocop:disable Style/DoubleNegation + end + results + end +end diff --git a/app/views/api/availabilities/show.json.jbuilder b/app/views/api/availabilities/show.json.jbuilder index 68706604f..df5b2d734 100644 --- a/app/views/api/availabilities/show.json.jbuilder +++ b/app/views/api/availabilities/show.json.jbuilder @@ -1,14 +1,14 @@ -json.id @availability.id +# frozen_string_literal: true + +json.extract! @availability, :id, :title, :lock, :is_recurrent, :occurrence_id, :period, :nb_periods, :end_date json.start_at @availability.start_at.iso8601 json.end_at @availability.end_at.iso8601 json.available_type @availability.available_type json.machine_ids @availability.machine_ids json.backgroundColor 'white' json.borderColor availability_border_color(@availability) -json.title @availability.title json.tag_ids @availability.tag_ids json.tags @availability.tags do |t| json.id t.id json.name t.name -end -json.lock @availability.lock +end \ No newline at end of file diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index d36dec8d0..4c9640bc7 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -59,8 +59,10 @@ en: reservable: "Reservable(s):" labels: "Label(s):" none: "None" - the_slot_START-END_has_been_successfully_deleted: "The slot {{START}} - {{END}} has been successfully deleted" # angular interpolation - unable_to_delete_the_slot_START-END_because_it_s_already_reserved_by_a_member: "Unable to delete the slot {{START}} - {{END}} because it's already reserved by a member" # angular interpolation + slot_successfully_deleted: "The slot {{START}} - {{END}} has been successfully deleted" # angular interpolation + slots_deleted: "The slot of {{START}}, and {COUNT, plural, =1{one other} other{{COUNT} others}}}, have been deleted" # messageFormat interpolation + unable_to_delete_the_slot: "Unable to delete the slot {{START}} - {{END}}, probably because it's already reserved by a member" # angular interpolation + slots_not_deleted: "On {TOTAL} slots, {COUNT, plural, =1{one was not deleted} other{{COUNT} were not deleted}}. Some reservations may exist on {COUNT, plural, =1{it} other{them}}." # messageFormat interpolation you_should_select_at_least_a_machine: "You should select at least one machine on this slot." export_is_running_you_ll_be_notified_when_its_ready: "Export is running. You'll be notified when it's ready." actions: "Actions" @@ -76,6 +78,7 @@ en: unlockable_because_reservations: "Unable to block booking on this slot because some uncancelled reservations exist on it." delete_slot: "Delete this slot" do_you_really_want_to_delete_this_slot: "Do you really want to delete this slot?" + delete_recurring_slot: "You're about to delete a recurring slot. What do you want to do?" event_in_the_past: "Unable to create a slot in the past." project_elements: diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 036104dc3..c44ecbf2b 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -56,11 +56,13 @@ es: select_nb_period: "Please select a number of periods for the recurrence" # translation_missing select_end_date: "Please select the date of the last occurrence" # translation_missing about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}:" # messageFormat interpolation # translation_missing - reservable: "Reservable(s):" # translation_missing + reservable: "Reservable(s):" # translation_missing labels: "Etiqueta(s):" none: "Ninguna" - the_slot_START-END_has_been_successfully_deleted: "La ranura {{START}} - {{END}} se ha eliminado correctamente" # angular interpolation - unable_to_delete_the_slot_START-END_because_it_s_already_reserved_by_a_member: "No se puede eliminar la ranura {{START}} - {{END}} porque ya está reservada por un miembror" # angular interpolation + slot_successfully_deleted: "La ranura {{START}} - {{END}} se ha eliminado correctamente" # angular interpolation + slots_deleted: "The slot of {{START}}, and {COUNT, plural, =1{one other} other{{COUNT} others}}}, have been deleted" # messageFormat interpolation # translation_missing + unable_to_delete_the_slot: "No se puede eliminar la ranura {{START}} - {{END}}, probablemente porque ya está reservada por un miembror" # angular interpolation + slots_not_deleted: "On {TOTAL} slots, {COUNT, plural, =1{one was not deleted} other{{COUNT} were not deleted}}. Some reservations may exist on {COUNT, plural, =1{it} other{them}}." # messageFormat interpolation # translation_missing you_should_select_at_least_a_machine: "Debe seleccionar al menos una máquina en esta ranura." export_is_running_you_ll_be_notified_when_its_ready: "La exportación se está ejecutando. Se le notificará cuando esté listo." actions: "Acciones" @@ -75,7 +77,8 @@ es: reservations_locked: "La reserva está bloqueada" unlockable_because_reservations: "No se puede bloquear la reserva en esta ranura porque existen algunas reservas no canceladas." delete_slot: "Delete this slot" # translation_missing - do_you_really_want_to_delete_this_slot: "Do you really want to delete this slot?" + do_you_really_want_to_delete_this_slot: "Do you really want to delete this slot?" # translation_missing + delete_recurring_slot: "You're about to delete a recurring slot. What do you want to do?"# translation_missing event_in_the_past: "Unable to create a slot in the past." # translation_missing project_elements: diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index b7684d326..d448b3b30 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -59,8 +59,10 @@ fr: reservable: "Réservable(s) :" labels: "Étiquette(s) :" none: "Aucune" - the_slot_START-END_has_been_successfully_deleted: "Le créneau {{START}} - {{END}} a bien été supprimé" # angular interpolation - unable_to_delete_the_slot_START-END_because_it_s_already_reserved_by_a_member: "Le créneau {{START}} - {{END}} n'a pu être supprimé car il est déjà réservé par un membre" # angular interpolation + slot_successfully_deleted: "Le créneau {{START}} - {{END}} a bien été supprimé" # angular interpolation + slots_deleted: "Le créneau du {{START}}, ainsi {COUNT, plural, =1{qu'un autre créneau} other{que {COUNT} autres créneaux}}}, ont été supprimés" # messageFormat interpolation + unable_to_delete_the_slot: "Le créneau {{START}} - {{END}} n'a pu être supprimé, probablement car il est déjà réservé par un membre" # angular interpolation + slots_not_deleted: "Sur {TOTAL} créneaux, {COUNT, plural, =1{un n'a pas pu être supprimé} other{{COUNT} n'ont pas pu être supprimés}}. Il est possible que des réservations existent sur {COUNT, plural, =1{celui-ci} other{ceux-ci}}." # messageFormat interpolation you_should_select_at_least_a_machine: "Vous devriez sélectionner au moins une machine pour ce créneau." export_is_running_you_ll_be_notified_when_its_ready: "L'export est en cours. Vous serez notifié lorsqu'il sera prêt." actions: "Actions" @@ -76,6 +78,10 @@ fr: unlockable_because_reservations: "Impossible de bloquer les réservations sur ce créneau car il existe des réservations non annulées sur celui-ci." delete_slot: "Supprimer le créneau" do_you_really_want_to_delete_this_slot: "Êtes vous sur de vouloir supprimer ce créneau ?" + delete_recurring_slot: "Vous êtes sur le point de supprimer un créneau périodique. Que voulez-vous supprimer ?" + delete_this_slot: "Uniquement ce créneau" + delete_this_and_next: "Ce créneau et tous les suivants" + delete_all: "Tous les créneaux" event_in_the_past: "Impossible de créer un créneau dans le passé." project_elements: diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index e5c061bb5..158118490 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -59,8 +59,10 @@ pt: reservable: "Reservable(s) :" # translation_missing labels: "Etiqueta(s):" none: "Nenhuma" - the_slot_START-END_has_been_successfully_deleted: "O slot {{START}} - {{END}} foi deletado com sucesso" # angular interpolation - unable_to_delete_the_slot_START-END_because_it_s_already_reserved_by_a_member: "Não é possível deletar o slot {{START}} - {{END}} porque já foi reservado por um membro" # angular interpolation + slot_successfully_deleted: "O slot {{START}} - {{END}} foi deletado com sucesso" # angular interpolation + slots_deleted: "The slot of {{START}}, and {COUNT, plural, =1{one other} other{{COUNT} others}}}, have been deleted" # messageFormat interpolation # translation_missing + unable_to_delete_the_slot: "Não é possível deletar o slot {{START}} - {{END}}, provavelmente porque já foi reservado por um membro" # angular interpolation + slots_not_deleted: "On {TOTAL} slots, {COUNT, plural, =1{one was not deleted} other{{COUNT} were not deleted}}. Some reservations may exist on {COUNT, plural, =1{it} other{them}}." # messageFormat interpolation # translation_missing you_should_select_at_least_a_machine: "Você deveria selecionar a última máquina neste slot." export_is_running_you_ll_be_notified_when_its_ready: "A Exportação está em andamento. Você será notificado quando terminar." actions: "Ações" @@ -76,6 +78,7 @@ pt: unlockable_because_reservations: "Não é possível bloquear a reserva neste slot porque existem algumas reservas não cancelados nele." delete_slot: "Exclua o slot" do_you_really_want_to_delete_this_slot: "Você realmente quer excluir esse slot?" + delete_recurring_slot: "You're about to delete a recurring slot. What do you want to do?"# translation_missing event_in_the_past: "Unable to create a slot in the past." # translation_missing project_elements: From ad928bd4e62d22d4c2048d110d0b75d55aa3ea0f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 19 Nov 2019 11:44:32 +0100 Subject: [PATCH 023/135] ability to set phone number optional or required also: show stars on required fields in new admin form --- CHANGELOG.md | 4 ++ app/assets/javascripts/app.js | 2 + .../templates/admin/admins/new.html.erb | 2 +- app/assets/templates/shared/_admin_form.html | 39 ++++++++++--------- .../templates/shared/_member_form.html.erb | 4 +- .../templates/shared/signupModal.html.erb | 6 ++- app/models/profile.rb | 2 +- app/models/user.rb | 3 +- app/views/application/index.html.erb | 1 + config/application.yml.default | 1 + config/secrets.yml | 4 ++ doc/environment.md | 5 +++ docker/env.example | 1 + 13 files changed, 48 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 562f6f662..0557c355a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,17 @@ # Changelog Fab Manager +- Ability to create and delete periodic calendar availabilities (recurrence) - An administrator can delete a member - Ability to configure the duration of a reservation slot. Previously, only 60 minutes slots were allowed +- Display indications on required fields in new administrator form +- Configuration of phone number in members registration forms: can be required or optional, depending on `PHONE_REQUIRED` configuration - Improved user experience in defining slots in the calendar management - Improved notification email to the member when a rolling subscription is taken - Handle Ctrl^C in upgrade scripts - Updated moment-timezone - Fix a security issue: fixed [CVE-2019-15587](https://github.com/advisories/GHSA-c3gv-9cxf-6f57) - [TODO DEPLOY] add the `SLOT_DURATION` environment variable (see [doc/environment.md](doc/environment.md#SLOT_DURATION) for configuration details) +- [TODO DEPLOY] add the `PHONE_REQUIRED` environment variable (see [doc/environment.md](doc/environment.md#PHONE_REQUIRED) for configuration details) - [TODO DEPLOY] -> (only dev) `bundle install` - [TODO DEPLOY] `rake db:migrate` diff --git a/app/assets/javascripts/app.js b/app/assets/javascripts/app.js index 01b4265e9..ea94b5a12 100644 --- a/app/assets/javascripts/app.js +++ b/app/assets/javascripts/app.js @@ -86,6 +86,8 @@ angular.module('application', ['ngCookies', 'ngResource', 'ngSanitize', 'ui.rout $rootScope.fablabWithoutOnlinePayment = Fablab.withoutOnlinePayment; // Global config: if true, no invoices will be generated $rootScope.fablabWithoutInvoices = Fablab.withoutInvoices; + // Global config: if true, the phone number is required to create an account + $rootScope.phoneRequired = Fablab.phoneRequired; // Global function to allow the user to navigate to the previous screen (ie. $state). // If no previous $state were recorded, navigate to the home page diff --git a/app/assets/templates/admin/admins/new.html.erb b/app/assets/templates/admin/admins/new.html.erb index a53506394..8eeebbb34 100644 --- a/app/assets/templates/admin/admins/new.html.erb +++ b/app/assets/templates/admin/admins/new.html.erb @@ -20,7 +20,7 @@
    - + '">
    diff --git a/app/assets/templates/shared/_admin_form.html b/app/assets/templates/shared/_admin_form.html index dae346c14..8470d9e70 100644 --- a/app/assets/templates/shared/_admin_form.html +++ b/app/assets/templates/shared/_admin_form.html @@ -1,26 +1,27 @@
    - - + + +
    - +
    - +
    - +
    - +
    - + + ng-required="phoneRequired"/>
    {{ 'phone_number_is_required' }}
    diff --git a/app/assets/templates/shared/signupModal.html.erb b/app/assets/templates/shared/signupModal.html.erb index 9c33debf2..f138bc513 100644 --- a/app/assets/templates/shared/signupModal.html.erb +++ b/app/assets/templates/shared/signupModal.html.erb @@ -204,9 +204,11 @@ name="phone" class="form-control" placeholder="{{ 'phone_number' | translate }}" - required> + ng-required="phoneRequired">
    - + + + {{ 'phone_number_is_required' }}
    diff --git a/app/models/profile.rb b/app/models/profile.rb index b673cd417..6814835c6 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -10,7 +10,7 @@ class Profile < ActiveRecord::Base validates :first_name, presence: true, length: { maximum: 30 } validates :last_name, presence: true, length: { maximum: 30 } - validates_numericality_of :phone, only_integer: true, allow_blank: false + validates_numericality_of :phone, only_integer: true, allow_blank: false, if: -> { Rails.application.secrets.phone_required } after_commit :update_invoicing_profile, if: :invoicing_data_was_modified?, on: [:update] diff --git a/app/models/user.rb b/app/models/user.rb index 481032fd7..919660c5a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -160,7 +160,8 @@ class User < ActiveRecord::Base def need_completion? statistic_profile.gender.nil? || profile.first_name.blank? || profile.last_name.blank? || username.blank? || - email.blank? || encrypted_password.blank? || group_id.nil? || statistic_profile.birthday.blank? || profile.phone.blank? + email.blank? || encrypted_password.blank? || group_id.nil? || statistic_profile.birthday.blank? || + (Rails.application.secrets.phone_required && profile.phone.blank?) end ## Retrieve the requested data in the User and user's Profile tables diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb index 123ad711b..65efb7dd1 100644 --- a/app/views/application/index.html.erb +++ b/app/views/application/index.html.erb @@ -20,6 +20,7 @@ Fablab.withoutSpaces = ('<%= Rails.application.secrets.fablab_without_spaces %>' !== 'false'); Fablab.withoutOnlinePayment = ('<%= Rails.application.secrets.fablab_without_online_payments %>' === 'true'); Fablab.withoutInvoices = ('<%= Rails.application.secrets.fablab_without_invoices %>' === 'true'); + Fablab.phoneRequired = ('<%= Rails.application.secrets.phone_required %>' === 'true'); Fablab.slotDuration = parseInt("<%= ApplicationHelper::SLOT_DURATION %>", 10); Fablab.disqusShortname = "<%= Rails.application.secrets.disqus_shortname %>"; Fablab.defaultHost = "<%= Rails.application.secrets.default_host %>"; diff --git a/config/application.yml.default b/config/application.yml.default index e8775cb29..f59f0a3ec 100644 --- a/config/application.yml.default +++ b/config/application.yml.default @@ -20,6 +20,7 @@ FABLAB_WITHOUT_PLANS: 'false' FABLAB_WITHOUT_SPACES: 'true' FABLAB_WITHOUT_ONLINE_PAYMENT: 'false' FABLAB_WITHOUT_INVOICES: 'false' +PHONE_REQUIRED: 'true' SLOT_DURATION: '60' diff --git a/config/secrets.yml b/config/secrets.yml index 87e05bab2..e277437a1 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -20,6 +20,7 @@ development: fablab_without_spaces: <%= ENV["FABLAB_WITHOUT_SPACES"] %> fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %> fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %> + phone_required: <%= ENV["PHONE_REQUIRED"] %> slot_duration: <%= ENV["SLOT_DURATION"] %> default_host: <%= ENV["DEFAULT_HOST"] %> default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %> @@ -63,6 +64,7 @@ test: fablab_without_spaces: false fablab_without_online_payments: false fablab_without_invoices: false + phone_required: true slot_duration: <%= ENV["SLOT_DURATION"] %> default_host: <%= ENV["DEFAULT_HOST"] %> default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %> @@ -106,6 +108,7 @@ staging: fablab_without_spaces: <%= ENV["FABLAB_WITHOUT_SPACES"] %> fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %> fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %> + phone_required: <%= ENV["PHONE_REQUIRED"] %> slot_duration: <%= ENV["SLOT_DURATION"] %> default_host: <%= ENV["DEFAULT_HOST"] %> default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %> @@ -160,6 +163,7 @@ production: fablab_without_spaces: <%= ENV["FABLAB_WITHOUT_SPACES"] %> fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %> fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %> + phone_required: <%= ENV["PHONE_REQUIRED"] %> slot_duration: <%= ENV["SLOT_DURATION"] %> default_host: <%= ENV["DEFAULT_HOST"] %> default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %> diff --git a/doc/environment.md b/doc/environment.md index 5ba50d6ec..b0bee2b16 100644 --- a/doc/environment.md +++ b/doc/environment.md @@ -102,6 +102,11 @@ Valid stripe API keys are still required, even if you don't require online payme If set to 'true', the invoices will be disabled. This is useful if you have your own invoicing system and you want to prevent Fab-manager from generating and sending invoices to members. **Very important**: if you disable invoices, you still have to configure VAT in the interface to prevent errors in accounting and prices. + + + PHONE_REQUIRED + +If set to 'false' the phone number won't be required to register a new user on the software. SLOT_DURATION diff --git a/docker/env.example b/docker/env.example index 5460ef28c..2f3f1d014 100644 --- a/docker/env.example +++ b/docker/env.example @@ -13,6 +13,7 @@ FABLAB_WITHOUT_PLANS=false FABLAB_WITHOUT_SPACES=true FABLAB_WITHOUT_ONLINE_PAYMENT=true FABLAB_WITHOUT_INVOICES=false +PHONE_REQUIRED=false SLOT_DURATION=60 From 37d6c84cc6e01bee48e8b4a20d35634ea547750b Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 19 Nov 2019 15:18:00 +0100 Subject: [PATCH 024/135] [bug] unable to remove training picture also: removed some invalid href=# in the templates --- CHANGELOG.md | 1 + app/assets/stylesheets/app.utilities.scss | 4 ++++ .../templates/admin/coupons/edit.html.erb | 2 +- .../templates/admin/coupons/new.html.erb | 4 ++-- .../templates/admin/trainings/_form.html.erb | 2 +- app/assets/templates/shared/_cart.html.erb | 2 +- app/assets/templates/shared/_coupon.html.erb | 2 +- app/assets/templates/shared/header.html.erb | 22 +++++++++---------- app/assets/templates/shared/leftnav.html.erb | 20 ++++++++--------- 9 files changed, 32 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0557c355a..1fe181342 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Improved notification email to the member when a rolling subscription is taken - Handle Ctrl^C in upgrade scripts - Updated moment-timezone +- Fix a bug: unable to remove the picture from a training - Fix a security issue: fixed [CVE-2019-15587](https://github.com/advisories/GHSA-c3gv-9cxf-6f57) - [TODO DEPLOY] add the `SLOT_DURATION` environment variable (see [doc/environment.md](doc/environment.md#SLOT_DURATION) for configuration details) - [TODO DEPLOY] add the `PHONE_REQUIRED` environment variable (see [doc/environment.md](doc/environment.md#PHONE_REQUIRED) for configuration details) diff --git a/app/assets/stylesheets/app.utilities.scss b/app/assets/stylesheets/app.utilities.scss index 274545752..7b6349c1d 100644 --- a/app/assets/stylesheets/app.utilities.scss +++ b/app/assets/stylesheets/app.utilities.scss @@ -379,6 +379,10 @@ p, .widget p { justify-content: center; } +.pointer { + cursor: pointer; +} + @media screen and (min-width: $screen-lg-min) { .b-r-lg {border-right: 1px solid $border-color; } .hide-b-r-lg { border: none !important; } diff --git a/app/assets/templates/admin/coupons/edit.html.erb b/app/assets/templates/admin/coupons/edit.html.erb index b391f8dbc..438b4e0a4 100644 --- a/app/assets/templates/admin/coupons/edit.html.erb +++ b/app/assets/templates/admin/coupons/edit.html.erb @@ -2,7 +2,7 @@
    - +
    diff --git a/app/assets/templates/admin/coupons/new.html.erb b/app/assets/templates/admin/coupons/new.html.erb index 16bf475cc..b0a0d992d 100644 --- a/app/assets/templates/admin/coupons/new.html.erb +++ b/app/assets/templates/admin/coupons/new.html.erb @@ -2,7 +2,7 @@
    - +
    @@ -20,7 +20,7 @@
    - + '">
    diff --git a/app/assets/templates/admin/trainings/_form.html.erb b/app/assets/templates/admin/trainings/_form.html.erb index 9a425505e..efb436af7 100644 --- a/app/assets/templates/admin/trainings/_form.html.erb +++ b/app/assets/templates/admin/trainings/_form.html.erb @@ -49,7 +49,7 @@ required bs-jasny-fileinput> - {{ 'delete' }} + {{ 'delete' }}
    diff --git a/app/assets/templates/shared/_cart.html.erb b/app/assets/templates/shared/_cart.html.erb index 4a7179243..2e8f37beb 100644 --- a/app/assets/templates/shared/_cart.html.erb +++ b/app/assets/templates/shared/_cart.html.erb @@ -33,7 +33,7 @@
    -
    {{ 'cart.remove_this_slot' }}
    +
    {{ 'cart.remove_this_slot' }}
    diff --git a/app/assets/templates/shared/_coupon.html.erb b/app/assets/templates/shared/_coupon.html.erb index bc4552ece..163d92493 100644 --- a/app/assets/templates/shared/_coupon.html.erb +++ b/app/assets/templates/shared/_coupon.html.erb @@ -1,5 +1,5 @@
    - {{ 'i_have_a_coupon' }} + {{ 'i_have_a_coupon' }}
    diff --git a/app/assets/templates/shared/header.html.erb b/app/assets/templates/shared/header.html.erb index 56a480048..a2be7428e 100644 --- a/app/assets/templates/shared/header.html.erb +++ b/app/assets/templates/shared/header.html.erb @@ -26,7 +26,7 @@ {{notifications.unread}} -
  • {{ 'sign_up' | translate }}
    • +
  • {{ 'sign_up' | translate }}
  • - {{ 'sign_in' | translate }} + {{ 'sign_in' | translate }}
    • diff --git a/app/assets/templates/shared/leftnav.html.erb b/app/assets/templates/shared/leftnav.html.erb index afde8ad6d..a480316d5 100644 --- a/app/assets/templates/shared/leftnav.html.erb +++ b/app/assets/templates/shared/leftnav.html.erb @@ -8,18 +8,18 @@
      From cabe2e56044bce4aa403224a2d81364668b21f8d Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 20 Nov 2019 17:06:42 +0100 Subject: [PATCH 025/135] update free places after cancel event reservation --- app/models/event.rb | 18 +++++++++--------- app/models/reservation.rb | 25 +++++++------------------ app/models/slot.rb | 8 ++++++++ 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/app/models/event.rb b/app/models/event.rb index 2bc81e842..12e593517 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -72,6 +72,15 @@ class Event < ActiveRecord::Base # Reservation.where(reservable: self) # end + def update_nb_free_places + if nb_total_places.nil? + self.nb_free_places = nil + else + reserved_places = reservations.joins(:slots).where('slots.canceled_at': nil).map(&:total_booked_seats).inject(0) { |sum, t| sum + t } + self.nb_free_places = (nb_total_places - reserved_places) + end + end + private def event_recurrence @@ -141,13 +150,4 @@ class Event < ActiveRecord::Base end update_columns(recurrence_id: id) end - - def update_nb_free_places - if nb_total_places.nil? - self.nb_free_places = nil - else - reserved_places = reservations.map(&:total_booked_seats).inject(0){ |sum, t| sum + t } - self.nb_free_places = (nb_total_places - reserved_places) - end - end end diff --git a/app/models/reservation.rb b/app/models/reservation.rb index b05546a53..f0d7d3aac 100644 --- a/app/models/reservation.rb +++ b/app/models/reservation.rb @@ -255,6 +255,13 @@ class Reservation < ActiveRecord::Base statistic_profile.user end + def update_event_nb_free_places + return unless reservable_type == 'Event' + + reservable.update_nb_free_places + reservable.save! + end + private def machine_not_already_reserved @@ -280,8 +287,6 @@ class Reservation < ActiveRecord::Base errors.add(:training, 'already fully reserved') if Availability.find(slot.availability_id).completed? end - private - def notify_member_create_reservation NotificationCenter.call type: 'notify_member_create_reservation', receiver: user, @@ -294,22 +299,6 @@ class Reservation < ActiveRecord::Base attached_object: self end - def update_event_nb_free_places - if reservable_id_was.blank? - # simple reservation creation, we subtract the number of booked seats from the previous number - nb_free_places = reservable.nb_free_places - total_booked_seats - else - # reservation moved from another date (for recurring events) - seats = total_booked_seats - - reservable_was = Event.find(reservable_id_was) - nb_free_places = reservable_was.nb_free_places + seats - reservable_was.update_columns(nb_free_places: nb_free_places) - nb_free_places = reservable.nb_free_places - seats - end - reservable.update_columns(nb_free_places: nb_free_places) - end - def cart_total total = (invoice.invoice_items.map(&:amount).map(&:to_i).reduce(:+) or 0) if plan_id.present? diff --git a/app/models/slot.rb b/app/models/slot.rb index 3d49b3b45..cddb98dac 100644 --- a/app/models/slot.rb +++ b/app/models/slot.rb @@ -15,6 +15,7 @@ class Slot < ActiveRecord::Base after_update :notify_member_and_admin_slot_is_modified, if: :dates_were_modified? after_update :notify_member_and_admin_slot_is_canceled, if: :canceled? + after_update :update_event_nb_free_places, if: :canceled? # for backward compatibility def reservation @@ -67,4 +68,11 @@ class Slot < ActiveRecord::Base def set_ex_start_end_dates_attrs update_columns(ex_start_at: start_at_was, ex_end_at: end_at_was) end + + def update_event_nb_free_places + return unless reservation.reservable_type == 'Event' + raise NotImplementedError if reservations.count > 1 + + reservation.update_event_nb_free_places + end end From 261d1666afaf28f816323a57d021272a53b10d22 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 16:56:02 +0000 Subject: [PATCH 026/135] Bump angular from 1.6.10 to 1.7.9 Bumps [angular](https://github.com/angular/angular.js) from 1.6.10 to 1.7.9. - [Release notes](https://github.com/angular/angular.js/releases) - [Changelog](https://github.com/angular/angular.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/angular/angular.js/compare/v1.6.10...v1.7.9) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index d410ec13c..80053b1b7 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "dependencies": { "@uirouter/angularjs": "0.4", "AngularDevise": "https://github.com/cloudspace/angular_devise.git#1.0.2", - "angular": "1.6", + "angular": "1.7", "angular-animate": "1.6", "angular-aside": "1.3", "angular-base64-upload": "^0.0.9", diff --git a/yarn.lock b/yarn.lock index b1eecf9a4..7bf285b1f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -192,15 +192,10 @@ angular-xeditable@0.10: dependencies: angular "~1.x" -angular@1.6: - version "1.6.10" - resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.10.tgz#eed3080a34d29d0f681ff119b18ce294e3f74826" - integrity sha512-PCZ5/hVdvPQiYyH0VwsPjrErPHRcITnaXxhksceOXgtJeesKHLA7KDu4X/yvcAi+1zdGgGF+9pDxkJvghXI9Wg== - -angular@^1.0.8, angular@~1.x: - version "1.7.5" - resolved "https://registry.yarnpkg.com/angular/-/angular-1.7.5.tgz#d1c1c01c6f5dc835638f3f9aa51012857bdac49e" - integrity sha512-760183yxtGzni740IBTieNuWLtPNAoMqvmC0Z62UoU0I3nqk+VJuO3JbQAXOyvo3Oy/ZsdNQwrSTh/B0OQZjNw== +angular@1.7, angular@^1.0.8, angular@~1.x: + version "1.7.9" + resolved "https://registry.yarnpkg.com/angular/-/angular-1.7.9.tgz#e52616e8701c17724c3c238cfe4f9446fd570bc4" + integrity sha512-5se7ZpcOtu0MBFlzGv5dsM1quQDoDeUTwZrWjGtTNA7O88cD8TEk5IEKCTDa3uECV9XnvKREVUr7du1ACiWGFQ== ansi-escapes@^3.0.0: version "3.1.0" From ce366beaa2c15851a263a220ccb986e8f48c366d Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 21 Nov 2019 11:15:05 +0100 Subject: [PATCH 027/135] display that an event reservation was canceled also: fixed transtions files --- .../controllers/admin/events.js.erb | 11 +++++++- .../javascripts/controllers/events.js.erb | 23 +++++++++++------ app/assets/stylesheets/app.components.scss | 22 ++++++++++++++++ .../admin/events/reservations.html.erb | 3 ++- app/assets/templates/events/show.html.erb | 25 +++++++++++-------- .../reservations/_reservation.json.jbuilder | 1 + config/locales/app.admin.en.yml | 5 ++++ config/locales/app.admin.es.yml | 5 ++++ config/locales/app.admin.fr.yml | 1 + config/locales/app.admin.pt.yml | 5 ++++ config/locales/app.logged.es.yml | 6 ++++- config/locales/app.logged.fr.yml | 6 ++++- config/locales/app.logged.pt.yml | 4 +++ config/locales/app.public.en.yml | 3 ++- config/locales/app.public.es.yml | 7 +++++- config/locales/app.public.fr.yml | 3 +-- config/locales/app.public.pt.yml | 4 +++ 17 files changed, 109 insertions(+), 25 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/events.js.erb b/app/assets/javascripts/controllers/admin/events.js.erb index 774111ed7..f1893864f 100644 --- a/app/assets/javascripts/controllers/admin/events.js.erb +++ b/app/assets/javascripts/controllers/admin/events.js.erb @@ -431,7 +431,16 @@ Application.Controllers.controller('ShowEventReservationsController', ['$scope', $scope.event = eventPromise; // list of reservations for the current event - return $scope.reservations = reservationsPromise; + $scope.reservations = reservationsPromise; + + /** + * Test if the provided reservation has been cancelled + * @param reservation {Reservation} + * @returns {boolean} + */ + $scope.isCancelled = function(reservation) { + return !!(reservation.slots[0].canceled_at); + } }]); /** diff --git a/app/assets/javascripts/controllers/events.js.erb b/app/assets/javascripts/controllers/events.js.erb index 6bb4c377e..fa2129a3a 100644 --- a/app/assets/javascripts/controllers/events.js.erb +++ b/app/assets/javascripts/controllers/events.js.erb @@ -128,7 +128,7 @@ Application.Controllers.controller('EventsController', ['$scope', '$state', 'Eve Application.Controllers.controller('ShowEventController', ['$scope', '$state', '$stateParams', '$rootScope', 'Event', '$uibModal', 'Member', 'Reservation', 'Price', 'CustomAsset', 'Slot', 'eventPromise', 'growl', '_t', 'Wallet', 'helpers', 'dialogs', 'priceCategoriesPromise', 'settingsPromise', function ($scope, $state, $stateParams, $rootScope, Event, $uibModal, Member, Reservation, Price, CustomAsset, Slot, eventPromise, growl, _t, Wallet, helpers, dialogs, priceCategoriesPromise, settingsPromise) { - /* PUBLIC SCOPE */ + /* PUBLIC SCOPE */ // reservations for the currently shown event $scope.reservations = []; @@ -352,7 +352,7 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' * @param reservation {{id:number, reservable_id:number, nb_reserve_places:number}} */ $scope.cancelReservation = function(reservation) { - return dialogs.confirm({ + dialogs.confirm({ resolve: { object: function() { return { @@ -362,20 +362,29 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' } } }, function() { // cancel confirmed - return Slot.cancel({ + Slot.cancel({ id: reservation.slots[0].id }, function() { // successfully canceled - var index; + let index; growl.success(_t('reservation_was_successfully_cancelled')); index = $scope.reservations.indexOf(reservation); $scope.event.nb_free_places = $scope.event.nb_free_places + reservation.total_booked_seats; - return $scope.reservations.splice(index, 1); + $scope.reservations[index].slots[0].canceled_at = new Date(); }, function(error) { - return growl.warning(_t('cancellation_failed')); + growl.warning(_t('cancellation_failed')); }); }); }; + /** + * Test if the provided reservation has been cancelled + * @param reservation {Reservation} + * @returns {boolean} + */ + $scope.isCancelled = function(reservation) { + return !!(reservation.slots[0].canceled_at); + } + /** * Callback to alter an already booked reservation date. A modal window will be opened to allow the user to choose * a new date for his reservation (if any available) @@ -777,7 +786,7 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' /** * What to do after the payment was successful - * @param resveration {Object} booked reservation + * @param reservation {Object} booked reservation */ var afterPayment = function (reservation) { $scope.event.nb_free_places = $scope.event.nb_free_places - reservation.total_booked_seats; diff --git a/app/assets/stylesheets/app.components.scss b/app/assets/stylesheets/app.components.scss index f477fd3dc..e4b6dde33 100644 --- a/app/assets/stylesheets/app.components.scss +++ b/app/assets/stylesheets/app.components.scss @@ -290,6 +290,11 @@ @include border-radius(3px); padding: 5px 10px; } + &.well-disabled { + border-color: $gray-lighter; + background-color: $gray-lighter; + color: $gray-light; + } } .read { @@ -629,3 +634,20 @@ padding: 10px; .help-block.error { color: #ff565d; } + +.disabled { + background-color: $gray-lighter; + color: $gray-light; + + & a { + color: $gray; + } + + .canceled-marker { + float: right; + top: -13px; + position: relative; + color: red; + text-transform: uppercase; + } +} diff --git a/app/assets/templates/admin/events/reservations.html.erb b/app/assets/templates/admin/events/reservations.html.erb index a4867fee9..954e23d11 100644 --- a/app/assets/templates/admin/events/reservations.html.erb +++ b/app/assets/templates/admin/events/reservations.html.erb @@ -27,7 +27,7 @@ - + {{ reservation.user_full_name }} @@ -35,6 +35,7 @@ {{ 'full_price_' | translate }} {{reservation.nb_reserve_places}}
       {{ticket.event_price_category.price_category.name}} : {{ticket.booked}} +
      {{ 'canceled' }}
      diff --git a/app/assets/templates/events/show.html.erb b/app/assets/templates/events/show.html.erb index 4e70c1713..6dcad7241 100644 --- a/app/assets/templates/events/show.html.erb +++ b/app/assets/templates/events/show.html.erb @@ -151,17 +151,22 @@
      {{ 'thank_you_your_payment_has_been_successfully_registered' | translate }}
      {{ 'you_can_find_your_reservation_s_details_on_your_' | translate }} {{ 'dashboard' }}
      -
      -
      {{ 'you_booked_DATE' | translate:{DATE:(reservation.created_at | amDateFormat:'L LT')} }}
      -
      {{ 'full_price_' | translate }} {{reservation.nb_reserve_places}} {{ 'ticket' | translate:{NUMBER:reservation.nb_reserve_places}:"messageformat" }}
      -
      - {{ticket.event_price_category.price_category.name}} : {{ticket.booked}} {{ 'ticket' | translate:{NUMBER:ticket.booked}:"messageformat" }} +
      +
      +
      {{ 'you_booked_DATE' | translate:{DATE:(reservation.created_at | amDateFormat:'L LT')} }}
      +
      {{ 'full_price_' | translate }} {{reservation.nb_reserve_places}} {{ 'ticket' | translate:{NUMBER:reservation.nb_reserve_places}:"messageformat" }}
      +
      + {{ticket.event_price_category.price_category.name}} : {{ticket.booked}} {{ 'ticket' | translate:{NUMBER:ticket.booked}:"messageformat" }} +
      +
      + {{ 'change' }} +
      +
      + {{ 'cancel' }} +
      -
      - {{ 'change' }} -
      -
      - {{ 'cancel' }} +
      +
      {{ 'canceled_reservation_SEATS' | translate:{SEATS:reservation.nb_reserve_places} }}
      diff --git a/app/views/api/reservations/_reservation.json.jbuilder b/app/views/api/reservations/_reservation.json.jbuilder index 102da726a..24b545a07 100644 --- a/app/views/api/reservations/_reservation.json.jbuilder +++ b/app/views/api/reservations/_reservation.json.jbuilder @@ -6,6 +6,7 @@ json.slots reservation.slots do |s| json.id s.id json.start_at s.start_at.iso8601 json.end_at s.end_at.iso8601 + json.canceled_at s.canceled_at&.iso8601 end json.nb_reserve_places reservation.nb_reserve_places json.tickets reservation.tickets do |t| diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 4c9640bc7..c69336065 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -79,6 +79,9 @@ en: delete_slot: "Delete this slot" do_you_really_want_to_delete_this_slot: "Do you really want to delete this slot?" delete_recurring_slot: "You're about to delete a recurring slot. What do you want to do?" + delete_this_slot: "Only this slot" + delete_this_and_next: "This slot and the following" + delete_all: "All slots" event_in_the_past: "Unable to create a slot in the past." project_elements: @@ -192,6 +195,7 @@ en: show_the_event: "Show the event" no_reservations_for_now: "No reservation for now." back_to_monitoring: "Back to monitoring" + canceled: "Canceled" pricing: # subscriptions, prices, credits and coupons management @@ -325,6 +329,7 @@ en: display_more_invoices: "Display more invoices..." no_invoices_for_now: "No invoices for now." invoicing_settings: "Invoicing settings" + warning_invoices_disabled: "Warning : invoices are not enabled. No invoices will be generated by Fab-manager. Nevertheless, you must correctly fill the information below, especially VAT." change_logo: "Change logo" john_smith: "John Smith" john_smith_at_example_com: "jean.smith@example.com" diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index c44ecbf2b..3bbd7cb8d 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -79,6 +79,9 @@ es: delete_slot: "Delete this slot" # translation_missing do_you_really_want_to_delete_this_slot: "Do you really want to delete this slot?" # translation_missing delete_recurring_slot: "You're about to delete a recurring slot. What do you want to do?"# translation_missing + delete_this_slot: "Only this slot" # translation_missing + delete_this_and_next: "This slot and the following" # translation_missing + delete_all: "All slots" # translation_missing event_in_the_past: "Unable to create a slot in the past." # translation_missing project_elements: @@ -192,6 +195,7 @@ es: show_the_event: "Mostrar el evento" no_reservations_for_now: "No hay reservas por ahora." back_to_monitoring: "Volver a monitorizar" + canceled: "cancelado" pricing: # subscriptions, prices, credits and coupons management @@ -325,6 +329,7 @@ es: display_more_invoices: "Mostrar más facturas..." no_invoices_for_now: "Sin facturas por ahora." invoicing_settings: "Configuración de facturación" + warning_invoices_disabled: "Warning : invoices are not enabled. No invoices will be generated by Fab-manager. Nevertheless, you must correctly fill the information below, especially VAT." # missing translation change_logo: "Cambio de logotipo" john_smith: "John Smith" john_smith_at_example_com: "jean.smith@example.com" diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index d448b3b30..7f4afa2c1 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -195,6 +195,7 @@ fr: show_the_event: "Afficher l'évènement" no_reservations_for_now: "Aucune réservation pour le moment." back_to_monitoring: "Retour au suivi" + canceled: "Annulé" pricing: # gestion des abonnements, des tarifs, des crédits et des codes promo diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 158118490..227e4ed24 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -79,6 +79,9 @@ pt: delete_slot: "Exclua o slot" do_you_really_want_to_delete_this_slot: "Você realmente quer excluir esse slot?" delete_recurring_slot: "You're about to delete a recurring slot. What do you want to do?"# translation_missing + delete_this_slot: "Only this slot" # translation_missing + delete_this_and_next: "This slot and the following" # translation_missing + delete_all: "All slots" # translation_missing event_in_the_past: "Unable to create a slot in the past." # translation_missing project_elements: @@ -192,6 +195,7 @@ pt: show_the_event: "Mostrar evento" no_reservations_for_now: "Nenhuma reserva." back_to_monitoring: "Voltar ao monitoramento" + canceled: "cancelado" pricing: # subscriptions, prices, credits and coupons management @@ -325,6 +329,7 @@ pt: display_more_invoices: "Mostrar mais faturas..." no_invoices_for_now: "Nenhuma fatura." invoicing_settings: "Configurações do faturamento" + warning_invoices_disabled: "Warning : invoices are not enabled. No invoices will be generated by Fab-manager. Nevertheless, you must correctly fill the information below, especially VAT." # missing translation change_logo: "Mudar o logo" john_smith: "John Smith" john_smith_at_example_com: "jean.smith@example.com" diff --git a/config/locales/app.logged.es.yml b/config/locales/app.logged.es.yml index 62eb175c1..02fca5123 100644 --- a/config/locales/app.logged.es.yml +++ b/config/locales/app.logged.es.yml @@ -65,8 +65,8 @@ es: used_for_invoicing: "This data will be used for billing purposes" # translation missing used_for_reservation: "This data will be used in case of change on one of your bookings" # translation missing used_for_profile: "This data will only be displayed on your profile" # translation missing - public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing used_for_pricing_stats: "This data will be used to determine the prices to which you are entitled, and for statistical purposes" # translation missing + public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing trainings: "Cursos" no_trainings: "Sin cursos" subscription: "Suscripción" @@ -130,6 +130,10 @@ es: i_reserve: "reservo" i_shift: "reemplazo" i_change: "cambio" + do_you_really_want_to_cancel_this_reservation: "Do you really want to cancel this reservation?" # translation missing + reservation_was_cancelled_successfully: "Reservation was cancelled successfully." # translation missing + cancellation_failed: "Cancellation failed." # translation missing + a_problem_occured_during_the_payment_process_please_try_again_later: "A problem occurred during the payment process. Please try again later." # translation missing trainings_reserve: # book a training diff --git a/config/locales/app.logged.fr.yml b/config/locales/app.logged.fr.yml index 53f69ad2c..89bc431ef 100644 --- a/config/locales/app.logged.fr.yml +++ b/config/locales/app.logged.fr.yml @@ -74,11 +74,11 @@ fr: or: "ou" confirm_changes: "Valider les modifications" change_my_data: "Modifier mes données" + sync_my_profile: "Synchroniser mon profil" once_your_data_are_up_to_date_: "Une fois vos données à jour," _click_on_the_synchronization_button_opposite_: "cliquez sur le bouton de synchronisation ci-contre" _disconnect_then_reconnect_: "déconnectez-vous puis re-connectez vous" _for_your_changes_to_take_effect: "pour que les modifications soient prises en compte." - sync_my_profile: "Synchroniser mon profil" projects: # tableau de bord : mes projets you_dont_have_any_projects: "Vous n'avez aucun projet." @@ -130,6 +130,10 @@ fr: i_reserve: "Je réserve" i_shift: "Je déplace" i_change: "Je change" + do_you_really_want_to_cancel_this_reservation: "Voulez-vous vraiment annuler cette réservation ?" + reservation_was_cancelled_successfully: "La réservation a bien été annulée." + cancellation_failed: "Échec de l'annulation." + a_problem_occured_during_the_payment_process_please_try_again_later: "Un problème est survenu pendant le processus de paiement. Merci de réessayer ultérieurement." trainings_reserve: # réserver une formation diff --git a/config/locales/app.logged.pt.yml b/config/locales/app.logged.pt.yml index aa01a9580..dfaf35fdb 100755 --- a/config/locales/app.logged.pt.yml +++ b/config/locales/app.logged.pt.yml @@ -130,6 +130,10 @@ pt: i_reserve: "Eu reservo" i_shift: "Eu mudo" i_change: "Eu altero" + do_you_really_want_to_cancel_this_reservation: "Do you really want to cancel this reservation?" # translation missing + reservation_was_cancelled_successfully: "Reservation was cancelled successfully." # translation missing + cancellation_failed: "Cancellation failed." # translation missing + a_problem_occured_during_the_payment_process_please_try_again_later: "A problem occurred during the payment process. Please try again later." # translation missing trainings_reserve: # book a training diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml index b9453dda2..ce9a26e9f 100644 --- a/config/locales/app.public.en.yml +++ b/config/locales/app.public.en.yml @@ -272,7 +272,7 @@ en: # details and booking of an event event_description: "Event description" downloadable_documents: "Downloadable documents" - informations_and_booking: "Informations and booking" + information_and_booking: "Information and booking" beginning: "Beginning:" ending: "Ending:" opening_hours: "Opening hours:" @@ -284,6 +284,7 @@ en: 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" you_booked_DATE: "You booked ({{DATE}}):" # angular interpolation + canceled_reservation_SEATS: "Reservation canceled ({{SEATS}} seats)" # angular interpolation book: "Book" change_the_reservation: "Change the reservation" you_can_shift_this_reservation_on_the_following_slots: "You can shift this reservation on the following slots:" diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml index 7cb326cc1..75aa29a37 100644 --- a/config/locales/app.public.es.yml +++ b/config/locales/app.public.es.yml @@ -27,6 +27,7 @@ es: sign_out: "Salir" sign_up: "Registrarse" sign_in: "Entrar" + # left menu notifications: "Notificaciones" admin: "Administrador" @@ -271,7 +272,7 @@ es: # details and booking of an event event_description: "Descripción del evento" downloadable_documents: "Archivos descargables" - informations_and_booking: "Información y reservas" + information_and_booking: "Información y reservas" beginning: "Empieza:" ending: "Termina:" opening_hours: "Hora de apertura:" @@ -283,6 +284,7 @@ es: make_a_gift_of_this_reservation: "Regalar esta reserva" you_can_find_your_reservation_s_details_on_your_: "Puede encontrar los detalles de su reserva en" you_booked_DATE: "You booked ({{DATE}}):" # angular interpolation + canceled_reservation_SEATS: "Reservation canceled ({{SEATS}} seats)" # angular interpolation #translation_missing book: "Reservar" change_the_reservation: "Cambiar la reserva" you_can_shift_this_reservation_on_the_following_slots: "Puede cambiar la reserva en los siguientes campos:" @@ -290,6 +292,9 @@ es: do_you_really_want_to_delete_this_event: "Do you really want to delete this event?" #translation_missing event_successfully_deleted: "Event successfully deleted" #translation_missing unable_to_delete_the_event_because_some_users_alredy_booked_it: "Unable to delete this event, it may have been already reserved by some users." #translation_missing + cancel_the_reservation: "Cancel the reservation" #translation_missing + do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." #translation_missing + cancellation_failed: "Cancellation failed." #translation_missing calendar: # public calendar diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index 5c7df7c28..522562d10 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -223,7 +223,6 @@ fr: unauthorized_operation: "Opération non autorisée" the_machine_cant_be_deleted_because_it_is_already_reserved_by_some_users: "La machine ne peut pas être supprimée car elle a déjà été réservée par des utilisateurs." - trainings_list: # liste des formations the_trainings: "Les formations" @@ -235,7 +234,6 @@ fr: unauthorized_operation: "Opération non autorisée" the_training_cant_be_deleted_because_it_is_already_reserved_by_some_users: "La formation ne peut pas être supprimée car elle a déjà été réservée par des utilisateurs." - plans: # page récapitulative des abonnements subcriptions: "Les abonnements" @@ -286,6 +284,7 @@ fr: 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" you_booked_DATE: "Vous avez réservé ({{DATE}}) :" # angular interpolation + canceled_reservation_SEATS: "Réservation annulée ({{SEATS}} places)" # angular interpolation book: "Réserver" change_the_reservation: "Modifier la réservation" you_can_shift_this_reservation_on_the_following_slots: "Vous pouvez déplacer cette réservation sur les créneaux suivants :" diff --git a/config/locales/app.public.pt.yml b/config/locales/app.public.pt.yml index 743348e02..ff0fb170f 100755 --- a/config/locales/app.public.pt.yml +++ b/config/locales/app.public.pt.yml @@ -284,6 +284,7 @@ pt: 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" you_booked_DATE: "Sua reserva ({{DATE}}):" # angular interpolation + canceled_reservation_SEATS: "Reservation canceled ({{SEATS}} seats)" # angular interpolation #translation_missing book: "Reservar" change_the_reservation: "Alterar reserva" you_can_shift_this_reservation_on_the_following_slots: "Você pode alterar essa reserva nos campos a seguir:" @@ -291,6 +292,9 @@ pt: do_you_really_want_to_delete_this_event: "Vocêrealmente deseja remover este evento?" event_successfully_deleted: "Evento excluído com sucesso" unable_to_delete_the_event_because_some_users_alredy_booked_it: "Não foi possível excluir este evento, já pode ter sido reservado por alguns usuários." + cancel_the_reservation: "Cancel the reservation" #translation_missing + do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." #translation_missing + cancellation_failed: "Cancellation failed." #translation_missin calendar: # public calendar From bbd613f2a51b7d67b7850ce85d61b690a4dcd386 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 25 Nov 2019 10:30:03 +0100 Subject: [PATCH 028/135] compute right nb of free seats for event reservation also: copy nb_total_places to n+1 instances when creating recurrent availabilities --- app/models/event.rb | 6 +++--- app/models/reservation.rb | 7 +++++-- .../availabilities/create_availabilities_service.rb | 3 ++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/models/event.rb b/app/models/event.rb index 12e593517..bad777185 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -98,7 +98,7 @@ class Event < ActiveRecord::Base else nil end - r = Recurrence.new(every: recurrence, on: on, starts: availability.start_at+1.day, until: recurrence_end_at) + r = Recurrence.new(every: recurrence, on: on, starts: availability.start_at + 1.day, until: recurrence_end_at) r.events.each do |date| days_diff = availability.end_at.day - availability.start_at.day start_at = DateTime.new( @@ -110,7 +110,7 @@ class Event < ActiveRecord::Base availability.start_at.sec, availability.start_at.zone ) - start_at = dst_correction(availability.start_at,start_at) + start_at = dst_correction(availability.start_at, start_at) end_date = date + days_diff.days end_at = DateTime.new( end_date.year, @@ -121,7 +121,7 @@ class Event < ActiveRecord::Base availability.end_at.sec, availability.end_at.zone ) - end_at = dst_correction(availability.start_at,end_at) + end_at = dst_correction(availability.start_at, end_at) ei = EventImage.new(attachment: event_image.attachment) if event_image efs = event_files.map do |f| EventFile.new(attachment: f.attachment) diff --git a/app/models/reservation.rb b/app/models/reservation.rb index f0d7d3aac..31ccc3e86 100644 --- a/app/models/reservation.rb +++ b/app/models/reservation.rb @@ -244,8 +244,11 @@ class Reservation < ActiveRecord::Base end def total_booked_seats - total = 0 - total = nb_reserve_places if slots.first.canceled_at + # cases: + # - machine/training/space reservation => 1 slot = 1 seat (currently not covered by this function) + # - event reservation => seats = nb_reserve_place (normal price) + tickets.booked (other prices) + total = nb_reserve_places + total = 0 if slots.first.canceled_at total += tickets.map(&:booked).map(&:to_i).reduce(:+) if tickets.count.positive? total diff --git a/app/services/availabilities/create_availabilities_service.rb b/app/services/availabilities/create_availabilities_service.rb index f848f0597..2afd49e11 100644 --- a/app/services/availabilities/create_availabilities_service.rb +++ b/app/services/availabilities/create_availabilities_service.rb @@ -20,7 +20,8 @@ class Availabilities::CreateAvailabilitiesService machine_ids: availability.machine_ids, training_ids: availability.training_ids, space_ids: availability.space_ids, - tag_ids: availability.tag_ids + tag_ids: availability.tag_ids, + nb_total_places: availability.nb_total_places ).save! end end From 1182822d8b42701fdefb1bb1de074109ef7f49ea Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 25 Nov 2019 10:45:54 +0100 Subject: [PATCH 029/135] show correct seats nb in canceled reservation --- app/assets/templates/events/show.html.erb | 2 +- app/models/reservation.rb | 6 ++++-- app/views/api/reservations/_reservation.json.jbuilder | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/assets/templates/events/show.html.erb b/app/assets/templates/events/show.html.erb index 6dcad7241..1c3ff1f4b 100644 --- a/app/assets/templates/events/show.html.erb +++ b/app/assets/templates/events/show.html.erb @@ -166,7 +166,7 @@
      -
      {{ 'canceled_reservation_SEATS' | translate:{SEATS:reservation.nb_reserve_places} }}
      +
      {{ 'canceled_reservation_SEATS' | translate:{SEATS:reservation.total_booked_seats} }}
      diff --git a/app/models/reservation.rb b/app/models/reservation.rb index 31ccc3e86..1536531be 100644 --- a/app/models/reservation.rb +++ b/app/models/reservation.rb @@ -243,12 +243,14 @@ class Reservation < ActiveRecord::Base true end - def total_booked_seats + # @param canceled if true, count the number of seats for this reservation, including canceled seats + def total_booked_seats(canceled: false) # cases: # - machine/training/space reservation => 1 slot = 1 seat (currently not covered by this function) # - event reservation => seats = nb_reserve_place (normal price) + tickets.booked (other prices) + return 0 if slots.first.canceled_at && !canceled + total = nb_reserve_places - total = 0 if slots.first.canceled_at total += tickets.map(&:booked).map(&:to_i).reduce(:+) if tickets.count.positive? total diff --git a/app/views/api/reservations/_reservation.json.jbuilder b/app/views/api/reservations/_reservation.json.jbuilder index 24b545a07..b3873a7e0 100644 --- a/app/views/api/reservations/_reservation.json.jbuilder +++ b/app/views/api/reservations/_reservation.json.jbuilder @@ -18,7 +18,7 @@ json.tickets reservation.tickets do |t| end end end -json.total_booked_seats reservation.total_booked_seats +json.total_booked_seats reservation.total_booked_seats(canceled: true) json.created_at reservation.created_at.iso8601 json.reservable_id reservation.reservable_id json.reservable_type reservation.reservable_type From 5d358efb9f38144a8a06e3a3c7ff5147baf5e2f6 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 25 Nov 2019 10:50:32 +0100 Subject: [PATCH 030/135] correct conjugation for event canceled --- config/locales/app.admin.es.yml | 2 +- config/locales/app.admin.fr.yml | 2 +- config/locales/app.admin.pt.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 3bbd7cb8d..db37e504e 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -195,7 +195,7 @@ es: show_the_event: "Mostrar el evento" no_reservations_for_now: "No hay reservas por ahora." back_to_monitoring: "Volver a monitorizar" - canceled: "cancelado" + canceled: "cancelada" pricing: # subscriptions, prices, credits and coupons management diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 7f4afa2c1..806c6905b 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -195,7 +195,7 @@ fr: show_the_event: "Afficher l'évènement" no_reservations_for_now: "Aucune réservation pour le moment." back_to_monitoring: "Retour au suivi" - canceled: "Annulé" + canceled: "Annulée" pricing: # gestion des abonnements, des tarifs, des crédits et des codes promo diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 227e4ed24..e91ccdbe1 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -195,7 +195,7 @@ pt: show_the_event: "Mostrar evento" no_reservations_for_now: "Nenhuma reserva." back_to_monitoring: "Voltar ao monitoramento" - canceled: "cancelado" + canceled: "cancelada" pricing: # subscriptions, prices, credits and coupons management From 1d1a163880f33f48904e5c00ec3d1de9073e2745 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 25 Nov 2019 10:52:45 +0100 Subject: [PATCH 031/135] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fe181342..37863f1dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - Ability to create and delete periodic calendar availabilities (recurrence) - An administrator can delete a member +- An event can be cancelled, if reservation cancellation is enabled - Ability to configure the duration of a reservation slot. Previously, only 60 minutes slots were allowed - Display indications on required fields in new administrator form - Configuration of phone number in members registration forms: can be required or optional, depending on `PHONE_REQUIRED` configuration From 452f1cdae467b4927cecfc89b7cc8c6ace942f35 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 25 Nov 2019 11:26:35 +0100 Subject: [PATCH 032/135] updated angular.js to 1.7 --- CHANGELOG.md | 5 +- package.json | 18 +++---- yarn.lock | 138 +++++++++++++++++++++++++++++++++++---------------- 3 files changed, 108 insertions(+), 53 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37863f1dd..c8820e587 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,10 +11,11 @@ - Handle Ctrl^C in upgrade scripts - Updated moment-timezone - Fix a bug: unable to remove the picture from a training -- Fix a security issue: fixed [CVE-2019-15587](https://github.com/advisories/GHSA-c3gv-9cxf-6f57) +- Fix a security issue: updated loofah to fix [CVE-2019-15587](https://github.com/advisories/GHSA-c3gv-9cxf-6f57) +- Fix a security issue: updated angular to 1.7.9 to fix [CVE-2019-10768](https://github.com/advisories/GHSA-89mq-4x47-5v83) - [TODO DEPLOY] add the `SLOT_DURATION` environment variable (see [doc/environment.md](doc/environment.md#SLOT_DURATION) for configuration details) - [TODO DEPLOY] add the `PHONE_REQUIRED` environment variable (see [doc/environment.md](doc/environment.md#PHONE_REQUIRED) for configuration details) -- [TODO DEPLOY] -> (only dev) `bundle install` +- [TODO DEPLOY] -> (only dev) `bundle install && yarn install` - [TODO DEPLOY] `rake db:migrate` ## v4.2.4 2019 October 30 diff --git a/package.json b/package.json index 4cb7350b7..1344f2e24 100644 --- a/package.json +++ b/package.json @@ -28,27 +28,27 @@ "@uirouter/angularjs": "0.4", "AngularDevise": "https://github.com/cloudspace/angular_devise.git#1.0.2", "angular": "1.7", - "angular-animate": "1.6", + "angular-animate": "1.7", "angular-aside": "1.3", "angular-base64-upload": "^0.0.9", "angular-bootstrap-switch": "0.4.0", - "angular-cookies": "1.6", + "angular-cookies": "1.7", "angular-google-analytics": "1.1", "angular-growl-v2": "https://github.com/JanStevens/angular-growl-2.git#0.7.9", - "angular-i18n": "1.6", + "angular-i18n": "1.7", "angular-loading-bar": "^0.9.0", "angular-medium-editor": "https://github.com/thijsw/angular-medium-editor.git#0.1.1", "angular-minicolors": "https://github.com/kaihenzler/angular-minicolors.git#0.0.5", "angular-moment": "1.3", "angular-recaptcha": "^4.2.0", - "angular-resource": "1.6", - "angular-sanitize": "1.6", + "angular-resource": "1.7", + "angular-sanitize": "1.7", "angular-scroll": "0.6", "angular-summernote": "0.7.1", - "angular-touch": "1.6", - "angular-translate": "2.8", - "angular-translate-interpolation-messageformat": "2.8", - "angular-translate-loader-partial": "2.8", + "angular-touch": "1.7", + "angular-translate": "2.18", + "angular-translate-interpolation-messageformat": "2.18", + "angular-translate-loader-partial": "2.18", "angular-ui-bootstrap": "0.14.3", "angular-ui-calendar": "https://github.com/angular-ui/ui-calendar.git#1.0.1", "angular-unsavedchanges": "0.2", diff --git a/yarn.lock b/yarn.lock index 6c2b0ba50..2e2d438c0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -62,10 +62,10 @@ ambi@^2.2.0: editions "^1.1.1" typechecker "^4.3.0" -angular-animate@1.6: - version "1.6.10" - resolved "https://registry.yarnpkg.com/angular-animate/-/angular-animate-1.6.10.tgz#c520f6d341370e34e0a62060c99bcf47b7d7db8c" - integrity sha512-RU9ZJbTspq0W0x675H5k1DeSgKbAFfp2aiYoNGdlD+wQNKvwwMR5ho+EkDKkx9zE02a5goe8Z6EhhYPQSff9dA== +angular-animate@1.7: + version "1.7.9" + resolved "https://registry.yarnpkg.com/angular-animate/-/angular-animate-1.7.9.tgz#a397f82434c1e7ed5b7a298fa70fc3de989a6785" + integrity sha512-fV+AISy/HTzurQH2ngsJg+lLIvfu0ahc1h4AYKauaXVw97rZc2k4iUA1bMstiEyClsdayQX568kjQc1NK+oYhw== angular-aside@1.3: version "1.3.2" @@ -82,10 +82,10 @@ angular-bootstrap-switch@0.4.0: resolved "https://registry.yarnpkg.com/angular-bootstrap-switch/-/angular-bootstrap-switch-0.4.0.tgz#8f4d45a0de5ff1227bd6ae2c5348e4c821d9303a" integrity sha1-j01FoN5f8SJ71q4sU0jkyCHZMDo= -angular-cookies@1.6: - version "1.6.10" - resolved "https://registry.yarnpkg.com/angular-cookies/-/angular-cookies-1.6.10.tgz#20a014d501242e2edacd21397c0e5480e08dee00" - integrity sha512-ADfbqXLhwcaecAiWIaxpl8XWFJgWsrDl/ksSEkYm5dSoXHYlj3HKlAhPbjBv/foYS7pdI0apmSGHWrBPqdjF/g== +angular-cookies@1.7: + version "1.7.9" + resolved "https://registry.yarnpkg.com/angular-cookies/-/angular-cookies-1.7.9.tgz#0f0cd2a9d1c81e5b8d6c6711d41f0909f9d0b8e0" + integrity sha512-3eRq/aPrtCZKDWQnc3nW3sFoMbLiHkCkyDF2O9u7VXnqvVsUPaipk5R1ZqahgcSQHQrN/F5IU4T4nrz52qAZmA== angular-google-analytics@1.1: version "1.1.8" @@ -96,10 +96,10 @@ angular-google-analytics@1.1: version "0.7.9" resolved "https://github.com/JanStevens/angular-growl-2.git#2a3a40e01419af879f80f582baaeceef3408e295" -angular-i18n@1.6: - version "1.6.10" - resolved "https://registry.yarnpkg.com/angular-i18n/-/angular-i18n-1.6.10.tgz#16d9d6e6f9501a2cb80bce30c5cd1c76ddb5a545" - integrity sha512-/57YZVxgyGmdCDttNe9fuAepI/c3lA9KgER9IY4U75f6K8eM8Y7GVhqBy3x2QQ9uTiubfvlcmoOJKCC621pPFw== +angular-i18n@1.7: + version "1.7.9" + resolved "https://registry.yarnpkg.com/angular-i18n/-/angular-i18n-1.7.9.tgz#3ecdfd6ef1cb1c5eec4658d64a2fdb402e1d2578" + integrity sha512-5woHq1BC0r9KOAoEoCeYt6IKfpLXhxzOwkI/wvukuDHuGGyPU0tapZSdUXihFmQz1nHeiNpspVbkYWsM586p0Q== angular-loading-bar@^0.9.0: version "0.9.0" @@ -126,15 +126,15 @@ angular-recaptcha@^4.2.0: resolved "https://registry.yarnpkg.com/angular-recaptcha/-/angular-recaptcha-4.2.0.tgz#3533802ae0d43ac9fedd5f6104e9dbf3c10588a7" integrity sha512-PZ4VsUiNKNqaGqCpTAEwyAWUNF0w7xFulMf3ajJVym7bidxPEi5py1jQdxj4LFIWUxoA7XPan4sJMK4UeB8Srg== -angular-resource@1.6: - version "1.6.10" - resolved "https://registry.yarnpkg.com/angular-resource/-/angular-resource-1.6.10.tgz#28c1834e9fa623467d2f9894716a4e6c7e077459" - integrity sha512-jrYXUGPtpv/lTBlYZ6HZefIV6Lb+6e1HUavBPg9TSzW7s4zYRBWzMj6vMg8gZzVjWdH/nYBWfilV0qfnmZSI+A== +angular-resource@1.7: + version "1.7.9" + resolved "https://registry.yarnpkg.com/angular-resource/-/angular-resource-1.7.9.tgz#fa53623fae2c60debe2410d692447dcb0ba02396" + integrity sha512-rXXhCE2qT31Pn4Sl+2XL+ntv4zxnA2OzY+clCl8/pOp/s/gIzxpQlEtXipo3QK8Qur3glbIkeF/bJw+gjVAdUw== -angular-sanitize@1.6: - version "1.6.10" - resolved "https://registry.yarnpkg.com/angular-sanitize/-/angular-sanitize-1.6.10.tgz#635a362afb2dd040179f17d3a5455962b2c1918f" - integrity sha512-01i1Xoq9ykUrsoYQMSB6dWZmPp9Df5hfCqMAGGzJBWZ7L2WY0OtUphdI0YvR8ZF9lAsWtGNtsEFilObjq5nTgQ== +angular-sanitize@1.7: + version "1.7.9" + resolved "https://registry.yarnpkg.com/angular-sanitize/-/angular-sanitize-1.7.9.tgz#6b4d5e826abdabd352b13a7c65c8c74daf6a7b15" + integrity sha512-nB/xe7JQWF9nLvhHommAICQ3eWrfRETo0EVGFESi952CDzDa+GAJ/2BFBNw44QqQPxj1Xua/uYKrbLsOGWZdbQ== angular-scroll@0.6: version "0.6.5" @@ -146,30 +146,32 @@ angular-summernote@0.7.1: resolved "https://registry.yarnpkg.com/angular-summernote/-/angular-summernote-0.7.1.tgz#c4bfa83020c4e32f96955b9974c43e5eaeea342e" integrity sha1-xL+oMCDE4y+WlVuZdMQ+Xq7qNC4= -angular-touch@1.6: - version "1.6.10" - resolved "https://registry.yarnpkg.com/angular-touch/-/angular-touch-1.6.10.tgz#bd51fa48bd2c2c477fea776817535601e6340c2f" - integrity sha512-ZblW46aN5s7OOihpXDa0qzrJXdaVGE44jc+a8e1NpOjhCKZDQze+nBHh3xw3toAF1BIfDJIkRstadk4h2R/uLg== +angular-touch@1.7: + version "1.7.9" + resolved "https://registry.yarnpkg.com/angular-touch/-/angular-touch-1.7.9.tgz#a85375407f9f2fb20442cb3ded48937c558d9267" + integrity sha512-qNKWUnecfah4mZxG7GM96AemhXyOVcE03kg3SrWExfmyO/hQNPE50Qqyszb+1UE8GO7WiWOYn1Y5wn9CtOInqA== -angular-translate-interpolation-messageformat@2.8: - version "2.8.1" - resolved "https://registry.yarnpkg.com/angular-translate-interpolation-messageformat/-/angular-translate-interpolation-messageformat-2.8.1.tgz#1b7df5a4e5c5d1c15822b59fbfad48cea440ecd0" - integrity sha1-G331pOXF0cFYIrWfv61IzqRA7NA= +angular-translate-interpolation-messageformat@2.18: + version "2.18.1" + resolved "https://registry.yarnpkg.com/angular-translate-interpolation-messageformat/-/angular-translate-interpolation-messageformat-2.18.1.tgz#16c52ae0c61c240f0f24164a0521943cf8ba408e" + integrity sha512-SlmyxLB/UUy7FWoGx5QJHrhq8fUu/xzCR0h/ngexOtXZopQjs1vm+TrFZ69d4c/LI7C91sfP4mq4ES29o1xCxA== dependencies: - angular-translate "~2.8.1" - messageformat "~0.1.6" + angular-translate "~2.18.1" + messageformat "~1.0.2" -angular-translate-loader-partial@2.8: - version "2.8.1" - resolved "https://registry.yarnpkg.com/angular-translate-loader-partial/-/angular-translate-loader-partial-2.8.1.tgz#5c2cc754fdd8ae36bcdc0c9fbee117b38d734694" - integrity sha1-XCzHVP3Yrja83AyfvuEXs41zRpQ= +angular-translate-loader-partial@2.18: + version "2.18.1" + resolved "https://registry.yarnpkg.com/angular-translate-loader-partial/-/angular-translate-loader-partial-2.18.1.tgz#1f4ec31c32c3d7b4371e39682444f6a6b84f1f88" + integrity sha512-+bPzY3+F2I1tb+X5bscvZq0OGoVEVkHwPGZvaY4nhbktpshArYpvIEV+RQFUa/QNj8vQc3iQ/pruJDb8w3zIdw== dependencies: - angular-translate "~2.8.1" + angular-translate "~2.18.1" -angular-translate@2.8, angular-translate@~2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/angular-translate/-/angular-translate-2.8.1.tgz#ba997c3557bc850c101a946b5938307c96971234" - integrity sha1-upl8NVe8hQwQGpRrWTgwfJaXEjQ= +angular-translate@2.18, angular-translate@~2.18.1: + version "2.18.1" + resolved "https://registry.yarnpkg.com/angular-translate/-/angular-translate-2.18.1.tgz#b29ed0d2f9bac44075e7aad3284166c59e150791" + integrity sha512-Mw0kFBqsv5j8ItL9IhRZunIlVmIRW6iFsiTmRs9wGr2QTt8z4rehYlWyHos8qnXc/kyOYJiW50iH50CSNHGB9A== + dependencies: + angular ">=1.2.26 <=1.7" angular-ui-bootstrap@0.14.3: version "0.14.3" @@ -192,7 +194,7 @@ angular-xeditable@0.10: dependencies: angular "~1.x" -angular@1.7, angular@^1.0.8, angular@~1.x: +angular@1.7, "angular@>=1.2.26 <=1.7", angular@^1.0.8, angular@~1.x: version "1.7.9" resolved "https://registry.yarnpkg.com/angular/-/angular-1.7.9.tgz#e52616e8701c17724c3c238cfe4f9446fd570bc4" integrity sha512-5se7ZpcOtu0MBFlzGv5dsM1quQDoDeUTwZrWjGtTNA7O88cD8TEk5IEKCTDa3uECV9XnvKREVUr7du1ACiWGFQ== @@ -722,6 +724,18 @@ glob@~3.2.8: inherits "2" minimatch "0.3" +glob@~7.0.6: + version "7.0.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a" + integrity sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo= + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.2" + once "^1.3.0" + path-is-absolute "^1.0.0" + globals@^11.7.0: version "11.9.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249" @@ -934,12 +948,24 @@ lru-cache@2: resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952" integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI= +make-plural@~3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-3.0.6.tgz#2033a03bac290b8f3bb91258f65b9df7e8b01ca7" + integrity sha1-IDOgO6wpC487uRJY9lud9+iwHKc= + optionalDependencies: + minimist "^1.2.0" + medium-editor@4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/medium-editor/-/medium-editor-4.4.0.tgz#ef188cc9cc5cba87177da8cb657a885dfbbe5760" integrity sha1-7xiMycxcuocXfajLZXqIXfu+V2A= -messageformat@0.1.8, messageformat@~0.1.6: +messageformat-parser@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/messageformat-parser/-/messageformat-parser-1.1.0.tgz#13ba2250a76bbde8e0fca0dbb3475f95c594a90a" + integrity sha512-Hwem6G3MsKDLS1FtBRGIs8T50P1Q00r3srS6QJePCFbad9fq0nYxwf3rnU2BreApRGhmpKMV7oZI06Sy1c9TPA== + +messageformat@0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/messageformat/-/messageformat-0.1.8.tgz#d3c9e9481d008ccc28f63a13fbdac526385a0828" integrity sha1-08npSB0AjMwo9joT+9rFJjhaCCg= @@ -951,6 +977,17 @@ messageformat@0.1.8, messageformat@~0.1.6: underscore "~1.5.2" watchr "~2.4.9" +messageformat@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/messageformat/-/messageformat-1.0.2.tgz#908f4691f29ff28dae35c45436a24cff93402388" + integrity sha1-kI9GkfKf8o2uNcRUNqJM/5NAI4g= + dependencies: + glob "~7.0.6" + make-plural "~3.0.6" + messageformat-parser "^1.0.0" + nopt "~3.0.6" + reserved-words "^0.1.1" + mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" @@ -964,7 +1001,7 @@ minimatch@0.3: lru-cache "2" sigmund "~1.0.0" -minimatch@^3.0.3, minimatch@^3.0.4: +minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -976,6 +1013,11 @@ minimist@0.0.8: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= +minimist@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= + mkdirp@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" @@ -1050,6 +1092,13 @@ nopt@~2.1.2: dependencies: abbrev "1" +nopt@~3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" + integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= + dependencies: + abbrev "1" + normalize-package-data@^2.3.2: version "2.4.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" @@ -1240,6 +1289,11 @@ require-uncached@^1.0.3: caller-path "^0.1.0" resolve-from "^1.0.0" +reserved-words@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz#00a0940f98cd501aeaaac316411d9adc52b31ab1" + integrity sha1-AKCUD5jNUBrqqsMWQR2a3FKzGrE= + resolve-from@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" From 563de29b9dcf21996d6a91d0ca81dc1bcf80245a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 25 Nov 2019 11:59:34 +0100 Subject: [PATCH 033/135] Calendar management: improved legend style --- CHANGELOG.md | 1 + app/assets/stylesheets/app.colors.scss | 3 +++ app/assets/stylesheets/app.components.scss | 8 ++++++++ app/assets/templates/admin/calendar/calendar.html.erb | 6 +++--- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8820e587..7bc4806f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Configuration of phone number in members registration forms: can be required or optional, depending on `PHONE_REQUIRED` configuration - Improved user experience in defining slots in the calendar management - Improved notification email to the member when a rolling subscription is taken +- Calendar management: improved legend style - Handle Ctrl^C in upgrade scripts - Updated moment-timezone - Fix a bug: unable to remove the picture from a training diff --git a/app/assets/stylesheets/app.colors.scss b/app/assets/stylesheets/app.colors.scss index c7a66e439..00a7a422a 100644 --- a/app/assets/stylesheets/app.colors.scss +++ b/app/assets/stylesheets/app.colors.scss @@ -12,6 +12,9 @@ .bg-stage { background-color: $violet; } .bg-success { background-color: $brand-success; } .bg-info { background-color: $brand-info; } +.border-machine { border-color: $beige !important; } +.border-space { border-color: $cyan !important; } +.border-formation { border-color: $violet !important; } .bg-black-light { background-color: #424242 !important; } diff --git a/app/assets/stylesheets/app.components.scss b/app/assets/stylesheets/app.components.scss index e4b6dde33..4de6ebbc3 100644 --- a/app/assets/stylesheets/app.components.scss +++ b/app/assets/stylesheets/app.components.scss @@ -651,3 +651,11 @@ padding: 10px; text-transform: uppercase; } } + +.calendar-legend { + border: 1px solid; + border-left: 3px solid; + border-radius: 3px; + font-size: 10px; + padding: 2px; +} \ No newline at end of file diff --git a/app/assets/templates/admin/calendar/calendar.html.erb b/app/assets/templates/admin/calendar/calendar.html.erb index 3b78432b2..ea8acabb6 100644 --- a/app/assets/templates/admin/calendar/calendar.html.erb +++ b/app/assets/templates/admin/calendar/calendar.html.erb @@ -13,9 +13,9 @@
      - {{ 'admin_calendar.trainings' }}
      - {{ 'admin_calendar.machines' }}
      - {{ 'admin_calendar.spaces' }} + {{ 'admin_calendar.trainings' }}
      + {{ 'admin_calendar.machines' }}
      + {{ 'admin_calendar.spaces' }}
      From 68b17cbe9a3f13730982645f56c619660486106f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 25 Nov 2019 14:49:39 +0100 Subject: [PATCH 034/135] Ability to show the scheduled events in the admin calendar --- CHANGELOG.md | 2 + .../controllers/admin/calendar.js.erb | 4 +- app/assets/stylesheets/app.colors.scss | 1 + app/assets/stylesheets/app.layout.scss | 15 +++++++ .../admin/calendar/calendar.html.erb | 41 ++++++++++++++----- .../api/availabilities_controller.rb | 3 +- .../api/availabilities/index.json.jbuilder | 1 + config/application.yml.default | 1 + config/locales/app.admin.en.yml | 3 ++ config/locales/app.admin.es.yml | 3 ++ config/locales/app.admin.fr.yml | 3 ++ config/locales/app.admin.pt.yml | 3 ++ config/secrets.yml | 6 ++- doc/environment.md | 5 +++ docker/env.example | 1 + 15 files changed, 78 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bc4806f6..dbb4d213d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - An administrator can delete a member - An event can be cancelled, if reservation cancellation is enabled - Ability to configure the duration of a reservation slot. Previously, only 60 minutes slots were allowed +- Ability to show the scheduled events in the admin calendar - Display indications on required fields in new administrator form - Configuration of phone number in members registration forms: can be required or optional, depending on `PHONE_REQUIRED` configuration - Improved user experience in defining slots in the calendar management @@ -16,6 +17,7 @@ - Fix a security issue: updated angular to 1.7.9 to fix [CVE-2019-10768](https://github.com/advisories/GHSA-89mq-4x47-5v83) - [TODO DEPLOY] add the `SLOT_DURATION` environment variable (see [doc/environment.md](doc/environment.md#SLOT_DURATION) for configuration details) - [TODO DEPLOY] add the `PHONE_REQUIRED` environment variable (see [doc/environment.md](doc/environment.md#PHONE_REQUIRED) for configuration details) +- [TODO DEPLOY] add the `EVENTS_IN_CALENDAR` environment variable (see [doc/environment.md](doc/environment.md#EVENTS_IN_CALENDAR) for configuration details) - [TODO DEPLOY] -> (only dev) `bundle install && yarn install` - [TODO DEPLOY] `rake db:migrate` diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index 6e1b19d1b..a4604246d 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -343,7 +343,9 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state * @see http://fullcalendar.io/docs/event_rendering/eventRender/ */ var eventRenderCb = function (event, element) { - element.find('.fc-content').prepend('x '); + if (event.available_type !== 'event') { + element.find('.fc-content').prepend('x '); + } if (event.tags.length > 0) { let html = ''; for (let tag of Array.from(event.tags)) { diff --git a/app/assets/stylesheets/app.colors.scss b/app/assets/stylesheets/app.colors.scss index 00a7a422a..e011b84b7 100644 --- a/app/assets/stylesheets/app.colors.scss +++ b/app/assets/stylesheets/app.colors.scss @@ -15,6 +15,7 @@ .border-machine { border-color: $beige !important; } .border-space { border-color: $cyan !important; } .border-formation { border-color: $violet !important; } +.border-event { border-color: $japonica !important; } .bg-black-light { background-color: #424242 !important; } diff --git a/app/assets/stylesheets/app.layout.scss b/app/assets/stylesheets/app.layout.scss index 538fd9833..17aadf990 100644 --- a/app/assets/stylesheets/app.layout.scss +++ b/app/assets/stylesheets/app.layout.scss @@ -101,6 +101,21 @@ } } +.display-h { + display: flex; + flex-direction: row; + justify-content: space-evenly; + padding: 0; +} + +.display-v { + display: flex; + flex-direction: column; + justify-content: space-around; + align-self: baseline; + height: inherit; +} + body.container{ padding: 0; diff --git a/app/assets/templates/admin/calendar/calendar.html.erb b/app/assets/templates/admin/calendar/calendar.html.erb index ea8acabb6..42cbe4ea1 100644 --- a/app/assets/templates/admin/calendar/calendar.html.erb +++ b/app/assets/templates/admin/calendar/calendar.html.erb @@ -12,10 +12,15 @@
      -
      - {{ 'admin_calendar.trainings' }}
      - {{ 'admin_calendar.machines' }}
      - {{ 'admin_calendar.spaces' }} +
      +
      + {{ 'admin_calendar.trainings' }}
      + {{ 'admin_calendar.machines' }}
      +
      +
      + {{ 'admin_calendar.spaces' }} + {{ 'admin_calendar.events' }} +
      @@ -43,7 +48,7 @@
    -
    +

    {{ 'admin_calendar.ongoing_reservations' }}

    @@ -57,7 +62,7 @@
    {{ 'admin_calendar.no_reservations' }}
    -
    {{ 'admin_calendar.reservations_locked' }}
    +
    {{ 'admin_calendar.reservations_locked' }}
    @@ -75,28 +80,42 @@
    -
    +

    {{ 'admin_calendar.actions' }}

    -
    +
    +
    + + + + {{ 'admin_calendar.edit_event' }} + + + + + + {{ 'admin_calendar.view_reservations' }} + + +
    diff --git a/app/controllers/api/availabilities_controller.rb b/app/controllers/api/availabilities_controller.rb index 825d4104e..405f8e443 100644 --- a/app/controllers/api/availabilities_controller.rb +++ b/app/controllers/api/availabilities_controller.rb @@ -14,9 +14,10 @@ class API::AvailabilitiesController < API::ApiController start_date = ActiveSupport::TimeZone[params[:timezone]].parse(params[:start]) end_date = ActiveSupport::TimeZone[params[:timezone]].parse(params[:end]).end_of_day @availabilities = Availability.includes(:machines, :tags, :trainings, :spaces) - .where.not(available_type: 'event') .where('start_at >= ? AND end_at <= ?', start_date, end_date) + @availabilities = @availabilities.where.not(available_type: 'event') unless Rails.application.secrets.events_in_calendar + @availabilities = @availabilities.where.not(available_type: 'space') if fablab_spaces_deactivated? end diff --git a/app/views/api/availabilities/index.json.jbuilder b/app/views/api/availabilities/index.json.jbuilder index 8749f6ca8..e6e86f563 100644 --- a/app/views/api/availabilities/index.json.jbuilder +++ b/app/views/api/availabilities/index.json.jbuilder @@ -6,6 +6,7 @@ json.array!(@availabilities) do |availability| json.available_type availability.available_type json.machine_ids availability.machine_ids json.training_ids availability.training_ids + json.event_id availability.event&.id json.backgroundColor !availability.lock ? 'white' : '#f5f5f5' json.borderColor availability_border_color(availability) json.tag_ids availability.tag_ids diff --git a/config/application.yml.default b/config/application.yml.default index f59f0a3ec..c53e53def 100644 --- a/config/application.yml.default +++ b/config/application.yml.default @@ -22,6 +22,7 @@ FABLAB_WITHOUT_ONLINE_PAYMENT: 'false' FABLAB_WITHOUT_INVOICES: 'false' PHONE_REQUIRED: 'true' +EVENTS_IN_CALENDAR: 'false' SLOT_DURATION: '60' DEFAULT_MAIL_FROM: Fab Manager Demo diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index c69336065..c6c0ee47a 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -18,6 +18,7 @@ en: trainings: "Trainings" machines: "Machines" spaces: "Spaces" + events: "Eventos" availabilities: "Availabilities" availabilities_notice: "Export to an Excel workbook every slots available for reservation, and their occupancy rate." ongoing_reservations: "Ongoing reservations" @@ -83,6 +84,8 @@ en: delete_this_and_next: "This slot and the following" delete_all: "All slots" event_in_the_past: "Unable to create a slot in the past." + edit_event: "Edit the event" + view_reservations: "View reservations" project_elements: # management of the projects' components diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index db37e504e..d7b1beb2b 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -18,6 +18,7 @@ es: trainings: "Formación" machines: "Máquinas" spaces: "Espacios" + events: "Eventos" availabilities: "Disponibilidades" availabilities_notice: "Exportar a un libro de trabajo de Excel cada ranura disponible para reserva, y su ratio de ocupación." ongoing_reservations: "Reservas en curso" @@ -83,6 +84,8 @@ es: delete_this_and_next: "This slot and the following" # translation_missing delete_all: "All slots" # translation_missing event_in_the_past: "Unable to create a slot in the past." # translation_missing + edit_event: "Edit the event" # translation_missing + view_reservations: "Ver reservas" # translation_missing project_elements: # management of the projects' components diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 806c6905b..32b548742 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -18,6 +18,7 @@ fr: trainings: "Formations" machines: "Machines" spaces: "Espaces" + events: "Évènements" availabilities: "Disponibilités" availabilities_notice: "Exporter dans un classeur Excel tous les créneaux ouverts à la réservation et leurs taux d'occupation." ongoing_reservations: "Réservations en cours" @@ -83,6 +84,8 @@ fr: delete_this_and_next: "Ce créneau et tous les suivants" delete_all: "Tous les créneaux" event_in_the_past: "Impossible de créer un créneau dans le passé." + edit_event: "Modifier l'évènement" + view_reservations: "Voir les réservations" project_elements: # gestion des éléments constituant les projets diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index e91ccdbe1..ca8bdb488 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -18,6 +18,7 @@ pt: trainings: "Treinamentos" machines: "Máquinas" spaces: "Espaços" + events: "Eventos" availabilities: "Disponíveis" availabilities_notice: "Exportar para Excel livro com todos os slots disponíveis para reserva, e suas ocupações." ongoing_reservations: "Reservas em curso" @@ -83,6 +84,8 @@ pt: delete_this_and_next: "This slot and the following" # translation_missing delete_all: "All slots" # translation_missing event_in_the_past: "Unable to create a slot in the past." # translation_missing + edit_event: "Edit the event" # translation_missing + view_reservations: "Ver reservas" # translation_missing project_elements: # management of the projects' components diff --git a/config/secrets.yml b/config/secrets.yml index e277437a1..0f79cec6c 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -21,6 +21,7 @@ development: fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %> fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %> phone_required: <%= ENV["PHONE_REQUIRED"] %> + events_in_calendar: <%= ENV["EVENTS_IN_CALENDAR"] %> slot_duration: <%= ENV["SLOT_DURATION"] %> default_host: <%= ENV["DEFAULT_HOST"] %> default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %> @@ -65,7 +66,8 @@ test: fablab_without_online_payments: false fablab_without_invoices: false phone_required: true - slot_duration: <%= ENV["SLOT_DURATION"] %> + events_in_calendar: false + slot_duration: 60 default_host: <%= ENV["DEFAULT_HOST"] %> default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %> time_zone: Paris @@ -109,6 +111,7 @@ staging: fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %> fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %> phone_required: <%= ENV["PHONE_REQUIRED"] %> + events_in_calendar: <%= ENV["EVENTS_IN_CALENDAR"] %> slot_duration: <%= ENV["SLOT_DURATION"] %> default_host: <%= ENV["DEFAULT_HOST"] %> default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %> @@ -164,6 +167,7 @@ production: fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %> fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %> phone_required: <%= ENV["PHONE_REQUIRED"] %> + events_in_calendar: <%= ENV["EVENTS_IN_CALENDAR"] %> slot_duration: <%= ENV["SLOT_DURATION"] %> default_host: <%= ENV["DEFAULT_HOST"] %> default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %> diff --git a/doc/environment.md b/doc/environment.md index b0bee2b16..a3c1fd0ca 100644 --- a/doc/environment.md +++ b/doc/environment.md @@ -107,6 +107,11 @@ This is useful if you have your own invoicing system and you want to prevent Fab PHONE_REQUIRED If set to 'false' the phone number won't be required to register a new user on the software. + + + EVENTS_IN_CALENDAR + +If set to 'true', the admin calendar will display the scheduled events in the current view, as read-only items. SLOT_DURATION diff --git a/docker/env.example b/docker/env.example index 2f3f1d014..bb27bd84d 100644 --- a/docker/env.example +++ b/docker/env.example @@ -15,6 +15,7 @@ FABLAB_WITHOUT_ONLINE_PAYMENT=true FABLAB_WITHOUT_INVOICES=false PHONE_REQUIRED=false +EVENTS_IN_CALENDAR=false SLOT_DURATION=60 DEFAULT_MAIL_FROM=Fab Manager Demo From 48b811d2b58c4d5e2929882af2fb241f31935a58 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 25 Nov 2019 16:12:23 +0100 Subject: [PATCH 035/135] Added freeCAD files as default allowed extensions also: refactored some ruby code --- CHANGELOG.md | 1 + app/models/project_image.rb | 5 ++++ app/models/project_step_image.rb | 5 ++++ app/uploaders/project_image_uploader.rb | 36 +++++-------------------- config/application.yml.default | 2 +- docker/env.example | 2 +- 6 files changed, 20 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbb4d213d..faa2b1991 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Calendar management: improved legend style - Handle Ctrl^C in upgrade scripts - Updated moment-timezone +- Added freeCAD files as default allowed extensions - Fix a bug: unable to remove the picture from a training - Fix a security issue: updated loofah to fix [CVE-2019-15587](https://github.com/advisories/GHSA-c3gv-9cxf-6f57) - Fix a security issue: updated angular to 1.7.9 to fix [CVE-2019-10768](https://github.com/advisories/GHSA-89mq-4x47-5v83) diff --git a/app/models/project_image.rb b/app/models/project_image.rb index 7f69a93e0..f9d548e2c 100644 --- a/app/models/project_image.rb +++ b/app/models/project_image.rb @@ -1,4 +1,9 @@ +# frozen_string_literal: true + +# Main image for project documentation class ProjectImage < Asset include ImageValidatorConcern mount_uploader :attachment, ProjectImageUploader + + validates :attachment, file_mime_type: { content_type: /image/ } end diff --git a/app/models/project_step_image.rb b/app/models/project_step_image.rb index 3caabb3c5..b1bb4ea4b 100644 --- a/app/models/project_step_image.rb +++ b/app/models/project_step_image.rb @@ -1,4 +1,9 @@ +# frozen_string_literal: true + +# Images for the documentation of a project step class ProjectStepImage < Asset include ImageValidatorConcern mount_uploader :attachment, ProjectImageUploader + + validates :attachment, file_mime_type: { content_type: /image/ } end diff --git a/app/uploaders/project_image_uploader.rb b/app/uploaders/project_image_uploader.rb index 30eac1a35..729ebe9a9 100644 --- a/app/uploaders/project_image_uploader.rb +++ b/app/uploaders/project_image_uploader.rb @@ -1,16 +1,14 @@ +# frozen_string_literal: true + +# CarrierWave uploader for project image. +# This file defines the parameters for these uploads. class ProjectImageUploader < CarrierWave::Uploader::Base - # Include RMagick or MiniMagick support: - # include CarrierWave::RMagick include CarrierWave::MiniMagick include UploadHelper # Choose what kind of storage to use for this uploader: storage :file after :remove, :delete_empty_dirs - # storage :fog - - # Override the directory where uploaded files will be stored. - # This is a sensible default for uploaders that are meant to be mounted: def store_dir "#{base_store_dir}/#{model.id}" @@ -20,38 +18,18 @@ class ProjectImageUploader < CarrierWave::Uploader::Base "uploads/#{model.class.to_s.underscore}" end - # Provide a default URL as a default if there hasn't been a file uploaded: - # def default_url - # # For Rails 3.1+ asset pipeline compatibility: - # # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_')) - # - # "/images/fallback/" + [version_name, "default.png"].compact.join('_') - # end - - # Process files as they are uploaded: - # process :scale => [200, 300] - # - # def scale(width, height) - # # do something - # end - - # Create different versions of your uploaded files: - # version :normal do - # process :resize_to_fit => [312, 270] - # end - version :large do - process :resize_to_fit => [1000, 700] + process resize_to_fit: [1000, 700] end version :medium do - process :resize_to_fit => [700, 400] + process resize_to_fit: [700, 400] end # Add a white list of extensions which are allowed to be uploaded. # For images you might use something like this: def extension_white_list - %w(jpg jpeg gif png) + %w[jpg jpeg gif png] end # Override the filename of the uploaded files: diff --git a/config/application.yml.default b/config/application.yml.default index c53e53def..8327dc659 100644 --- a/config/application.yml.default +++ b/config/application.yml.default @@ -91,7 +91,7 @@ LOG_LEVEL: 'debug' DISK_SPACE_MB_ALERT: '100' SUPERADMIN_EMAIL: 'admin@sleede.com' -ALLOWED_EXTENSIONS: pdf ai eps cad math svg stl dxf dwg obj step iges igs 3dm 3dmf doc docx png ino scad fcad skp sldprt sldasm slddrw slddrt tex latex ps +ALLOWED_EXTENSIONS: pdf ai eps cad math svg stl dxf dwg obj step iges igs 3dm 3dmf doc docx png ino scad fcad skp sldprt sldasm slddrw slddrt tex latex ps fcstd fcstd1 ALLOWED_MIME_TYPES: application/pdf application/postscript application/illustrator image/x-eps image/svg+xml application/sla application/dxf application/acad application/dwg application/octet-stream application/step application/iges model/iges x-world/x-3dmf application/vnd.openxmlformats-officedocument.wordprocessingml.document image/png text/x-arduino text/plain application/scad application/vnd.sketchup.skp application/x-koan application/vnd-koan koan/x-skm application/vnd.koan application/x-tex application/x-latex # 5242880 = 5 megabytes diff --git a/docker/env.example b/docker/env.example index bb27bd84d..0717f6fed 100644 --- a/docker/env.example +++ b/docker/env.example @@ -76,7 +76,7 @@ DISK_SPACE_MB_ALERT='100' SUPERADMIN_EMAIL='admin@sleede.com' -ALLOWED_EXTENSIONS=pdf ai eps cad math svg stl dxf dwg obj step iges igs 3dm 3dmf doc docx png ino scad fcad skp sldprt sldasm slddrw slddrt tex latex ps +ALLOWED_EXTENSIONS=pdf ai eps cad math svg stl dxf dwg obj step iges igs 3dm 3dmf doc docx png ino scad fcad skp sldprt sldasm slddrw slddrt tex latex ps fcstd fcstd1 ALLOWED_MIME_TYPES=application/pdf application/postscript application/illustrator image/x-eps image/svg+xml application/sla application/dxf application/acad application/dwg application/octet-stream application/step application/iges model/iges x-world/x-3dmf application/ application/vnd.openxmlformats-officedocument.wordprocessingml.document image/png text/x-arduino text/plain application/scad application/vnd.sketchup.skp application/x-koan application/vnd-koan koan/x-skm application/vnd.koan application/x-tex application/x-latex # 5242880 = 5 megabytes From eb3c78a61d449718e2702ab7a48ea8bc3577c64e Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 26 Nov 2019 13:44:43 +0100 Subject: [PATCH 036/135] [poc] show google agenda events in the public calendar --- Gemfile | 2 ++ Gemfile.lock | 4 ++++ .../javascripts/controllers/calendar.js | 7 +++++-- app/assets/javascripts/router.js.erb | 1 + app/assets/javascripts/services/ical.js | 5 +++++ app/controllers/api/ical_controller.rb | 19 +++++++++++++++++++ app/views/api/ical/externals.json.jbuilder | 8 ++++++++ config/routes.rb | 2 ++ 8 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/services/ical.js create mode 100644 app/controllers/api/ical_controller.rb create mode 100644 app/views/api/ical/externals.json.jbuilder diff --git a/Gemfile b/Gemfile index b69b1c8f9..af5fd4003 100644 --- a/Gemfile +++ b/Gemfile @@ -152,3 +152,5 @@ gem 'sys-filesystem' gem 'sha3' gem 'repost' + +gem 'icalendar' diff --git a/Gemfile.lock b/Gemfile.lock index eec86b501..db0e0d4e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -191,6 +191,9 @@ GEM multi_xml (>= 0.5.2) i18n (0.9.5) concurrent-ruby (~> 1.0) + icalendar (2.5.3) + ice_cube (~> 0.16) + ice_cube (0.16.3) ice_nine (0.11.2) jaro_winkler (1.5.1) jbuilder (2.5.0) @@ -497,6 +500,7 @@ DEPENDENCIES forgery friendly_id (~> 5.1.0) has_secure_token + icalendar jbuilder (~> 2.5) jbuilder_cache_multi jquery-rails diff --git a/app/assets/javascripts/controllers/calendar.js b/app/assets/javascripts/controllers/calendar.js index 0af678931..14515614c 100644 --- a/app/assets/javascripts/controllers/calendar.js +++ b/app/assets/javascripts/controllers/calendar.js @@ -16,8 +16,8 @@ * Controller used in the public calendar global */ -Application.Controllers.controller('CalendarController', ['$scope', '$state', '$aside', 'moment', 'Availability', 'Slot', 'Setting', 'growl', 'dialogs', 'bookingWindowStart', 'bookingWindowEnd', '_t', 'uiCalendarConfig', 'CalendarConfig', 'trainingsPromise', 'machinesPromise', 'spacesPromise', - function ($scope, $state, $aside, moment, Availability, Slot, Setting, growl, dialogs, bookingWindowStart, bookingWindowEnd, _t, uiCalendarConfig, CalendarConfig, trainingsPromise, machinesPromise, spacesPromise) { +Application.Controllers.controller('CalendarController', ['$scope', '$state', '$aside', 'moment', 'Availability', 'Slot', 'Setting', 'growl', 'dialogs', 'bookingWindowStart', 'bookingWindowEnd', '_t', 'uiCalendarConfig', 'CalendarConfig', 'trainingsPromise', 'machinesPromise', 'spacesPromise', 'externalsPromise', + function ($scope, $state, $aside, moment, Availability, Slot, Setting, growl, dialogs, bookingWindowStart, bookingWindowEnd, _t, uiCalendarConfig, CalendarConfig, trainingsPromise, machinesPromise, spacesPromise, externalsPromise) { /* PRIVATE STATIC CONSTANTS */ let currentMachineEvent = null; machinesPromise.forEach(m => m.checked = true); @@ -38,6 +38,9 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ // List of spaces $scope.spaces = spacesPromise.filter(t => !t.disabled); + // External ICS calendars + $scope.externals = externalsPromise; + // add availabilities source to event sources $scope.eventSources = []; diff --git a/app/assets/javascripts/router.js.erb b/app/assets/javascripts/router.js.erb index 12cad9d20..4b020ab3d 100644 --- a/app/assets/javascripts/router.js.erb +++ b/app/assets/javascripts/router.js.erb @@ -638,6 +638,7 @@ angular.module('application.router', ['ui.router']) trainingsPromise: ['Training', function (Training) { return Training.query().$promise; }], machinesPromise: ['Machine', function (Machine) { return Machine.query().$promise; }], spacesPromise: ['Space', function (Space) { return Space.query().$promise; }], + externalsPromise: ['Ical', function (Ical) { return Ical.get().$promise; }], translations: ['Translations', function (Translations) { return Translations.query(['app.public.calendar']).$promise; }] } }) diff --git a/app/assets/javascripts/services/ical.js b/app/assets/javascripts/services/ical.js new file mode 100644 index 000000000..dec1ed635 --- /dev/null +++ b/app/assets/javascripts/services/ical.js @@ -0,0 +1,5 @@ +'use strict'; + +Application.Services.factory('Ical', ['$resource', function ($resource) { + return $resource('/api/ical/externals'); +}]); diff --git a/app/controllers/api/ical_controller.rb b/app/controllers/api/ical_controller.rb new file mode 100644 index 000000000..dc3307d85 --- /dev/null +++ b/app/controllers/api/ical_controller.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +# API Controller for resources of type iCalendar +class API::IcalController < API::ApiController + respond_to :json + + def externals + require 'net/http' + require 'uri' + + ics = Net::HTTP.get(URI.parse('https://calendar.google.com/calendar/ical/sylvain%40sleede.com/public/basic.ics')) + + require 'icalendar' + require 'icalendar/tzinfo' + + cals = Icalendar::Calendar.parse(ics) + @events = cals.first.events + end +end \ No newline at end of file diff --git a/app/views/api/ical/externals.json.jbuilder b/app/views/api/ical/externals.json.jbuilder new file mode 100644 index 000000000..faedb232b --- /dev/null +++ b/app/views/api/ical/externals.json.jbuilder @@ -0,0 +1,8 @@ +json.array!(@events) do |event| + json.id event.uid + json.title event.summary + json.start event.dtstart.iso8601 + json.end event.dtend.iso8601 + json.backgroundColor 'white' + json.borderColor '#214712' +end diff --git a/config/routes.rb b/config/routes.rb index 0609afaeb..9e0b5e095 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -112,6 +112,8 @@ Rails.application.routes.draw do get 'first', action: 'first', on: :collection end + get 'ical/externals' => 'ical#externals' + # for admin resources :trainings do get :availabilities, on: :member From 91008b3df1723b3715c2d7882ab173d95f7929f2 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 27 Nov 2019 11:52:37 +0100 Subject: [PATCH 037/135] improved calendar legend --- app/assets/javascripts/app.js | 2 ++ app/assets/stylesheets/app.components.scss | 27 ++++++++++++++----- app/assets/stylesheets/app.layout.scss | 18 +------------ .../admin/calendar/calendar.html.erb | 22 ++++++++------- app/views/application/index.html.erb | 1 + config/locales/app.admin.en.yml | 1 + config/locales/app.admin.es.yml | 1 + config/locales/app.admin.fr.yml | 1 + config/locales/app.admin.pt.yml | 1 + 9 files changed, 40 insertions(+), 34 deletions(-) diff --git a/app/assets/javascripts/app.js b/app/assets/javascripts/app.js index ea94b5a12..f932fd84f 100644 --- a/app/assets/javascripts/app.js +++ b/app/assets/javascripts/app.js @@ -88,6 +88,8 @@ angular.module('application', ['ngCookies', 'ngResource', 'ngSanitize', 'ui.rout $rootScope.fablabWithoutInvoices = Fablab.withoutInvoices; // Global config: if true, the phone number is required to create an account $rootScope.phoneRequired = Fablab.phoneRequired; + // Global config: if true, the events are shown in the admin calendar + $rootScope.eventsInCalendar = Fablab.eventsInCalendar; // Global function to allow the user to navigate to the previous screen (ie. $state). // If no previous $state were recorded, navigate to the home page diff --git a/app/assets/stylesheets/app.components.scss b/app/assets/stylesheets/app.components.scss index 4de6ebbc3..6a1659507 100644 --- a/app/assets/stylesheets/app.components.scss +++ b/app/assets/stylesheets/app.components.scss @@ -651,11 +651,24 @@ padding: 10px; text-transform: uppercase; } } +.calendar-legend-block { + text-align: right; + padding-right: 2em; -.calendar-legend { - border: 1px solid; - border-left: 3px solid; - border-radius: 3px; - font-size: 10px; - padding: 2px; -} \ No newline at end of file + h4 { + font-size: 12px; + font-style: italic; + } + .legends { + display: flex; + flex-direction: row-reverse; + } + .calendar-legend { + border: 1px solid; + border-left: 3px solid; + border-radius: 3px; + font-size: 10px; + padding: 2px; + margin-left: 10px; + } +} diff --git a/app/assets/stylesheets/app.layout.scss b/app/assets/stylesheets/app.layout.scss index 17aadf990..1c257746b 100644 --- a/app/assets/stylesheets/app.layout.scss +++ b/app/assets/stylesheets/app.layout.scss @@ -101,22 +101,6 @@ } } -.display-h { - display: flex; - flex-direction: row; - justify-content: space-evenly; - padding: 0; -} - -.display-v { - display: flex; - flex-direction: column; - justify-content: space-around; - align-self: baseline; - height: inherit; -} - - body.container{ padding: 0; } @@ -651,4 +635,4 @@ body.container{ position: absolute; left: -4px; } -} \ No newline at end of file +} diff --git a/app/assets/templates/admin/calendar/calendar.html.erb b/app/assets/templates/admin/calendar/calendar.html.erb index 42cbe4ea1..21366925d 100644 --- a/app/assets/templates/admin/calendar/calendar.html.erb +++ b/app/assets/templates/admin/calendar/calendar.html.erb @@ -12,15 +12,8 @@
    -
    -
    - {{ 'admin_calendar.trainings' }}
    - {{ 'admin_calendar.machines' }}
    -
    -
    - {{ 'admin_calendar.spaces' }} - {{ 'admin_calendar.events' }} -
    +
    +
    @@ -32,6 +25,15 @@
    +
    +

    {{ 'admin_calendar.legend' }}

    +
    + {{ 'admin_calendar.trainings' }}
    + {{ 'admin_calendar.machines' }}
    + {{ 'admin_calendar.spaces' }} + {{ 'admin_calendar.events' }} +
    +
    @@ -119,4 +121,4 @@
    -
    \ No newline at end of file + diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb index 65efb7dd1..b8885143e 100644 --- a/app/views/application/index.html.erb +++ b/app/views/application/index.html.erb @@ -21,6 +21,7 @@ Fablab.withoutOnlinePayment = ('<%= Rails.application.secrets.fablab_without_online_payments %>' === 'true'); Fablab.withoutInvoices = ('<%= Rails.application.secrets.fablab_without_invoices %>' === 'true'); Fablab.phoneRequired = ('<%= Rails.application.secrets.phone_required %>' === 'true'); + Fablab.eventsInCalendar = ('<%= Rails.application.secrets.events_in_calendar %>' === 'true'); Fablab.slotDuration = parseInt("<%= ApplicationHelper::SLOT_DURATION %>", 10); Fablab.disqusShortname = "<%= Rails.application.secrets.disqus_shortname %>"; Fablab.defaultHost = "<%= Rails.application.secrets.default_host %>"; diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index c6c0ee47a..0b1aaa437 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -86,6 +86,7 @@ en: event_in_the_past: "Unable to create a slot in the past." edit_event: "Edit the event" view_reservations: "View reservations" + legend: "legend" project_elements: # management of the projects' components diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index d7b1beb2b..2f329ba4b 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -86,6 +86,7 @@ es: event_in_the_past: "Unable to create a slot in the past." # translation_missing edit_event: "Edit the event" # translation_missing view_reservations: "Ver reservas" # translation_missing + legend: "leyenda" project_elements: # management of the projects' components diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 32b548742..c55d89754 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -86,6 +86,7 @@ fr: event_in_the_past: "Impossible de créer un créneau dans le passé." edit_event: "Modifier l'évènement" view_reservations: "Voir les réservations" + legend: "Légende" project_elements: # gestion des éléments constituant les projets diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index ca8bdb488..487a45cf2 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -86,6 +86,7 @@ pt: event_in_the_past: "Unable to create a slot in the past." # translation_missing edit_event: "Edit the event" # translation_missing view_reservations: "Ver reservas" # translation_missing + legend: "legenda" project_elements: # management of the projects' components From 90b35641385e878b8c5da746d378252ceb10aa53 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 27 Nov 2019 12:31:32 +0100 Subject: [PATCH 038/135] admin calendar: surround select item by shadow-box --- CHANGELOG.md | 2 +- .../controllers/admin/calendar.js.erb | 32 ++++++++++++++++--- app/assets/stylesheets/app.plugins.scss | 6 +++- .../admin/calendar/calendar.html.erb | 2 +- 4 files changed, 34 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index faa2b1991..ccd19e3a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ - Configuration of phone number in members registration forms: can be required or optional, depending on `PHONE_REQUIRED` configuration - Improved user experience in defining slots in the calendar management - Improved notification email to the member when a rolling subscription is taken -- Calendar management: improved legend style +- Calendar management: improved legend display and visual behavior - Handle Ctrl^C in upgrade scripts - Updated moment-timezone - Added freeCAD files as default allowed extensions diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index a4604246d..5b7979642 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -23,7 +23,6 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state /* PRIVATE STATIC CONSTANTS */ // The calendar is divided in slots of 30 minutes - let loadingCb; const BASE_SLOT = '00:30:00'; // The bookings can be positioned every half hours @@ -40,6 +39,9 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state // currently selected availability $scope.availability = null; + // corresponding fullCalendar item in the DOM + $scope.availabilityDom = null; + // bind the availabilities slots with full-Calendar events $scope.eventSources = []; $scope.eventSources.push({ @@ -62,7 +64,10 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state return calendarEventClickCb(event, jsEvent, view); }, eventRender (event, element, view) { - return eventRenderCb(event, element); + return eventRenderCb(event, element, view); + }, + viewRender(view, element) { + return viewRenderCb(view, element); }, loading (isLoading, view) { return loadingCb(isLoading, view); @@ -328,6 +333,12 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state var calendarEventClickCb = function (event, jsEvent, view) { $scope.availability = event; + if ($scope.availabilityDom) { + $scope.availabilityDom.classList.remove("fc-selected") + } + $scope.availabilityDom = jsEvent.target.closest('.fc-event'); + $scope.availabilityDom.classList.add("fc-selected") + // if the user has clicked on the delete event button, delete the event if ($(jsEvent.target).hasClass('remove-event')) { return $scope.removeSlot(); @@ -360,12 +371,23 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state * Triggered when resource fetching starts/stops. * @see https://fullcalendar.io/docs/resource_data/loading/ */ - return loadingCb = function (isLoading, view) { + const loadingCb = function (isLoading, view) { if (isLoading) { - // we remove existing events when fetching starts to prevent duplicates - return uiCalendarConfig.calendars.calendar.fullCalendar('removeEvents'); + // we remove existing events when fetching starts to prevent duplicates + uiCalendarConfig.calendars.calendar.fullCalendar('removeEvents'); + } }; + + /** + * Triggered when the view is changed + * @see https://fullcalendar.io/docs/v3/viewRender#v2 + */ + const viewRenderCb = function(view, element) { + // we unselect the current event to keep consistency + $scope.availability = null; + $scope.availabilityDom = null; + }; } ]); diff --git a/app/assets/stylesheets/app.plugins.scss b/app/assets/stylesheets/app.plugins.scss index af46e9830..e1e6360c2 100644 --- a/app/assets/stylesheets/app.plugins.scss +++ b/app/assets/stylesheets/app.plugins.scss @@ -1,4 +1,4 @@ -// medium editor placeholder +// medium editor placeholder .medium-editor-placeholder { min-height: 30px; // fix for firefox } @@ -126,6 +126,10 @@ } } +.fc-selected { + box-shadow: 0 6px 10px 0 rgba(0,0,0,0.14),0 1px 18px 0 rgba(0,0,0,0.12),0 3px 5px -1px rgba(0,0,0,0.2); +} + diff --git a/app/assets/templates/admin/calendar/calendar.html.erb b/app/assets/templates/admin/calendar/calendar.html.erb index 21366925d..f1666a628 100644 --- a/app/assets/templates/admin/calendar/calendar.html.erb +++ b/app/assets/templates/admin/calendar/calendar.html.erb @@ -105,7 +105,7 @@
    - + {{ 'admin_calendar.edit_event' }} From a9b1eabb2cb0585f184779b038d8a004746bd401 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 26 Nov 2019 13:44:43 +0100 Subject: [PATCH 039/135] [poc] show google agenda events in the public calendar --- Gemfile | 2 ++ Gemfile.lock | 4 ++++ .../javascripts/controllers/calendar.js | 7 +++++-- app/assets/javascripts/router.js.erb | 1 + app/assets/javascripts/services/ical.js | 5 +++++ app/controllers/api/ical_controller.rb | 19 +++++++++++++++++++ app/views/api/ical/externals.json.jbuilder | 8 ++++++++ config/routes.rb | 2 ++ 8 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/services/ical.js create mode 100644 app/controllers/api/ical_controller.rb create mode 100644 app/views/api/ical/externals.json.jbuilder diff --git a/Gemfile b/Gemfile index b69b1c8f9..af5fd4003 100644 --- a/Gemfile +++ b/Gemfile @@ -152,3 +152,5 @@ gem 'sys-filesystem' gem 'sha3' gem 'repost' + +gem 'icalendar' diff --git a/Gemfile.lock b/Gemfile.lock index eec86b501..db0e0d4e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -191,6 +191,9 @@ GEM multi_xml (>= 0.5.2) i18n (0.9.5) concurrent-ruby (~> 1.0) + icalendar (2.5.3) + ice_cube (~> 0.16) + ice_cube (0.16.3) ice_nine (0.11.2) jaro_winkler (1.5.1) jbuilder (2.5.0) @@ -497,6 +500,7 @@ DEPENDENCIES forgery friendly_id (~> 5.1.0) has_secure_token + icalendar jbuilder (~> 2.5) jbuilder_cache_multi jquery-rails diff --git a/app/assets/javascripts/controllers/calendar.js b/app/assets/javascripts/controllers/calendar.js index 0af678931..14515614c 100644 --- a/app/assets/javascripts/controllers/calendar.js +++ b/app/assets/javascripts/controllers/calendar.js @@ -16,8 +16,8 @@ * Controller used in the public calendar global */ -Application.Controllers.controller('CalendarController', ['$scope', '$state', '$aside', 'moment', 'Availability', 'Slot', 'Setting', 'growl', 'dialogs', 'bookingWindowStart', 'bookingWindowEnd', '_t', 'uiCalendarConfig', 'CalendarConfig', 'trainingsPromise', 'machinesPromise', 'spacesPromise', - function ($scope, $state, $aside, moment, Availability, Slot, Setting, growl, dialogs, bookingWindowStart, bookingWindowEnd, _t, uiCalendarConfig, CalendarConfig, trainingsPromise, machinesPromise, spacesPromise) { +Application.Controllers.controller('CalendarController', ['$scope', '$state', '$aside', 'moment', 'Availability', 'Slot', 'Setting', 'growl', 'dialogs', 'bookingWindowStart', 'bookingWindowEnd', '_t', 'uiCalendarConfig', 'CalendarConfig', 'trainingsPromise', 'machinesPromise', 'spacesPromise', 'externalsPromise', + function ($scope, $state, $aside, moment, Availability, Slot, Setting, growl, dialogs, bookingWindowStart, bookingWindowEnd, _t, uiCalendarConfig, CalendarConfig, trainingsPromise, machinesPromise, spacesPromise, externalsPromise) { /* PRIVATE STATIC CONSTANTS */ let currentMachineEvent = null; machinesPromise.forEach(m => m.checked = true); @@ -38,6 +38,9 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ // List of spaces $scope.spaces = spacesPromise.filter(t => !t.disabled); + // External ICS calendars + $scope.externals = externalsPromise; + // add availabilities source to event sources $scope.eventSources = []; diff --git a/app/assets/javascripts/router.js.erb b/app/assets/javascripts/router.js.erb index 12cad9d20..4b020ab3d 100644 --- a/app/assets/javascripts/router.js.erb +++ b/app/assets/javascripts/router.js.erb @@ -638,6 +638,7 @@ angular.module('application.router', ['ui.router']) trainingsPromise: ['Training', function (Training) { return Training.query().$promise; }], machinesPromise: ['Machine', function (Machine) { return Machine.query().$promise; }], spacesPromise: ['Space', function (Space) { return Space.query().$promise; }], + externalsPromise: ['Ical', function (Ical) { return Ical.get().$promise; }], translations: ['Translations', function (Translations) { return Translations.query(['app.public.calendar']).$promise; }] } }) diff --git a/app/assets/javascripts/services/ical.js b/app/assets/javascripts/services/ical.js new file mode 100644 index 000000000..dec1ed635 --- /dev/null +++ b/app/assets/javascripts/services/ical.js @@ -0,0 +1,5 @@ +'use strict'; + +Application.Services.factory('Ical', ['$resource', function ($resource) { + return $resource('/api/ical/externals'); +}]); diff --git a/app/controllers/api/ical_controller.rb b/app/controllers/api/ical_controller.rb new file mode 100644 index 000000000..dc3307d85 --- /dev/null +++ b/app/controllers/api/ical_controller.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +# API Controller for resources of type iCalendar +class API::IcalController < API::ApiController + respond_to :json + + def externals + require 'net/http' + require 'uri' + + ics = Net::HTTP.get(URI.parse('https://calendar.google.com/calendar/ical/sylvain%40sleede.com/public/basic.ics')) + + require 'icalendar' + require 'icalendar/tzinfo' + + cals = Icalendar::Calendar.parse(ics) + @events = cals.first.events + end +end \ No newline at end of file diff --git a/app/views/api/ical/externals.json.jbuilder b/app/views/api/ical/externals.json.jbuilder new file mode 100644 index 000000000..faedb232b --- /dev/null +++ b/app/views/api/ical/externals.json.jbuilder @@ -0,0 +1,8 @@ +json.array!(@events) do |event| + json.id event.uid + json.title event.summary + json.start event.dtstart.iso8601 + json.end event.dtend.iso8601 + json.backgroundColor 'white' + json.borderColor '#214712' +end diff --git a/config/routes.rb b/config/routes.rb index 0609afaeb..9e0b5e095 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -112,6 +112,8 @@ Rails.application.routes.draw do get 'first', action: 'first', on: :collection end + get 'ical/externals' => 'ical#externals' + # for admin resources :trainings do get :availabilities, on: :member From bb777227d6a79ce8a26733859cc82675ad7639d7 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 27 Nov 2019 13:59:56 +0100 Subject: [PATCH 040/135] display events of external ics in calendar --- app/assets/javascripts/controllers/calendar.js | 11 ++++++----- app/assets/javascripts/router.js.erb | 1 - app/assets/templates/calendar/calendar.html.erb | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/controllers/calendar.js b/app/assets/javascripts/controllers/calendar.js index 14515614c..43f0542a3 100644 --- a/app/assets/javascripts/controllers/calendar.js +++ b/app/assets/javascripts/controllers/calendar.js @@ -16,8 +16,8 @@ * Controller used in the public calendar global */ -Application.Controllers.controller('CalendarController', ['$scope', '$state', '$aside', 'moment', 'Availability', 'Slot', 'Setting', 'growl', 'dialogs', 'bookingWindowStart', 'bookingWindowEnd', '_t', 'uiCalendarConfig', 'CalendarConfig', 'trainingsPromise', 'machinesPromise', 'spacesPromise', 'externalsPromise', - function ($scope, $state, $aside, moment, Availability, Slot, Setting, growl, dialogs, bookingWindowStart, bookingWindowEnd, _t, uiCalendarConfig, CalendarConfig, trainingsPromise, machinesPromise, spacesPromise, externalsPromise) { +Application.Controllers.controller('CalendarController', ['$scope', '$state', '$aside', 'moment', 'Availability', 'Slot', 'Setting', 'growl', 'dialogs', 'bookingWindowStart', 'bookingWindowEnd', '_t', 'uiCalendarConfig', 'CalendarConfig', 'trainingsPromise', 'machinesPromise', 'spacesPromise', + function ($scope, $state, $aside, moment, Availability, Slot, Setting, growl, dialogs, bookingWindowStart, bookingWindowEnd, _t, uiCalendarConfig, CalendarConfig, trainingsPromise, machinesPromise, spacesPromise) { /* PRIVATE STATIC CONSTANTS */ let currentMachineEvent = null; machinesPromise.forEach(m => m.checked = true); @@ -38,11 +38,12 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ // List of spaces $scope.spaces = spacesPromise.filter(t => !t.disabled); - // External ICS calendars - $scope.externals = externalsPromise; - // add availabilities source to event sources $scope.eventSources = []; + $scope.eventSources.push({ + url: '/api/ical/externals', + textColor: 'black' + }); // filter availabilities if have change $scope.filterAvailabilities = function (filter, scope) { diff --git a/app/assets/javascripts/router.js.erb b/app/assets/javascripts/router.js.erb index 4b020ab3d..12cad9d20 100644 --- a/app/assets/javascripts/router.js.erb +++ b/app/assets/javascripts/router.js.erb @@ -638,7 +638,6 @@ angular.module('application.router', ['ui.router']) trainingsPromise: ['Training', function (Training) { return Training.query().$promise; }], machinesPromise: ['Machine', function (Machine) { return Machine.query().$promise; }], spacesPromise: ['Space', function (Space) { return Space.query().$promise; }], - externalsPromise: ['Ical', function (Ical) { return Ical.get().$promise; }], translations: ['Translations', function (Translations) { return Translations.query(['app.public.calendar']).$promise; }] } }) diff --git a/app/assets/templates/calendar/calendar.html.erb b/app/assets/templates/calendar/calendar.html.erb index bc3c16530..fc2a5c8ae 100644 --- a/app/assets/templates/calendar/calendar.html.erb +++ b/app/assets/templates/calendar/calendar.html.erb @@ -41,7 +41,7 @@

    {{ 'calendar.filter_calendar' }}

    - + '">
    @@ -56,7 +56,7 @@

    {{ 'calendar.filter_calendar' }}

    - + '">
    From 9e2134c9cfc8d2ee8ce57e552a8a4f5fc535b7b4 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 27 Nov 2019 16:17:32 +0100 Subject: [PATCH 041/135] ics sources configuration interface --- .../controllers/admin/calendar.js.erb | 54 ++++++++++++ .../javascripts/controllers/calendar.js | 2 +- app/assets/javascripts/router.js.erb | 12 +++ app/assets/stylesheets/app.components.scss | 1 + app/assets/stylesheets/app.utilities.scss | 1 + app/assets/stylesheets/application.scss.erb | 6 +- app/assets/stylesheets/modules/icalendar.scss | 10 +++ .../admin/calendar/calendar.html.erb | 12 +-- .../templates/admin/calendar/icalendar.html | 87 +++++++++++++++++++ .../templates/admin/settings/general.html | 4 +- config/locales/app.admin.fr.yml | 14 +++ 11 files changed, 191 insertions(+), 12 deletions(-) create mode 100644 app/assets/stylesheets/modules/icalendar.scss create mode 100644 app/assets/templates/admin/calendar/icalendar.html diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index 5b7979642..569d7a35d 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -755,3 +755,57 @@ Application.Controllers.controller('DeleteRecurrentAvailabilityController', ['$s } } ]); + + + +/** + * Controller used in the iCalendar (ICS) imports management page + */ + +Application.Controllers.controller('AdminICalendarController', ['$scope', + function ($scope) { + // list of ICS sources + $scope.calendars = []; + + // configuration of a new ICS source + $scope.newCalendar = { + color: undefined, + textColor: undefined, + url: undefined, + textHidden: false + }; + + /** + * Save the new iCalendar in database + */ + $scope.save = function () { + $scope.calendars.push(Object.assign({}, $scope.newCalendar)); + $scope.newCalendar.url = undefined; + $scope.newCalendar.color = null; + $scope.newCalendar.textColor = null; + $scope.newCalendar.textHidden = false; + } + + /** + * Return a CSS-like style of the given calendar configuration + * @param calendar + */ + $scope.calendarStyle = function (calendar) { + return { + 'border-color': calendar.color, + 'color': calendar.textColor, + 'width': calendar.textHidden ? '50px' : 'auto', + 'height': calendar.textHidden ? '21px' : 'auto' + }; + } + + /** + * Delete the given calendar from the database + * @param calendar + */ + $scope.delete = function (calendar) { + const idx = $scope.calendars.indexOf(calendar); + $scope.calendars.splice(idx, 1); + } + } +]); diff --git a/app/assets/javascripts/controllers/calendar.js b/app/assets/javascripts/controllers/calendar.js index 43f0542a3..e46eb8db1 100644 --- a/app/assets/javascripts/controllers/calendar.js +++ b/app/assets/javascripts/controllers/calendar.js @@ -170,7 +170,7 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ }; const eventRenderCb = function (event, element) { - if (event.tags.length > 0) { + if (event.tags && event.tags.length > 0) { let html = ''; for (let tag of Array.from(event.tags)) { html += `${tag.name} `; diff --git a/app/assets/javascripts/router.js.erb b/app/assets/javascripts/router.js.erb index 12cad9d20..f0476c79c 100644 --- a/app/assets/javascripts/router.js.erb +++ b/app/assets/javascripts/router.js.erb @@ -659,6 +659,18 @@ angular.module('application.router', ['ui.router']) translations: ['Translations', function (Translations) { return Translations.query('app.admin.calendar').$promise; }] } }) + .state('app.admin.calendar.icalendar', { + url: '/admin/calendar/icalendar', + views: { + 'main@': { + templateUrl: '<%= asset_path "admin/calendar/icalendar.html" %>', + controller: 'AdminICalendarController' + } + }, + resolve: { + translations: ['Translations', function (Translations) { return Translations.query('app.admin.icalendar').$promise; }] + } + }) // project's elements .state('app.admin.project_elements', { diff --git a/app/assets/stylesheets/app.components.scss b/app/assets/stylesheets/app.components.scss index 6a1659507..e550aa8ea 100644 --- a/app/assets/stylesheets/app.components.scss +++ b/app/assets/stylesheets/app.components.scss @@ -670,5 +670,6 @@ padding: 10px; font-size: 10px; padding: 2px; margin-left: 10px; + display: inline-block; } } diff --git a/app/assets/stylesheets/app.utilities.scss b/app/assets/stylesheets/app.utilities.scss index 7b6349c1d..ad1d4241c 100644 --- a/app/assets/stylesheets/app.utilities.scss +++ b/app/assets/stylesheets/app.utilities.scss @@ -102,6 +102,7 @@ p, .widget p { .text-italic { font-style: italic; } +.text-left { text-align: left !important; } .text-center { text-align: center; } .text-right { text-align: right; } diff --git a/app/assets/stylesheets/application.scss.erb b/app/assets/stylesheets/application.scss.erb index ada57aaa4..b87230fd9 100644 --- a/app/assets/stylesheets/application.scss.erb +++ b/app/assets/stylesheets/application.scss.erb @@ -32,11 +32,7 @@ @import "app.buttons"; @import "app.components"; @import "app.plugins"; -@import "modules/invoice"; -@import "modules/signup"; -@import "modules/abuses"; -@import "modules/cookies"; -@import "modules/stripe"; +@import "modules/*"; @import "app.responsive"; diff --git a/app/assets/stylesheets/modules/icalendar.scss b/app/assets/stylesheets/modules/icalendar.scss new file mode 100644 index 000000000..a36dafa74 --- /dev/null +++ b/app/assets/stylesheets/modules/icalendar.scss @@ -0,0 +1,10 @@ +.calendar-form { + margin : 2em; + border: 1px solid #ddd; + border-radius: 3px; + padding: 1em; + + & > .input-group, & > .minicolors { + margin-top: 1em; + } +} diff --git a/app/assets/templates/admin/calendar/calendar.html.erb b/app/assets/templates/admin/calendar/calendar.html.erb index f1666a628..ef3345004 100644 --- a/app/assets/templates/admin/calendar/calendar.html.erb +++ b/app/assets/templates/admin/calendar/calendar.html.erb @@ -5,15 +5,17 @@     -
    +

    {{ 'admin_calendar.calendar_management' }}

    -
    -
    - +
    +
    + + +
    @@ -28,7 +30,7 @@

    {{ 'admin_calendar.legend' }}

    - {{ 'admin_calendar.trainings' }}
    + {{ 'admin_calendar.trainings' }}
    {{ 'admin_calendar.machines' }}
    {{ 'admin_calendar.spaces' }} {{ 'admin_calendar.events' }} diff --git a/app/assets/templates/admin/calendar/icalendar.html b/app/assets/templates/admin/calendar/icalendar.html new file mode 100644 index 000000000..70faf8f5f --- /dev/null +++ b/app/assets/templates/admin/calendar/icalendar.html @@ -0,0 +1,87 @@ +
    +
    +
    +
    + +
    +
    +
    +
    +

    {{ 'icalendar.icalendar_import' }}

    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    + +
    +
    + {{ 'icalendar.intro' }} +
    +
    + + + + + + + + + + + + + + +
    {{ 'icalendar.url' }}{{ 'icalendar.display' }}
    {{calendar.url}} {{ calendar.textHidden ? '' : 'icalendar.example' }} + + +
    + +

    {{ 'icalendar.new_import' }}

    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    + + +
    +
    + +
    + +
    +
    +
    diff --git a/app/assets/templates/admin/settings/general.html b/app/assets/templates/admin/settings/general.html index 2822ad1ba..f4f9c0514 100644 --- a/app/assets/templates/admin/settings/general.html +++ b/app/assets/templates/admin/settings/general.html @@ -341,7 +341,9 @@
    -
    +
    +
    +
    diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index c55d89754..576cada15 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -88,6 +88,20 @@ fr: view_reservations: "Voir les réservations" legend: "Légende" + icalendar: + icalendar: + icalendar_import: "Import iCalendar" + intro: "Fab-manager vous permet d'importer automatiquement des évènements de calendrier, au format iCalendar RFC 5545, depuis des URL externes. Ces URL seront synchronisée toutes les nuits et les évènements seront affichés dans le calendrier publique." + new_import: "Nouvel import ICS" + color: "Couleur" + text_color: "Couleur du texte" + url: "URL" + example: "Exemple" + display: "Affichage" + hide_text: "Cacher le texte" + hidden: "Caché" + shown: "Affiché" + project_elements: # gestion des éléments constituant les projets project_elements: From baf8cfb4876556bb47055af3253d15697cc2f516 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 27 Nov 2019 17:05:19 +0100 Subject: [PATCH 042/135] iCalendar server api & db model --- .../controllers/admin/calendar.js.erb | 6 +- .../javascripts/controllers/calendar.js | 2 +- app/assets/javascripts/router.js.erb | 1 + app/assets/javascripts/services/ical.js | 5 -- app/assets/javascripts/services/icalendar.js | 12 ++++ app/controllers/api/i_calendar_controller.rb | 55 +++++++++++++++++++ app/controllers/api/ical_controller.rb | 19 ------- app/models/i_calendar.rb | 5 ++ app/policies/i_calendar_policy.rb | 12 ++++ .../api/i_calendar/_i_calendar.json.jbuilder | 3 + .../events.json.jbuilder} | 4 +- app/views/api/i_calendar/index.json.jbuilder | 5 ++ app/views/api/i_calendar/show.json.jbuilder | 3 + config/routes.rb | 4 +- .../20191127153729_create_i_calendars.rb | 16 ++++++ db/schema.rb | 11 +++- test/fixtures/i_calendars.yml | 13 +++++ test/models/i_calendar_test.rb | 7 +++ 18 files changed, 152 insertions(+), 31 deletions(-) delete mode 100644 app/assets/javascripts/services/ical.js create mode 100644 app/assets/javascripts/services/icalendar.js create mode 100644 app/controllers/api/i_calendar_controller.rb delete mode 100644 app/controllers/api/ical_controller.rb create mode 100644 app/models/i_calendar.rb create mode 100644 app/policies/i_calendar_policy.rb create mode 100644 app/views/api/i_calendar/_i_calendar.json.jbuilder rename app/views/api/{ical/externals.json.jbuilder => i_calendar/events.json.jbuilder} (74%) create mode 100644 app/views/api/i_calendar/index.json.jbuilder create mode 100644 app/views/api/i_calendar/show.json.jbuilder create mode 100644 db/migrate/20191127153729_create_i_calendars.rb create mode 100644 test/fixtures/i_calendars.yml create mode 100644 test/models/i_calendar_test.rb diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index 569d7a35d..e41157041 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -762,10 +762,10 @@ Application.Controllers.controller('DeleteRecurrentAvailabilityController', ['$s * Controller used in the iCalendar (ICS) imports management page */ -Application.Controllers.controller('AdminICalendarController', ['$scope', - function ($scope) { +Application.Controllers.controller('AdminICalendarController', ['$scope', 'iCalendars', + function ($scope, iCalendars) { // list of ICS sources - $scope.calendars = []; + $scope.calendars = iCalendars; // configuration of a new ICS source $scope.newCalendar = { diff --git a/app/assets/javascripts/controllers/calendar.js b/app/assets/javascripts/controllers/calendar.js index e46eb8db1..33d811f55 100644 --- a/app/assets/javascripts/controllers/calendar.js +++ b/app/assets/javascripts/controllers/calendar.js @@ -41,7 +41,7 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ // add availabilities source to event sources $scope.eventSources = []; $scope.eventSources.push({ - url: '/api/ical/externals', + url: '/api/i_calendar/events', textColor: 'black' }); diff --git a/app/assets/javascripts/router.js.erb b/app/assets/javascripts/router.js.erb index f0476c79c..62503a9cf 100644 --- a/app/assets/javascripts/router.js.erb +++ b/app/assets/javascripts/router.js.erb @@ -668,6 +668,7 @@ angular.module('application.router', ['ui.router']) } }, resolve: { + iCalendars: ['ICalendar', function (ICalendar) { return ICalendar.query().$promise; }], translations: ['Translations', function (Translations) { return Translations.query('app.admin.icalendar').$promise; }] } }) diff --git a/app/assets/javascripts/services/ical.js b/app/assets/javascripts/services/ical.js deleted file mode 100644 index dec1ed635..000000000 --- a/app/assets/javascripts/services/ical.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -Application.Services.factory('Ical', ['$resource', function ($resource) { - return $resource('/api/ical/externals'); -}]); diff --git a/app/assets/javascripts/services/icalendar.js b/app/assets/javascripts/services/icalendar.js new file mode 100644 index 000000000..21d30843e --- /dev/null +++ b/app/assets/javascripts/services/icalendar.js @@ -0,0 +1,12 @@ +'use strict'; + +Application.Services.factory('ICalendar', ['$resource', function ($resource) { + return $resource('/api/i_calendar/:id', + { id: '@id' }, { + events: { + method: 'GET', + url: '/api/i_calendar/events' + } + } + ); +}]); diff --git a/app/controllers/api/i_calendar_controller.rb b/app/controllers/api/i_calendar_controller.rb new file mode 100644 index 000000000..f004a13ab --- /dev/null +++ b/app/controllers/api/i_calendar_controller.rb @@ -0,0 +1,55 @@ +# frozen_string_literal: true + +# API Controller for resources of type iCalendar +class API::ICalendarController < API::ApiController + before_action :authenticate_user!, except: %i[index events] + before_action :set_i_cal, only: [:destroy] + respond_to :json + + def index + @i_cals = ICalendar.all + end + + def create + authorize ICalendar + @i_cal = ICalendar.new(i_calendar_params) + if @i_cal.save + render :show, status: :created, location: @i_cal + else + render json: @i_cal.errors, status: :unprocessable_entity + end + end + + def destroy + authorize ICalendar + @i_cal.destroy + head :no_content + end + + def events + require 'net/http' + require 'uri' + require 'icalendar' + + @events = [] + + @i_cals = ICalendar.all.each do |i_cal| + ics = Net::HTTP.get(URI.parse(i_cal.url)) + cals = Icalendar::Calendar.parse(ics) + + cals.first.events.each do |evt| + @events.push(evt.merge!(color: i_cal.color)) + end + end + end + + private + + def set_i_cal + @i_cal = ICalendar.find(params[:id]) + end + + def i_calendar_params + params.require(:i_calendar).permit(:url, :color, :text_color, :text_hidden) + end +end diff --git a/app/controllers/api/ical_controller.rb b/app/controllers/api/ical_controller.rb deleted file mode 100644 index dc3307d85..000000000 --- a/app/controllers/api/ical_controller.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -# API Controller for resources of type iCalendar -class API::IcalController < API::ApiController - respond_to :json - - def externals - require 'net/http' - require 'uri' - - ics = Net::HTTP.get(URI.parse('https://calendar.google.com/calendar/ical/sylvain%40sleede.com/public/basic.ics')) - - require 'icalendar' - require 'icalendar/tzinfo' - - cals = Icalendar::Calendar.parse(ics) - @events = cals.first.events - end -end \ No newline at end of file diff --git a/app/models/i_calendar.rb b/app/models/i_calendar.rb new file mode 100644 index 000000000..17d630cae --- /dev/null +++ b/app/models/i_calendar.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +# iCalendar (RFC 5545) files, stored by URL and kept with their display configuration +class ICalendar < ActiveRecord::Base +end diff --git a/app/policies/i_calendar_policy.rb b/app/policies/i_calendar_policy.rb new file mode 100644 index 000000000..fd4021814 --- /dev/null +++ b/app/policies/i_calendar_policy.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +# Check the access policies for API::ICalendarController +class ICalendarPolicy < ApplicationPolicy + def create? + user.admin? + end + + def destroy? + user.admin? + end +end diff --git a/app/views/api/i_calendar/_i_calendar.json.jbuilder b/app/views/api/i_calendar/_i_calendar.json.jbuilder new file mode 100644 index 000000000..23b68df1d --- /dev/null +++ b/app/views/api/i_calendar/_i_calendar.json.jbuilder @@ -0,0 +1,3 @@ +# frozen_string_literal: true + +json.extract! i_cal, :id, :url, :color, :text_color, :text_hidden diff --git a/app/views/api/ical/externals.json.jbuilder b/app/views/api/i_calendar/events.json.jbuilder similarity index 74% rename from app/views/api/ical/externals.json.jbuilder rename to app/views/api/i_calendar/events.json.jbuilder index faedb232b..5078729e7 100644 --- a/app/views/api/ical/externals.json.jbuilder +++ b/app/views/api/i_calendar/events.json.jbuilder @@ -1,8 +1,10 @@ +# frozen_string_literal: true + json.array!(@events) do |event| json.id event.uid json.title event.summary json.start event.dtstart.iso8601 json.end event.dtend.iso8601 json.backgroundColor 'white' - json.borderColor '#214712' + json.borderColor event.color end diff --git a/app/views/api/i_calendar/index.json.jbuilder b/app/views/api/i_calendar/index.json.jbuilder new file mode 100644 index 000000000..a517d6997 --- /dev/null +++ b/app/views/api/i_calendar/index.json.jbuilder @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +json.array!(@i_cals) do |i_cal| + json.partial! 'api/i_calendar/i_calendar', i_cal: i_cal +end diff --git a/app/views/api/i_calendar/show.json.jbuilder b/app/views/api/i_calendar/show.json.jbuilder new file mode 100644 index 000000000..8e787f030 --- /dev/null +++ b/app/views/api/i_calendar/show.json.jbuilder @@ -0,0 +1,3 @@ +# frozen_string_literal: true + +json.partial! 'api/i_calendar/i_calendar', i_cal: @i_cal diff --git a/config/routes.rb b/config/routes.rb index 9e0b5e095..bcb92b44c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -112,7 +112,9 @@ Rails.application.routes.draw do get 'first', action: 'first', on: :collection end - get 'ical/externals' => 'ical#externals' + resources :i_calendar, only: %i[index create destroy] do + get 'events', on: :collection + end # for admin resources :trainings do diff --git a/db/migrate/20191127153729_create_i_calendars.rb b/db/migrate/20191127153729_create_i_calendars.rb new file mode 100644 index 000000000..289e93b94 --- /dev/null +++ b/db/migrate/20191127153729_create_i_calendars.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +# From this migration, we store URL to iCalendar files and a piece of configuration about them. +# This allows to display the events of these external calendars in fab-manager +class CreateICalendars < ActiveRecord::Migration + def change + create_table :i_calendars do |t| + t.string :url + t.string :color + t.string :text_color + t.boolean :text_hidden + + t.timestamps null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 6e2ed6b2c..bd9579e7f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20191113103352) do +ActiveRecord::Schema.define(version: 20191127153729) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -251,6 +251,15 @@ ActiveRecord::Schema.define(version: 20191113103352) do add_index "history_values", ["invoicing_profile_id"], name: "index_history_values_on_invoicing_profile_id", using: :btree add_index "history_values", ["setting_id"], name: "index_history_values_on_setting_id", using: :btree + create_table "i_calendars", force: :cascade do |t| + t.string "url" + t.string "color" + t.string "text_color" + t.boolean "text_hidden" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "imports", force: :cascade do |t| t.integer "user_id" t.string "attachment" diff --git a/test/fixtures/i_calendars.yml b/test/fixtures/i_calendars.yml new file mode 100644 index 000000000..d3406e7cf --- /dev/null +++ b/test/fixtures/i_calendars.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + url: MyString + color: MyString + text_color: MyString + text_hidden: false + +two: + url: MyString + color: MyString + text_color: MyString + text_hidden: false diff --git a/test/models/i_calendar_test.rb b/test/models/i_calendar_test.rb new file mode 100644 index 000000000..0ab530e7c --- /dev/null +++ b/test/models/i_calendar_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class ICalendarTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From 97d93cd6226ff9ddfbc4e124c7c43144c5a7c080 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 27 Nov 2019 17:39:19 +0100 Subject: [PATCH 043/135] added a name to imported calendar --- .../controllers/admin/calendar.js.erb | 23 +++++++++++++------ app/assets/stylesheets/modules/icalendar.scss | 9 ++++++++ .../templates/admin/calendar/icalendar.html | 12 ++++++++-- app/controllers/api/i_calendar_controller.rb | 2 +- .../api/i_calendar/_i_calendar.json.jbuilder | 2 +- config/locales/app.admin.fr.yml | 2 ++ .../20191127153729_create_i_calendars.rb | 1 + db/schema.rb | 1 + 8 files changed, 41 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index e41157041..85d95c1db 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -762,8 +762,8 @@ Application.Controllers.controller('DeleteRecurrentAvailabilityController', ['$s * Controller used in the iCalendar (ICS) imports management page */ -Application.Controllers.controller('AdminICalendarController', ['$scope', 'iCalendars', - function ($scope, iCalendars) { +Application.Controllers.controller('AdminICalendarController', ['$scope', 'iCalendars', 'ICalendar', 'growl', '_t', + function ($scope, iCalendars, ICalendar, growl, _t) { // list of ICS sources $scope.calendars = iCalendars; @@ -772,6 +772,7 @@ Application.Controllers.controller('AdminICalendarController', ['$scope', 'iCale color: undefined, textColor: undefined, url: undefined, + name: undefined, textHidden: false }; @@ -779,11 +780,19 @@ Application.Controllers.controller('AdminICalendarController', ['$scope', 'iCale * Save the new iCalendar in database */ $scope.save = function () { - $scope.calendars.push(Object.assign({}, $scope.newCalendar)); - $scope.newCalendar.url = undefined; - $scope.newCalendar.color = null; - $scope.newCalendar.textColor = null; - $scope.newCalendar.textHidden = false; + ICalendar.save({}, { i_calendar: $scope.newCalendar }, function (data) { + // success + $scope.calendars.push(data); + $scope.newCalendar.url = undefined; + $scope.newCalendar.name = undefined; + $scope.newCalendar.color = null; + $scope.newCalendar.textColor = null; + $scope.newCalendar.textHidden = false; + }, function (error) { + // failed + growl.error(_t('icalendar.create_error')); + console.error(error); + }) } /** diff --git a/app/assets/stylesheets/modules/icalendar.scss b/app/assets/stylesheets/modules/icalendar.scss index a36dafa74..7c852fcd6 100644 --- a/app/assets/stylesheets/modules/icalendar.scss +++ b/app/assets/stylesheets/modules/icalendar.scss @@ -8,3 +8,12 @@ margin-top: 1em; } } + +.calendar-name { + font-weight: 600; + font-style: italic; +} + +.calendar-url { + overflow: hidden; +} diff --git a/app/assets/templates/admin/calendar/icalendar.html b/app/assets/templates/admin/calendar/icalendar.html index 70faf8f5f..fec55b748 100644 --- a/app/assets/templates/admin/calendar/icalendar.html +++ b/app/assets/templates/admin/calendar/icalendar.html @@ -30,14 +30,16 @@ - + + - + +
    {{ 'icalendar.url' }}{{ 'icalendar.name' }}{{ 'icalendar.url' }} {{ 'icalendar.display' }}
    {{calendar.url}}{{calendar.name}}{{calendar.url}} {{ calendar.textHidden ? '' : 'icalendar.example' }} @@ -47,6 +49,12 @@

    {{ 'icalendar.new_import' }}

    +
    +
    + +
    + +
    diff --git a/app/controllers/api/i_calendar_controller.rb b/app/controllers/api/i_calendar_controller.rb index f004a13ab..857ae30d1 100644 --- a/app/controllers/api/i_calendar_controller.rb +++ b/app/controllers/api/i_calendar_controller.rb @@ -50,6 +50,6 @@ class API::ICalendarController < API::ApiController end def i_calendar_params - params.require(:i_calendar).permit(:url, :color, :text_color, :text_hidden) + params.require(:i_calendar).permit(:name, :url, :color, :text_color, :text_hidden) end end diff --git a/app/views/api/i_calendar/_i_calendar.json.jbuilder b/app/views/api/i_calendar/_i_calendar.json.jbuilder index 23b68df1d..dfa627cd3 100644 --- a/app/views/api/i_calendar/_i_calendar.json.jbuilder +++ b/app/views/api/i_calendar/_i_calendar.json.jbuilder @@ -1,3 +1,3 @@ # frozen_string_literal: true -json.extract! i_cal, :id, :url, :color, :text_color, :text_hidden +json.extract! i_cal, :id, :name, :url, :color, :text_color, :text_hidden diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 576cada15..85e75a36a 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -96,11 +96,13 @@ fr: color: "Couleur" text_color: "Couleur du texte" url: "URL" + name: "Nom" example: "Exemple" display: "Affichage" hide_text: "Cacher le texte" hidden: "Caché" shown: "Affiché" + create_error: "Impossible de créer l'import iCalendar. Veuillez réessayer ultérieurement" project_elements: # gestion des éléments constituant les projets diff --git a/db/migrate/20191127153729_create_i_calendars.rb b/db/migrate/20191127153729_create_i_calendars.rb index 289e93b94..b9b558a0f 100644 --- a/db/migrate/20191127153729_create_i_calendars.rb +++ b/db/migrate/20191127153729_create_i_calendars.rb @@ -6,6 +6,7 @@ class CreateICalendars < ActiveRecord::Migration def change create_table :i_calendars do |t| t.string :url + t.string :name t.string :color t.string :text_color t.boolean :text_hidden diff --git a/db/schema.rb b/db/schema.rb index bd9579e7f..30b47937e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -253,6 +253,7 @@ ActiveRecord::Schema.define(version: 20191127153729) do create_table "i_calendars", force: :cascade do |t| t.string "url" + t.string "name" t.string "color" t.string "text_color" t.boolean "text_hidden" From 85d17d62f39df8ae18709bca981e6fb1800e2e90 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 27 Nov 2019 17:44:01 +0100 Subject: [PATCH 044/135] fix events endpoint --- app/controllers/api/i_calendar_controller.rb | 2 +- app/views/api/i_calendar/events.json.jbuilder | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/api/i_calendar_controller.rb b/app/controllers/api/i_calendar_controller.rb index 857ae30d1..902ae04b7 100644 --- a/app/controllers/api/i_calendar_controller.rb +++ b/app/controllers/api/i_calendar_controller.rb @@ -38,7 +38,7 @@ class API::ICalendarController < API::ApiController cals = Icalendar::Calendar.parse(ics) cals.first.events.each do |evt| - @events.push(evt.merge!(color: i_cal.color)) + @events.push(evt) end end end diff --git a/app/views/api/i_calendar/events.json.jbuilder b/app/views/api/i_calendar/events.json.jbuilder index 5078729e7..fc8e89f64 100644 --- a/app/views/api/i_calendar/events.json.jbuilder +++ b/app/views/api/i_calendar/events.json.jbuilder @@ -6,5 +6,4 @@ json.array!(@events) do |event| json.start event.dtstart.iso8601 json.end event.dtend.iso8601 json.backgroundColor 'white' - json.borderColor event.color end From f72ae98109e90c2db797299b7c827df03a1feaa4 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 27 Nov 2019 17:50:38 +0100 Subject: [PATCH 045/135] do not show title if calendar is configured to hide them --- app/controllers/api/i_calendar_controller.rb | 2 +- app/views/api/i_calendar/events.json.jbuilder | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/api/i_calendar_controller.rb b/app/controllers/api/i_calendar_controller.rb index 902ae04b7..6b798921f 100644 --- a/app/controllers/api/i_calendar_controller.rb +++ b/app/controllers/api/i_calendar_controller.rb @@ -38,7 +38,7 @@ class API::ICalendarController < API::ApiController cals = Icalendar::Calendar.parse(ics) cals.first.events.each do |evt| - @events.push(evt) + @events.push(calendar: i_cal, event: evt) end end end diff --git a/app/views/api/i_calendar/events.json.jbuilder b/app/views/api/i_calendar/events.json.jbuilder index fc8e89f64..2029e8558 100644 --- a/app/views/api/i_calendar/events.json.jbuilder +++ b/app/views/api/i_calendar/events.json.jbuilder @@ -1,9 +1,9 @@ # frozen_string_literal: true json.array!(@events) do |event| - json.id event.uid - json.title event.summary - json.start event.dtstart.iso8601 - json.end event.dtend.iso8601 + json.id event[:event].uid + json.title event[:calendar].text_hidden ? '' : event[:event].summary + json.start event[:event].dtstart.iso8601 + json.end event[:event].dtend.iso8601 json.backgroundColor 'white' end From 36eba998082ec27f97ebe54a6fb145aa59630af9 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 2 Dec 2019 10:39:42 +0100 Subject: [PATCH 046/135] [bug] report errors on admin creation --- CHANGELOG.md | 1 + app/assets/javascripts/controllers/admin/members.js.erb | 3 ++- app/services/user_service.rb | 2 +- config/locales/app.admin.en.yml | 1 + config/locales/app.admin.es.yml | 1 + config/locales/app.admin.fr.yml | 1 + config/locales/app.admin.pt.yml | 1 + 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccd19e3a4..e36c9ad9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Updated moment-timezone - Added freeCAD files as default allowed extensions - Fix a bug: unable to remove the picture from a training +- Fix a bug: report errors on admin creation - Fix a security issue: updated loofah to fix [CVE-2019-15587](https://github.com/advisories/GHSA-c3gv-9cxf-6f57) - Fix a security issue: updated angular to 1.7.9 to fix [CVE-2019-10768](https://github.com/advisories/GHSA-89mq-4x47-5v83) - [TODO DEPLOY] add the `SLOT_DURATION` environment variable (see [doc/environment.md](doc/environment.md#SLOT_DURATION) for configuration details) diff --git a/app/assets/javascripts/controllers/admin/members.js.erb b/app/assets/javascripts/controllers/admin/members.js.erb index e9c9f77c9..bacbd58aa 100644 --- a/app/assets/javascripts/controllers/admin/members.js.erb +++ b/app/assets/javascripts/controllers/admin/members.js.erb @@ -754,7 +754,8 @@ Application.Controllers.controller('NewAdminController', ['$state', '$scope', 'A return $state.go('app.admin.members'); } , function (error) { - console.log(error); + growl.error(_t('failed_to_create_admin') + JSON.stringify(error.data ? error.data : error)); + console.error(error); } ); }; diff --git a/app/services/user_service.rb b/app/services/user_service.rb index 3293c57c6..55d05e6fa 100644 --- a/app/services/user_service.rb +++ b/app/services/user_service.rb @@ -41,7 +41,7 @@ class UserService # if the authentication is made through an SSO, generate a migration token admin.generate_auth_migration_token unless AuthProvider.active.providable_type == DatabaseProvider.name - saved = admin.save(validate: false) + saved = admin.save if saved admin.send_confirmation_instructions admin.add_role(:admin) diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 0b1aaa437..960196bbc 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -678,6 +678,7 @@ en: # add a new administrator to the platform add_an_administrator: "Add an administrator" administrator_successfully_created_he_will_receive_his_connection_directives_by_email: "Administrator successfully created. {GENDER, select, female{She} other{He}} receive {GENDER, select, female{her} other{his}} connection directives by e-mail." # messageFormat interpolation + failed_to_create_admin: "Unable to create the administrator:" authentication_new: # add a new authentication provider (SSO) diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 2f329ba4b..ed24b3296 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -678,6 +678,7 @@ es: # add a new administrator to the platform add_an_administrator: "Agregar un administrador" administrator_successfully_created_he_will_receive_his_connection_directives_by_email: "administrador creado correctamente. {GENDER, select, female{She} other{He}} receive {GENDER, select, female{her} other{his}} directivas de conexión por e-mail." # messageFormat interpolation + failed_to_create_admin: "No se puede crear el administrador :" authentication_new: # add a new authentication provider (SSO) diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 85e75a36a..ada28f728 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -694,6 +694,7 @@ fr: # ajouter un nouvel administrateur à la plate-forme add_an_administrator: "Ajouter un administrateur" administrator_successfully_created_he_will_receive_his_connection_directives_by_email: "L'administrateur a bien été créé. {GENDER, select, female{Elle} other{Il}} recevra ses instructions de connexion par email." # messageFormat interpolation + failed_to_create_admin: "Impossible de créer l'administrateur :" authentication_new: # ajouter un nouveau fournisseur d'authentification (SSO) diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 487a45cf2..d6795c2b4 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -678,6 +678,7 @@ pt: # add a new administrator to the platform add_an_administrator: "Adicionar administrador" administrator_successfully_created_he_will_receive_his_connection_directives_by_email: "Administrator criado com sucesso. {GENDER, select, female{Ela} other{Ele}} receberá {GENDER, select, female{sua} other{seu}} diretivas de conexão por e-mail." # messageFormat interpolation + failed_to_create_admin: "Não é possível criar administrador:" authentication_new: # add a new authentication provider (SSO) From 77cf8c821857db99ae8988710c9fb8af411ed79f Mon Sep 17 00:00:00 2001 From: Nicolas Florentin Date: Mon, 2 Dec 2019 11:57:25 +0100 Subject: [PATCH 047/135] replaces almost all Time.now by DateTime.current --- .../api/accounting_periods_controller.rb | 2 +- app/controllers/api/events_controller.rb | 8 ++++---- .../open_api/v1/events_controller.rb | 2 +- app/controllers/rss/events_controller.rb | 2 +- app/models/avoir.rb | 2 +- app/models/coupon.rb | 6 +++--- app/models/event.rb | 2 +- app/models/project.rb | 2 +- app/models/slot.rb | 2 +- app/models/subscription.rb | 6 +++--- app/models/user.rb | 4 ++-- app/policies/event_policy.rb | 2 +- app/policies/slot_policy.rb | 2 +- .../availabilities/availabilities_service.rb | 18 +++++++++--------- .../public_availabilities_service.rb | 2 +- app/services/invoice_reference_service.rb | 2 +- app/services/slot_service.rb | 2 +- app/services/user_service.rb | 2 +- app/services/vat_history_service.rb | 2 +- app/validators/closed_period_validator.rb | 2 +- app/validators/coupon_expiration_validator.rb | 2 +- app/views/exports/users_members.xlsx.axlsx | 4 ++-- app/workers/archive_worker.rb | 2 +- .../open_api_trace_calls_count_worker.rb | 2 +- app/workers/reservation_reminder_worker.rb | 2 +- app/workers/subscription_expire_worker.rb | 4 ++-- db/schema.rb | 2 +- db/seeds.rb | 2 +- lib/tasks/fablab/es.rake | 2 +- lib/tasks/fablab/stripe.rake | 2 +- 30 files changed, 48 insertions(+), 48 deletions(-) diff --git a/app/controllers/api/accounting_periods_controller.rb b/app/controllers/api/accounting_periods_controller.rb index f374e18bd..e154ef76e 100644 --- a/app/controllers/api/accounting_periods_controller.rb +++ b/app/controllers/api/accounting_periods_controller.rb @@ -14,7 +14,7 @@ class API::AccountingPeriodsController < API::ApiController def create authorize AccountingPeriod - @accounting_period = AccountingPeriod.new(period_params.merge(closed_at: DateTime.now, closed_by: current_user.id)) + @accounting_period = AccountingPeriod.new(period_params.merge(closed_at: DateTime.current, closed_by: current_user.id)) if @accounting_period.save render :show, status: :created, location: @accounting_period else diff --git a/app/controllers/api/events_controller.rb b/app/controllers/api/events_controller.rb index 0791b8de0..532db2f7f 100644 --- a/app/controllers/api/events_controller.rb +++ b/app/controllers/api/events_controller.rb @@ -17,11 +17,11 @@ class API::EventsController < API::ApiController if current_user&.admin? @events = case params[:scope] when 'future' - @events.where('availabilities.start_at >= ?', Time.now).order('availabilities.start_at DESC') + @events.where('availabilities.start_at >= ?', DateTime.current).order('availabilities.start_at DESC') when 'future_asc' - @events.where('availabilities.start_at >= ?', Time.now).order('availabilities.start_at ASC') + @events.where('availabilities.start_at >= ?', DateTime.current).order('availabilities.start_at ASC') when 'passed' - @events.where('availabilities.start_at < ?', Time.now).order('availabilities.start_at DESC') + @events.where('availabilities.start_at < ?', DateTime.current).order('availabilities.start_at DESC') else @events.order('availabilities.start_at DESC') end @@ -36,7 +36,7 @@ class API::EventsController < API::ApiController limit = params[:limit] @events = Event.includes(:event_image, :event_files, :availability, :category) .where('events.nb_total_places != -1 OR events.nb_total_places IS NULL') - .where('availabilities.start_at >= ?', Time.now) + .where('availabilities.start_at >= ?', DateTime.current) .order('availabilities.start_at ASC').references(:availabilities) .limit(limit) end diff --git a/app/controllers/open_api/v1/events_controller.rb b/app/controllers/open_api/v1/events_controller.rb index adcc4a6ed..169c367ef 100644 --- a/app/controllers/open_api/v1/events_controller.rb +++ b/app/controllers/open_api/v1/events_controller.rb @@ -6,7 +6,7 @@ class OpenAPI::V1::EventsController < OpenAPI::V1::BaseController if upcoming @events = Event.includes(:event_image, :event_files, :availability, :category) - .where('availabilities.end_at >= ?', Time.now) + .where('availabilities.end_at >= ?', DateTime.current) .order('availabilities.start_at ASC').references(:availabilities) else @events = Event.includes(:event_image, :event_files, :availability, :category).order(created_at: :desc) diff --git a/app/controllers/rss/events_controller.rb b/app/controllers/rss/events_controller.rb index 2b6351ef5..63ea6a657 100644 --- a/app/controllers/rss/events_controller.rb +++ b/app/controllers/rss/events_controller.rb @@ -5,7 +5,7 @@ class Rss::EventsController < Rss::RssController def index @events = Event.includes(:event_image, :event_files, :availability, :category) - .where('availabilities.start_at >= ?', Time.now) + .where('availabilities.start_at >= ?', DateTime.current) .order('availabilities.start_at ASC').references(:availabilities).limit(10) @fab_name = Setting.find_by(name: 'fablab_name').value end diff --git a/app/models/avoir.rb b/app/models/avoir.rb index c4d976cfe..e8d6bd98f 100644 --- a/app/models/avoir.rb +++ b/app/models/avoir.rb @@ -14,6 +14,6 @@ class Avoir < Invoice end def expire_subscription - user.subscription.expire(Time.now) + user.subscription.expire(DateTime.current) end end diff --git a/app/models/coupon.rb b/app/models/coupon.rb index 25855cf1e..f510cae51 100644 --- a/app/models/coupon.rb +++ b/app/models/coupon.rb @@ -17,7 +17,7 @@ class Coupon < ActiveRecord::Base validates_with CouponExpirationValidator scope :disabled, -> { where(active: false) } - scope :expired, -> { where('valid_until IS NOT NULL AND valid_until < ?', DateTime.now) } + scope :expired, -> { where('valid_until IS NOT NULL AND valid_until < ?', DateTime.current) } scope :sold_out, lambda { joins(:invoices).select('coupons.*, COUNT(invoices.id) as invoices_count').group('coupons.id') .where.not(max_usages: nil).having('COUNT(invoices.id) >= coupons.max_usages') @@ -26,7 +26,7 @@ class Coupon < ActiveRecord::Base joins('LEFT OUTER JOIN invoices ON invoices.coupon_id = coupons.id') .select('coupons.*, COUNT(invoices.id) as invoices_count') .group('coupons.id') - .where('active = true AND (valid_until IS NULL OR valid_until >= ?)', DateTime.now) + .where('active = true AND (valid_until IS NULL OR valid_until >= ?)', DateTime.current) .having('COUNT(invoices.id) < coupons.max_usages OR coupons.max_usages IS NULL') } @@ -55,7 +55,7 @@ class Coupon < ActiveRecord::Base def status(user_id = nil, amount = nil) if !active? 'disabled' - elsif !valid_until.nil? && valid_until.at_end_of_day < DateTime.now + elsif !valid_until.nil? && valid_until.at_end_of_day < DateTime.current 'expired' elsif !max_usages.nil? && invoices.count >= max_usages 'sold_out' diff --git a/app/models/event.rb b/app/models/event.rb index bad777185..d1b12bb6c 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -37,7 +37,7 @@ class Event < ActiveRecord::Base def recurrence_events Event.includes(:availability) - .where('events.recurrence_id = ? AND events.id != ? AND availabilities.start_at >= ?', recurrence_id, id, Time.now) + .where('events.recurrence_id = ? AND events.id != ? AND availabilities.start_at >= ?', recurrence_id, id, DateTime.current) .references(:availabilities) end diff --git a/app/models/project.rb b/app/models/project.rb index 18b564d01..d9768d22f 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -151,7 +151,7 @@ class Project < ActiveRecord::Base def after_save_and_publish return unless state_changed? && published? - update_columns(published_at: Time.now) + update_columns(published_at: DateTime.current) notify_admin_when_project_published end end diff --git a/app/models/slot.rb b/app/models/slot.rb index cddb98dac..ddb60de9a 100644 --- a/app/models/slot.rb +++ b/app/models/slot.rb @@ -52,7 +52,7 @@ class Slot < ActiveRecord::Base end def can_be_modified? - return false if (start_at - Time.now) / 1.day < 1 + return false if (start_at - DateTime.current) / 1.day < 1 true end diff --git a/app/models/subscription.rb b/app/models/subscription.rb index 4d3160eb2..86d13371b 100644 --- a/app/models/subscription.rb +++ b/app/models/subscription.rb @@ -81,7 +81,7 @@ class Subscription < ActiveRecord::Base end def cancel - update_columns(canceled_at: Time.now) + update_columns(canceled_at: DateTime.current) end def expire(time) @@ -96,7 +96,7 @@ class Subscription < ActiveRecord::Base end def expired? - expired_at <= Time.now + expired_at <= DateTime.current end def expired_at @@ -179,7 +179,7 @@ class Subscription < ActiveRecord::Base end def set_expiration_date - start_at = Time.now + start_at = DateTime.current self.expiration_date = start_at + plan.duration end diff --git a/app/models/user.rb b/app/models/user.rb index 919660c5a..96d841d36 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -108,7 +108,7 @@ class User < ActiveRecord::Base end def subscribed_plan - return nil if subscription.nil? || subscription.expired_at < Time.now + return nil if subscription.nil? || subscription.expired_at < DateTime.current subscription.plan end @@ -240,7 +240,7 @@ class User < ActiveRecord::Base # remove the token self.auth_token = nil - self.merged_at = DateTime.now + self.merged_at = DateTime.current # check that the email duplication was resolved if sso_user.email.end_with? '-duplicate' diff --git a/app/policies/event_policy.rb b/app/policies/event_policy.rb index e271834d7..c6855ba0b 100644 --- a/app/policies/event_policy.rb +++ b/app/policies/event_policy.rb @@ -7,7 +7,7 @@ class EventPolicy < ApplicationPolicy def resolve if user.nil? || (user && !user.admin?) scope.includes(:event_image, :event_files, :availability, :category) - .where('availabilities.start_at >= ?', Time.now) + .where('availabilities.start_at >= ?', DateTime.current) .order('availabilities.start_at ASC') .references(:availabilities) else diff --git a/app/policies/slot_policy.rb b/app/policies/slot_policy.rb index cbf742b51..3ec6819b9 100644 --- a/app/policies/slot_policy.rb +++ b/app/policies/slot_policy.rb @@ -6,7 +6,7 @@ class SlotPolicy < ApplicationPolicy # these condition does not apply to admins user.admin? or - (record.reservation.user == user and enabled and ((record.start_at - Time.now).to_i / 3600 >= delay)) + (record.reservation.user == user and enabled and ((record.start_at - DateTime.current).to_i / 3600 >= delay)) end def cancel? diff --git a/app/services/availabilities/availabilities_service.rb b/app/services/availabilities/availabilities_service.rb index 019082cae..5539faac4 100644 --- a/app/services/availabilities/availabilities_service.rb +++ b/app/services/availabilities/availabilities_service.rb @@ -18,7 +18,7 @@ class Availabilities::AvailabilitiesService slots = [] availabilities.each do |a| ((a.end_at - a.start_at) / ApplicationHelper::SLOT_DURATION.minutes).to_i.times do |i| - next unless (a.start_at + (i * ApplicationHelper::SLOT_DURATION).minutes) > Time.now + next unless (a.start_at + (i * ApplicationHelper::SLOT_DURATION).minutes) > DateTime.current slot = Slot.new( start_at: a.start_at + (i * ApplicationHelper::SLOT_DURATION).minutes, @@ -44,7 +44,7 @@ class Availabilities::AvailabilitiesService slots = [] availabilities.each do |a| ((a.end_at - a.start_at) / ApplicationHelper::SLOT_DURATION.minutes).to_i.times do |i| - next unless (a.start_at + (i * ApplicationHelper::SLOT_DURATION).minutes) > Time.now + next unless (a.start_at + (i * ApplicationHelper::SLOT_DURATION).minutes) > DateTime.current slot = Slot.new( start_at: a.start_at + (i * ApplicationHelper::SLOT_DURATION).minutes, @@ -69,7 +69,7 @@ class Availabilities::AvailabilitiesService # first, we get the already-made reservations reservations = user.reservations.where("reservable_type = 'Training'") reservations = reservations.where('reservable_id = :id', id: training_id.to_i) if training_id.is_number? - reservations = reservations.joins(:slots).where('slots.start_at > ?', Time.now) + reservations = reservations.joins(:slots).where('slots.start_at > ?', DateTime.current) # visible availabilities depends on multiple parameters availabilities = training_availabilities(training_id, user) @@ -83,7 +83,7 @@ class Availabilities::AvailabilitiesService private def subscription_year?(user) - user.subscription && user.subscription.plan.interval == 'year' && user.subscription.expired_at >= Time.now + user.subscription && user.subscription.plan.interval == 'year' && user.subscription.expired_at >= DateTime.current end # member must have validated at least 1 training and must have a valid yearly subscription. @@ -95,21 +95,21 @@ class Availabilities::AvailabilitiesService Reservation.where('reservable_type = ? and reservable_id = ?', reservable.class.name, reservable.id) .includes(:slots, statistic_profile: [user: [:profile]]) .references(:slots, :user) - .where('slots.start_at > ?', Time.now) + .where('slots.start_at > ?', DateTime.current) end def availabilities(reservable, type, user) if user.admin? reservable.availabilities .includes(:tags) - .where('end_at > ? AND available_type = ?', Time.now, type) + .where('end_at > ? AND available_type = ?', DateTime.current, type) .where(lock: false) else end_at = @maximum_visibility[:other] end_at = @maximum_visibility[:year] if subscription_year?(user) reservable.availabilities .includes(:tags) - .where('end_at > ? AND end_at < ? AND available_type = ?', Time.now, end_at, type) + .where('end_at > ? AND end_at < ? AND available_type = ?', DateTime.current, end_at, type) .where('availability_tags.tag_id' => user.tag_ids.concat([nil])) .where(lock: false) end @@ -126,14 +126,14 @@ class Availabilities::AvailabilitiesService # 1) an admin (he can see all future availabilities) if @current_user.admin? availabilities.includes(:tags, :slots, trainings: [:machines]) - .where('availabilities.start_at > ?', Time.now) + .where('availabilities.start_at > ?', DateTime.current) .where(lock: false) # 2) an user (he cannot see availabilities further than 1 (or 3) months) else end_at = @maximum_visibility[:other] end_at = @maximum_visibility[:year] if show_extended_slots?(user) availabilities.includes(:tags, :slots, :availability_tags, trainings: [:machines]) - .where('availabilities.start_at > ? AND availabilities.start_at < ?', Time.now, end_at) + .where('availabilities.start_at > ? AND availabilities.start_at < ?', DateTime.current, end_at) .where('availability_tags.tag_id' => user.tag_ids.concat([nil])) .where(lock: false) end diff --git a/app/services/availabilities/public_availabilities_service.rb b/app/services/availabilities/public_availabilities_service.rb index 3e0257a53..9c3f63a0f 100644 --- a/app/services/availabilities/public_availabilities_service.rb +++ b/app/services/availabilities/public_availabilities_service.rb @@ -47,7 +47,7 @@ class Availabilities::PublicAvailabilitiesService availabilities.each do |a| space = a.spaces.first ((a.end_at - a.start_at) / ApplicationHelper::SLOT_DURATION.minutes).to_i.times do |i| - next unless (a.start_at + (i * ApplicationHelper::SLOT_DURATION).minutes) > Time.now + next unless (a.start_at + (i * ApplicationHelper::SLOT_DURATION).minutes) > DateTime.current slot = Slot.new( start_at: a.start_at + (i * ApplicationHelper::SLOT_DURATION).minutes, diff --git a/app/services/invoice_reference_service.rb b/app/services/invoice_reference_service.rb index e756a7aa9..966a76b15 100644 --- a/app/services/invoice_reference_service.rb +++ b/app/services/invoice_reference_service.rb @@ -3,7 +3,7 @@ # Provides methods to generate invoice references class InvoiceReferenceService class << self - def generate_reference(invoice, date: Time.now, avoir: false) + def generate_reference(invoice, date: DateTime.current, avoir: false) pattern = Setting.find_by(name: 'invoice_reference').value reference = replace_invoice_number_pattern(pattern, invoice) diff --git a/app/services/slot_service.rb b/app/services/slot_service.rb index de3bb41fb..64419f8b0 100644 --- a/app/services/slot_service.rb +++ b/app/services/slot_service.rb @@ -4,7 +4,7 @@ class SlotService def cancel(slot) # first we mark ths slot as cancelled in DB, to free a ticket - slot.update_attributes(canceled_at: DateTime.now) + slot.update_attributes(canceled_at: DateTime.current) # then we try to remove this reservation from ElasticSearch, to keep the statistics up-to-date model_name = slot.reservation.reservable.class.name diff --git a/app/services/user_service.rb b/app/services/user_service.rb index 3293c57c6..898da5720 100644 --- a/app/services/user_service.rb +++ b/app/services/user_service.rb @@ -19,7 +19,7 @@ class UserService ) user.build_statistic_profile( gender: true, - birthday: Time.now + birthday: DateTime.current ) saved = user.save diff --git a/app/services/vat_history_service.rb b/app/services/vat_history_service.rb index ef8cf60d4..8ced7b37c 100644 --- a/app/services/vat_history_service.rb +++ b/app/services/vat_history_service.rb @@ -27,7 +27,7 @@ class VatHistoryService def vat_history chronology = [] - end_date = DateTime.now + end_date = DateTime.current Setting.find_by(name: 'invoice_VAT-active').history_values.order(created_at: 'DESC').each do |v| chronology.push(start: v.created_at, end: end_date, enabled: v.value == 'true') end_date = v.created_at diff --git a/app/validators/closed_period_validator.rb b/app/validators/closed_period_validator.rb index db6ae34e5..b81843c79 100644 --- a/app/validators/closed_period_validator.rb +++ b/app/validators/closed_period_validator.rb @@ -6,7 +6,7 @@ class ClosedPeriodValidator < ActiveModel::Validator date = if record.is_a?(Avoir) record.avoir_date else - DateTime.now + DateTime.current end diff --git a/app/validators/coupon_expiration_validator.rb b/app/validators/coupon_expiration_validator.rb index d9a80f55e..1e9cc6aab 100644 --- a/app/validators/coupon_expiration_validator.rb +++ b/app/validators/coupon_expiration_validator.rb @@ -7,7 +7,7 @@ class CouponExpirationValidator < ActiveModel::Validator current = record.valid_until unless current.blank? - if current.end_of_day < Time.now + if current.end_of_day < DateTime.current record.errors[:valid_until] << I18n.t('errors.messages.cannot_be_in_the_past') end diff --git a/app/views/exports/users_members.xlsx.axlsx b/app/views/exports/users_members.xlsx.axlsx index bd170e5ea..c77ca49bf 100644 --- a/app/views/exports/users_members.xlsx.axlsx +++ b/app/views/exports/users_members.xlsx.axlsx @@ -56,8 +56,8 @@ wb.add_worksheet(name: t('export_members.members')) do |sheet| member.profile.interest, member.profile.software_mastered, member.group&.name, - expiration && Time.now < expiration ? member.subscription.plan.name : t('export_members.without_subscriptions'), - expiration && Time.now < expiration ? member.subscription.expired_at.to_date : nil, + expiration && DateTime.current < expiration ? member.subscription.plan.name : t('export_members.without_subscriptions'), + expiration && DateTime.current < expiration ? member.subscription.expired_at.to_date : nil, member.trainings.map(&:name).join("\n"), member.tags.map(&:name).join("\n"), member.invoices.size, diff --git a/app/workers/archive_worker.rb b/app/workers/archive_worker.rb index 8dc432b8a..ec8530f72 100644 --- a/app/workers/archive_worker.rb +++ b/app/workers/archive_worker.rb @@ -45,7 +45,7 @@ class ArchiveWorker last_archive_checksum: last_checksum, previous_file: previous_file, software_version: Version.current, - date: Time.now.iso8601 + date: DateTime.current.iso8601 }, formats: [:json], handlers: [:jbuilder] diff --git a/app/workers/open_api_trace_calls_count_worker.rb b/app/workers/open_api_trace_calls_count_worker.rb index 5768522ce..e4bfd52f5 100644 --- a/app/workers/open_api_trace_calls_count_worker.rb +++ b/app/workers/open_api_trace_calls_count_worker.rb @@ -4,7 +4,7 @@ class OpenAPITraceCallsCountWorker < Sidekiq::Workers def perform OpenAPI::Client.find_each do |client| - OpenAPI::CallsCountTracing.create!(client: client, calls_count: client.calls_count, at: DateTime.now) + OpenAPI::CallsCountTracing.create!(client: client, calls_count: client.calls_count, at: DateTime.current) end end end diff --git a/app/workers/reservation_reminder_worker.rb b/app/workers/reservation_reminder_worker.rb index 75e03e0af..5d5b509cd 100644 --- a/app/workers/reservation_reminder_worker.rb +++ b/app/workers/reservation_reminder_worker.rb @@ -9,7 +9,7 @@ class ReservationReminderWorker if enabled == 'true' delay = Setting.find_by(name: 'reminder_delay').try(:value).try(:to_i).try(:hours) || DEFAULT_REMINDER_DELAY - starting = Time.now.beginning_of_hour + delay + starting = DateTime.current.beginning_of_hour + delay ending = starting + 1.hour Reservation.joins(:slots).where('slots.start_at >= ? AND slots.start_at <= ? AND slots.canceled_at IS NULL', starting, ending).each do |r| diff --git a/app/workers/subscription_expire_worker.rb b/app/workers/subscription_expire_worker.rb index def238f70..13362f0ae 100644 --- a/app/workers/subscription_expire_worker.rb +++ b/app/workers/subscription_expire_worker.rb @@ -2,8 +2,8 @@ class SubscriptionExpireWorker include Sidekiq::Worker def perform(expire_in) - Subscription.where('expiration_date >= ?', Time.now.at_beginning_of_day).each do |s| - if (s.expired_at - expire_in.days).to_date == Time.now.to_date + Subscription.where('expiration_date >= ?', DateTime.current.at_beginning_of_day).each do |s| + if (s.expired_at - expire_in.days).to_date == DateTime.current.to_date if expire_in != 0 NotificationCenter.call type: 'notify_member_subscription_will_expire_in_7_days', receiver: s.user, diff --git a/db/schema.rb b/db/schema.rb index 6e2ed6b2c..bd8b2e67e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -15,8 +15,8 @@ ActiveRecord::Schema.define(version: 20191113103352) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" - enable_extension "pg_trgm" enable_extension "unaccent" + enable_extension "pg_trgm" create_table "abuses", force: :cascade do |t| t.integer "signaled_id" diff --git a/db/seeds.rb b/db/seeds.rb index bd5890780..da3de1060 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -90,7 +90,7 @@ if Role.where(name: 'admin').joins(:users).count.zero? admin = User.new(username: 'admin', email: ENV['ADMIN_EMAIL'], password: ENV['ADMIN_PASSWORD'], password_confirmation: Rails.application.secrets.admin_password, group_id: Group.find_by(slug: 'admins').id, profile_attributes: { first_name: 'admin', last_name: 'admin', phone: '0123456789' }, - statistic_profile_attributes: { gender: true, birthday: Time.now }) + statistic_profile_attributes: { gender: true, birthday: DateTime.current }) admin.add_role 'admin' admin.save! end diff --git a/lib/tasks/fablab/es.rake b/lib/tasks/fablab/es.rake index db66a5f1a..5950bd550 100644 --- a/lib/tasks/fablab/es.rake +++ b/lib/tasks/fablab/es.rake @@ -170,7 +170,7 @@ namespace :fablab do days = args.period.to_i if days.zero? - StatisticService.new.generate_statistic(start_date: DateTime.now.beginning_of_day, end_date: DateTime.now.end_of_day) + StatisticService.new.generate_statistic(start_date: DateTime.current.beginning_of_day, end_date: DateTime.current.end_of_day) else days.times.each do |i| StatisticService.new.generate_statistic(start_date: i.day.ago.beginning_of_day, end_date: i.day.ago.end_of_day) diff --git a/lib/tasks/fablab/stripe.rake b/lib/tasks/fablab/stripe.rake index 4584cdca1..6f1249e95 100644 --- a/lib/tasks/fablab/stripe.rake +++ b/lib/tasks/fablab/stripe.rake @@ -6,7 +6,7 @@ namespace :fablab do desc 'Cancel stripe subscriptions' task cancel_subscriptions: :environment do - Subscription.where('expiration_date >= ?', Time.now.at_beginning_of_day).each do |s| + Subscription.where('expiration_date >= ?', DateTime.current.at_beginning_of_day).each do |s| puts "-> Start cancel subscription of #{s.user.email}" s.cancel puts '-> Done' From 55d2c88134538710e1ed82692df19bf2bba7735b Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 2 Dec 2019 12:19:30 +0100 Subject: [PATCH 048/135] delete & sync ical sources --- .../controllers/admin/calendar.js.erb | 31 +++++++++++++++++-- app/assets/javascripts/services/icalendar.js | 5 +++ .../templates/admin/calendar/icalendar.html | 3 +- app/controllers/api/i_calendar_controller.rb | 5 +++ config/locales/app.admin.fr.yml | 3 ++ config/routes.rb | 1 + 6 files changed, 45 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index 85d95c1db..71fbd47b3 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -813,8 +813,35 @@ Application.Controllers.controller('AdminICalendarController', ['$scope', 'iCale * @param calendar */ $scope.delete = function (calendar) { - const idx = $scope.calendars.indexOf(calendar); - $scope.calendars.splice(idx, 1); + ICalendar.delete( + { id: calendar.id }, + function () { + // success + const idx = $scope.calendars.indexOf(calendar); + $scope.calendars.splice(idx, 1); + }, function (error) { + // failed + growl.error(_t('icalendar.delete_failed')); + console.error(error); + }); + } + + /** + * Asynchronously re-fetches the events from the given calendar + * @param calendar + */ + $scope.sync = function (calendar) { + ICalendar.sync( + { id: calendar.id }, + function () { + // success + growl.info(_t('icalendar.refresh')); + }, function (error) { + // failed + growl.error(_t('icalendar.sync_failed')); + console.error(error); + } + ) } } ]); diff --git a/app/assets/javascripts/services/icalendar.js b/app/assets/javascripts/services/icalendar.js index 21d30843e..1e01bd5e3 100644 --- a/app/assets/javascripts/services/icalendar.js +++ b/app/assets/javascripts/services/icalendar.js @@ -6,6 +6,11 @@ Application.Services.factory('ICalendar', ['$resource', function ($resource) { events: { method: 'GET', url: '/api/i_calendar/events' + }, + sync: { + method: 'POST', + url: '/api/i_calendar/:id/sync', + params: { id: '@id' } } } ); diff --git a/app/assets/templates/admin/calendar/icalendar.html b/app/assets/templates/admin/calendar/icalendar.html index fec55b748..6c9411d48 100644 --- a/app/assets/templates/admin/calendar/icalendar.html +++ b/app/assets/templates/admin/calendar/icalendar.html @@ -33,7 +33,7 @@ {{ 'icalendar.name' }} {{ 'icalendar.url' }} {{ 'icalendar.display' }} - + @@ -42,6 +42,7 @@ {{calendar.url}} {{ calendar.textHidden ? '' : 'icalendar.example' }} + diff --git a/app/controllers/api/i_calendar_controller.rb b/app/controllers/api/i_calendar_controller.rb index 6b798921f..c506507fe 100644 --- a/app/controllers/api/i_calendar_controller.rb +++ b/app/controllers/api/i_calendar_controller.rb @@ -43,6 +43,11 @@ class API::ICalendarController < API::ApiController end end + def sync + puts '[TODO] run worker' + render json: { processing: true }, status: :created + end + private def set_i_cal diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index ada28f728..e5218afc6 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -103,6 +103,9 @@ fr: hidden: "Caché" shown: "Affiché" create_error: "Impossible de créer l'import iCalendar. Veuillez réessayer ultérieurement" + delete_failed: "Impossible de supprimer l'import iCalendar. Veuillez réessayer ultérieurement" + refresh: "Mise à jour en cours..." + sync_failed: "Impossible de synchroniser l'URL. Veuillez réessayer ultérieurement" project_elements: # gestion des éléments constituant les projets diff --git a/config/routes.rb b/config/routes.rb index bcb92b44c..a8f97dcbc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -114,6 +114,7 @@ Rails.application.routes.draw do resources :i_calendar, only: %i[index create destroy] do get 'events', on: :collection + post 'sync', on: :member end # for admin From 6ff6c710602b236c5c15184c0bdad6225f01cdc8 Mon Sep 17 00:00:00 2001 From: Nicolas Florentin Date: Mon, 2 Dec 2019 12:32:52 +0100 Subject: [PATCH 049/135] rm dead code Slot#can_be_modified? --- app/models/slot.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/models/slot.rb b/app/models/slot.rb index cddb98dac..58b8269a3 100644 --- a/app/models/slot.rb +++ b/app/models/slot.rb @@ -51,12 +51,6 @@ class Slot < ActiveRecord::Base attached_object: self end - def can_be_modified? - return false if (start_at - Time.now) / 1.day < 1 - - true - end - def dates_were_modified? start_at_changed? or end_at_changed? end From 43a05f624a8c16f4ae4ed50632f56308c8dbd158 Mon Sep 17 00:00:00 2001 From: Nicolas Florentin Date: Mon, 2 Dec 2019 12:35:01 +0100 Subject: [PATCH 050/135] updates changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccd19e3a4..0cce90749 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Updated moment-timezone - Added freeCAD files as default allowed extensions - Fix a bug: unable to remove the picture from a training +- Fix a bug: replaces all Time.now by DateTime.current to prevent time zones issues [Taiga#134] - Fix a security issue: updated loofah to fix [CVE-2019-15587](https://github.com/advisories/GHSA-c3gv-9cxf-6f57) - Fix a security issue: updated angular to 1.7.9 to fix [CVE-2019-10768](https://github.com/advisories/GHSA-89mq-4x47-5v83) - [TODO DEPLOY] add the `SLOT_DURATION` environment variable (see [doc/environment.md](doc/environment.md#SLOT_DURATION) for configuration details) From b17bcfde866e6cbcbfc99a80d7f4744fb2ea345f Mon Sep 17 00:00:00 2001 From: Nicolas Florentin Date: Mon, 2 Dec 2019 12:39:20 +0100 Subject: [PATCH 051/135] comment model slot.rb --- app/models/slot.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/slot.rb b/app/models/slot.rb index ddb60de9a..f59012d86 100644 --- a/app/models/slot.rb +++ b/app/models/slot.rb @@ -2,6 +2,7 @@ # Time range of duration defined by ApplicationHelper::SLOT_DURATION, slicing an Availability. # During a slot a Reservation is possible +# Only reserved slots are persisted in DB, others are instanciated on the fly class Slot < ActiveRecord::Base include NotifyWith::NotificationAttachedObject From db41e846ddfd19aec2c3cffc4b9025e755df88d1 Mon Sep 17 00:00:00 2001 From: Nicolas Florentin Date: Mon, 2 Dec 2019 15:29:05 +0100 Subject: [PATCH 052/135] uses DateTime#current instead of Time.now in tests --- app/models/slot.rb | 6 ---- app/models/statistic_profile.rb | 2 +- lib/tasks/fablab/fix.rake | 2 +- test/fixtures/availabilities.yml | 32 +++++++++---------- .../availabilities/as_admin_test.rb | 6 ++-- .../availabilities/as_user_test.rb | 2 +- test/integration/credits/machine_test.rb | 2 +- .../exports/accounting_export_test.rb | 2 +- test/integration/invoices/as_admin_test.rb | 2 +- .../subscriptions/renew_as_user_test.rb | 4 +-- test/integration/wallets_test.rb | 2 +- test/models/coupon_test.rb | 2 +- test/test_helper.rb | 2 +- 13 files changed, 30 insertions(+), 36 deletions(-) diff --git a/app/models/slot.rb b/app/models/slot.rb index f59012d86..c7a1a4b6d 100644 --- a/app/models/slot.rb +++ b/app/models/slot.rb @@ -52,12 +52,6 @@ class Slot < ActiveRecord::Base attached_object: self end - def can_be_modified? - return false if (start_at - DateTime.current) / 1.day < 1 - - true - end - def dates_were_modified? start_at_changed? or end_at_changed? end diff --git a/app/models/statistic_profile.rb b/app/models/statistic_profile.rb index d429366e0..599208b68 100644 --- a/app/models/statistic_profile.rb +++ b/app/models/statistic_profile.rb @@ -30,7 +30,7 @@ class StatisticProfile < ActiveRecord::Base def age if birthday.present? - now = Time.now.utc.to_date + now = DateTime.current.utc.to_date (now - birthday).to_f / AVG_DAYS_PER_YEAR else '' diff --git a/lib/tasks/fablab/fix.rake b/lib/tasks/fablab/fix.rake index 5a7dbfd6a..32453807e 100644 --- a/lib/tasks/fablab/fix.rake +++ b/lib/tasks/fablab/fix.rake @@ -129,7 +129,7 @@ namespace :fablab do desc '[release 3.1.2] fix users with invalid group_id' task users_group_ids: :environment do User.where.not(group_id: Group.all.map(&:id)).each do |u| - u.update_columns(group_id: Group.first.id, updated_at: DateTime.now) + u.update_columns(group_id: Group.first.id, updated_at: DateTime.current) meta_data = { ex_group_name: 'invalid group' } diff --git a/test/fixtures/availabilities.yml b/test/fixtures/availabilities.yml index 5610aaaf8..24b340890 100644 --- a/test/fixtures/availabilities.yml +++ b/test/fixtures/availabilities.yml @@ -1,8 +1,8 @@ availability_1: id: 1 - start_at: <%= DateTime.now.utc.change({hour: 6}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> - end_at: <%= DateTime.now.utc.change({hour: 10}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> + start_at: <%= DateTime.current.utc.change({hour: 6}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> + end_at: <%= DateTime.current.utc.change({hour: 10}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> available_type: training created_at: 2016-04-04 15:24:01.517486000 Z updated_at: 2016-04-04 15:24:01.517486000 Z @@ -11,8 +11,8 @@ availability_1: availability_2: id: 2 - start_at: <%= (DateTime.now + 1.day).utc.change({hour: 6}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> - end_at: <%= (DateTime.now + 1.day).utc.change({hour: 10}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> + start_at: <%= (DateTime.current + 1.day).utc.change({hour: 6}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> + end_at: <%= (DateTime.current + 1.day).utc.change({hour: 10}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> available_type: training created_at: 2016-04-04 15:24:09.169364000 Z updated_at: 2016-04-04 15:24:09.169364000 Z @@ -21,8 +21,8 @@ availability_2: availability_3: id: 3 - start_at: <%= DateTime.now.utc.change({hour: 12}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> - end_at: <%= DateTime.now.utc.change({hour: 18}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> + start_at: <%= DateTime.current.utc.change({hour: 12}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> + end_at: <%= DateTime.current.utc.change({hour: 18}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> available_type: machines created_at: 2016-04-04 15:24:27.587583000 Z updated_at: 2016-04-04 15:24:27.587583000 Z @@ -31,8 +31,8 @@ availability_3: availability_4: id: 4 - start_at: <%= (DateTime.now + 1.day).utc.change({hour: 12}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> - end_at: <%= (DateTime.now + 1.day).utc.change({hour: 18}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> + start_at: <%= (DateTime.current + 1.day).utc.change({hour: 12}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> + end_at: <%= (DateTime.current + 1.day).utc.change({hour: 18}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> available_type: machines created_at: 2016-04-04 15:24:44.044908000 Z updated_at: 2016-04-04 15:24:44.044908000 Z @@ -41,8 +41,8 @@ availability_4: availability_5: id: 5 - start_at: <%= (DateTime.now + 2.day).utc.change({hour: 12}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> - end_at: <%= (DateTime.now + 2.day).utc.change({hour: 18}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> + start_at: <%= (DateTime.current + 2.day).utc.change({hour: 12}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> + end_at: <%= (DateTime.current + 2.day).utc.change({hour: 18}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> available_type: machines created_at: 2016-04-04 15:25:48.584444000 Z updated_at: 2016-04-04 15:25:48.584444000 Z @@ -51,8 +51,8 @@ availability_5: availability_6: id: 6 - start_at: <%= (DateTime.now + 3.day).utc.change({hour: 12}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> - end_at: <%= (DateTime.now + 3.day).utc.change({hour: 18}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> + start_at: <%= (DateTime.current + 3.day).utc.change({hour: 12}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> + end_at: <%= (DateTime.current + 3.day).utc.change({hour: 18}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> available_type: machines created_at: 2016-04-04 15:26:17.953216000 Z updated_at: 2016-04-04 15:26:17.953216000 Z @@ -61,8 +61,8 @@ availability_6: availability_7: id: 7 - start_at: <%= (DateTime.now + 3.day).utc.change({hour: 12}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> - end_at: <%= (DateTime.now + 3.day).utc.change({hour: 18}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> + start_at: <%= (DateTime.current + 3.day).utc.change({hour: 12}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> + end_at: <%= (DateTime.current + 3.day).utc.change({hour: 18}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> available_type: machines created_at: 2016-04-04 15:26:39.278627000 Z updated_at: 2016-04-04 15:26:39.278627000 Z @@ -71,8 +71,8 @@ availability_7: availability_8: id: 8 - start_at: <%= (DateTime.now + 2.day).utc.change({hour: 6}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> - end_at: <%= (DateTime.now + 2.day).utc.change({hour: 10}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> + start_at: <%= (DateTime.current + 2.day).utc.change({hour: 6}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> + end_at: <%= (DateTime.current + 2.day).utc.change({hour: 10}).strftime('%Y-%m-%d %H:%M:%S.%9N Z') %> available_type: training created_at: 2016-04-04 15:26:49.572724000 Z updated_at: 2016-04-04 15:26:49.572724000 Z diff --git a/test/integration/availabilities/as_admin_test.rb b/test/integration/availabilities/as_admin_test.rb index 50a046de1..092da0796 100644 --- a/test/integration/availabilities/as_admin_test.rb +++ b/test/integration/availabilities/as_admin_test.rb @@ -37,7 +37,7 @@ module Availabilities # Check that we din't get availabilities from the past availabilities.each do |a| - assert_not a[:start] < DateTime.now, 'retrieved a slot in the past' + assert_not a[:start] < DateTime.current, 'retrieved a slot in the past' end end @@ -46,7 +46,7 @@ module Availabilities Rails.application.secrets.fablab_without_spaces = true # this simulates a fullCalendar (v2) call - start_date = DateTime.now.utc.strftime('%Y-%m-%d') + start_date = DateTime.current.utc.strftime('%Y-%m-%d') end_date = 7.days.from_now.utc.strftime('%Y-%m-%d') tz = Time.zone.tzinfo.name get "/api/availabilities?start=#{start_date}&end=#{end_date}&timezone=#{tz}&_=1487169767960" @@ -68,7 +68,7 @@ module Availabilities test 'get calendar availabilities with spaces' do # this simulates a fullCalendar (v2) call - start_date = DateTime.now.utc.strftime('%Y-%m-%d') + start_date = DateTime.current.utc.strftime('%Y-%m-%d') end_date = 7.days.from_now.utc.strftime('%Y-%m-%d') tz = Time.zone.tzinfo.name get "/api/availabilities?start=#{start_date}&end=#{end_date}&timezone=#{tz}&_=1487169767960" diff --git a/test/integration/availabilities/as_user_test.rb b/test/integration/availabilities/as_user_test.rb index 88655fa7e..bfb9007b1 100644 --- a/test/integration/availabilities/as_user_test.rb +++ b/test/integration/availabilities/as_user_test.rb @@ -22,7 +22,7 @@ class Availabilities::AsUserTest < ActionDispatch::IntegrationTest # Check that we din't get availabilities from the past availabilities.each do |a| - assert_not a[:start] < DateTime.now, 'retrieved a slot in the past' + assert_not a[:start] < DateTime.current, 'retrieved a slot in the past' end # Check that we don't get availabilities in more than a month diff --git a/test/integration/credits/machine_test.rb b/test/integration/credits/machine_test.rb index 2728d08b0..dac006de3 100644 --- a/test/integration/credits/machine_test.rb +++ b/test/integration/credits/machine_test.rb @@ -57,7 +57,7 @@ module Credits credit = json_response(response.body) assert_equal 13, credit[:id] c = Credit.find(credit[:id]) - assert Time.now - c.updated_at < 1.minute + assert c.updated_at > 1.minute.ago assert_equal 5, c.hours end diff --git a/test/integration/exports/accounting_export_test.rb b/test/integration/exports/accounting_export_test.rb index 7885a6572..7a969c3b6 100644 --- a/test/integration/exports/accounting_export_test.rb +++ b/test/integration/exports/accounting_export_test.rb @@ -19,7 +19,7 @@ class Exports::AccountingExportTest < ActionDispatch::IntegrationTest encoding: 'ISO-8859-1', date_format: '%d/%m/%Y', start_date: '2012-03-12T00:00:00.000Z', - end_date: DateTime.now.utc.iso8601, + end_date: DateTime.current.utc.iso8601, label_max_length: 50, decimal_separator: ',', export_invoices_at_zero: false diff --git a/test/integration/invoices/as_admin_test.rb b/test/integration/invoices/as_admin_test.rb index bee8de4ec..15e9cb993 100644 --- a/test/integration/invoices/as_admin_test.rb +++ b/test/integration/invoices/as_admin_test.rb @@ -33,7 +33,7 @@ class InvoicesTest < ActionDispatch::IntegrationTest end test 'admin generates a refund' do - date = DateTime.now.iso8601 + date = DateTime.current.iso8601 post '/api/invoices', { avoir: { avoir_date: date, diff --git a/test/integration/subscriptions/renew_as_user_test.rb b/test/integration/subscriptions/renew_as_user_test.rb index 6ccdb8b17..117efac12 100644 --- a/test/integration/subscriptions/renew_as_user_test.rb +++ b/test/integration/subscriptions/renew_as_user_test.rb @@ -37,14 +37,14 @@ class Subscriptions::RenewAsUserTest < ActionDispatch::IntegrationTest assert_not_nil @user.subscription, "user's subscription was not found" # Check the expiration date - assert @user.subscription.expired_at > DateTime.now, + assert @user.subscription.expired_at > DateTime.current, "user's subscription expiration was not updated ... VCR cassettes may be outdated, please check the gitlab wiki" assert_equal @user.subscription.expired_at.iso8601, (@user.subscription.created_at + plan.duration).iso8601, 'subscription expiration date does not match' assert_in_delta 5, - (DateTime.now.to_i - @user.subscription.updated_at.to_i), + (DateTime.current.to_i - @user.subscription.updated_at.to_i), 10, "user's subscription was not updated recently" diff --git a/test/integration/wallets_test.rb b/test/integration/wallets_test.rb index 06ca437c9..fa3f6f47a 100644 --- a/test/integration/wallets_test.rb +++ b/test/integration/wallets_test.rb @@ -83,7 +83,7 @@ class WalletsTest < ActionDispatch::IntegrationTest login_as(admin, scope: :user) w = @vlonchamp.wallet amount = 10 - avoir_date = Time.now.end_of_day + avoir_date = DateTime.current.end_of_day expected_amount = w.amount + amount put "/api/wallet/#{w.id}/credit", amount: amount, diff --git a/test/models/coupon_test.rb b/test/models/coupon_test.rb index 1c8ade1a5..6f7efa052 100644 --- a/test/models/coupon_test.rb +++ b/test/models/coupon_test.rb @@ -3,7 +3,7 @@ require 'test_helper' class CouponTest < ActiveSupport::TestCase test 'valid coupon with percentage' do - c = Coupon.new({name: 'Hot deals', code: 'HOT15', percent_off: 15, validity_per_user: 'once', valid_until: (Time.now + 2.weeks), max_usages: 100, active: true}) + c = Coupon.new({name: 'Hot deals', code: 'HOT15', percent_off: 15, validity_per_user: 'once', valid_until: (DateTime.current + 2.weeks), max_usages: 100, active: true}) assert c.valid? assert_equal 'active', c.status, 'Invalid coupon status' assert_equal 'percent_off', c.type, 'Invalid coupon type' diff --git a/test/test_helper.rb b/test/test_helper.rb index 6081adc5e..e26a7a98b 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -39,7 +39,7 @@ class ActiveSupport::TestCase def stripe_payment_method(error: nil) number = '4242424242424242' exp_month = 4 - exp_year = DateTime.now.next_year.year + exp_year = DateTime.current.next_year.year cvc = '314' case error From cca6b14f58a1ae5cc97a8567af0ccec3b7ca71e9 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 2 Dec 2019 15:53:24 +0100 Subject: [PATCH 053/135] import events asyncronously from icalendar --- app/assets/javascripts/services/icalendar.js | 2 +- app/controllers/api/i_calendar_controller.rb | 20 +++--------- app/models/i_calendar.rb | 10 ++++++ app/models/i_calendar_event.rb | 6 ++++ app/services/i_calendar_import_service.rb | 31 +++++++++++++++++++ app/views/api/i_calendar/events.json.jbuilder | 8 ++--- app/workers/i_calendar_import_worker.rb | 14 +++++++++ config/routes.rb | 2 +- config/schedule.yml | 5 +++ ...20191202135507_create_i_calendar_events.rb | 15 +++++++++ db/schema.rb | 17 +++++++++- test/fixtures/i_calendar_events.yml | 19 ++++++++++++ test/models/i_calendar_test.rb | 7 ----- 13 files changed, 126 insertions(+), 30 deletions(-) create mode 100644 app/models/i_calendar_event.rb create mode 100644 app/services/i_calendar_import_service.rb create mode 100644 app/workers/i_calendar_import_worker.rb create mode 100644 db/migrate/20191202135507_create_i_calendar_events.rb create mode 100644 test/fixtures/i_calendar_events.yml delete mode 100644 test/models/i_calendar_test.rb diff --git a/app/assets/javascripts/services/icalendar.js b/app/assets/javascripts/services/icalendar.js index 1e01bd5e3..93c790dab 100644 --- a/app/assets/javascripts/services/icalendar.js +++ b/app/assets/javascripts/services/icalendar.js @@ -5,7 +5,7 @@ Application.Services.factory('ICalendar', ['$resource', function ($resource) { { id: '@id' }, { events: { method: 'GET', - url: '/api/i_calendar/events' + url: '/api/i_calendar/:id/events' }, sync: { method: 'POST', diff --git a/app/controllers/api/i_calendar_controller.rb b/app/controllers/api/i_calendar_controller.rb index c506507fe..5e17224f6 100644 --- a/app/controllers/api/i_calendar_controller.rb +++ b/app/controllers/api/i_calendar_controller.rb @@ -27,25 +27,13 @@ class API::ICalendarController < API::ApiController end def events - require 'net/http' - require 'uri' - require 'icalendar' - - @events = [] - - @i_cals = ICalendar.all.each do |i_cal| - ics = Net::HTTP.get(URI.parse(i_cal.url)) - cals = Icalendar::Calendar.parse(ics) - - cals.first.events.each do |evt| - @events.push(calendar: i_cal, event: evt) - end - end + @events = ICalendarEvent.where(i_calendar_id: params[:id]).joins(:i_calendar) end def sync - puts '[TODO] run worker' - render json: { processing: true }, status: :created + worker = ICalendarImportWorker.new + worker.perform([params[:id]]) + render json: { processing: [params[:id]] }, status: :created end private diff --git a/app/models/i_calendar.rb b/app/models/i_calendar.rb index 17d630cae..d670e4986 100644 --- a/app/models/i_calendar.rb +++ b/app/models/i_calendar.rb @@ -2,4 +2,14 @@ # iCalendar (RFC 5545) files, stored by URL and kept with their display configuration class ICalendar < ActiveRecord::Base + has_many :i_calendar_events + + after_create sync_events + + private + + def sync_events + worker = ICalendarImportWorker.new + worker.perform([id]) + end end diff --git a/app/models/i_calendar_event.rb b/app/models/i_calendar_event.rb new file mode 100644 index 000000000..b7b4897d0 --- /dev/null +++ b/app/models/i_calendar_event.rb @@ -0,0 +1,6 @@ +# frozen_string_literal: true + +# iCalendar (RFC 5545) event, belonging to an ICalendar object (its source) +class ICalendarEvent < ActiveRecord::Base + belongs_to :i_calendar +end diff --git a/app/services/i_calendar_import_service.rb b/app/services/i_calendar_import_service.rb new file mode 100644 index 000000000..06b122bfe --- /dev/null +++ b/app/services/i_calendar_import_service.rb @@ -0,0 +1,31 @@ +# frozen_string_literal: true + +# Import all events from a given remote RFC 5545 iCalendar +class ICalendarImportService + def import(i_calendar_id) + require 'net/http' + require 'uri' + require 'icalendar' + + events = [] + + i_cal = ICalendar.find(i_calendar_id) + ics = Net::HTTP.get(URI.parse(i_cal.url)) + cals = Icalendar::Calendar.parse(ics) + + cals.each do |cal| + cal.events.each do |evt| + events.push( + uid: evt.uid, + dtstart: evt.dtstart, + dtend: evt.dtend, + summary: evt.summary, + description: evt.description, + i_calendar_id: i_calendar_id + ) + end + end + + ICalendarEvent.create!(events) + end +end diff --git a/app/views/api/i_calendar/events.json.jbuilder b/app/views/api/i_calendar/events.json.jbuilder index 2029e8558..725d6f0f0 100644 --- a/app/views/api/i_calendar/events.json.jbuilder +++ b/app/views/api/i_calendar/events.json.jbuilder @@ -1,9 +1,9 @@ # frozen_string_literal: true json.array!(@events) do |event| - json.id event[:event].uid - json.title event[:calendar].text_hidden ? '' : event[:event].summary - json.start event[:event].dtstart.iso8601 - json.end event[:event].dtend.iso8601 + json.id event.uid + json.title event.i_calendar.text_hidden ? '' : event.summary + json.start event.dtstart.iso8601 + json.end event.dtend.iso8601 json.backgroundColor 'white' end diff --git a/app/workers/i_calendar_import_worker.rb b/app/workers/i_calendar_import_worker.rb new file mode 100644 index 000000000..cf571eaba --- /dev/null +++ b/app/workers/i_calendar_import_worker.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +# Periodically import the iCalendar RFC 5545 events from the configured source +class ICalendarImportWorker + include Sidekiq::Worker + + def perform(calendar_ids = ICalendar.all.map(&:id)) + service = ICalendarImportService.new + + calendar_ids.each do |id| + service.import(id) + end + end +end diff --git a/config/routes.rb b/config/routes.rb index a8f97dcbc..f3f505121 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -113,7 +113,7 @@ Rails.application.routes.draw do end resources :i_calendar, only: %i[index create destroy] do - get 'events', on: :collection + get 'events', on: :member post 'sync', on: :member end diff --git a/config/schedule.yml b/config/schedule.yml index f2a8e114e..d89fe27cf 100644 --- a/config/schedule.yml +++ b/config/schedule.yml @@ -15,6 +15,11 @@ generate_statistic: class: "StatisticWorker" queue: default +i_calendar_import: + cron: "0 2 * * *" + class: "ICalendarImportWorker" + queue: default + open_api_trace_calls_count: cron: "0 4 * * 0" # every sunday at 4am class: "OpenAPITraceCallsCountWorker" diff --git a/db/migrate/20191202135507_create_i_calendar_events.rb b/db/migrate/20191202135507_create_i_calendar_events.rb new file mode 100644 index 000000000..748349cd5 --- /dev/null +++ b/db/migrate/20191202135507_create_i_calendar_events.rb @@ -0,0 +1,15 @@ +class CreateICalendarEvents < ActiveRecord::Migration + def change + create_table :i_calendar_events do |t| + t.string :uid + t.datetime :dtstart + t.datetime :dtend + t.string :summary + t.string :description + t.string :attendee + t.belongs_to :i_calendar, index: true, foreign_key: true + + t.timestamps null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 30b47937e..1d370074c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20191127153729) do +ActiveRecord::Schema.define(version: 20191202135507) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -251,6 +251,20 @@ ActiveRecord::Schema.define(version: 20191127153729) do add_index "history_values", ["invoicing_profile_id"], name: "index_history_values_on_invoicing_profile_id", using: :btree add_index "history_values", ["setting_id"], name: "index_history_values_on_setting_id", using: :btree + create_table "i_calendar_events", force: :cascade do |t| + t.string "uid" + t.datetime "dtstart" + t.datetime "dtend" + t.string "summary" + t.string "description" + t.string "attendee" + t.integer "i_calendar_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + add_index "i_calendar_events", ["i_calendar_id"], name: "index_i_calendar_events_on_i_calendar_id", using: :btree + create_table "i_calendars", force: :cascade do |t| t.string "url" t.string "name" @@ -933,6 +947,7 @@ ActiveRecord::Schema.define(version: 20191127153729) do add_foreign_key "exports", "users" add_foreign_key "history_values", "invoicing_profiles" add_foreign_key "history_values", "settings" + add_foreign_key "i_calendar_events", "i_calendars" add_foreign_key "invoices", "coupons" add_foreign_key "invoices", "invoicing_profiles" add_foreign_key "invoices", "invoicing_profiles", column: "operator_profile_id" diff --git a/test/fixtures/i_calendar_events.yml b/test/fixtures/i_calendar_events.yml new file mode 100644 index 000000000..490aa79a1 --- /dev/null +++ b/test/fixtures/i_calendar_events.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + uid: MyString + dtstart: 2019-12-02 14:55:07 + dtend: 2019-12-02 14:55:07 + summary: MyString + description: MyString + attendee: MyString + i_calendar_id: + +two: + uid: MyString + dtstart: 2019-12-02 14:55:07 + dtend: 2019-12-02 14:55:07 + summary: MyString + description: MyString + attendee: MyString + i_calendar_id: diff --git a/test/models/i_calendar_test.rb b/test/models/i_calendar_test.rb deleted file mode 100644 index 0ab530e7c..000000000 --- a/test/models/i_calendar_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class ICalendarTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end From 22be9f6a08fa041b09f2d0f6c786df910551991e Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 2 Dec 2019 16:49:20 +0100 Subject: [PATCH 054/135] display external calendars list in public calendar + pull availabilities --- .../javascripts/controllers/calendar.js | 41 ++++++++++++------- app/assets/javascripts/router.js.erb | 1 + app/assets/templates/calendar/filter.html.erb | 11 +++++ app/controllers/api/i_calendar_controller.rb | 7 +++- app/models/i_calendar.rb | 2 +- config/locales/app.public.fr.yml | 1 + 6 files changed, 47 insertions(+), 16 deletions(-) diff --git a/app/assets/javascripts/controllers/calendar.js b/app/assets/javascripts/controllers/calendar.js index 33d811f55..ce0e1298d 100644 --- a/app/assets/javascripts/controllers/calendar.js +++ b/app/assets/javascripts/controllers/calendar.js @@ -16,8 +16,8 @@ * Controller used in the public calendar global */ -Application.Controllers.controller('CalendarController', ['$scope', '$state', '$aside', 'moment', 'Availability', 'Slot', 'Setting', 'growl', 'dialogs', 'bookingWindowStart', 'bookingWindowEnd', '_t', 'uiCalendarConfig', 'CalendarConfig', 'trainingsPromise', 'machinesPromise', 'spacesPromise', - function ($scope, $state, $aside, moment, Availability, Slot, Setting, growl, dialogs, bookingWindowStart, bookingWindowEnd, _t, uiCalendarConfig, CalendarConfig, trainingsPromise, machinesPromise, spacesPromise) { +Application.Controllers.controller('CalendarController', ['$scope', '$state', '$aside', 'moment', 'Availability', 'Slot', 'Setting', 'growl', 'dialogs', 'bookingWindowStart', 'bookingWindowEnd', '_t', 'uiCalendarConfig', 'CalendarConfig', 'trainingsPromise', 'machinesPromise', 'spacesPromise', 'iCalendarPromise', + function ($scope, $state, $aside, moment, Availability, Slot, Setting, growl, dialogs, bookingWindowStart, bookingWindowEnd, _t, uiCalendarConfig, CalendarConfig, trainingsPromise, machinesPromise, spacesPromise, iCalendarPromise) { /* PRIVATE STATIC CONSTANTS */ let currentMachineEvent = null; machinesPromise.forEach(m => m.checked = true); @@ -38,12 +38,11 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ // List of spaces $scope.spaces = spacesPromise.filter(t => !t.disabled); + // List of external iCalendar sources + $scope.externals = iCalendarPromise; + // add availabilities source to event sources $scope.eventSources = []; - $scope.eventSources.push({ - url: '/api/i_calendar/events', - textColor: 'black' - }); // filter availabilities if have change $scope.filterAvailabilities = function (filter, scope) { @@ -52,10 +51,19 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ trainings: isSelectAll('trainings', scope), machines: isSelectAll('machines', scope), spaces: isSelectAll('spaces', scope), + externals: isSelectAll('externals', scope), evt: filter.evt, dispo: filter.dispo }); - return $scope.calendarConfig.events = availabilitySourceUrl(); + $scope.calendarConfig.events = availabilitySourceUrl(); + $scope.externals.filter(e => e.checked).forEach(e => { + $scope.eventSources.push({ + url: `/api/i_calendar/${e.id}/events`, + textColor: e.textColor, + color: e.color + }); + }); + return uiCalendarConfig.calendars.calendar.fullCalendar('refetchEvents'); }; // a variable for formation/machine/event/dispo checkbox is or not checked @@ -63,6 +71,7 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ trainings: isSelectAll('trainings', $scope), machines: isSelectAll('machines', $scope), spaces: isSelectAll('spaces', $scope), + externals: isSelectAll('externals', $scope), evt: true, dispo: true }; @@ -89,6 +98,9 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ spaces () { return $scope.spaces; }, + externals () { + return $scope.externals; + }, filter () { return $scope.filter; }, @@ -99,10 +111,11 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ return $scope.filterAvailabilities; } }, - controller: ['$scope', '$uibModalInstance', 'trainings', 'machines', 'spaces', 'filter', 'toggleFilter', 'filterAvailabilities', function ($scope, $uibModalInstance, trainings, machines, spaces, filter, toggleFilter, filterAvailabilities) { + controller: ['$scope', '$uibModalInstance', 'trainings', 'machines', 'spaces', 'externals', 'filter', 'toggleFilter', 'filterAvailabilities', function ($scope, $uibModalInstance, trainings, machines, spaces, externals, filter, toggleFilter, filterAvailabilities) { $scope.trainings = trainings; $scope.machines = machines; $scope.spaces = spaces; + $scope.externals = externals; $scope.filter = filter; $scope.toggleFilter = (type, filter) => toggleFilter(type, filter); @@ -124,19 +137,19 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ if (event.available_type === 'machines') { currentMachineEvent = event; calendar.fullCalendar('changeView', 'agendaDay'); - return calendar.fullCalendar('gotoDate', event.start); + calendar.fullCalendar('gotoDate', event.start); } else if (event.available_type === 'space') { calendar.fullCalendar('changeView', 'agendaDay'); - return calendar.fullCalendar('gotoDate', event.start); + calendar.fullCalendar('gotoDate', event.start); } else if (event.available_type === 'event') { - return $state.go('app.public.events_show', { id: event.event_id }); + $state.go('app.public.events_show', { id: event.event_id }); } else if (event.available_type === 'training') { - return $state.go('app.public.training_show', { id: event.training_id }); + $state.go('app.public.training_show', { id: event.training_id }); } else { if (event.machine_id) { - return $state.go('app.public.machines_show', { id: event.machine_id }); + $state.go('app.public.machines_show', { id: event.machine_id }); } else if (event.space_id) { - return $state.go('app.public.space_show', { id: event.space_id }); + $state.go('app.public.space_show', { id: event.space_id }); } } }; diff --git a/app/assets/javascripts/router.js.erb b/app/assets/javascripts/router.js.erb index 62503a9cf..7ebc08af3 100644 --- a/app/assets/javascripts/router.js.erb +++ b/app/assets/javascripts/router.js.erb @@ -638,6 +638,7 @@ angular.module('application.router', ['ui.router']) trainingsPromise: ['Training', function (Training) { return Training.query().$promise; }], machinesPromise: ['Machine', function (Machine) { return Machine.query().$promise; }], spacesPromise: ['Space', function (Space) { return Space.query().$promise; }], + iCalendarPromise: ['ICalendar', function (ICalendar) { return ICalendar.query().$promise; }], translations: ['Translations', function (Translations) { return Translations.query(['app.public.calendar']).$promise; }] } }) diff --git a/app/assets/templates/calendar/filter.html.erb b/app/assets/templates/calendar/filter.html.erb index c275fbeb9..76172a3a5 100644 --- a/app/assets/templates/calendar/filter.html.erb +++ b/app/assets/templates/calendar/filter.html.erb @@ -36,3 +36,14 @@

    {{ 'calendar.show_unavailables' }}

    +
    +
    +

    {{ 'calendar.externals' }}

    + +
    + +
    + {{::e.name}} + +
    +
    diff --git a/app/controllers/api/i_calendar_controller.rb b/app/controllers/api/i_calendar_controller.rb index 5e17224f6..b828b709d 100644 --- a/app/controllers/api/i_calendar_controller.rb +++ b/app/controllers/api/i_calendar_controller.rb @@ -27,7 +27,12 @@ class API::ICalendarController < API::ApiController end def events - @events = ICalendarEvent.where(i_calendar_id: params[:id]).joins(:i_calendar) + start_date = ActiveSupport::TimeZone[params[:timezone]]&.parse(params[:start]) + end_date = ActiveSupport::TimeZone[params[:timezone]]&.parse(params[:end])&.end_of_day + + @events = ICalendarEvent.where(i_calendar_id: params[:id]) + .where('dtstart >= ? AND dtend <= ?', start_date, end_date) + .joins(:i_calendar) end def sync diff --git a/app/models/i_calendar.rb b/app/models/i_calendar.rb index d670e4986..1f63f6129 100644 --- a/app/models/i_calendar.rb +++ b/app/models/i_calendar.rb @@ -4,7 +4,7 @@ class ICalendar < ActiveRecord::Base has_many :i_calendar_events - after_create sync_events + after_create :sync_events private diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index 522562d10..c5493ad5f 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -306,6 +306,7 @@ fr: machines: "Machines" spaces: "Espaces" events: "Évènements" + externals: "Autres calendriers" spaces_list: # liste des espaces From 122ff54cd806aa96c06890809734842ffd832b74 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 3 Dec 2019 10:17:29 +0100 Subject: [PATCH 055/135] fix colors in ics imports --- .../javascripts/controllers/admin/calendar.js.erb | 14 +++++++------- app/assets/javascripts/controllers/calendar.js | 2 +- app/assets/templates/admin/calendar/icalendar.html | 6 +++--- app/models/i_calendar.rb | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index 71fbd47b3..2ae01b869 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -770,10 +770,10 @@ Application.Controllers.controller('AdminICalendarController', ['$scope', 'iCale // configuration of a new ICS source $scope.newCalendar = { color: undefined, - textColor: undefined, + text_color: undefined, url: undefined, name: undefined, - textHidden: false + text_hidden: false }; /** @@ -786,8 +786,8 @@ Application.Controllers.controller('AdminICalendarController', ['$scope', 'iCale $scope.newCalendar.url = undefined; $scope.newCalendar.name = undefined; $scope.newCalendar.color = null; - $scope.newCalendar.textColor = null; - $scope.newCalendar.textHidden = false; + $scope.newCalendar.text_color = null; + $scope.newCalendar.text_hidden = false; }, function (error) { // failed growl.error(_t('icalendar.create_error')); @@ -802,9 +802,9 @@ Application.Controllers.controller('AdminICalendarController', ['$scope', 'iCale $scope.calendarStyle = function (calendar) { return { 'border-color': calendar.color, - 'color': calendar.textColor, - 'width': calendar.textHidden ? '50px' : 'auto', - 'height': calendar.textHidden ? '21px' : 'auto' + 'color': calendar.text_color, + 'width': calendar.text_hidden ? '50px' : 'auto', + 'height': calendar.text_hidden ? '21px' : 'auto' }; } diff --git a/app/assets/javascripts/controllers/calendar.js b/app/assets/javascripts/controllers/calendar.js index ce0e1298d..fa5670550 100644 --- a/app/assets/javascripts/controllers/calendar.js +++ b/app/assets/javascripts/controllers/calendar.js @@ -59,7 +59,7 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ $scope.externals.filter(e => e.checked).forEach(e => { $scope.eventSources.push({ url: `/api/i_calendar/${e.id}/events`, - textColor: e.textColor, + textColor: e.text_color, color: e.color }); }); diff --git a/app/assets/templates/admin/calendar/icalendar.html b/app/assets/templates/admin/calendar/icalendar.html index 6c9411d48..c423e1aac 100644 --- a/app/assets/templates/admin/calendar/icalendar.html +++ b/app/assets/templates/admin/calendar/icalendar.html @@ -33,7 +33,7 @@ {{ 'icalendar.name' }} {{ 'icalendar.url' }} {{ 'icalendar.display' }} - + @@ -72,12 +72,12 @@
    - +
    Date: Tue, 3 Dec 2019 10:23:19 +0100 Subject: [PATCH 056/135] external calendars legend --- app/assets/javascripts/controllers/calendar.js | 11 +++++++++++ app/assets/stylesheets/modules/icalendar.scss | 5 +++++ app/assets/templates/calendar/filter.html.erb | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/controllers/calendar.js b/app/assets/javascripts/controllers/calendar.js index fa5670550..f307a9e35 100644 --- a/app/assets/javascripts/controllers/calendar.js +++ b/app/assets/javascripts/controllers/calendar.js @@ -66,6 +66,17 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ return uiCalendarConfig.calendars.calendar.fullCalendar('refetchEvents'); }; + /** + * Return a CSS-like style of the given calendar configuration + * @param calendar + */ + $scope.calendarStyle = function (calendar) { + return { + 'border-color': calendar.color, + 'color': calendar.text_color, + }; + }; + // a variable for formation/machine/event/dispo checkbox is or not checked $scope.filter = { trainings: isSelectAll('trainings', $scope), diff --git a/app/assets/stylesheets/modules/icalendar.scss b/app/assets/stylesheets/modules/icalendar.scss index 7c852fcd6..d97ed60f7 100644 --- a/app/assets/stylesheets/modules/icalendar.scss +++ b/app/assets/stylesheets/modules/icalendar.scss @@ -17,3 +17,8 @@ .calendar-url { overflow: hidden; } + +.external-calendar-legend { + border-left: 3px solid; + border-radius: 3px; +} \ No newline at end of file diff --git a/app/assets/templates/calendar/filter.html.erb b/app/assets/templates/calendar/filter.html.erb index 76172a3a5..8db10fd89 100644 --- a/app/assets/templates/calendar/filter.html.erb +++ b/app/assets/templates/calendar/filter.html.erb @@ -43,7 +43,7 @@
    - {{::e.name}} + {{::e.name}}
    From 32e7fc390049320b017a0d579cb52e3a81c0bb97 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 3 Dec 2019 10:48:53 +0100 Subject: [PATCH 057/135] confirm delete icalendar imports + fix display + add translations --- .../controllers/admin/calendar.js.erb | 40 +++++++++++++------ .../templates/admin/calendar/icalendar.html | 4 +- app/assets/templates/calendar/filter.html.erb | 2 +- config/locales/app.admin.en.yml | 22 ++++++++++ config/locales/app.admin.es.yml | 22 ++++++++++ config/locales/app.admin.fr.yml | 3 ++ config/locales/app.admin.pt.yml | 22 ++++++++++ 7 files changed, 100 insertions(+), 15 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index 2ae01b869..220363e4d 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -762,8 +762,8 @@ Application.Controllers.controller('DeleteRecurrentAvailabilityController', ['$s * Controller used in the iCalendar (ICS) imports management page */ -Application.Controllers.controller('AdminICalendarController', ['$scope', 'iCalendars', 'ICalendar', 'growl', '_t', - function ($scope, iCalendars, ICalendar, growl, _t) { +Application.Controllers.controller('AdminICalendarController', ['$scope', 'iCalendars', 'ICalendar', 'dialogs', 'growl', '_t', + function ($scope, iCalendars, ICalendar, dialogs, growl, _t) { // list of ICS sources $scope.calendars = iCalendars; @@ -813,17 +813,33 @@ Application.Controllers.controller('AdminICalendarController', ['$scope', 'iCale * @param calendar */ $scope.delete = function (calendar) { - ICalendar.delete( - { id: calendar.id }, + dialogs.confirm( + { + resolve: { + object () { + return { + title: _t('icalendar.confirmation_required'), + msg: _t('icalendar.confirm_delete_import') + }; + } + } + }, function () { - // success - const idx = $scope.calendars.indexOf(calendar); - $scope.calendars.splice(idx, 1); - }, function (error) { - // failed - growl.error(_t('icalendar.delete_failed')); - console.error(error); - }); + ICalendar.delete( + { id: calendar.id }, + function () { + // success + const idx = $scope.calendars.indexOf(calendar); + $scope.calendars.splice(idx, 1); + growl.info(_t('icalendar.delete_success')); + }, function (error) { + // failed + growl.error(_t('icalendar.delete_failed')); + console.error(error); + } + ); + } + ) } /** diff --git a/app/assets/templates/admin/calendar/icalendar.html b/app/assets/templates/admin/calendar/icalendar.html index c423e1aac..a91d5090a 100644 --- a/app/assets/templates/admin/calendar/icalendar.html +++ b/app/assets/templates/admin/calendar/icalendar.html @@ -40,7 +40,7 @@ {{calendar.name}} {{calendar.url}} - {{ calendar.textHidden ? '' : 'icalendar.example' }} + {{ calendar.text_hidden ? '' : 'icalendar.example' }} @@ -72,7 +72,7 @@
    - +
    diff --git a/app/assets/templates/calendar/filter.html.erb b/app/assets/templates/calendar/filter.html.erb index 8db10fd89..7242f3c47 100644 --- a/app/assets/templates/calendar/filter.html.erb +++ b/app/assets/templates/calendar/filter.html.erb @@ -36,7 +36,7 @@

    {{ 'calendar.show_unavailables' }}

    -
    +

    {{ 'calendar.externals' }}

    diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 960196bbc..261408460 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -88,6 +88,28 @@ en: view_reservations: "View reservations" legend: "legend" + icalendar: + icalendar: + icalendar_import: "iCalendar import" + intro: "Fab-manager allows to automatically import calendar events, at RFC 5545 iCalendar format, from external URL. These URL are synchronized every nights and the events are shown in the public calendar." + new_import: "New ICS import" + color: "Colour" + text_color: "Text colour" + url: "URL" + name: "Name" + example: "Example" + display: "Display" + hide_text: "Hide the text" + hidden: "Hidden" + shown: "Shown" + create_error: "Unable to create iCalendar import. Please try again later" + delete_failed: "Unable to delete the iCalendar import. Please try again later" + refresh: "Updating..." + sync_failed: "Unable to synchronize the URL. Please try again later" + confirmation_required: "Confirmation required" + confirm_delete_import: "Do you really want to delete this iCalendar import?" + delete_success: "iCalendar import successfully deleted" + project_elements: # management of the projects' components project_elements: diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index ed24b3296..fb62110e7 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -88,6 +88,28 @@ es: view_reservations: "Ver reservas" # translation_missing legend: "leyenda" + icalendar: + icalendar: + icalendar_import: "iCalendar import" # translation_missing + intro: "Fab-manager allows to automatically import calendar events, at RFC 5545 iCalendar format, from external URL. These URL are synchronized every nights and the events are shown in the public calendar." # translation_missing + new_import: "New ICS import" # translation_missing + color: "Colour" # translation_missing + text_color: "Text colour" # translation_missing + url: "URL" # translation_missing + name: "Name" # translation_missing + example: "Example" # translation_missing + display: "Display" # translation_missing + hide_text: "Hide the text" # translation_missing + hidden: "Hidden" # translation_missing + shown: "Shown" # translation_missing + create_error: "Unable to create iCalendar import. Please try again later" # translation_missing + delete_failed: "Unable to delete the iCalendar import. Please try again later" # translation_missing + refresh: "Updating..." # translation_missing + sync_failed: "Unable to synchronize the URL. Please try again later" # translation_missing + confirmation_required: "Confirmation required" # translation_missing + confirm_delete_import: "Do you really want to delete this iCalendar import?" # translation_missing + delete_success: "iCalendar import successfully deleted" # translation_missing + project_elements: # management of the projects' components project_elements: diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index e5218afc6..4a5108f15 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -106,6 +106,9 @@ fr: delete_failed: "Impossible de supprimer l'import iCalendar. Veuillez réessayer ultérieurement" refresh: "Mise à jour en cours..." sync_failed: "Impossible de synchroniser l'URL. Veuillez réessayer ultérieurement" + confirmation_required: "Confirmation requise" + confirm_delete_import: "Êtes-vous sur de vouloir supprimer cet import iCalendar ?" + delete_success: "L'import iCalendar a bien été supprimé" project_elements: # gestion des éléments constituant les projets diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index d6795c2b4..a908d7da0 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -88,6 +88,28 @@ pt: view_reservations: "Ver reservas" # translation_missing legend: "legenda" + icalendar: + icalendar: + icalendar_import: "iCalendar import" # translation_missing + intro: "Fab-manager allows to automatically import calendar events, at RFC 5545 iCalendar format, from external URL. These URL are synchronized every nights and the events are shown in the public calendar." # translation_missing + new_import: "New ICS import" # translation_missing + color: "Colour" # translation_missing + text_color: "Text colour" # translation_missing + url: "URL" # translation_missing + name: "Name" # translation_missing + example: "Example" # translation_missing + display: "Display" # translation_missing + hide_text: "Hide the text" # translation_missing + hidden: "Hidden" # translation_missing + shown: "Shown" # translation_missing + create_error: "Unable to create iCalendar import. Please try again later" # translation_missing + delete_failed: "Unable to delete the iCalendar import. Please try again later" # translation_missing + refresh: "Updating..." # translation_missing + sync_failed: "Unable to synchronize the URL. Please try again later" # translation_missing + confirmation_required: "Confirmation required" # translation_missing + confirm_delete_import: "Do you really want to delete this iCalendar import?" # translation_missing + delete_success: "iCalendar import successfully deleted" # translation_missing + project_elements: # management of the projects' components project_elements: From 538b5cef7839194bad145a5a6818558b341ae837 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 3 Dec 2019 11:27:20 +0100 Subject: [PATCH 058/135] add/remove ical imports in public agenda also: a little of refacftoring in CalendarController --- .../javascripts/controllers/calendar.js | 111 ++++++++++++------ config/locales/app.public.en.yml | 1 + config/locales/app.public.es.yml | 1 + config/locales/app.public.pt.yml | 1 + 4 files changed, 76 insertions(+), 38 deletions(-) diff --git a/app/assets/javascripts/controllers/calendar.js b/app/assets/javascripts/controllers/calendar.js index f307a9e35..4f60257c5 100644 --- a/app/assets/javascripts/controllers/calendar.js +++ b/app/assets/javascripts/controllers/calendar.js @@ -39,7 +39,7 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ $scope.spaces = spacesPromise.filter(t => !t.disabled); // List of external iCalendar sources - $scope.externals = iCalendarPromise; + $scope.externals = iCalendarPromise.map(e => Object.assign(e, { checked: true })); // add availabilities source to event sources $scope.eventSources = []; @@ -56,14 +56,25 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ dispo: filter.dispo }); $scope.calendarConfig.events = availabilitySourceUrl(); - $scope.externals.filter(e => e.checked).forEach(e => { - $scope.eventSources.push({ - url: `/api/i_calendar/${e.id}/events`, - textColor: e.text_color, - color: e.color - }); + // external iCalendar events sources + $scope.externals.forEach(e => { + if (e.checked) { + if (!$scope.eventSources.some(evt => evt.id === e.id)) { + $scope.eventSources.push({ + id: e.id, + url: `/api/i_calendar/${e.id}/events`, + textColor: e.text_color || '#000', + color: e.color + }); + } + } else { + if ($scope.eventSources.some(evt => evt.id === e.id)) { + const idx = $scope.eventSources.findIndex(evt => evt.id === e.id); + $scope.eventSources.splice(idx, 1); + } + } }); - return uiCalendarConfig.calendars.calendar.fullCalendar('refetchEvents'); + uiCalendarConfig.calendars.calendar.fullCalendar('refetchEventSources'); }; /** @@ -73,7 +84,7 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ $scope.calendarStyle = function (calendar) { return { 'border-color': calendar.color, - 'color': calendar.text_color, + 'color': calendar.text_color }; }; @@ -142,8 +153,49 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ /* PRIVATE SCOPE */ + /** + * Kind of constructor: these actions will be realized first when the controller is loaded + */ + const initialize = () => { + // fullCalendar (v2) configuration + $scope.calendarConfig = CalendarConfig({ + events: availabilitySourceUrl(), + slotEventOverlap: true, + header: { + left: 'month agendaWeek agendaDay', + center: 'title', + right: 'today prev,next' + }, + minTime: moment.duration(moment(bookingWindowStart.setting.value).format('HH:mm:ss')), + maxTime: moment.duration(moment(bookingWindowEnd.setting.value).format('HH:mm:ss')), + defaultView: window.innerWidth <= 480 ? 'agendaDay' : 'agendaWeek', + eventClick (event, jsEvent, view) { + return calendarEventClickCb(event, jsEvent, view); + }, + viewRender (view, element) { + return viewRenderCb(view, element); + }, + eventRender (event, element, view) { + return eventRenderCb(event, element); + } + }); + $scope.externals.forEach(e => { + if (e.checked) { + $scope.eventSources.push({ + id: e.id, + url: `/api/i_calendar/${e.id}/events`, + textColor: e.text_color || '#000', + color: e.color + }); + } + }); + }; + + /** + * Callback triggered when an event object is clicked in the fullCalendar view + */ const calendarEventClickCb = function (event, jsEvent, view) { - // current calendar object + // current calendar object const { calendar } = uiCalendarConfig.calendars; if (event.available_type === 'machines') { currentMachineEvent = event; @@ -168,8 +220,8 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ // agendaDay view: disable slotEventOverlap // agendaWeek view: enable slotEventOverlap const toggleSlotEventOverlap = function (view) { - // set defaultView, because when we change slotEventOverlap - // ui-calendar will trigger rerender calendar + // set defaultView, because when we change slotEventOverlap + // ui-calendar will trigger rerender calendar $scope.calendarConfig.defaultView = view.type; const today = currentMachineEvent ? currentMachineEvent.start : moment().utc().startOf('day'); if ((today > view.intervalStart) && (today < view.intervalEnd) && (today !== view.intervalStart)) { @@ -184,15 +236,22 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ } }; - // function is called when calendar view is rendered or changed + /** + * This function is called when calendar view is rendered or changed + * @see https://fullcalendar.io/docs/v3/viewRender#v2 + */ const viewRenderCb = function (view, element) { toggleSlotEventOverlap(view); if (view.type === 'agendaDay') { - // get availabilties by 1 day for show machine slots + // get availabilties by 1 day for show machine slots return uiCalendarConfig.calendars.calendar.fullCalendar('refetchEvents'); } }; + /** + * Callback triggered by fullCalendar when it is about to render an event. + * @see https://fullcalendar.io/docs/v3/eventRender#v2 + */ const eventRenderCb = function (event, element) { if (event.tags && event.tags.length > 0) { let html = ''; @@ -212,30 +271,6 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$ var availabilitySourceUrl = () => `/api/availabilities/public?${$.param(getFilter())}`; - const initialize = () => - // fullCalendar (v2) configuration - $scope.calendarConfig = CalendarConfig({ - events: availabilitySourceUrl(), - slotEventOverlap: true, - header: { - left: 'month agendaWeek agendaDay', - center: 'title', - right: 'today prev,next' - }, - minTime: moment.duration(moment(bookingWindowStart.setting.value).format('HH:mm:ss')), - maxTime: moment.duration(moment(bookingWindowEnd.setting.value).format('HH:mm:ss')), - defaultView: window.innerWidth <= 480 ? 'agendaDay' : 'agendaWeek', - eventClick (event, jsEvent, view) { - return calendarEventClickCb(event, jsEvent, view); - }, - viewRender (view, element) { - return viewRenderCb(view, element); - }, - eventRender (event, element, view) { - return eventRenderCb(event, element); - } - }); - // !!! MUST BE CALLED AT THE END of the controller return initialize(); } diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml index ce9a26e9f..75575446a 100644 --- a/config/locales/app.public.en.yml +++ b/config/locales/app.public.en.yml @@ -306,6 +306,7 @@ en: machines: "Machines" spaces: "Spaces" events: "Events" + externals: "Other calendars" spaces_list: # list of spaces diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml index 75aa29a37..b5bceebfc 100644 --- a/config/locales/app.public.es.yml +++ b/config/locales/app.public.es.yml @@ -306,6 +306,7 @@ es: machines: "Máquinas" spaces: "Espacios" events: "Eventos" + externals: "Otros calendarios" spaces_list: # list of spaces diff --git a/config/locales/app.public.pt.yml b/config/locales/app.public.pt.yml index ff0fb170f..bd8088c68 100755 --- a/config/locales/app.public.pt.yml +++ b/config/locales/app.public.pt.yml @@ -306,6 +306,7 @@ pt: machines: "Máquinas" spaces: "Espaços" events: "Eventos" + externals: "Outras agendas" spaces_list: # list of spaces From 64fe68b2b0ce0d9e8843565e4280fa1896a162ed Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 3 Dec 2019 12:16:07 +0100 Subject: [PATCH 059/135] icalendar source sync: create/update/delete ical events --- app/controllers/api/i_calendar_controller.rb | 3 +-- app/models/i_calendar_event.rb | 6 +++++ app/services/i_calendar_import_service.rb | 24 ++++++++++++-------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/app/controllers/api/i_calendar_controller.rb b/app/controllers/api/i_calendar_controller.rb index b828b709d..76cd5beb1 100644 --- a/app/controllers/api/i_calendar_controller.rb +++ b/app/controllers/api/i_calendar_controller.rb @@ -36,8 +36,7 @@ class API::ICalendarController < API::ApiController end def sync - worker = ICalendarImportWorker.new - worker.perform([params[:id]]) + ICalendarImportWorker.perform_async([params[:id]]) render json: { processing: [params[:id]] }, status: :created end diff --git a/app/models/i_calendar_event.rb b/app/models/i_calendar_event.rb index b7b4897d0..bfa940e9b 100644 --- a/app/models/i_calendar_event.rb +++ b/app/models/i_calendar_event.rb @@ -3,4 +3,10 @@ # iCalendar (RFC 5545) event, belonging to an ICalendar object (its source) class ICalendarEvent < ActiveRecord::Base belongs_to :i_calendar + + def self.update_or_create_by(args, attributes) + obj = find_or_create_by(args) + obj.update(attributes) + obj + end end diff --git a/app/services/i_calendar_import_service.rb b/app/services/i_calendar_import_service.rb index 06b122bfe..2664436bd 100644 --- a/app/services/i_calendar_import_service.rb +++ b/app/services/i_calendar_import_service.rb @@ -7,25 +7,29 @@ class ICalendarImportService require 'uri' require 'icalendar' - events = [] + uids = [] i_cal = ICalendar.find(i_calendar_id) ics = Net::HTTP.get(URI.parse(i_cal.url)) cals = Icalendar::Calendar.parse(ics) + # create new events and update existings cals.each do |cal| cal.events.each do |evt| - events.push( - uid: evt.uid, - dtstart: evt.dtstart, - dtend: evt.dtend, - summary: evt.summary, - description: evt.description, - i_calendar_id: i_calendar_id + uids.push(evt.uid.to_s) + ICalendarEvent.update_or_create_by( + { uid: evt.uid.to_s }, + { + dtstart: evt.dtstart, + dtend: evt.dtend, + summary: evt.summary, + description: evt.description, + i_calendar_id: i_calendar_id + } ) end end - - ICalendarEvent.create!(events) + # remove deleted events + ICalendarEvent.where(i_calendar_id: i_calendar_id).where.not(uid: uids).destroy_all end end From 264f10e3e97cd9841732c4d73cde7522feb06ba9 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 3 Dec 2019 15:50:08 +0100 Subject: [PATCH 060/135] updated changelog --- CHANGELOG.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e36c9ad9b..abfc1150c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,9 @@ - Ability to create and delete periodic calendar availabilities (recurrence) - An administrator can delete a member - An event can be cancelled, if reservation cancellation is enabled -- Ability to configure the duration of a reservation slot. Previously, only 60 minutes slots were allowed -- Ability to show the scheduled events in the admin calendar +- Ability to import iCalendar agendas in the public calendar, through URLs to ICS files (RFC 5545) +- Ability to configure the duration of a reservation slot, using `SLOT_DURATION`. Previously, only 60 minutes slots were allowed +- Display the scheduled events in the admin calendar, depending on `EVENTS_IN_CALENDAR` configuration. - Display indications on required fields in new administrator form - Configuration of phone number in members registration forms: can be required or optional, depending on `PHONE_REQUIRED` configuration - Improved user experience in defining slots in the calendar management @@ -14,7 +15,7 @@ - Updated moment-timezone - Added freeCAD files as default allowed extensions - Fix a bug: unable to remove the picture from a training -- Fix a bug: report errors on admin creation +- Fix a bug: no alerts on errors during admin creation - Fix a security issue: updated loofah to fix [CVE-2019-15587](https://github.com/advisories/GHSA-c3gv-9cxf-6f57) - Fix a security issue: updated angular to 1.7.9 to fix [CVE-2019-10768](https://github.com/advisories/GHSA-89mq-4x47-5v83) - [TODO DEPLOY] add the `SLOT_DURATION` environment variable (see [doc/environment.md](doc/environment.md#SLOT_DURATION) for configuration details) From f50e45d2de3bc2aef29144fc295f02545594418b Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 3 Dec 2019 16:32:59 +0100 Subject: [PATCH 061/135] rake task to sync users with stripe --- CHANGELOG.md | 1 + app/workers/stripe_worker.rb | 18 ++++++++---------- doc/environment.md | 3 ++- lib/tasks/fablab/stripe.rake | 12 ++++++++++++ 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 370bd70f7..58b56bddb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Handle Ctrl^C in upgrade scripts - Updated moment-timezone - Added freeCAD files as default allowed extensions +- Rake task to sync local users with Stripe - Fix a bug: unable to remove the picture from a training - Fix a bug: no alerts on errors during admin creation - Fix a bug: replaces all Time.now by DateTime.current to prevent time zones issues [Taiga#134] diff --git a/app/workers/stripe_worker.rb b/app/workers/stripe_worker.rb index d3b8d0d5e..b45f50ce2 100644 --- a/app/workers/stripe_worker.rb +++ b/app/workers/stripe_worker.rb @@ -1,6 +1,9 @@ +# frozen_string_literal: true + +# This worker perform various requests to the Stripe API (payment service) class StripeWorker include Sidekiq::Worker - sidekiq_options :queue => :stripe + sidekiq_options queue: :stripe def perform(action, *params) send(action, *params) @@ -18,8 +21,8 @@ class StripeWorker def create_stripe_coupon(coupon_id) coupon = Coupon.find(coupon_id) stp_coupon = { - id: coupon.code, - duration: coupon.validity_per_user, + id: coupon.code, + duration: coupon.validity_per_user } if coupon.type == 'percent_off' stp_coupon[:percent_off] = coupon.percent_off @@ -28,13 +31,8 @@ class StripeWorker stp_coupon[:currency] = Rails.application.secrets.stripe_currency end - unless coupon.valid_until.nil? - stp_coupon[:redeem_by] = coupon.valid_until.to_i - end - stp_coupon - unless coupon.max_usages.nil? - stp_coupon[:max_redemptions] = coupon.max_usages - end + stp_coupon[:redeem_by] = coupon.valid_until.to_i unless coupon.valid_until.nil? + stp_coupon[:max_redemptions] = coupon.max_usages unless coupon.max_usages.nil? Stripe::Coupon.create(stp_coupon) end diff --git a/doc/environment.md b/doc/environment.md index a3c1fd0ca..23d962d94 100644 --- a/doc/environment.md +++ b/doc/environment.md @@ -61,6 +61,7 @@ Retrieve them from https://dashboard.stripe.com/account/apikeys. **MANDATORY**: Even if you don't want to charge your customers, you must fill this settings. For this purpose, you can use a stripe account in test mode, which will provide you test keys. +If you change these keys during the application lifecycle, you must run `rake fablab:stripe:sync_members`, otherwise your users won't be able to do card payments. STRIPE_CURRENCY @@ -229,7 +230,7 @@ The check will run every weeks and if the threshold is exceeded, an alert will b ADMIN_EMAIL, ADMIN_PASSWORD Credentials for the first admin user created when seeding the project. -By default, theses variables are not present in application.yml because they are only used once, when running the database seed with the command `rake db:seed. +By default, theses variables are not present in application.yml because they are only used once, when running the database seed with the command `rake db:seed`. SUPERADMIN_EMAIL diff --git a/lib/tasks/fablab/stripe.rake b/lib/tasks/fablab/stripe.rake index 6f1249e95..e406b4aee 100644 --- a/lib/tasks/fablab/stripe.rake +++ b/lib/tasks/fablab/stripe.rake @@ -45,5 +45,17 @@ namespace :fablab do File.write(cassette_file, cassette) end end + + desc 'sync users to the stripe database' + task sync_members: :environment do + User.with_role(:member).each do |member| + begin + stp_customer = Stripe::Customer.retrieve member.stp_customer_id + StripeWorker.perform_async(:create_stripe_customer, member.id) if stp_customer.nil? || stp_customer[:deleted] + rescue Stripe::InvalidRequestError + StripeWorker.perform_async(:create_stripe_customer, member.id) + end + end + end end end From 22ae8d5073c414f19ca0a191c70e952e4c736547 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 3 Dec 2019 17:15:32 +0100 Subject: [PATCH 062/135] updated and refactored readme updated instructions to setup a development environment splitted readme into multiple files to improve clarity --- CHANGELOG.md | 1 + README.md | 308 +----------------- doc/development_readme.md | 231 +++++++++++++ .../README.md => doc/docker-compose_readme.md | 0 doc/translation_readme.md | 75 +++++ 5 files changed, 319 insertions(+), 296 deletions(-) create mode 100644 doc/development_readme.md rename docker/README.md => doc/docker-compose_readme.md (100%) create mode 100644 doc/translation_readme.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 58b56bddb..b5271df47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Updated moment-timezone - Added freeCAD files as default allowed extensions - Rake task to sync local users with Stripe +- Updated and refactored README - Fix a bug: unable to remove the picture from a training - Fix a bug: no alerts on errors during admin creation - Fix a bug: replaces all Time.now by DateTime.current to prevent time zones issues [Taiga#134] diff --git a/README.md b/README.md index 458c69baf..9948f4245 100644 --- a/README.md +++ b/README.md @@ -10,26 +10,13 @@ FabManager is the Fab Lab management solution. It provides a comprehensive, web- 1. [Software stack](#software-stack) 2. [Contributing](#contributing) 3. [Setup a production environment](#setup-a-production-environment) -4. [Setup a development environment](#setup-a-development-environment)
    -4.1. [General Guidelines](#general-guidelines)
    -5. [PostgreSQL](#postgresql)
    -5.1. [Install PostgreSQL 9.6](#setup-postgresql) -6. [ElasticSearch](#elasticsearch)
    -6.1. [Install ElasticSearch](#setup-elasticsearch)
    -6.2. [Rebuild statistics](#rebuild-stats)
    -6.3. [Backup and Restore](#backup-and-restore-elasticsearch) -7. [Internationalization (i18n)](#i18n)
    -7.1. [Translation](#i18n-translation)
    -7.1.1. [Front-end translations](#i18n-translation-front)
    -7.1.2. [Back-end translations](#i18n-translation-back)
    -7.2. [Configuration](#i18n-configuration)
    -7.2.1. [Settings](#i18n-settings)
    -7.2.2. [Applying changes](#i18n-apply) -8. [Open Projects](#open-projects) -9. [Plugins](#plugins) -10. [Single Sign-On](#sso) -11. [Known issues](#known-issues) -12. [Related Documentation](#related-documentation) +4. [Setup a development environment](#setup-a-development-environment) +5. [Internationalization (i18n)](#i18n) +6. [Open Projects](#open-projects) +7. [Plugins](#plugins) +8. [Single Sign-On](#sso) +9. [Known issues](#known-issues) +10. [Related Documentation](#related-documentation) @@ -54,293 +41,22 @@ Contributions are welcome. Please read [the contribution guidelines](CONTRIBUTIN ## Setup a production environment To run fab-manager as a production application, this is highly recommended to use [Docker-compose](https://docs.docker.com/compose/overview/). -The procedure to follow is described in the [docker-compose readme](docker/README.md). +The procedure to follow is described in the [docker-compose readme](doc/docker-compose_readme.md). ## Setup a development environment -In you intend to run fab-manager on your local machine to contribute to the project development, you can set it up with the following procedure. +In you intend to run fab-manager on your local machine to contribute to the project development, you can set it up by following the [development readme](doc/development_readme.md). +This procedure relies on docker to set-up the dependencies. -This procedure is not easy to follow so if you don't need to write some code for Fab-manager, please prefer the [docker-compose installation method](docker/README.md). - -Optionally, you can use a virtual development environment that relies on Vagrant and Virtual Box by following the [virtual machine instructions](doc/virtual-machine.md). - - -### General Guidelines - -1. Install RVM, with the ruby version specified in the [.ruby-version file](.ruby-version). - For more details about the process, please read the [official RVM documentation](http://rvm.io/rvm/install). - If you're using ArchLinux, you may have to [read this](doc/archlinux_readme.md) before. - -2. Install NVM, with the node.js version specified in the [.nvmrc file](.nvmrc). - For instructions about installing NVM, please refer to [the NVM readme](https://github.com/creationix/nvm#installation). - -3. Install Yarn, the front-end package manager. - Depending on your system, the installation process may differ, please read the [official Yarn documentation](https://yarnpkg.com/en/docs/install#debian-stable). - -4. Install docker. - Your system may provide a pre-packaged version of docker in its repositories, but this version may be outdated. - Please refer to [ubuntu](https://docs.docker.com/install/linux/docker-ce/ubuntu/), [debian](https://docs.docker.com/install/linux/docker-ce/debian/) or [MacOS](https://docs.docker.com/docker-for-mac/install/) documentation to setup a recent version of docker. - -5. Add your current user to the docker group, to allow using docker without `sudo`. - ```bash - # add the docker group if it doesn't already exist - sudo groupadd docker - # add the current user to the docker group - sudo usermod -aG docker $(whoami) - # restart to validate changes - sudo reboot - ``` - -6. Create a docker network for fab-manager. - You may have to change the network address if it is already in use. - ```bash - docker network create --subnet=172.18.0.0/16 fabmanager - ``` - -7. Retrieve the project from Git - - ```bash - git clone https://github.com/sleede/fab-manager.git - ``` - -8. Install the software dependencies. - First install [PostgreSQL](#postgresql) and [ElasticSearch](#elasticsearch) as specified in their respective documentations. - Then install the other dependencies: - - For Ubuntu/Debian: - - ```bash - # on Ubuntu 18.04 server, you may have to enable the "universe" repository - sudo add-apt-repository universe - # then, install the dependencies - sudo apt-get install libpq-dev redis-server imagemagick - ``` - - For MacOS X: - - ```bash - brew install redis imagemagick - ``` - -9. Init the RVM and NVM instances and check they were correctly configured - - ```bash - cd fab-manager - rvm current | grep -q `cat .ruby-version`@fab-manager && echo "ok" - # Must print ok - nvm use - node --version | grep -q `cat .nvmrc` && echo "ok" - # Must print ok - ``` - -10. Install bundler in the current RVM gemset - - ```bash - gem install bundler --version=1.17.3 - ``` - -11. Install the required ruby gems and javascript plugins - - ```bash - bundle install - yarn install - ``` - -12. Create the default configuration files **and configure them!** (see the [environment configuration documentation](doc/environment.md)) - - ```bash - cp config/database.yml.default config/database.yml - cp config/application.yml.default config/application.yml - vi config/application.yml - # or use your favorite text editor instead of vi (nano, ne...) - ``` - -13. Build the databases. - - **Warning**: **DO NOT** run `rake db:setup` instead of these commands, as this will not run some required raw SQL instructions. - - **Please note**: Your password length must be between 8 and 128 characters, otherwise db:seed will be rejected. This is configured in [config/initializers/devise.rb](config/initializers/devise.rb) - - ```bash - # for dev - rake db:create - rake db:migrate - ADMIN_EMAIL='youradminemail' ADMIN_PASSWORD='youradminpassword' rake db:seed - rake fablab:es:build_stats - # for tests - RAILS_ENV=test rake db:create - RAILS_ENV=test rake db:migrate - ``` - -14. Create the pids folder used by Sidekiq. If you want to use a different location, you can configure it in `config/sidekiq.yml` - - ```bash - mkdir -p tmp/pids - ``` - -15. Start the development web server - - ```bash - foreman s -p 3000 - ``` - -16. You should now be able to access your local development FabManager instance by accessing `http://localhost:3000` in your web browser. - -17. You can login as the default administrator using the credentials defined previously. - -18. Email notifications will be caught by MailCatcher. - To see the emails sent by the platform, open your web browser at `http://localhost:1080` to access the MailCatcher interface. - - - -## PostgreSQL - - -### Install PostgreSQL 9.6 - -We will use docker to easily install the required version of PostgreSQL. - -1. Create the docker binding folder - ```bash - mkdir -p .docker/postgresql - ``` - -2. Start the PostgreSQL container. - ```bash - docker run --restart=always -d --name fabmanager-postgres \ - -v $(pwd)/.docker/postgresql:/var/lib/postgresql/data \ - --network fabmanager --ip 172.18.0.2 \ - -p 5432:5432 \ - postgres:9.6 - ``` - -3. Configure fab-manager to use it. - On linux systems, PostgreSQL will be available at 172.18.0.2. - On MacOS, you'll have to set the host to 127.0.0.1 (or localhost). - See [environment.md](doc/environment.md) for more details. - -4 . Finally, you may want to have a look at detailed informations about PostgreSQL usage in fab-manager. - Some information about that is available in the [PostgreSQL Readme](doc/postgresql_readme.md). - - -## ElasticSearch - -ElasticSearch is a powerful search engine based on Apache Lucene combined with a NoSQL database used as a cache to index data and quickly process complex requests on it. - -In FabManager, it is used for the admin's statistics module and to perform searches in projects. - - -### Install ElasticSearch - -1. Create the docker binding folders - ```bash - mkdir -p .docker/elasticsearch/config - mkdir -p .docker/elasticsearch/plugins - mkdir -p .docker/elasticsearch/backups - ``` - -2. Copy the default configuration files - ```bash - cp docker/elasticsearch.yml .docker/elasticsearch/config - cp docker/log4j2.properties .docker/elasticsearch/config - ``` - -3. Start the ElasticSearch container. - ```bash - docker run --restart=always -d --name fabmanager-elastic \ - -v $(pwd)/.docker/elasticsearch/config:/usr/share/elasticsearch/config \ - -v $(pwd)/.docker/elasticsearch:/usr/share/elasticsearch/data \ - -v $(pwd)/.docker/elasticsearch/plugins:/usr/share/elasticsearch/plugins \ - -v $(pwd)/.docker/elasticsearch/backups:/usr/share/elasticsearch/backups \ - --network fabmanager --ip 172.18.0.3 \ - -p 9200:9200 -p 9300:9300 \ - elasticsearch:5.6 - ``` - -4. Configure fab-manager to use it. - On linux systems, ElasticSearch will be available at 172.18.0.3. - On MacOS, you'll have to set the host to 127.0.0.1 (or localhost). - See [environment.md](doc/environment.md) for more details. - - -### Rebuild statistics - -Every nights, the statistics for the day that just ended are built automatically at 01:00 (AM) and stored in ElastricSearch. -See [schedule.yml](config/schedule.yml) to modify this behavior. -If the scheduled task wasn't executed for any reason (eg. you are in a dev environment and your computer was turned off at 1 AM), you can force the statistics data generation in ElasticSearch, running the following command. - -```bash -# Here for the 50 last days -rake fablab:es:generate_stats[50] -``` - - -### Backup and Restore - -To backup and restore the ElasticSearch database, use the [elasticsearch-dump](https://github.com/taskrabbit/elasticsearch-dump) tool. - -Dump the database with: `elasticdump --input=http://localhost:9200/stats --output=fablab_stats.json`. -Restore it with: `elasticdump --input=fablab_stats.json --output=http://localhost:9200/stats`. +Optionally, you can use a virtual development environment that relies on Vagrant and Virtual Box by following the [virtual machine instructions](virtual-machine.md). ## Internationalization (i18n) The FabManager application can only run in a single language but this language can easily be changed. - -### Translation - -Check the files located in `config/locales`: - -- Front app translations (angular.js) are located in `config/locales/app.scope.XX.yml`. - Where scope has one the following meaning : - - admin: translations of the administrator views (manage and configure the FabLab). - - logged: translations of the end-user's views accessible only to connected users. - - public: translation of end-user's views publicly accessible to anyone. - - shared: translations shared by many views (like forms or buttons). -- Back app translations (Ruby on Rails) are located in `config/locales/XX.yml`. -- Emails translations are located in `config/locales/mails.XX.yml`. -- Messages related to the authentication system are located in `config/locales/devise.XX.yml`. - -If you plan to translate the application to a new locale, please consider that the reference translation is French. -Indeed, in some cases, the English texts/sentences can seems confuse or lack of context as they were originally translated from French. - -To prevent syntax mistakes while translating locale files, we **STRONGLY advise** you to use a text editor which support syntax coloration for YML and Ruby. - - -#### Front-end translations - -Front-end translations uses [angular-translate](http://angular-translate.github.io) with some interpolations interpreted by angular.js and other interpreted by [MessageFormat](https://github.com/SlexAxton/messageformat.js/). -**These two kinds of interpolation use a near but different syntax witch SHOULD NOT be confused.** -Please refer to the official [angular-translate documentation](http://angular-translate.github.io/docs/#/guide/14_pluralization) before translating. - - -#### Back-end translations - -Back-end translations uses the [Ruby on Rails syntax](http://guides.rubyonrails.org/i18n.html) but some complex interpolations are interpreted by [MessageFormat](https://github.com/format-message/message-format-rb) and are marked as it in comments. -**DO NOT confuse the syntaxes.** - -In each cases, some inline comments are included in the localisation files. -They can be recognized as they start with the sharp character (#). -These comments are not required to be translated, they are intended to help the translator to have some context information about the sentence to translate. - -You will also need to translate the invoice watermark, located in `app/pdfs/data/`. -You'll find there the [GIMP source of the image](app/pdfs/data/watermark.xcf), which is using [Rubik Mono One](https://fonts.google.com/specimen/Rubik+Mono+One) as font. -Use it to generate a similar localised PNG image which keep the default image size, as PDF are not responsive. - - - -### Configuration - -Locales configurations are made in `config/application.yml`. -If you are in a development environment, your can keep the default values, otherwise, in production, values must be configured carefully. - - -#### Settings - -Please refer to the [environment configuration documentation](doc/environment.md#internationalization-settings) - - -#### Applying changes - -After modifying any values concerning the localisation, restart the application (ie. web server) to apply these changes in the i18n configuration. +Please refer to the [translation readme](doc/translation_readme.md) for instructions about configuring the language or to contribute to the translation. ## Open Projects diff --git a/doc/development_readme.md b/doc/development_readme.md new file mode 100644 index 000000000..a3d3af8f3 --- /dev/null +++ b/doc/development_readme.md @@ -0,0 +1,231 @@ +# Install Fab-Manager in a development environment with Docker + +This document will guide you through all the steps needed to set up a development environment for Fab-Manager. + +##### Table of contents + +1. [General Guidelines](#general-guidelines)
    +2. [PostgreSQL](#postgresql)
    +2.1. [Install PostgreSQL 9.6](#setup-postgresql) +3. [ElasticSearch](#elasticsearch)
    +3.1. [Install ElasticSearch](#setup-elasticsearch)
    +3.2. [Rebuild statistics](#rebuild-stats)
    +3.3. [Backup and Restore](#backup-and-restore-elasticsearch) + +This procedure is not easy to follow so if you don't need to write some code for Fab-manager, please prefer the [docker-compose installation method](docker-compose_readme.md). + + + +## General Guidelines + +1. Install RVM, with the ruby version specified in the [.ruby-version file](../.ruby-version). + For more details about the process, please read the [official RVM documentation](http://rvm.io/rvm/install). + If you're using ArchLinux, you may have to [read this](archlinux_readme.md) before. + +2. Install NVM, with the node.js version specified in the [.nvmrc file](../.nvmrc). + For instructions about installing NVM, please refer to [the NVM readme](https://github.com/nvm-sh/nvm#installation-and-update). + +3. Install Yarn, the front-end package manager. + Depending on your system, the installation process may differ, please read the [official Yarn documentation](https://yarnpkg.com/en/docs/install#debian-stable). + +4. Install docker. + Your system may provide a pre-packaged version of docker in its repositories, but this version may be outdated. + Please refer to [ubuntu](https://docs.docker.com/install/linux/docker-ce/ubuntu/), [debian](https://docs.docker.com/install/linux/docker-ce/debian/) or [MacOS](https://docs.docker.com/docker-for-mac/install/) documentation to setup a recent version of docker. + +5. Add your current user to the docker group, to allow using docker without `sudo`. + ```bash + # add the docker group if it doesn't already exist + sudo groupadd docker + # add the current user to the docker group + sudo usermod -aG docker $(whoami) + # restart to validate changes + sudo reboot + ``` + +6. Create a docker network for fab-manager. + You may have to change the network address if it is already in use. + >  If you're using MacOS, this is not required. + ```bash + docker network create --subnet=172.18.0.0/16 fabmanager + ``` + +7. Retrieve the project from Git + + ```bash + git clone https://github.com/sleede/fab-manager.git + ``` + +8. Install the software dependencies. + First install [PostgreSQL](#postgresql) and [ElasticSearch](#elasticsearch) as specified in their respective documentations (see below). + Then install the other dependencies: + - For Ubuntu/Debian: + + ```bash + # on Ubuntu 18.04 server, you may have to enable the "universe" repository + sudo add-apt-repository universe + # then, install the dependencies + sudo apt-get install libpq-dev redis-server imagemagick + ``` + - For MacOS X: + + ```bash + brew install redis imagemagick + ``` + +9. Init the RVM and NVM instances and check they were correctly configured + + ```bash + cd fab-manager + rvm current | grep -q `cat .ruby-version`@fab-manager && echo "ok" + # Must print ok + nvm use + node --version | grep -q `cat .nvmrc` && echo "ok" + # Must print ok + ``` + +10. Install bundler in the current RVM gemset + + ```bash + gem install bundler --version=1.17.3 + ``` + +11. Install the required ruby gems and javascript plugins + + ```bash + bundle install + yarn install + ``` + +12. Create the default configuration files **and configure them!** (see the [environment configuration documentation](doc/environment.md)) + + ```bash + cp config/database.yml.default config/database.yml + cp config/application.yml.default config/application.yml + vi config/application.yml + # or use your favorite text editor instead of vi (nano, ne...) + ``` + +13. Build the databases. + - **Warning**: **DO NOT** run `rake db:setup` instead of these commands, as this will not run some required raw SQL instructions. + - **Please note**: Your password length must be between 8 and 128 characters, otherwise db:seed will be rejected. This is configured in [config/initializers/devise.rb](config/initializers/devise.rb) + + ```bash + # for dev + rake db:create + rake db:migrate + ADMIN_EMAIL='youradminemail' ADMIN_PASSWORD='youradminpassword' rake db:seed + rake fablab:es:build_stats + # for tests + RAILS_ENV=test rake db:create + RAILS_ENV=test rake db:migrate + ``` + +14. Create the pids folder used by Sidekiq. If you want to use a different location, you can configure it in `config/sidekiq.yml` + + ```bash + mkdir -p tmp/pids + ``` + +15. Start the development web server + + ```bash + foreman s -p 3000 + ``` + +16. You should now be able to access your local development FabManager instance by accessing `http://localhost:3000` in your web browser. + +17. You can login as the default administrator using the credentials defined previously. + +18. Email notifications will be caught by MailCatcher. + To see the emails sent by the platform, open your web browser at `http://localhost:1080` to access the MailCatcher interface. + + + +## PostgreSQL + + +### Install PostgreSQL 9.6 + +We will use docker to easily install the required version of PostgreSQL. + +1. Create the docker binding folder + ```bash + mkdir -p .docker/postgresql + ``` + +2. Start the PostgreSQL container. + >  If you're using MacOS, remove the --network and --ip parameters, and add -p 5432:5432. + ```bash + docker run --restart=always -d --name fabmanager-postgres \ + -v $(pwd)/.docker/postgresql:/var/lib/postgresql/data \ + --network fabmanager --ip 172.18.0.2 \ + postgres:9.6 + ``` + +3. Configure fab-manager to use it. + On linux systems, PostgreSQL will be available at 172.18.0.2. + On MacOS, you'll have to set the host to 127.0.0.1 (or localhost). + See [environment.md](doc/environment.md) for more details. + +4 . Finally, you may want to have a look at detailed informations about PostgreSQL usage in fab-manager. + Some information about that is available in the [PostgreSQL Readme](doc/postgresql_readme.md). + + +## ElasticSearch + +ElasticSearch is a powerful search engine based on Apache Lucene combined with a NoSQL database used as a cache to index data and quickly process complex requests on it. + +In FabManager, it is used for the admin's statistics module and to perform searches in projects. + + +### Install ElasticSearch + +1. Create the docker binding folders + ```bash + mkdir -p .docker/elasticsearch/config + mkdir -p .docker/elasticsearch/plugins + mkdir -p .docker/elasticsearch/backups + ``` + +2. Copy the default configuration files + ```bash + cp docker/elasticsearch.yml .docker/elasticsearch/config + cp docker/log4j2.properties .docker/elasticsearch/config + ``` + +3. Start the ElasticSearch container. + >  If you're using MacOS, remove the --network and --ip parameters, and add -p 9200:9200. + ```bash + docker run --restart=always -d --name fabmanager-elastic \ + -v $(pwd)/.docker/elasticsearch/config:/usr/share/elasticsearch/config \ + -v $(pwd)/.docker/elasticsearch:/usr/share/elasticsearch/data \ + -v $(pwd)/.docker/elasticsearch/plugins:/usr/share/elasticsearch/plugins \ + -v $(pwd)/.docker/elasticsearch/backups:/usr/share/elasticsearch/backups \ + --network fabmanager --ip 172.18.0.3 \ + elasticsearch:5.6 + ``` + +4. Configure fab-manager to use it. + On linux systems, ElasticSearch will be available at 172.18.0.3. + On MacOS, you'll have to set the host to 127.0.0.1 (or localhost). + See [environment.md](doc/environment.md) for more details. + + +### Rebuild statistics + +Every nights, the statistics for the day that just ended are built automatically at 01:00 (AM) and stored in ElastricSearch. +See [schedule.yml](config/schedule.yml) to modify this behavior. +If the scheduled task wasn't executed for any reason (eg. you are in a dev environment and your computer was turned off at 1 AM), you can force the statistics data generation in ElasticSearch, running the following command. + +```bash +# Here for the 50 last days +rake fablab:es:generate_stats[50] +``` + + +### Backup and Restore + +To backup and restore the ElasticSearch database, use the [elasticsearch-dump](https://github.com/taskrabbit/elasticsearch-dump) tool. + +Dump the database with: `elasticdump --input=http://localhost:9200/stats --output=fablab_stats.json`. +Restore it with: `elasticdump --input=fablab_stats.json --output=http://localhost:9200/stats`. diff --git a/docker/README.md b/doc/docker-compose_readme.md similarity index 100% rename from docker/README.md rename to doc/docker-compose_readme.md diff --git a/doc/translation_readme.md b/doc/translation_readme.md new file mode 100644 index 000000000..17667785f --- /dev/null +++ b/doc/translation_readme.md @@ -0,0 +1,75 @@ +# Fab-Manager translation documentation + +This document will explain you what you need to know to contribute to the translation process of Fab-Manager. + +##### Table of contents + +1. [Translation](#i18n-translation)
    +1.1. [Front-end translations](#i18n-translation-front)
    +1.2. [Back-end translations](#i18n-translation-back) +2. [Configuration](#i18n-configuration)
    +2.1. [Settings](#i18n-settings)
    +2.2. [Applying changes](#i18n-apply) + + +## Translation + +First, consider that it can be a good idea to setup a development environment to contribute to the software translation. +This is not mandatory, but this will allow you to test your changes in context and see if anything went wrong, especially with the special syntaxes. +Please refer to the [development readme](development_readme.md) or to the [virtual machine instructions](virtual-machine.md) to setup such an environment. + +Once done, check the files located in `config/locales`: + +- Front app translations (angular.js) are located in `config/locales/app.scope.XX.yml`. + Where scope has one the following meaning : + - admin: translations of the administrator views (manage and configure the FabLab). + - logged: translations of the end-user's views accessible only to connected users. + - public: translation of end-user's views publicly accessible to anyone. + - shared: translations shared by many views (like forms or buttons). +- Back app translations (Ruby on Rails) are located in `config/locales/XX.yml`. +- Emails translations are located in `config/locales/mails.XX.yml`. +- Messages related to the authentication system are located in `config/locales/devise.XX.yml`. + +If you plan to translate the application to a new locale, please consider that the reference translation is French. +Indeed, in some cases, the English texts/sentences can seems confuse or lack of context as they were originally translated from French. + +To prevent syntax mistakes while translating locale files, we **STRONGLY advise** you to use a text editor which support syntax coloration for YML and Ruby. +As an example, [Visual Studio Code](https://code.visualstudio.com/), with the [Ruby extension](https://marketplace.visualstudio.com/items?itemName=rebornix.Ruby) and the [YAML extension](https://marketplace.visualstudio.com/items?itemName=redhat.vscode-yaml) will do the job. + + +### Front-end translations + +Front-end translations uses [angular-translate](http://angular-translate.github.io) with some interpolations interpreted by angular.js and other interpreted by [MessageFormat](https://github.com/SlexAxton/messageformat.js/). +**These two kinds of interpolation use a near but different syntax witch SHOULD NOT be confused.** +Please refer to the official [angular-translate documentation](http://angular-translate.github.io/docs/#/guide/14_pluralization) before translating. + + +### Back-end translations + +Back-end translations uses the [Ruby on Rails syntax](http://guides.rubyonrails.org/i18n.html) but some complex interpolations are interpreted by [MessageFormat](https://github.com/format-message/message-format-rb) and are marked as it in comments. +**DO NOT confuse the syntaxes.** + +In each cases, some inline comments are included in the localisation files. +They can be recognized as they start with the sharp character (#). +These comments are not required to be translated, they are intended to help the translator to have some context information about the sentence to translate. + +You will also need to translate the invoice watermark, located in `app/pdfs/data/`. +You'll find there the [GIMP source of the image](app/pdfs/data/watermark.xcf), which is using [Rubik Mono One](https://fonts.google.com/specimen/Rubik+Mono+One) as font. +Use it to generate a similar localised PNG image which keep the default image size, as PDF are not responsive. + + + +## Configuration + +Locales configurations are made in `config/application.yml`. +If you are in a development environment, your can keep the default values, otherwise, in production, values must be configured carefully. + + +### Settings + +Please refer to the [environment configuration documentation](doc/environment.md#internationalization-settings) + + +### Applying changes + +After modifying any values concerning the localisation, restart the application (ie. web server) to apply these changes in the i18n configuration. From 33ab2ec7d7f9dfe313d3070bda96aec002489719 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 3 Dec 2019 17:32:27 +0100 Subject: [PATCH 063/135] moved known issues to a separate doc --- README.md | 48 +--------------------------- doc/development_readme.md | 14 ++++----- doc/docker-compose_readme.md | 14 ++++----- doc/known-issues.md | 61 ++++++++++++++++++++++++++++++++++++ doc/translation_readme.md | 5 +-- 5 files changed, 79 insertions(+), 63 deletions(-) create mode 100644 doc/known-issues.md diff --git a/README.md b/README.md index 9948f4245..886171eb0 100644 --- a/README.md +++ b/README.md @@ -106,53 +106,7 @@ Developers may find information on how to implement their own authentication pro ## Known issues -- When browsing a machine page, you may encounter an "InterceptError" in the console and the loading bar will stop loading before reaching its ending. - This may happen if the machine was created through a seed file without any image. - To solve this, simply add an image to the machine's profile and refresh the web page. - -- When starting the Ruby on Rails server (eg. `foreman s`) you may receive the following error: - - worker.1 | invalid url: redis::6379 - web.1 | Exiting - worker.1 | ...lib/redis/client.rb...:in `_parse_options' - - This may happen when the `application.yml` file is missing. - To solve this issue copy `config/application.yml.default` to `config/application.yml`. - This is required before the first start. - -- Due to a stripe limitation, you won't be able to create plans longer than one year. - -- When running the tests suite with `rake test`, all tests may fail with errors similar to the following: - - Error: - ... - ActiveRecord::InvalidForeignKey: PG::ForeignKeyViolation: ERROR: insert or update on table "..." violates foreign key constraint "fk_rails_..." - DETAIL: Key (group_id)=(1) is not present in table "...". - : ... - test_after_commit (1.0.0) lib/test_after_commit/database_statements.rb:11:in `block in transaction' - test_after_commit (1.0.0) lib/test_after_commit/database_statements.rb:5:in `transaction' - - This is due to an ActiveRecord behavior witch disable referential integrity in PostgreSQL to load the fixtures. - PostgreSQL will prevent any users to disable referential integrity on the fly if they doesn't have the `SUPERUSER` role. - To fix that, logon as the `postgres` user and run the PostgreSQL shell (see [the dedicated section](#run-postgresql-cli) for instructions). - Then, run the following command (replace `sleede` with your test database user, as specified in your database.yml): - - ALTER ROLE sleede WITH SUPERUSER; - - DO NOT do this in a production environment, unless you know what you're doing: this could lead to a serious security issue. - -- With Ubuntu 16.04, ElasticSearch may refuse to start even after having configured the service with systemd. - To solve this issue, you may have to set `START_DAEMON` to `true` in `/etc/default/elasticsearch`. - Then reload ElasticSearch with: - - ```bash - sudo systemctl restart elasticsearch.service - ``` -- In some cases, the invoices won't be generated. This can be due to the image included in the invoice header not being supported. - To fix this issue, change the image in the administrator interface (manage the invoices / invoices settings). - See [this thread](https://forum.fab-manager.com/t/resolu-erreur-generation-facture/428) for more info. - -- In the excel exports, if the cells expected to contain dates are showing strange numbers, check that you have correctly configured the [EXCEL_DATE_FORMAT](doc/environment.md#EXCEL_DATE_FORMAT) variable. +Before reporting an issue, please check if your issue is not listed in the [know issues](doc/known-issues.md) with its solution. ## Related Documentation diff --git a/doc/development_readme.md b/doc/development_readme.md index a3d3af8f3..afdb92a4e 100644 --- a/doc/development_readme.md +++ b/doc/development_readme.md @@ -44,7 +44,7 @@ This procedure is not easy to follow so if you don't need to write some code for 6. Create a docker network for fab-manager. You may have to change the network address if it is already in use. - >  If you're using MacOS, this is not required. + > 🍏 If you're using MacOS, this is not required. ```bash docker network create --subnet=172.18.0.0/16 fabmanager ``` @@ -96,7 +96,7 @@ This procedure is not easy to follow so if you don't need to write some code for yarn install ``` -12. Create the default configuration files **and configure them!** (see the [environment configuration documentation](doc/environment.md)) +12. Create the default configuration files **and configure them!** (see the [environment configuration documentation](environment.md)) ```bash cp config/database.yml.default config/database.yml @@ -154,7 +154,7 @@ We will use docker to easily install the required version of PostgreSQL. ``` 2. Start the PostgreSQL container. - >  If you're using MacOS, remove the --network and --ip parameters, and add -p 5432:5432. + > 🍏 If you're using MacOS, remove the --network and --ip parameters, and add -p 5432:5432. ```bash docker run --restart=always -d --name fabmanager-postgres \ -v $(pwd)/.docker/postgresql:/var/lib/postgresql/data \ @@ -165,10 +165,10 @@ We will use docker to easily install the required version of PostgreSQL. 3. Configure fab-manager to use it. On linux systems, PostgreSQL will be available at 172.18.0.2. On MacOS, you'll have to set the host to 127.0.0.1 (or localhost). - See [environment.md](doc/environment.md) for more details. + See [environment.md](environment.md) for more details. 4 . Finally, you may want to have a look at detailed informations about PostgreSQL usage in fab-manager. - Some information about that is available in the [PostgreSQL Readme](doc/postgresql_readme.md). + Some information about that is available in the [PostgreSQL Readme](postgresql_readme.md). ## ElasticSearch @@ -194,7 +194,7 @@ In FabManager, it is used for the admin's statistics module and to perform searc ``` 3. Start the ElasticSearch container. - >  If you're using MacOS, remove the --network and --ip parameters, and add -p 9200:9200. + > 🍏 If you're using MacOS, remove the --network and --ip parameters, and add -p 9200:9200. ```bash docker run --restart=always -d --name fabmanager-elastic \ -v $(pwd)/.docker/elasticsearch/config:/usr/share/elasticsearch/config \ @@ -208,7 +208,7 @@ In FabManager, it is used for the admin's statistics module and to perform searc 4. Configure fab-manager to use it. On linux systems, ElasticSearch will be available at 172.18.0.3. On MacOS, you'll have to set the host to 127.0.0.1 (or localhost). - See [environment.md](doc/environment.md) for more details. + See [environment.md](environment.md) for more details. ### Rebuild statistics diff --git a/doc/docker-compose_readme.md b/doc/docker-compose_readme.md index b7b08b334..8b833fdea 100644 --- a/doc/docker-compose_readme.md +++ b/doc/docker-compose_readme.md @@ -1,9 +1,9 @@ -# Install Fabmanager app in production with Docker +# Install Fab-Manager in production with docker-compose -This README tries to describe all the steps to put a fabmanager app into production on a server, based on a solution using Docker and Docker-compose. +This document will guide you through all the steps needed to set up your Fab-Manager app on a production server, based on a solution using Docker and Docker-compose. We recommend DigitalOcean, but these steps will work on any Docker-compatible cloud provider or local server. -In order to make it work, please use the same directories structure as described in this guide in your fabmanager app folder. +In order to make it work, please use the same directories structure as described in this guide in your Fab-Manager app folder. You will need to be root through the rest of the setup. ##### Table of contents @@ -57,7 +57,7 @@ On DigitalOcean, create a Droplet with One-click apps **"Docker on Ubuntu 16.04 This way, Docker and Docker-compose are preinstalled. Choose a datacenter and set the hostname as your domain name. -With other providers, choose a [supported operating system](https://github.com/sleede/fab-manager/blob/master/README.md#software-stack) and install docker on it: +With other providers, choose a [supported operating system](../README.md#software-stack) and install docker on it: - [Debian](https://docs.docker.com/engine/installation/linux/docker-ce/debian/) - [Ubuntu](https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/) @@ -68,9 +68,9 @@ Then install [Docker Compose](https://docs.docker.com/compose/install/) There are many domain name registrars on the internet, you may choose one that fit your needs. You can find an exhaustive list [on the ICANN website](https://www.icann.org/registrar-reports/accredited-list.html) -1. Once done, buy a domain name on it +1. Once done, buy a domain name on it 2. Replace the IP address of the domain with the IP address of your VPS (This is a DNS record type A) -3. **Do not** try to access your domain name right away, DNS are not aware of the change yet so **WAIT** and be patient. +3. **Do not** try to access your domain name right away, DNS are not aware of the change yet so **WAIT** and be patient. ### Connect through SSH @@ -111,7 +111,7 @@ vi config/env # or use your favorite text editor instead of vi (nano, ne...) ``` You need to carefully configure each variable before starting fab-manager. -Please refer to the [environment configuration documentation](../doc/environment.md) for explanations about those variables. +Please refer to the [environment configuration documentation](environment.md) for explanations about those variables. ### Setup nginx configuration diff --git a/doc/known-issues.md b/doc/known-issues.md new file mode 100644 index 000000000..64ed867c7 --- /dev/null +++ b/doc/known-issues.md @@ -0,0 +1,61 @@ +# Known issues + +This document is listing common known issues. + +> Production issues may also apply to development environments. + +##### Table of contents + +1. [Development](#development) +2. [Production](#production) + + +## Development + +- When starting the Ruby on Rails server (eg. `foreman s`) you may receive the following error: + + worker.1 | invalid url: redis::6379 + web.1 | Exiting + worker.1 | ...lib/redis/client.rb...:in `_parse_options' + + This may happen when the `application.yml` file is missing. + To solve this issue copy `config/application.yml.default` to `config/application.yml`. + This is required before the first start. + +- When running the tests suite with `rake test`, all tests may fail with errors similar to the following: + + Error: + ... + ActiveRecord::InvalidForeignKey: PG::ForeignKeyViolation: ERROR: insert or update on table "..." violates foreign key constraint "fk_rails_..." + DETAIL: Key (group_id)=(1) is not present in table "...". + : ... + test_after_commit (1.0.0) lib/test_after_commit/database_statements.rb:11:in `block in transaction' + test_after_commit (1.0.0) lib/test_after_commit/database_statements.rb:5:in `transaction' + + This is due to an ActiveRecord behavior witch disable referential integrity in PostgreSQL to load the fixtures. + PostgreSQL will prevent any users to disable referential integrity on the fly if they doesn't have the `SUPERUSER` role. + To fix that, logon as the `postgres` user and run the PostgreSQL shell (see [the dedicated section](#run-postgresql-cli) for instructions). + Then, run the following command (replace `sleede` with your test database user, as specified in your database.yml): + + ALTER ROLE sleede WITH SUPERUSER; + + DO NOT do this in a production environment, unless you know what you're doing: this could lead to a serious security issue. + + +## Production + +- Due to a stripe limitation, you won't be able to create plans longer than one year. + +- With Ubuntu 16.04, ElasticSearch may refuse to start even after having configured the service with systemd. + To solve this issue, you may have to set `START_DAEMON` to `true` in `/etc/default/elasticsearch`. + Then reload ElasticSearch with: + + ```bash + sudo systemctl restart elasticsearch.service + ``` + +- In some cases, the invoices won't be generated. This can be due to the image included in the invoice header not being supported. + To fix this issue, change the image in the administrator interface (manage the invoices / invoices settings). + See [this thread](https://forum.fab-manager.com/t/resolu-erreur-generation-facture/428) for more info. + +- In the excel exports, if the cells expected to contain dates are showing strange numbers, check that you have correctly configured the [EXCEL_DATE_FORMAT](environment.md#EXCEL_DATE_FORMAT) variable. diff --git a/doc/translation_readme.md b/doc/translation_readme.md index 17667785f..7607e4b27 100644 --- a/doc/translation_readme.md +++ b/doc/translation_readme.md @@ -61,13 +61,14 @@ Use it to generate a similar localised PNG image which keep the default image si ## Configuration -Locales configurations are made in `config/application.yml`. +In development, locales configurations are made in [config/application.yml](../config/application.yml.default). +In production, locales configuration are made in the [config/env](../docker/env.example) file. If you are in a development environment, your can keep the default values, otherwise, in production, values must be configured carefully. ### Settings -Please refer to the [environment configuration documentation](doc/environment.md#internationalization-settings) +Please refer to the [environment configuration documentation](environment.md#internationalization-settings) ### Applying changes From 2602010770eb6f6c6cb467b37efc2e83bdaff79c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 23:00:14 +0000 Subject: [PATCH 064/135] Bump puma from 3.10.0 to 3.12.2 Bumps [puma](https://github.com/puma/puma) from 3.10.0 to 3.12.2. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v3.10.0...v3.12.2) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index b69b1c8f9..736b8d43d 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gem 'compass-rails', '2.0.4' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.11.1' # Use Puma as web server -gem 'puma', '3.10.0' +gem 'puma', '3.12.2' # Use SCSS for stylesheets gem 'sass-rails', '5.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 0c1c06a6b..b9f503543 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -153,7 +153,7 @@ GEM execjs (2.7.0) faker (1.4.3) i18n (~> 0.5) - faraday (0.17) + faraday (0.17.0) multipart-post (>= 1.2, < 3) ffi (1.9.24) figaro (1.1.0) @@ -284,7 +284,7 @@ GEM protected_attributes (1.1.3) activemodel (>= 4.0.1, < 5.0) public_suffix (3.0.2) - puma (3.10.0) + puma (3.12.2) pundit (1.0.0) activesupport (>= 3.0.0) raabro (1.1.6) @@ -516,7 +516,7 @@ DEPENDENCIES prawn prawn-table protected_attributes - puma (= 3.10.0) + puma (= 3.12.2) pundit rack-protection (= 1.5.5) railroady From 177c4c3ace6cc583174705ba9cd679d614112ade Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 9 Dec 2019 08:33:39 +0100 Subject: [PATCH 065/135] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5271df47..5d8eb994f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - Fix a bug: replaces all Time.now by DateTime.current to prevent time zones issues [Taiga#134] - Fix a security issue: updated loofah to fix [CVE-2019-15587](https://github.com/advisories/GHSA-c3gv-9cxf-6f57) - Fix a security issue: updated angular to 1.7.9 to fix [CVE-2019-10768](https://github.com/advisories/GHSA-89mq-4x47-5v83) +- Fix a security issue: updated puma to 3.12.2 to fix [GHSA-7xx3-m584-x994](https://github.com/advisories/GHSA-7xx3-m584-x994) - [TODO DEPLOY] add the `SLOT_DURATION` environment variable (see [doc/environment.md](doc/environment.md#SLOT_DURATION) for configuration details) - [TODO DEPLOY] add the `PHONE_REQUIRED` environment variable (see [doc/environment.md](doc/environment.md#PHONE_REQUIRED) for configuration details) - [TODO DEPLOY] add the `EVENTS_IN_CALENDAR` environment variable (see [doc/environment.md](doc/environment.md#EVENTS_IN_CALENDAR) for configuration details) From 510c802ab1ce029e0f78a9adf7319a2622215c0b Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 9 Dec 2019 10:27:50 +0100 Subject: [PATCH 066/135] messages variations depending on slot duration --- app/assets/javascripts/app.js | 2 ++ .../templates/admin/pricing/credits.html.erb | 6 +++--- .../templates/admin/pricing/machine_hours.html.erb | 4 ++-- app/assets/templates/admin/pricing/spaces.html.erb | 4 ++-- config/locales/app.admin.en.yml | 12 ++++++------ config/locales/app.admin.es.yml | 12 ++++++------ config/locales/app.admin.fr.yml | 12 ++++++------ config/locales/app.admin.pt.yml | 14 +++++++------- config/locales/app.shared.en.yml | 2 +- config/locales/app.shared.es.yml | 2 +- config/locales/app.shared.fr.yml | 2 +- config/locales/app.shared.pt.yml | 2 +- config/locales/en.yml | 4 ++-- config/locales/es.yml | 4 ++-- config/locales/fr.yml | 4 ++-- config/locales/mails.en.yml | 2 +- config/locales/mails.es.yml | 7 ++++--- config/locales/mails.fr.yml | 2 +- config/locales/mails.pt.yml | 2 +- config/locales/pt.yml | 5 +++-- db/seeds.rb | 4 ++-- test/fixtures/history_values.yml | 2 +- test/fixtures/statistic_indices.yml | 2 +- 23 files changed, 58 insertions(+), 54 deletions(-) diff --git a/app/assets/javascripts/app.js b/app/assets/javascripts/app.js index f932fd84f..134f71ab6 100644 --- a/app/assets/javascripts/app.js +++ b/app/assets/javascripts/app.js @@ -90,6 +90,8 @@ angular.module('application', ['ngCookies', 'ngResource', 'ngSanitize', 'ui.rout $rootScope.phoneRequired = Fablab.phoneRequired; // Global config: if true, the events are shown in the admin calendar $rootScope.eventsInCalendar = Fablab.eventsInCalendar; + // Global config: machine/space slot duration + $rootScope.slotDuration = Fablab.slotDuration; // Global function to allow the user to navigate to the previous screen (ie. $state). // If no previous $state were recorded, navigate to the home page diff --git a/app/assets/templates/admin/pricing/credits.html.erb b/app/assets/templates/admin/pricing/credits.html.erb index 07c23d359..0dfd69f79 100644 --- a/app/assets/templates/admin/pricing/credits.html.erb +++ b/app/assets/templates/admin/pricing/credits.html.erb @@ -52,7 +52,7 @@ {{ 'pricing.machine' }} - {{ 'pricing.hours' }} + {{ 'pricing.hours' | translate:{DURATION:slotDuration} }} {{ 'pricing.related_subscriptions' }} @@ -104,7 +104,7 @@ {{ 'pricing.space' }} - {{ 'pricing.hours' }} + {{ 'pricing.hours' | translate:{DURATION:slotDuration} }} {{ 'pricing.related_subscriptions' }} @@ -146,4 +146,4 @@ - \ No newline at end of file + diff --git a/app/assets/templates/admin/pricing/machine_hours.html.erb b/app/assets/templates/admin/pricing/machine_hours.html.erb index 636219c63..3823e42cc 100644 --- a/app/assets/templates/admin/pricing/machine_hours.html.erb +++ b/app/assets/templates/admin/pricing/machine_hours.html.erb @@ -1,5 +1,5 @@
    - {{ 'pricing.these_prices_match_machine_hours_rates_' | translate }} {{ 'pricing._without_subscriptions' }}. + {{ 'pricing.these_prices_match_machine_hours_rates_' | translate:{DURATION:slotDuration} }} {{ 'pricing._without_subscriptions' }}.
    @@ -24,4 +24,4 @@ -
    \ No newline at end of file + diff --git a/app/assets/templates/admin/pricing/spaces.html.erb b/app/assets/templates/admin/pricing/spaces.html.erb index 25417cb6e..1395f3f83 100644 --- a/app/assets/templates/admin/pricing/spaces.html.erb +++ b/app/assets/templates/admin/pricing/spaces.html.erb @@ -1,5 +1,5 @@
    - {{ 'pricing.these_prices_match_space_hours_rates_' | translate }} {{ 'pricing._without_subscriptions' }}. + {{ 'pricing.these_prices_match_space_hours_rates_' | translate:{DURATION:slotDuration} }} {{ 'pricing._without_subscriptions' }}.
    @@ -24,4 +24,4 @@ -
    \ No newline at end of file + diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 261408460..fa2dc79f3 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -242,8 +242,8 @@ en: group: "Group" prominence: "Prominence" price: "Price" - machine_hours: "Machine hours" - these_prices_match_machine_hours_rates_: "These prices match machine hours rates" + machine_hours: "Machine slots" + these_prices_match_machine_hours_rates_: "These prices match {{DURATION}} minutes of machine usage, " _without_subscriptions: "without subscriptions" machines: "Machines" credits: "Credits" @@ -251,7 +251,7 @@ en: related_trainings: "Related trainings" add_a_machine_credit: "Add a machine credit" machine: "Machine" - hours: "Hours" + hours: "Slots of {{DURATION}} minutes" related_subscriptions: "Related subscriptions" please_specify_a_number: "Please specify a number." none: "None" # grammar note: concordance with "training". @@ -296,7 +296,7 @@ en: forever: "Each use" valid_until: "Valid until (included)" spaces: "Spaces" - these_prices_match_space_hours_rates_: "These prices match space hours rates" + these_prices_match_space_hours_rates_: "These prices match {{DURATION}} minutes of space usage, " add_a_space_credit: "Add a Space credit" space: "Espace" error_a_credit_linking_this_space_with_that_subscription_already_exists: "Error : a credit linking this space with that subscription already exists." @@ -322,14 +322,14 @@ en: successfully_created_subscriptions_dont_forget_to_redefine_prices: "Subscription(s) successfully created. Don't forget to redefine prices." unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Unable to save this user. Check that there isn't an already defined user with the same name." edit: - # edit a subscription plan / machine hours prices + # edit a subscription plan / machine slots prices edit_plan: subscription_plan: "Subscription plan:" prices: "Prices" copy_prices_from: "Copy prices from" machines: "Machines" machine: "Machine" - hourly_rate: "Hourly rate" + hourly_rate: "Price by slot" spaces: "Spaces" space: "Space" unable_to_save_subscription_changes_please_try_again: "Unable to save subscription changes. Please try again." diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index fb62110e7..6f9521cc1 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -242,8 +242,8 @@ es: group: "Grupo" prominence: "Prominencia" price: "Precio" - machine_hours: "Horas de la máquina" - these_prices_match_machine_hours_rates_: "Estos precios se ajustan a la tarifas de máquina por horas" + machine_hours: "Machine slots" # translation_missing + these_prices_match_machine_hours_rates_: "Estos precios se ajustan a la tarifas de máquina por {{DURATION}} minutas" _without_subscriptions: "Sin suscripciones" machines: "Máquinas" credits: "Créditos" @@ -251,7 +251,7 @@ es: related_trainings: "Formación relacionada" add_a_machine_credit: "Agregar un crédito de máquina" machine: "Máquina" - hours: "Horas" + hours: "Slots of {{DURATION}} minutes" # translation_missing related_subscriptions: "Suscripciónes relacionada" please_specify_a_number: "Por favor, especifique un número." none: "Nada" # nota gramatical: concordancia con "formación". @@ -296,7 +296,7 @@ es: forever: "Cada uso" valid_until: "Válido hasta (incluido)" spaces: "Espacios" - these_prices_match_space_hours_rates_: "Estos precios coinciden con las tarifas de espacio por horas" + these_prices_match_space_hours_rates_: "Estos precios coinciden con las tarifas de espacio por {{DURATION}} minutas" add_a_space_credit: "Añadir un crédito de espacio" space: "Espacio" error_a_credit_linking_this_space_with_that_subscription_already_exists: "Error: un crédito que vincula este espacio con esa suscripción ya existe." @@ -322,14 +322,14 @@ es: successfully_created_subscriptions_dont_forget_to_redefine_prices: "Suscripción(es) creada correctamente. No olvide redefinir los precios." unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "No se puede guardar este usuario. Compruebe que no hay un usuario ya definido con el mismo nombre." edit: - # edit a subscription plan / machine hours prices + # edit a subscription plan / machine slot prices edit_plan: subscription_plan: "Plan de suscripción:" prices: "Precios" copy_prices_from: "Copia los precios desde" machines: "Máquinas" machine: "Máquina" - hourly_rate: "Tarifa por hora" + hourly_rate: "Tarifa por slot" # translation_missing spaces: "Espacios" space: "Espacio" unable_to_save_subscription_changes_please_try_again: "No se pueden guardar los cambios de suscripción. Por favor, inténtelo de nuevo." diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 4a5108f15..0a9cc3791 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -242,8 +242,8 @@ fr: group: "Groupe" prominence: "Importance" price: "Prix" - machine_hours: "Heures machines" - these_prices_match_machine_hours_rates_: "Ces tarifs correspondent au prix d'une heure machine" + machine_hours: "Créneaux machines" + these_prices_match_machine_hours_rates_: "Ces tarifs correspondent au prix de {{DURATION}} minutes d'utilisation d'une machine, " # angular interpolation _without_subscriptions: "sans abonnement" machines: "Machines" credits: "Crédits" @@ -251,7 +251,7 @@ fr: related_trainings: "Formations associées" add_a_machine_credit: "Ajouter un crédit Machine" machine: "Machine" - hours: "Heures" + hours: "Créneaux de {{DURATION}} minutes" related_subscriptions: "Abonnements associés" please_specify_a_number: "Veuillez spécifier un nombre." none: "Aucune" # grammar note: concordance with "training". @@ -296,7 +296,7 @@ fr: forever: "À chaque utilisation" valid_until: "Valable jusqu'au (inclus)" spaces: "Espaces" - these_prices_match_space_hours_rates_: "Ces tarifs correspondent au prix d'une heure espace" + these_prices_match_space_hours_rates_: "Ces tarifs correspondent au prix de {{DURATION}} minutes d'utilisation d'un espace, " add_a_space_credit: "Ajouter un crédit Espace" space: "Espace" error_a_credit_linking_this_space_with_that_subscription_already_exists: "Erreur : un crédit associant cet espace et cet abonnement existe déjà." @@ -322,14 +322,14 @@ fr: successfully_created_subscriptions_dont_forget_to_redefine_prices: "Création du/des abonnement(s) réussie. N'oubliez pas de redéfinir les tarifs." unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Impossible d'enregistrer cet utilisateur. Vérifiez qu'il n'existe pas déjà un utilisateur du même nom." edit: - # modifier une formule d'abonnement / les prix des heures machines + # modifier une formule d'abonnement / les prix des créneaux machines edit_plan: subscription_plan: "Formule d'abonnement :" prices: "Tarifs" copy_prices_from: "Copier les prix depuis" machines: "Machines" machine: "Machine" - hourly_rate: "Tarif horaire" + hourly_rate: "Tarif par créneau" spaces: "Espaces" space: "Espace" unable_to_save_subscription_changes_please_try_again: "Les modifications de l'abonnement n'ont pas pu être enregistrées. Veuillez réessayer." diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index a908d7da0..fd2409743 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -242,8 +242,8 @@ pt: group: "Grupo" prominence: "Relevância" price: "Preço" - machine_hours: "Horas máquina" - these_prices_match_machine_hours_rates_: "Estes preços correspondem às horas de trabalho" + machine_hours: "Machine slots" # translation_missing + these_prices_match_machine_hours_rates_: "Estes preços correspondem às {{DURATION}} minutos de trabalho" _without_subscriptions: "sem assinaturas" machines: "Máquinas" credits: "Créditos" @@ -251,7 +251,7 @@ pt: related_trainings: "Treinamentos relacionados" add_a_machine_credit: "Adicionar crédito de máquina" machine: "Máquina" - hours: "Horas" + hours: "Slots of {{DURATION}} minutes" # translation_missing related_subscriptions: "Assinaturas relacionadas" please_specify_a_number: "Por favor especifique um número." none: "Vazio" # grammar note: concordance with "training". @@ -296,7 +296,7 @@ pt: forever: "Cada uso" valid_until: "Válido até (incluindo)" spaces: "Espaços" - these_prices_match_space_hours_rates_: "Estes preços correspondem às taxas de horários de espaço" + these_prices_match_space_hours_rates_: "Estes preços correspondem às {{DURATION}} minutos de espaço" add_a_space_credit: "Adicionar espaço de crédito" space: "Espaço" error_a_credit_linking_this_space_with_that_subscription_already_exists: "Erro: um crédito que vincula esse espaço com essa assinatura já existe." @@ -322,14 +322,14 @@ pt: successfully_created_subscriptions_dont_forget_to_redefine_prices: "Assinaturas criadas com sucesso. Não se esqueça de redefinir os preços." unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Impossível salvar este usuário. Certifique-se que ele não possui o mesmo nome de outro usuário." edit: - # edit a subscription plan / machine hours prices + # edit a subscription plan / machine slot prices edit_plan: subscription_plan: "Plano de assinatura:" prices: "Preços" copy_prices_from: "Copiar preços de" machines: "Máquinas" machine: "Máquina" - hourly_rate: "Taxa horária" + hourly_rate: "Price by slot" # translation_missing spaces: "Espaços" space: "Espaço" unable_to_save_subscription_changes_please_try_again: "Impossível salvar mudanças da assinatura. Por favor tente novamente." @@ -339,7 +339,7 @@ pt: invoices: # list of all invoices & invoicing parameters invoices: "Faturas" - accounting_periods: "Accounting periods" # missing translation + accounting_periods: "Accounting periods" # missing translation invoices_list: "Lista de faturas" filter_invoices: "Filtrar faturas" invoice_num_: "Fatura #:" diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index efd840816..45c24864a 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -443,7 +443,7 @@ en: _subscription: "subscription" cost_of_the_subscription: "Cost of the subscription" confirm_and_pay: "Confirm and pay" - you_have_settled_the_following_TYPE: "You have settled the following {TYPE, select, Machine{machine hours} Training{training} other{elements}}:" # messageFormat interpolation + you_have_settled_the_following_TYPE: "You have settled the following {TYPE, select, Machine{machine slots} Training{training} other{elements}}:" # messageFormat interpolation you_have_settled_a_: "You have settled a" total_: "TOTAL :" thank_you_your_payment_has_been_successfully_registered: "Thank you. Your payment has been successfully registered !" diff --git a/config/locales/app.shared.es.yml b/config/locales/app.shared.es.yml index 4f3bbb25a..108a25acf 100644 --- a/config/locales/app.shared.es.yml +++ b/config/locales/app.shared.es.yml @@ -443,7 +443,7 @@ es: _subscription: "suscripción" cost_of_the_subscription: "Coste de la suscripción" confirm_and_pay: "Confirmar y pagar" - you_have_settled_the_following_TYPE: "Acaba de seleccionar {TYPE, select, Machine{machine hours} Training{training} other{elements}}:" # messageFormat interpolation + you_have_settled_the_following_TYPE: "Acaba de seleccionar {TYPE, select, Machine{machine slots} Training{training} other{elements}}:" # messageFormat interpolation #translation_missing you_have_settled_a_: "Ha establecido una" total_: "TOTAL :" thank_you_your_payment_has_been_successfully_registered: "Gracias. Su pago se ha registrado con éxito." diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 9116b6daf..fb67ea2df 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -443,7 +443,7 @@ fr: _subscription: "abonnement" cost_of_the_subscription: "Coût de l'abonnement" confirm_and_pay: "Valider et payer" - you_have_settled_the_following_TYPE: "Vous avez réglé {TYPE, select, Machine{les heures machines suivantes} Training{la formation suivante} other{les éléments suivants}} :" # messageFormat interpolation + you_have_settled_the_following_TYPE: "Vous avez réglé {TYPE, select, Machine{les créneaux machines suivants} Training{la formation suivante} other{les éléments suivants}} :" # messageFormat interpolation you_have_settled_a_: "Vous avez réglé un" total_: "TOTAL :" thank_you_your_payment_has_been_successfully_registered: "Merci. Votre paiement a bien été pris en compte !" diff --git a/config/locales/app.shared.pt.yml b/config/locales/app.shared.pt.yml index 725f06c58..0316392c5 100755 --- a/config/locales/app.shared.pt.yml +++ b/config/locales/app.shared.pt.yml @@ -443,7 +443,7 @@ pt: _subscription: "inscrição" cost_of_the_subscription: "Custo da inscrição" confirm_and_pay: "Confirmar e pagar" - you_have_settled_the_following_TYPE: "Você liquidou o seguinte {TYPE, select, Machine{horas máquina} Training{training} other{elements}}:" # messageFormat interpolation + you_have_settled_the_following_TYPE: "Você liquidou o seguinte {TYPE, select, Machine{slots de máquina} Training{training} other{elements}}:" # messageFormat interpolation you_have_settled_a_: "Você tem liquidado:" total_: "TOTAL :" thank_you_your_payment_has_been_successfully_registered: "Obrigado. Seu pagamento foi registrado com sucesso !" diff --git a/config/locales/en.yml b/config/locales/en.yml index ab0e1d645..3868fd2c0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -322,7 +322,7 @@ en: statistics_global: "of all the statistics" statistics_account: "of the registration statistics" statistics_event: "of statistics about events" - statistics_machine: "of statistics about machine hours" + statistics_machine: "of statistics about machine slots" statistics_project: "of statistics about projects" statistics_subscription: "of subscription statistics" statistics_training: "of statistics about trainings" @@ -354,7 +354,7 @@ en: statistics: # statistics tools for admins subscriptions: "Subscriptions" - machines_hours: "Machines hours" + machines_hours: "Machines slots" spaces: "Spaces" trainings: "Trainings" events: "Events" diff --git a/config/locales/es.yml b/config/locales/es.yml index a117f19a0..d6eac0d60 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -322,7 +322,7 @@ es: statistics_global: "de todas las estadísticas" statistics_account: "de las estadísticas de registro" statistics_event: "de estadísticas sobre eventos" - statistics_machine: "de estadísticas sobre horas de máquina" + statistics_machine: "de estadísticas sobre slots de máquina" # missing translation statistics_project: "de estadísticas sobre proyectos" statistics_subscription: "de estadísticas de suscripción" statistics_training: "de estadísticas de cursos" @@ -354,7 +354,7 @@ es: statistics: # statistics tools for admins subscriptions: "Suscripciones" - machines_hours: "Horario de máquinas" + machines_hours: "Machine slots" # missing translation spaces: "Espacios" trainings: "Cursos" events: "Eventos" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 6a71f1e2c..fef290c6d 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -322,7 +322,7 @@ fr: statistics_global: "de toutes les statistiques" statistics_account: "des statistiques d'inscriptions" statistics_event: "des statistiques sur les évènements" - statistics_machine: "des statistiques d'heures machines" + statistics_machine: "des statistiques de créneaux machines" statistics_project: "des statistiques sur les projets" statistics_subscription: "des statistiques d'abonnements" statistics_training: "des statistiques sur les formations" @@ -355,7 +355,7 @@ fr: statistics: # outil de statistiques pour les administrateurs subscriptions: "Abonnements" - machines_hours: "Heures machines" + machines_hours: "Créneaux machines" spaces: "Espaces" trainings: "Formations" events: "Évènements" diff --git a/config/locales/mails.en.yml b/config/locales/mails.en.yml index e50ef8934..a97595db0 100644 --- a/config/locales/mails.en.yml +++ b/config/locales/mails.en.yml @@ -259,7 +259,7 @@ en: statistics_global: "of all the statistics" statistics_account: "of the registration statistics" statistics_event: "of statistics about events" - statistics_machine: "of statistics about machine hours" + statistics_machine: "of statistics about machine slots" statistics_project: "of statistics about projects" statistics_subscription: "of subscription statistics" statistics_training: "of statistics about trainings" diff --git a/config/locales/mails.es.yml b/config/locales/mails.es.yml index 0341c8b66..edf65a3c0 100644 --- a/config/locales/mails.es.yml +++ b/config/locales/mails.es.yml @@ -229,6 +229,7 @@ es: subject: "Una cuenta importada ha completado su perfil" body: account_completed: "Una cuenta de usuario importada previamente %{PROVIDER} ha completado su perfil:" + imported_account_completed: "An user account previously imported through %{PROVIDER} has just completed his/her profile data:" # translation missing provider_id: "su ID de proveedor es:" notify_admin_abuse_reported: @@ -239,10 +240,10 @@ es: signaled_by: "marcado por:" signaled_on: "marcado el:" message: "Mensaje:" - visit_management_interface: "Refer to the Reporting Management Interface for more information." # missing translation + visit_management_interface: "Refer to the Reporting Management Interface for more information." # missing translation notify_user_wallet_is_credited: - subject: "" # translation_missing + subject: "Your wallet has been credited" # translation missing body: wallet_credit_html: "Se han ingresado %{AMOUNT} por el administrador." @@ -258,7 +259,7 @@ es: statistics_global: "de todas las estadísticas" statistics_account: "de las estadísticas de registro" statistics_event: "de estadísticas sobre eventos" - statistics_machine: "de estadísticas sobre horas de máquina" + statistics_machine: "de estadísticas sobre slots de máquina" # translation missing statistics_project: "de estadísticas sobre proyectos" statistics_subscription: "de estadísticas de suscripción" statistics_training: "de estadísticas sobre entrenamientos" diff --git a/config/locales/mails.fr.yml b/config/locales/mails.fr.yml index 5f1601c6a..e4d0c2d1b 100644 --- a/config/locales/mails.fr.yml +++ b/config/locales/mails.fr.yml @@ -259,7 +259,7 @@ fr: statistics_global: "de toutes les statistiques" statistics_account: "des statistiques d'inscriptions" statistics_event: "des statistiques sur les évènements" - statistics_machine: "des statistiques d'heures machines" + statistics_machine: "des statistiques de créneaux machines" statistics_project: "des statistiques sur les projets" statistics_subscription: "des statistiques d'abonnements" statistics_training: "des statistiques sur les formations" diff --git a/config/locales/mails.pt.yml b/config/locales/mails.pt.yml index ae2c14662..fee5cf5e6 100755 --- a/config/locales/mails.pt.yml +++ b/config/locales/mails.pt.yml @@ -259,7 +259,7 @@ pt: statistics_global: "de todas as estatísticas" statistics_account: "das estatísticas de registro" statistics_event: "das estatísticas sobre eventos" - statistics_machine: "das estatísticas de hora máquina" + statistics_machine: "das estatísticas de slot máquina" #translation_missing statistics_project: "das estatísticas de projetos" statistics_subscription: "das estatísticas de assinaturas" statistics_training: "das estatísticas de treinamento" diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 6230f49a0..4e71e1dde 100755 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -322,7 +322,7 @@ pt: statistics_global: "de todas as estatísticas" statistics_account: "das estatísticas de registro" statistics_event: "de estatísticas sobre eventos" - statistics_machine: "de estatísticas sobre horas de máquina" + statistics_machine: "de estatísticas sobre slots de máquina" # missing translation statistics_project: "de estatísticas sobre projetos" statistics_subscription: "de estatísticas de assinatura" statistics_training: "de estatísticas sobre treinamentos" @@ -351,10 +351,11 @@ pt: notify_privacy_policy_changed: policy_updated: "Privacy policy updated." # missing translation click_to_show: "Click here to consult" # missing translation + statistics: # statistics tools for admins subscriptions: "Assinaturas" - machines_hours: "Horas de máquina" + machines_hours: "Slots de máquina" # missing translation spaces: "Espaços" trainings: "Treinamentos" events: "Eventos" diff --git a/db/seeds.rb b/db/seeds.rb index da3de1060..e13ae4cdb 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -425,8 +425,8 @@ Stylesheet.build_sheet! unless Setting.find_by(name: 'training_information_message').try(:value) setting = Setting.find_or_initialize_by(name: 'training_information_message') - setting.value = "Avant de réserver une formation, nous vous conseillons de consulter nos offres d'abonnement qui"+ - ' proposent des conditions avantageuses sur le prix des formations et les heures machines.' + setting.value = "Avant de réserver une formation, nous vous conseillons de consulter nos offres d'abonnement qui" \ + ' proposent des conditions avantageuses sur le prix des formations et les créneaux machines.' setting.save end diff --git a/test/fixtures/history_values.yml b/test/fixtures/history_values.yml index 0940b6d94..be2063477 100644 --- a/test/fixtures/history_values.yml +++ b/test/fixtures/history_values.yml @@ -250,7 +250,7 @@ value_history_26: invoicing_profile_id: 1 value: Avant de réserver une formation, nous vous conseillons de consulter nos offres d'abonnement qui proposent des conditions avantageuses sur le prix des formations - et les heures machines. + et les créneaux machines. created_at: 2018-12-17 11:23:01.569316000 Z updated_at: 2018-12-17 11:23:01.717053000 Z footprint: 4413b595bfbb0ec9ac2637997b1731eb06e516dea606e6a2f1acc4b9bf323f98 diff --git a/test/fixtures/statistic_indices.yml b/test/fixtures/statistic_indices.yml index b3b6fbe60..aab5aa638 100644 --- a/test/fixtures/statistic_indices.yml +++ b/test/fixtures/statistic_indices.yml @@ -11,7 +11,7 @@ statistic_index_1: statistic_index_2: id: 2 es_type_key: machine - label: Heures machines + label: Créneaux machines created_at: 2016-04-04 14:11:33.359367000 Z updated_at: 2016-04-04 14:11:33.359367000 Z table: true From 6aa3c0caebe52f7b60cfa300e5f534034b2a4275 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 9 Dec 2019 11:55:31 +0100 Subject: [PATCH 067/135] Notify all admins on the creation of a refund invoice --- CHANGELOG.md | 1 + app/models/avoir.rb | 10 ++++++++++ app/models/notification_type.rb | 1 + .../_notify_admin_refund_created.json.jbuilder | 5 +++++ .../notify_admin_refund_created.html.erb | 8 ++++++++ config/locales/en.yml | 3 +++ config/locales/es.yml | 3 +++ config/locales/fr.yml | 2 ++ config/locales/mails.en.yml | 6 ++++++ config/locales/mails.es.yml | 10 ++++++++-- config/locales/mails.fr.yml | 6 ++++++ config/locales/mails.pt.yml | 10 ++++++++-- config/locales/pt.yml | 6 ++++-- 13 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 app/views/api/notifications/_notify_admin_refund_created.json.jbuilder create mode 100644 app/views/notifications_mailer/notify_admin_refund_created.html.erb diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d8eb994f..61a9ec7e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Configuration of phone number in members registration forms: can be required or optional, depending on `PHONE_REQUIRED` configuration - Improved user experience in defining slots in the calendar management - Improved notification email to the member when a rolling subscription is taken +- Notify all admins on the creation of a refund invoice - Calendar management: improved legend display and visual behavior - Handle Ctrl^C in upgrade scripts - Updated moment-timezone diff --git a/app/models/avoir.rb b/app/models/avoir.rb index e8d6bd98f..641a80ce9 100644 --- a/app/models/avoir.rb +++ b/app/models/avoir.rb @@ -5,6 +5,8 @@ class Avoir < Invoice belongs_to :invoice + after_create :notify_admins_refund_created + validates :payment_method, inclusion: { in: %w[stripe cheque transfer none cash wallet] } attr_accessor :invoice_items_ids @@ -16,4 +18,12 @@ class Avoir < Invoice def expire_subscription user.subscription.expire(DateTime.current) end + + private + + def notify_admins_refund_created + NotificationCenter.call type: 'notify_admin_refund_created', + receiver: User.admins, + attached_object: self + end end diff --git a/app/models/notification_type.rb b/app/models/notification_type.rb index f73f76463..45efb7ae3 100644 --- a/app/models/notification_type.rb +++ b/app/models/notification_type.rb @@ -47,6 +47,7 @@ class NotificationType notify_admin_archive_complete notify_privacy_policy_changed notify_admin_import_complete + notify_admin_refund_created ] # deprecated: # - notify_member_subscribed_plan_is_changed diff --git a/app/views/api/notifications/_notify_admin_refund_created.json.jbuilder b/app/views/api/notifications/_notify_admin_refund_created.json.jbuilder new file mode 100644 index 000000000..17b8588de --- /dev/null +++ b/app/views/api/notifications/_notify_admin_refund_created.json.jbuilder @@ -0,0 +1,5 @@ +json.title notification.notification_type +json.description t('.refund_created', + AMOUNT: number_to_currency(notification.attached_object.total / 100.00), + USER: notification.attached_object.invoicing_profile&.full_name) +json.url notification_url(notification, format: :json) diff --git a/app/views/notifications_mailer/notify_admin_refund_created.html.erb b/app/views/notifications_mailer/notify_admin_refund_created.html.erb new file mode 100644 index 000000000..d0ec9e8ad --- /dev/null +++ b/app/views/notifications_mailer/notify_admin_refund_created.html.erb @@ -0,0 +1,8 @@ +<%= render 'notifications_mailer/shared/hello', recipient: @recipient %> + +

    <%= t('.body.refund_created', + AMOUNT: number_to_currency(@attached_object.total / 100.00), + INVOICE: @attached_object.invoice.reference, + USER: @attached_object.invoicing_profile&.full_name) %> +

    +

    " target="_blank"><%= t('.body.download') %>

    diff --git a/config/locales/en.yml b/config/locales/en.yml index 3868fd2c0..c54560d8d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -351,6 +351,9 @@ en: notify_privacy_policy_changed: policy_updated: "Privacy policy updated." click_to_show: "Click here to consult" + notify_admin_refund_created: + refund_created: "A refund of %{AMOUNT} has been created for user %{USER}" + statistics: # statistics tools for admins subscriptions: "Subscriptions" diff --git a/config/locales/es.yml b/config/locales/es.yml index d6eac0d60..05aefa471 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -351,6 +351,9 @@ es: notify_privacy_policy_changed: policy_updated: "Privacy policy updated." # missing translation click_to_show: "Click here to consult" # missing translation + notify_admin_refund_created: + refund_created: "A refund of %{AMOUNT} has been created for user %{USER}" # missing translation + statistics: # statistics tools for admins subscriptions: "Suscripciones" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index fef290c6d..44585e45b 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -351,6 +351,8 @@ fr: notify_privacy_policy_changed: policy_updated: "Nouvelle mise à jour de la Politique de confidentialité." click_to_show: "Cliquez ici pour la consulter" + notify_admin_refund_created: + refund_created: "Un avoir de %{AMOUNT} a été généré pour l'utilisateur %{USER}" statistics: # outil de statistiques pour les administrateurs diff --git a/config/locales/mails.en.yml b/config/locales/mails.en.yml index a97595db0..1709f0226 100644 --- a/config/locales/mails.en.yml +++ b/config/locales/mails.en.yml @@ -313,5 +313,11 @@ en: content_html: "

    We wish to inform you that we have just updated our privacy policy.

    We may change our privacy policy regularly. In accordance with the regulations, you will receive a notification for each update.

    By accessing or using our services after the privacy policy update, we will consider that you agree its terms, updates included.

    " link_to_policy: "Cliquez ici pour consultez la politique de confidentialité." + notify_admin_refund_created: + subject: "A refund has been generated" + body: + refund_created: "A refund of %{AMOUNT} has been generated on invoice %{INVOICE} of user %{USER}" + download: "Click here to download this refund invoice" + shared: hello: "Hello %{user_name}" diff --git a/config/locales/mails.es.yml b/config/locales/mails.es.yml index edf65a3c0..4e3e70175 100644 --- a/config/locales/mails.es.yml +++ b/config/locales/mails.es.yml @@ -299,7 +299,7 @@ es: warning_last_closed_period_over_1_year: "Please remind to periodically close your accounting periods. Last closed period ended at %{LAST_END}." warning_no_closed_periods: "Please remind to periodically close your accounting periods. You have to close periods from %{FIRST_DATE}." - notify_admin_archive_complete: #translation_missing + notify_admin_archive_complete: #translation_missing subject: "Archiving completed" body: archive_complete: "You have closed the accounting period from %{START} to %{END}. Archiving of data is now complete." @@ -307,11 +307,17 @@ es: here: "here." save_on_secured: "Remember that you must save this archive on a secured external support, which may be requested by the tax authorities during a check." - notify_privacy_policy_changed: #translation_missing + notify_privacy_policy_changed: #translation_missing subject: "Privacy policy updated" body: content_html: "

    We wish to inform you that we have just updated our privacy policy.

    We may change our privacy policy regularly. In accordance with the regulations, you will receive a notification for each update.

    By accessing or using our services after the privacy policy update, we will consider that you agree its terms, updates included.

    " link_to_policy: "Cliquez ici pour consultez la politique de confidentialité." + notify_admin_refund_created: #translation_missing + subject: "A refund has been generated" + body: + refund_created: "A refund of %{AMOUNT} has been generated on invoice %{INVOICE} of user %{USER}" + download: "Click here to download this refund invoice" + shared: hello: "¡Hola %{user_name}!" diff --git a/config/locales/mails.fr.yml b/config/locales/mails.fr.yml index e4d0c2d1b..0c7fc4852 100644 --- a/config/locales/mails.fr.yml +++ b/config/locales/mails.fr.yml @@ -313,5 +313,11 @@ fr: content_html: "

    Nous souhaitons vous signaler que nous venons de mettre à jour notre politique de confidentialité.

    Nous pouvons apporter régulièrement des modifications à notre politique de confidentialité. Conformément à la réglementation, une notification vous sera envoyée à chaque mise à jour.

    En accédant ou en utilisant nos services après la mise à jour de la Politique de confidentialité, nous considérerons que vous acceptez les termes de celle-ci, mises à jour comprises.

    " link_to_policy: "Cliquez ici pour consultez la politique de confidentialité." + notify_admin_refund_created: + subject: "Un avoir a été généré" + body: + refund_created: "Un avoir de %{AMOUNT} a été généré sur la facture %{INVOICE} de l'utilisateur %{USER}" + download: "Cliquez ici pour télécharger cet avoir" + shared: hello: "Bonjour %{user_name}" diff --git a/config/locales/mails.pt.yml b/config/locales/mails.pt.yml index fee5cf5e6..32cbee51a 100755 --- a/config/locales/mails.pt.yml +++ b/config/locales/mails.pt.yml @@ -299,7 +299,7 @@ pt: warning_last_closed_period_over_1_year: "Please remind to periodically close your accounting periods. Last closed period ended at %{LAST_END}." warning_no_closed_periods: "Please remind to periodically close your accounting periods. You have to close periods from %{FIRST_DATE}." - notify_admin_archive_complete: #translation_missing + notify_admin_archive_complete: #translation_missing subject: "Archiving completed" body: archive_complete: "You have closed the accounting period from %{START} to %{END}. Archiving of data is now complete." @@ -307,11 +307,17 @@ pt: here: "here." save_on_secured: "Remember that you must save this archive on a secured external support, which may be requested by the tax authorities during a check." - notify_privacy_policy_changed: #translation_missing + notify_privacy_policy_changed: #translation_missing subject: "Privacy policy updated" body: content_html: "

    We wish to inform you that we have just updated our privacy policy.

    We may change our privacy policy regularly. In accordance with the regulations, you will receive a notification for each update.

    By accessing or using our services after the privacy policy update, we will consider that you agree its terms, updates included.

    " link_to_policy: "Cliquez ici pour consultez la politique de confidentialité." + notify_admin_refund_created: #translation_missing + subject: "A refund has been generated" + body: + refund_created: "A refund of %{AMOUNT} has been generated on invoice %{INVOICE} of user %{USER}" + download: "Click here to download this refund invoice" + shared: hello: "Olá %{user_name}" diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 4e71e1dde..b6ece70a6 100755 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -349,8 +349,10 @@ pt: notify_admin_archive_complete: # missing translation archive_complete: "Data archiving from %{START} to %{END} is done. click here to download. Remember to save it on an external secured media." # missing translation notify_privacy_policy_changed: - policy_updated: "Privacy policy updated." # missing translation - click_to_show: "Click here to consult" # missing translation + policy_updated: "Privacy policy updated." # missing translation + click_to_show: "Click here to consult" # missing translation + notify_admin_refund_created: + refund_created: "A refund of %{AMOUNT} has been created for user %{USER}" # missing translation statistics: # statistics tools for admins From 0c11f61010f707e239c0100776115d22de233ce8 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 10 Dec 2019 12:16:26 +0100 Subject: [PATCH 068/135] Prevent event reservation in the past --- CHANGELOG.md | 1 + app/assets/javascripts/controllers/events.js.erb | 3 +++ app/assets/templates/events/show.html.erb | 7 ++++++- config/locales/app.public.en.yml | 3 +++ config/locales/app.public.es.yml | 3 +++ config/locales/app.public.fr.yml | 3 +++ config/locales/app.public.pt.yml | 3 +++ 7 files changed, 22 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61a9ec7e3..885ab0d97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Improved notification email to the member when a rolling subscription is taken - Notify all admins on the creation of a refund invoice - Calendar management: improved legend display and visual behavior +- Prevent event reservation in the past [Taiga#127] - Handle Ctrl^C in upgrade scripts - Updated moment-timezone - Added freeCAD files as default allowed extensions diff --git a/app/assets/javascripts/controllers/events.js.erb b/app/assets/javascripts/controllers/events.js.erb index fa2129a3a..5b183029f 100644 --- a/app/assets/javascripts/controllers/events.js.erb +++ b/app/assets/javascripts/controllers/events.js.erb @@ -133,6 +133,9 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' // reservations for the currently shown event $scope.reservations = []; + // current date & time + $scope.now = moment(); + // user to deal with $scope.ctrl = { member: {} }; diff --git a/app/assets/templates/events/show.html.erb b/app/assets/templates/events/show.html.erb index 1c3ff1f4b..bd9965530 100644 --- a/app/assets/templates/events/show.html.erb +++ b/app/assets/templates/events/show.html.erb @@ -171,7 +171,12 @@
    - +
    + {{ 'event_is_over' }} + {{ 'thanks_for_coming' }} + {{ 'view_event_list' }} +
    +
    diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml index 75575446a..3db122cd4 100644 --- a/config/locales/app.public.en.yml +++ b/config/locales/app.public.en.yml @@ -295,6 +295,9 @@ en: cancel_the_reservation: "Cancel the reservation" do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." cancellation_failed: "Cancellation failed." + event_is_over: "The event is over" + thanks_for_coming: "Thanks for coming!" + view_event_list: "View events to come" calendar: # public calendar diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml index b5bceebfc..ebe8fb16b 100644 --- a/config/locales/app.public.es.yml +++ b/config/locales/app.public.es.yml @@ -295,6 +295,9 @@ es: cancel_the_reservation: "Cancel the reservation" #translation_missing do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." #translation_missing cancellation_failed: "Cancellation failed." #translation_missing + event_is_over: "The event is over" #translation_missing + thanks_for_coming: "Thanks for coming!" #translation_missing + view_event_list: "View events to come" #translation_missing calendar: # public calendar diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index c5493ad5f..653fdf691 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -295,6 +295,9 @@ fr: cancel_the_reservation: "Annuler la réservation" do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Êtes vous sur de vouloir annuler cette réservation? Ceci s'applique à TOUTES les places réservées." cancellation_failed: "L'annulation a échoué." + event_is_over: "L'évènement est terminé." + thanks_for_coming: "Merci d'avoir participé !" + view_event_list: "Voir les évènements à venir" calendar: # calendrier publique diff --git a/config/locales/app.public.pt.yml b/config/locales/app.public.pt.yml index bd8088c68..8cf7a2bda 100755 --- a/config/locales/app.public.pt.yml +++ b/config/locales/app.public.pt.yml @@ -295,6 +295,9 @@ pt: cancel_the_reservation: "Cancel the reservation" #translation_missing do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." #translation_missing cancellation_failed: "Cancellation failed." #translation_missin + event_is_over: "The event is over" #translation_missing + thanks_for_coming: "Thanks for coming!" #translation_missing + view_event_list: "View events to come" #translation_missing calendar: # public calendar From 34a2d2277161640a588c0eb84a190110510b4418 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 10 Dec 2019 16:32:15 +0100 Subject: [PATCH 069/135] updated GitHub issue template with link to roadmap --- .github/ISSUE_TEMPLATE.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 08f52b2da..0580a8c37 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,8 +1,14 @@ -This issue tracker is **reserved** for bug reports and feature requests. +This issue tracker is **reserved** for bug reports. -The place to ask a question or call for help is at Fab-manager forums at https://forum.fab-manager.com/. +The place to ask a question or call for help is at [Fab-manager forums](https://forum.fab-manager.com) + +The place to request or vote for new feature is on the [roadmap website](https://roadmap.fab-manager.com) To report a bug, please describe: - Expected behavior and actual behavior. - Steps to reproduce the problem. - Specifications like the version of the project, operating system, or hardware. + +The following elements may help to quickly resolve your issue: +- Server logs `tail -f /apps/fabmanager/log/app-stdout.log` on the server +- Client logs `Ctrl`+`Maj`+`i` > `Console` in the browser From 3c0e3a5f6c8196b451834a121ffdc6855de218f5 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 11 Dec 2019 12:42:47 +0100 Subject: [PATCH 070/135] Update Crowdin configuration file --- crowdin.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 crowdin.yml diff --git a/crowdin.yml b/crowdin.yml new file mode 100644 index 000000000..0bc049730 --- /dev/null +++ b/crowdin.yml @@ -0,0 +1,17 @@ +files: + - source: /config/locales/app.admin.en.yml + translation: /config/locales/app.admin.%two_letters_code%.yml + - source: /config/locales/app.logged.en.yml + translation: /config/locales/app.logged.%two_letters_code%.yml + - source: /config/locales/app.public.en.yml + translation: /config/locales/app.public.%two_letters_code%.yml + - source: /config/locales/app.shared.en.yml + translation: /config/locales/app.shared.%two_letters_code%.yml + - source: /config/locales/en.yml + translation: /config/locales/%two_letters_code%.yml + - source: /config/locales/devise.en.yml + translation: /config/locales/devise.%two_letters_code%.yml + - source: /config/locales/mails.en.yml + translation: /config/locales/mails.%two_letters_code%.yml + - source: /config/locales/rails.en.yml + translation: /config/locales/rails.%two_letters_code%.yml From ba99b0bda2c4bd4388e140cfae3f8034b8c88cf0 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 11 Dec 2019 15:02:57 +0100 Subject: [PATCH 071/135] change roadmap by feedback --- .github/ISSUE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 0580a8c37..6f9669cf3 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -2,7 +2,7 @@ This issue tracker is **reserved** for bug reports. The place to ask a question or call for help is at [Fab-manager forums](https://forum.fab-manager.com) -The place to request or vote for new feature is on the [roadmap website](https://roadmap.fab-manager.com) +The place to request or vote for new feature is on the [feedback website](https://feedback.fab-manager.com) To report a bug, please describe: - Expected behavior and actual behavior. From c565d9ff2b544b7fa1647ee4a7237cf242427069 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 16 Dec 2019 10:16:11 +0100 Subject: [PATCH 072/135] unified front-end i18n interpolations syntax to messageformat --- app/assets/javascripts/app.js | 4 +- .../controllers/admin/calendar.js.erb | 11 +-- .../controllers/admin/events.js.erb | 4 +- .../javascripts/controllers/admin/groups.js | 6 +- .../controllers/admin/members.js.erb | 2 +- .../controllers/application.js.erb | 2 +- .../javascripts/controllers/events.js.erb | 4 +- .../javascripts/controllers/plans.js.erb | 4 +- app/assets/javascripts/directives/cart.js.erb | 4 +- .../admin/calendar/eventModal.html.erb | 2 +- .../templates/admin/members/edit.html.erb | 4 +- .../templates/admin/trainings/index.html.erb | 2 +- .../templates/dashboard/events.html.erb | 6 +- app/assets/templates/events/show.html.erb | 8 +- app/assets/templates/plans/index.html.erb | 8 +- .../templates/profile/complete.html.erb | 2 +- app/assets/templates/projects/show.html.erb | 2 +- app/assets/templates/shared/_cart.html.erb | 8 +- app/assets/templates/shared/header.html.erb | 2 +- .../templates/stripe/payment_modal.html.erb | 2 +- config/locales/app.admin.en.yml | 82 +++++++++--------- config/locales/app.admin.es.yml | 84 +++++++++---------- config/locales/app.admin.fr.yml | 82 +++++++++--------- config/locales/app.admin.pt.yml | 78 ++++++++--------- config/locales/app.logged.en.yml | 12 +-- config/locales/app.logged.es.yml | 12 +-- config/locales/app.logged.fr.yml | 12 +-- config/locales/app.logged.pt.yml | 12 +-- config/locales/app.public.en.yml | 32 +++---- config/locales/app.public.es.yml | 32 +++---- config/locales/app.public.fr.yml | 32 +++---- config/locales/app.public.pt.yml | 32 +++---- config/locales/app.shared.en.yml | 30 +++---- config/locales/app.shared.es.yml | 30 +++---- config/locales/app.shared.fr.yml | 30 +++---- config/locales/app.shared.pt.yml | 30 +++---- 36 files changed, 351 insertions(+), 358 deletions(-) diff --git a/app/assets/javascripts/app.js b/app/assets/javascripts/app.js index 134f71ab6..53d5e99b3 100644 --- a/app/assets/javascripts/app.js +++ b/app/assets/javascripts/app.js @@ -59,8 +59,8 @@ angular.module('application', ['ngCookies', 'ngResource', 'ngSanitize', 'ui.rout $translateProvider.useLoaderCache(true); // Secure i18n module against XSS attacks by escaping the output $translateProvider.useSanitizeValueStrategy('escapeParameters'); - // Enable the MessageFormat interpolation (used for pluralization) - $translateProvider.addInterpolation('$translateMessageFormatInterpolation'); + // Use the MessageFormat interpolation by default (used for pluralization) + $translateProvider.useMessageFormatInterpolation(); // Set the langage of the instance (from ruby configuration) $translateProvider.preferredLanguage(Fablab.locale); }]).run(['$rootScope', '$log', 'AuthService', 'Auth', 'amMoment', '$state', 'editableOptions', 'Analytics', diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index 220363e4d..1ea8ada06 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -87,8 +87,7 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state return { title: _t('admin_calendar.confirmation_required'), msg: _t('admin_calendar.do_you_really_want_to_cancel_the_USER_s_reservation_the_DATE_at_TIME_concerning_RESERVATION' - , { GENDER: getGender($scope.currentUser), USER: slot.user.name, DATE: moment(slot.start_at).format('L'), TIME: moment(slot.start_at).format('LT'), RESERVATION: slot.reservable.name } - , 'messageformat') + , { GENDER: getGender($scope.currentUser), USER: slot.user.name, DATE: moment(slot.start_at).format('L'), TIME: moment(slot.start_at).format('LT'), RESERVATION: slot.reservable.name }) }; } } @@ -131,7 +130,7 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state object () { return { title: _t('admin_calendar.confirmation_required'), - msg: _t('admin_calendar.do_you_really_want_to_remove_MACHINE_from_this_slot', { GENDER: getGender($scope.currentUser), MACHINE: machine.name }, 'messageformat') + ' ' + + msg: _t('admin_calendar.do_you_really_want_to_remove_MACHINE_from_this_slot', { GENDER: getGender($scope.currentUser), MACHINE: machine.name }) + ' ' + _t('admin_calendar.this_will_prevent_any_new_reservation_on_this_slot_but_wont_cancel_those_existing') + ' ' + _t('admin_calendar.beware_this_cannot_be_reverted') }; @@ -711,8 +710,7 @@ Application.Controllers.controller('DeleteRecurrentAvailabilityController', ['$s if (res.deleted > 1) { growl.success(_t( 'admin_calendar.slots_deleted', - {START: moment(start_at).format('LL LT'), COUNT: res.deleted - 1}, - 'messageformat' + {START: moment(start_at).format('LL LT'), COUNT: res.deleted - 1} )); } else { growl.success(_t( @@ -731,8 +729,7 @@ Application.Controllers.controller('DeleteRecurrentAvailabilityController', ['$s if (data.total > 1) { growl.warning(_t( 'admin_calendar.slots_not_deleted', - {TOTAL: data.total, COUNT: data.total - data.deleted}, - 'messageformat' + {TOTAL: data.total, COUNT: data.total - data.deleted} )); } else { growl.error(_t( diff --git a/app/assets/javascripts/controllers/admin/events.js.erb b/app/assets/javascripts/controllers/admin/events.js.erb index f1893864f..e2706ce85 100644 --- a/app/assets/javascripts/controllers/admin/events.js.erb +++ b/app/assets/javascripts/controllers/admin/events.js.erb @@ -232,7 +232,7 @@ Application.Controllers.controller('AdminEventsController', ['$scope', '$state', return false; } if (getModel(model)[1][index].related_to > 0) { - growl.error(_t('unable_to_delete_ELEMENT_already_in_use_NUMBER_times', { ELEMENT: model, NUMBER: getModel(model)[1][index].related_to }, 'messageformat')); + growl.error(_t('unable_to_delete_ELEMENT_already_in_use_NUMBER_times', { ELEMENT: model, NUMBER: getModel(model)[1][index].related_to })); return false; } return dialogs.confirm({ @@ -240,7 +240,7 @@ Application.Controllers.controller('AdminEventsController', ['$scope', '$state', object () { return { title: _t('confirmation_required'), - msg: _t('do_you_really_want_to_delete_this_ELEMENT', { ELEMENT: model }, 'messageformat') + msg: _t('do_you_really_want_to_delete_this_ELEMENT', { ELEMENT: model }) }; } } diff --git a/app/assets/javascripts/controllers/admin/groups.js b/app/assets/javascripts/controllers/admin/groups.js index 1f174ba5b..221d64d8f 100644 --- a/app/assets/javascripts/controllers/admin/groups.js +++ b/app/assets/javascripts/controllers/admin/groups.js @@ -86,13 +86,13 @@ Application.Controllers.controller('GroupsController', ['$scope', 'groupsPromise return $scope.toggleDisableGroup = function (index) { const group = $scope.groups[index]; if (!group.disabled && (group.users > 0)) { - return growl.error(_t('group_form.unable_to_disable_group_with_users', { USERS: group.users }, 'messageformat')); + return growl.error(_t('group_form.unable_to_disable_group_with_users', { USERS: group.users })); } else { return Group.update({ id: group.id }, { group: { disabled: !group.disabled } }, function (response) { $scope.groups[index] = response; - return growl.success(_t('group_form.group_successfully_enabled_disabled', { STATUS: response.disabled }, 'messageformat')); + return growl.success(_t('group_form.group_successfully_enabled_disabled', { STATUS: response.disabled })); } - , error => growl.error(_t('group_form.unable_to_enable_disable_group', { STATUS: !group.disabled }, 'messageformat'))); + , error => growl.error(_t('group_form.unable_to_enable_disable_group', { STATUS: !group.disabled }))); } }; } diff --git a/app/assets/javascripts/controllers/admin/members.js.erb b/app/assets/javascripts/controllers/admin/members.js.erb index bacbd58aa..ce7b16c41 100644 --- a/app/assets/javascripts/controllers/admin/members.js.erb +++ b/app/assets/javascripts/controllers/admin/members.js.erb @@ -750,7 +750,7 @@ Application.Controllers.controller('NewAdminController', ['$state', '$scope', 'A {}, { admin: $scope.admin }, function () { - growl.success(_t('administrator_successfully_created_he_will_receive_his_connection_directives_by_email', { GENDER: getGender($scope.admin) }, 'messageformat')); + growl.success(_t('administrator_successfully_created_he_will_receive_his_connection_directives_by_email', { GENDER: getGender($scope.admin) })); return $state.go('app.admin.members'); } , function (error) { diff --git a/app/assets/javascripts/controllers/application.js.erb b/app/assets/javascripts/controllers/application.js.erb index f048af8dd..834b3529b 100644 --- a/app/assets/javascripts/controllers/application.js.erb +++ b/app/assets/javascripts/controllers/application.js.erb @@ -325,7 +325,7 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco angular.forEach(notifications.notifications, function (n) { toDisplay.push(n); }); if (toDisplay.length < notifications.totals.unread) { - toDisplay.push({ message: { description: _t('and_NUMBER_other_notifications', { NUMBER: notifications.totals.unread - toDisplay.length }, 'messageformat') } }); + toDisplay.push({ message: { description: _t('and_NUMBER_other_notifications', { NUMBER: notifications.totals.unread - toDisplay.length }) } }); } angular.forEach(toDisplay, function (notification) { growl.info(notification.message.description); }); diff --git a/app/assets/javascripts/controllers/events.js.erb b/app/assets/javascripts/controllers/events.js.erb index 5b183029f..fa70501b1 100644 --- a/app/assets/javascripts/controllers/events.js.erb +++ b/app/assets/javascripts/controllers/events.js.erb @@ -750,10 +750,10 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' // Button label if ($scope.amount > 0) { - $scope.validButtonName = _t('confirm_payment_of_html', { ROLE: $scope.currentUser.role, AMOUNT: $filter('currency')($scope.amount) }, 'messageformat'); + $scope.validButtonName = _t('confirm_payment_of_html', { ROLE: $scope.currentUser.role, AMOUNT: $filter('currency')($scope.amount) }); } else { if ((price.price > 0) && ($scope.walletAmount === 0)) { - $scope.validButtonName = _t('confirm_payment_of_html', { ROLE: $scope.currentUser.role, AMOUNT: $filter('currency')(price.price) }, 'messageformat'); + $scope.validButtonName = _t('confirm_payment_of_html', { ROLE: $scope.currentUser.role, AMOUNT: $filter('currency')(price.price) }); } else { $scope.validButtonName = _t('confirm'); } diff --git a/app/assets/javascripts/controllers/plans.js.erb b/app/assets/javascripts/controllers/plans.js.erb index be4a19e7e..6db1445eb 100644 --- a/app/assets/javascripts/controllers/plans.js.erb +++ b/app/assets/javascripts/controllers/plans.js.erb @@ -318,10 +318,10 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop // Button label if ($scope.amount > 0) { - $scope.validButtonName = _t('confirm_payment_of_html', { ROLE: $scope.currentUser.role, AMOUNT: $filter('currency')($scope.amount) }, 'messageformat'); + $scope.validButtonName = _t('confirm_payment_of_html', { ROLE: $scope.currentUser.role, AMOUNT: $filter('currency')($scope.amount) }); } else { if ((price.price > 0) && ($scope.walletAmount === 0)) { - $scope.validButtonName = _t('confirm_payment_of_html', { ROLE: $scope.currentUser.role, AMOUNT: $filter('currency')(price.price) }, 'messageformat'); + $scope.validButtonName = _t('confirm_payment_of_html', { ROLE: $scope.currentUser.role, AMOUNT: $filter('currency')(price.price) }); } else { $scope.validButtonName = _t('confirm'); } diff --git a/app/assets/javascripts/directives/cart.js.erb b/app/assets/javascripts/directives/cart.js.erb index 75dcce2f0..0eb1dd94e 100644 --- a/app/assets/javascripts/directives/cart.js.erb +++ b/app/assets/javascripts/directives/cart.js.erb @@ -556,10 +556,10 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs', // Button label if ($scope.amount > 0) { - $scope.validButtonName = _t('cart.confirm_payment_of_html', { ROLE: $rootScope.currentUser.role, AMOUNT: $filter('currency')($scope.amount) }, 'messageformat'); + $scope.validButtonName = _t('cart.confirm_payment_of_html', { ROLE: $rootScope.currentUser.role, AMOUNT: $filter('currency')($scope.amount) }); } else { if ((price.price > 0) && ($scope.walletAmount === 0)) { - $scope.validButtonName = _t('cart.confirm_payment_of_html', { ROLE: $rootScope.currentUser.role, AMOUNT: $filter('currency')(price.price) }, 'messageformat'); + $scope.validButtonName = _t('cart.confirm_payment_of_html', { ROLE: $rootScope.currentUser.role, AMOUNT: $filter('currency')(price.price) }); } else { $scope.validButtonName = _t('confirm'); } diff --git a/app/assets/templates/admin/calendar/eventModal.html.erb b/app/assets/templates/admin/calendar/eventModal.html.erb index 6dc0c822f..64ce005a4 100644 --- a/app/assets/templates/admin/calendar/eventModal.html.erb +++ b/app/assets/templates/admin/calendar/eventModal.html.erb @@ -154,7 +154,7 @@

    {{ 'admin_calendar.summary' }}

    - {{ 'admin_calendar.about_to_create' | translate:{NUMBER:occurrences.length,TYPE:availability.available_type}:'messageformat'}} + {{ 'admin_calendar.about_to_create' | translate:{NUMBER:occurrences.length,TYPE:availability.available_type}}}
    • {{slot.start_at | amDateFormat:'L LT'}} - {{slot.end_at | amDateFormat:'LT'}}
    diff --git a/app/assets/templates/admin/members/edit.html.erb b/app/assets/templates/admin/members/edit.html.erb index 90d8de79a..b9d249d22 100644 --- a/app/assets/templates/admin/members/edit.html.erb +++ b/app/assets/templates/admin/members/edit.html.erb @@ -158,11 +158,11 @@ {{r.reservable.title}} - {{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }}
    - {{ 'NUMBER_full_price_tickets_reserved' }} + {{ 'NUMBER_full_price_tickets_reserved' }}
    - {{ 'NUMBER_NAME_tickets_reserved' }} + {{ 'NUMBER_NAME_tickets_reserved' }}     diff --git a/app/assets/templates/admin/trainings/index.html.erb b/app/assets/templates/admin/trainings/index.html.erb index 647098869..3eb92b3e4 100644 --- a/app/assets/templates/admin/trainings/index.html.erb +++ b/app/assets/templates/admin/trainings/index.html.erb @@ -93,7 +93,7 @@ diff --git a/app/assets/templates/dashboard/events.html.erb b/app/assets/templates/dashboard/events.html.erb index 2c199becf..8adbb1cab 100644 --- a/app/assets/templates/dashboard/events.html.erb +++ b/app/assets/templates/dashboard/events.html.erb @@ -23,15 +23,13 @@ {{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }}
    + translate-values="{NUMBER: r.nb_reserve_places}"> {{ 'NUMBER_normal_places_reserved' }}
    + translate-values="{NUMBER: ticket.booked, NAME: ticket.price_category.name}"> {{ 'NUMBER_of_NAME_places_reserved' }}     diff --git a/app/assets/templates/events/show.html.erb b/app/assets/templates/events/show.html.erb index bd9965530..0d8c9e845 100644 --- a/app/assets/templates/events/show.html.erb +++ b/app/assets/templates/events/show.html.erb @@ -115,14 +115,14 @@
    {{ 'ticket' | translate:{NUMBER:reserve.nbReservePlaces}:"messageformat" }} + {{ 'ticket' | translate:{NUMBER:reserve.nbReservePlaces} }}
    {{ 'ticket' | translate:{NUMBER:reserve.tickets[price.id]}:"messageformat" }} + {{ 'ticket' | translate:{NUMBER:reserve.tickets[price.id]} }}
    @@ -154,9 +154,9 @@
    {{ 'you_booked_DATE' | translate:{DATE:(reservation.created_at | amDateFormat:'L LT')} }}
    -
    {{ 'full_price_' | translate }} {{reservation.nb_reserve_places}} {{ 'ticket' | translate:{NUMBER:reservation.nb_reserve_places}:"messageformat" }}
    +
    {{ 'full_price_' | translate }} {{reservation.nb_reserve_places}} {{ 'ticket' | translate:{NUMBER:reservation.nb_reserve_places} }}
    - {{ticket.event_price_category.price_category.name}} : {{ticket.booked}} {{ 'ticket' | translate:{NUMBER:ticket.booked}:"messageformat" }} + {{ticket.event_price_category.price_category.name}} : {{ticket.booked}} {{ 'ticket' | translate:{NUMBER:ticket.booked} }}
    {{ 'change' }} diff --git a/app/assets/templates/plans/index.html.erb b/app/assets/templates/plans/index.html.erb index 174a71d62..0b47bd74c 100644 --- a/app/assets/templates/plans/index.html.erb +++ b/app/assets/templates/plans/index.html.erb @@ -88,7 +88,7 @@

    {{ 'my_group' }}

    -

    {{ 'his_group' }}

    +

    {{ 'his_group' }}

    @@ -99,16 +99,14 @@ ng-click="group.change = !group.change" ng-show="(!selectedPlan && ctrl.member && !ctrl.member.subscribed_plan && ctrl.member.subscription) || (!paid.plan)" translate - translate-values="{ROLE:currentUser.role}" - translate-interpolation="messageformat">{{ 'he_wants_to_change_group' }} + translate-values="{ROLE:currentUser.role}">{{ 'he_wants_to_change_group' }}
    + translate-values="{ROLE:currentUser.role, GENDER:getGender(currentUser)}">{{ 'change_my_group' }}
    diff --git a/app/assets/templates/profile/complete.html.erb b/app/assets/templates/profile/complete.html.erb index a024ce6ef..57a104e1f 100644 --- a/app/assets/templates/profile/complete.html.erb +++ b/app/assets/templates/profile/complete.html.erb @@ -25,7 +25,7 @@
    - {{ 'you_ve_just_created_a_new_account_on_the_fablab_by_logging_from' | translate:{ GENDER: nameGenre, NAME: fablabName }:"messageformat" }}
    + {{ 'you_ve_just_created_a_new_account_on_the_fablab_by_logging_from' | translate:{ GENDER: nameGenre, NAME: fablabName } }}
    {{activeProvider.name}} ({{ssoEmail()}})

    {{ 'we_need_some_more_details' }}.

    diff --git a/app/assets/templates/projects/show.html.erb b/app/assets/templates/projects/show.html.erb index 0918d3a98..ebb456876 100644 --- a/app/assets/templates/projects/show.html.erb +++ b/app/assets/templates/projects/show.html.erb @@ -90,7 +90,7 @@
    {{project.project_caos_attributes.length}} -

    {{ 'CAD_file_to_download' }}

    +

    {{ 'CAD_file_to_download' }}

    - + '">
    - +
    diff --git a/app/assets/templates/dashboard/trainings.html.erb b/app/assets/templates/dashboard/trainings.html.erb index e7282172d..de757fff1 100644 --- a/app/assets/templates/dashboard/trainings.html.erb +++ b/app/assets/templates/dashboard/trainings.html.erb @@ -2,7 +2,7 @@
    - + '">
    @@ -13,7 +13,7 @@
    -

    {{ 'your_next_trainings' | translate }}

    +

    {{ 'app.logged.dashboard.trainings.your_next_trainings' | translate }}

      @@ -21,14 +21,14 @@ {{r.reservable.name}} - {{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }}
    -
    {{ 'no_trainings' }}
    +
    {{ 'app.logged.dashboard.trainings.no_trainings' }}
    -

    {{ 'your_previous_trainings' | translate }}

    +

    {{ 'app.logged.dashboard.trainings.your_previous_trainings' | translate }}

      @@ -36,14 +36,14 @@ {{r.reservable.name}} - {{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }}
    -
    {{ 'no_trainings' }}
    +
    {{ 'app.logged.dashboard.trainings.no_trainings' }}
    -

    {{ 'your_approved_trainings' | translate }}

    +

    {{ 'app.logged.dashboard.trainings.your_approved_trainings' | translate }}

      @@ -51,7 +51,7 @@ {{t.name}}
    -
    {{ 'no_trainings' }}
    +
    {{ 'app.logged.dashboard.trainings.no_trainings' }}
    diff --git a/app/assets/templates/dashboard/wallet.html.erb b/app/assets/templates/dashboard/wallet.html.erb index 175504c64..3eb89eb71 100644 --- a/app/assets/templates/dashboard/wallet.html.erb +++ b/app/assets/templates/dashboard/wallet.html.erb @@ -2,7 +2,7 @@
    - + '">
    @@ -10,11 +10,11 @@
    - + '">
    - + '">
    diff --git a/app/assets/templates/events/index.html.erb b/app/assets/templates/events/index.html.erb index 49b85f4a3..84fc67b1f 100644 --- a/app/assets/templates/events/index.html.erb +++ b/app/assets/templates/events/index.html.erb @@ -7,13 +7,13 @@
    -

    {{ 'the_fablab_s_events' }}

    +

    {{ 'app.public.events_list.the_fablab_s_events' }}

    - {{ 'add_an_event' }} + {{ 'app.public.events_list.add_an_event' }}
    @@ -23,19 +23,19 @@
    @@ -53,10 +53,10 @@
    {{event.category.name}}

    {{event.title}}

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

    -

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

    +

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

    -
    {{ 'free_admission' }}
    -
    {{ 'full_price_' | translate }} {{event.amount | currency}} / {{ price.category.name }} {{price.amount | currency}}
    +
    {{ 'app.public.events_list.free_admission' }}
    +
    {{ 'app.public.events_list.full_price_' | translate }} {{event.amount | currency}} / {{ price.category.name }} {{price.amount | currency}}
    {{event.event_themes[0].name}} @@ -64,10 +64,10 @@
    - {{event.nb_free_places}} {{ 'still_available' | translate }} - {{ 'sold_out' }} - {{ 'cancelled' }} - {{ 'free_entry' }} + {{event.nb_free_places}} {{ 'app.public.events_list.still_available' | translate }} + {{ 'app.public.events_list.sold_out' }} + {{ 'app.public.events_list.cancelled' }} + {{ 'app.public.events_list.free_entry' }}
    @@ -86,7 +86,7 @@
    - {{ 'load_the_next_events' }} + {{ 'app.public.events_list.load_the_next_events' }}
    diff --git a/app/assets/templates/home.html.erb b/app/assets/templates/home.html.erb index f11b15937..9d0bbf796 100644 --- a/app/assets/templates/home.html.erb +++ b/app/assets/templates/home.html.erb @@ -5,7 +5,7 @@
    -

    {{ 'latest_documented_projects' }}

    +

    {{ 'app.public.home.latest_documented_projects' }}

    @@ -24,14 +24,14 @@
    - {{ 'follow_us' | translate }} + {{ 'app.public.home.follow_us' | translate }}
    -

    {{ 'latest_tweets' }}

    +

    {{ 'app.public.home.latest_tweets' }}

      @@ -44,7 +44,7 @@
      -

      {{ 'latest_registered_members' }}

      +

      {{ 'app.public.home.latest_registered_members' }}

      @@ -64,11 +64,11 @@
      - +
      - +
      @@ -80,7 +80,7 @@
    -

    {{ 'fablab_s_next_events' | translate }} {{ 'every_events' | translate }}

    +

    {{ 'app.public.home.fablab_s_next_events' | translate }} {{ 'app.public.home.every_events' | translate }}

    @@ -106,14 +106,14 @@
    -
    {{ 'from_date_to_date' | translate:{START:(event.start_date | amDateFormat:'L'), END:(event.end_date | amDateFormat:'L')} }}
    -
    {{ 'on_the_date' | translate:{DATE:(event.start_date | amDateFormat:'L')} }}
    +
    {{ 'app.public.home.from_date_to_date' | translate:{START:(event.start_date | amDateFormat:'L'), END:(event.end_date | amDateFormat:'L')} }}
    +
    {{ 'app.public.home.on_the_date' | translate:{DATE:(event.start_date | amDateFormat:'L')} }}
    - {{ 'all_day' }} - {{ 'from_time_to_time' | translate:{START:(event.start_date | amDateFormat:'LT'), END:(event.end_date | amDateFormat:'LT')} }} + {{ 'app.public.home.all_day' }} + {{ 'app.public.home.from_time_to_time' | translate:{START:(event.start_date | amDateFormat:'LT'), END:(event.end_date | amDateFormat:'LT')} }}
    @@ -122,22 +122,22 @@
    - {{ 'still_available' | translate }} {{event.nb_free_places}} - {{ 'free_entry' }} - {{ 'event_full' }} + {{ 'app.public.home.still_available' | translate }} {{event.nb_free_places}} + {{ 'app.public.home.free_entry' }} + {{ 'app.public.home.event_full' }}
    - {{ 'free_admission' }} - {{ 'full_price' | translate }} {{event.amount | currency}} + {{ 'app.public.home.free_admission' }} + {{ 'app.public.home.full_price' | translate }} {{event.amount | currency}}
    -
    {{ 'consult' }}
    +
    {{ 'app.shared.buttons.consult' }}
    diff --git a/app/assets/templates/machines/index.html.erb b/app/assets/templates/machines/index.html.erb index 112f4dbdb..39cd2968d 100644 --- a/app/assets/templates/machines/index.html.erb +++ b/app/assets/templates/machines/index.html.erb @@ -7,13 +7,13 @@
    -

    {{ 'machines_list.the_fablab_s_machines' }}

    +

    {{ 'app.public.machines_list.the_fablab_s_machines' }}

    - {{ 'machines_list.add_a_machine' }} + {{ 'app.public.machines_list.add_a_machine' }}
    @@ -26,7 +26,7 @@
    @@ -48,13 +48,13 @@
    - +
    - +
    diff --git a/app/assets/templates/machines/show.html.erb b/app/assets/templates/machines/show.html.erb index 0e332c35b..2e4849842 100644 --- a/app/assets/templates/machines/show.html.erb +++ b/app/assets/templates/machines/show.html.erb @@ -15,15 +15,15 @@
    - {{ 'book_this_machine' }} + translate>{{ 'app.public.machines_show.book_this_machine' }} - {{ 'edit' | translate }} + {{ 'app.shared.buttons.edit' | translate }} - +
    @@ -48,7 +48,7 @@
    -

    {{ 'technical_specifications' }}

    +

    {{ 'app.public.machines_show.technical_specifications' }}

    @@ -59,19 +59,19 @@
    {{machine.machine_files_attributes.length}} -

    {{ 'files_to_download' }}

    +

    {{ 'app.public.machines_show.files_to_download' }}

    - -
    -

    {{ 'projects_using_the_machine' }}

    +

    {{ 'app.public.machines_show.projects_using_the_machine' }}

      diff --git a/app/assets/templates/members/index.html.erb b/app/assets/templates/members/index.html.erb index e9f5e2124..4a68a1514 100644 --- a/app/assets/templates/members/index.html.erb +++ b/app/assets/templates/members/index.html.erb @@ -7,7 +7,7 @@
    -

    {{ 'the_fablab_members' }}

    +

    {{ 'app.logged.members.the_fablab_members' }}

    @@ -21,10 +21,10 @@ - - - - + + + + @@ -41,7 +41,7 @@ @@ -49,9 +49,9 @@
    {{ 'avatar' }}{{ 'user' }}{{ 'pseudonym' }}{{ 'email_address' }}{{ 'app.logged.members.avatar' }}{{ 'app.logged.members.user' }}{{ 'app.logged.members.pseudonym' }}{{ 'app.logged.members.email_address' }}
    - +
    -

    {{ 'no_members_for_now' }}

    +

    {{ 'app.logged.members.no_members_for_now' }}

    diff --git a/app/assets/templates/members/show.html.erb b/app/assets/templates/members/show.html.erb index 355c83924..7205b8424 100644 --- a/app/assets/templates/members/show.html.erb +++ b/app/assets/templates/members/show.html.erb @@ -15,11 +15,11 @@
    - {{ 'members_list' }} + {{ 'app.logged.members_show.members_list' }}
    - + '"> diff --git a/app/assets/templates/notifications/index.html.erb b/app/assets/templates/notifications/index.html.erb index 1d244d4cd..18a1505aa 100644 --- a/app/assets/templates/notifications/index.html.erb +++ b/app/assets/templates/notifications/index.html.erb @@ -7,7 +7,7 @@
    -

    {{ 'notifications_center' }}

    +

    {{ 'app.logged.notifications.notifications_center' }}

    @@ -19,14 +19,14 @@
    - + - - + + @@ -42,13 +42,13 @@ - +
    {{ 'date' }}{{ 'notif_title' }}{{ 'app.logged.notifications.date' }}{{ 'app.logged.notifications.notif_title' }}
    {{ 'no_new_notifications' }}{{ 'app.logged.notifications.no_new_notifications' }}
    -
    {{ 'archives' }}
    +
    {{ 'app.logged.notifications.archives' }}
    @@ -73,7 +73,7 @@ - + @@ -81,7 +81,7 @@
    {{ 'no_archived_notifications' }}{{ 'app.logged.notifications.no_archived_notifications' }}
    - {{ 'load_the_next_notifications' }} + {{ 'app.logged.notifications.load_the_next_notifications' }}
    diff --git a/app/assets/templates/plans/index.html.erb b/app/assets/templates/plans/index.html.erb index 0b47bd74c..69c2ac6c3 100644 --- a/app/assets/templates/plans/index.html.erb +++ b/app/assets/templates/plans/index.html.erb @@ -7,7 +7,7 @@
    -

    {{ 'subcriptions' }}

    +

    {{ 'app.public.plans.subcriptions' }}

    @@ -44,24 +44,24 @@
    - +

    - {{ 'more_information' }} + {{ 'app.public.plans.more_information' }} @@ -69,7 +69,7 @@
    - {{ 'your_subscription_expires_on_the_DATE' | translate:{DATE:(currentUser.subscription.expired_at | amDateFormat:'L' )} }} + {{ 'app.public.plans.your_subscription_expires_on_the_DATE' | translate:{DATE:(currentUser.subscription.expired_at | amDateFormat:'L' )} }}
    @@ -87,8 +87,8 @@
    -

    {{ 'my_group' }}

    -

    {{ 'his_group' }}

    +

    {{ 'app.public.plans.my_group' }}

    +

    {{ 'app.public.plans.his_group' }}

    @@ -99,70 +99,70 @@ ng-click="group.change = !group.change" ng-show="(!selectedPlan && ctrl.member && !ctrl.member.subscribed_plan && ctrl.member.subscription) || (!paid.plan)" translate - translate-values="{ROLE:currentUser.role}">{{ 'he_wants_to_change_group' }} + translate-values="{ROLE:currentUser.role}">{{ 'app.public.plans.he_wants_to_change_group' }}
    + translate-values="{ROLE:currentUser.role, GENDER:getGender(currentUser)}">{{ 'app.public.plans.change_my_group' }}
    -

    {{ 'summary' }}

    +

    {{ 'app.public.plans.summary' }}

    - {{ 'your_subscription_has_expired_on_the_DATE' | translate:{DATE:(ctrl.member.subscription.expired_at | amDateFormat:'LL')} }} + {{ 'app.public.plans.your_subscription_has_expired_on_the_DATE' | translate:{DATE:(ctrl.member.subscription.expired_at | amDateFormat:'LL')} }}
    {{ctrl.member.subscription.plan | humanReadablePlanName }} -
    {{ 'subscription_price' | translate }} {{ctrl.member.subscription.plan.amount | currency}}
    +
    {{ 'app.public.plans.subscription_price' | translate }} {{ctrl.member.subscription.plan.amount | currency}}
    -

    {{ 'summary' }}

    +

    {{ 'app.public.plans.summary' }}

    - {{ 'you_ve_just_selected_a_' | translate }} {{ '_subscription' }} : + {{ 'app.public.plans.you_ve_just_selected_a_subscription_html' }}
    {{ selectedPlan | humanReadablePlanName }} -
    {{ 'subscription_price' | translate }} {{selectedPlan.amount | currency}}
    +
    {{ 'app.public.plans.subscription_price' | translate }} {{selectedPlan.amount | currency}}
    - +
    -

    {{ 'summary' }}

    +

    {{ 'app.public.plans.summary' }}

    - {{ 'you_ve_just_payed_the_' | translate }} {{ '_subscription' }} : + {{ 'app.public.plans.you_ve_just_payed_the_subscription_html' }}
    {{ paid.plan | humanReadablePlanName }} -
    {{ 'subscription_price' | translate }} {{paid.plan.amount | currency}}
    +
    {{ 'app.public.plans.subscription_price' | translate }} {{paid.plan.amount | currency}}
    -
    {{ 'thank_you_your_subscription_is_successful' | translate }}
    - {{ 'your_invoice_will_be_available_soon_from_your_' | translate }} {{ 'dashboard' }}
    +
    {{ 'app.public.plans.thank_you_your_subscription_is_successful' | translate }}
    + {{ 'app.public.plans.your_invoice_will_be_available_soon_from_your_dashboard' }}
    diff --git a/app/assets/templates/plans/payment_modal.html.erb b/app/assets/templates/plans/payment_modal.html.erb index 7b1f97185..db6145684 100644 --- a/app/assets/templates/plans/payment_modal.html.erb +++ b/app/assets/templates/plans/payment_modal.html.erb @@ -1,15 +1,15 @@
    -

    {{ 'subscription_confirmation' }}

    +

    {{ 'app.public.plans.subscription_confirmation' }}

    {{alert.msg}} - + '"> -

    {{ 'here_is_the_NAME_subscription_summary' | translate:{NAME:member.name} }}

    +

    {{ 'app.public.plans.here_is_the_NAME_subscription_summary' | translate:{NAME:member.name} }}

    {{ plan | humanReadablePlanName }}

    - +
    diff --git a/app/assets/templates/projects/index.html.erb b/app/assets/templates/projects/index.html.erb index f927f20b2..7d5f00cba 100644 --- a/app/assets/templates/projects/index.html.erb +++ b/app/assets/templates/projects/index.html.erb @@ -7,13 +7,13 @@
    -

    {{ 'projects_list.the_fablab_projects' }}

    +

    {{ 'app.public.projects_list.the_fablab_projects' }}

    - {{ 'projects_list.add_a_project' }} + {{ 'app.public.projects_list.add_a_project' }}
    @@ -23,16 +23,16 @@
    - {{ 'projects_list.reset_all_filters' | translate }} + {{ 'app.public.projects_list.reset_all_filters' | translate }} - - + + @@ -44,7 +44,7 @@
    - +
    @@ -53,27 +53,27 @@
    @@ -81,7 +81,7 @@
    - {{ 'projects_list.project_search_result_is_empty' | translate }} + {{ 'app.public.projects_list.project_search_result_is_empty' | translate }}
    @@ -99,7 +99,7 @@
    - {{ 'projects_list.rough_draft' }} + {{ 'app.public.projects_list.rough_draft' }}
    @@ -119,7 +119,7 @@
    - {{ 'projects_list.load_next_projects' }} + {{ 'app.public.projects_list.load_next_projects' }}
    diff --git a/app/assets/templates/shared/_member_form.html.erb b/app/assets/templates/shared/_member_form.html.erb index f2678e33f..e42b39a11 100644 --- a/app/assets/templates/shared/_member_form.html.erb +++ b/app/assets/templates/shared/_member_form.html.erb @@ -21,8 +21,8 @@ - {{ 'add_an_avatar' }} - {{ 'change' }} + {{ 'app.shared.user.add_an_avatar' }} + {{ 'app.shared.buttons.change' }} @@ -47,7 +47,7 @@ value="true" ng-disabled="preventField['profile.gender'] && user.statistic_profile.gender && !userForm['user[statistic_profile_attributes][gender]'].$dirty" required/> - {{ 'man' | translate }} + {{ 'app.shared.user.man' | translate }} - + - {{ 'gender_is_required' }} + {{ 'app.shared.user.gender_is_required' }}
    - +
    - {{ 'pseudonym_is_required' }} + {{ 'app.shared.user.pseudonym_is_required' }}
    - +
    - {{ 'surname_is_required' }} + {{ 'app.shared.user.surname_is_required' }}
    - +
    - {{ 'first_name_is_required' }} + {{ 'app.shared.user.first_name_is_required' }}
    - +
    - {{ 'email_address_is_required' }} + {{ 'app.shared.user.email_address_is_required' }}
    + translate>{{ 'app.shared.user.change_password' }}
    @@ -141,12 +141,12 @@ ng-model="user.password" class="form-control" id="user_password" - placeholder="{{ 'new_password' | translate }}" + placeholder="{{ 'app.shared.user.new_password' | translate }}" ng-minlength="8" required/> - {{ 'password_is_required' }} - {{ 'password_is_too_short' }} + {{ 'app.shared.user.password_is_required' }} + {{ 'app.shared.user.password_is_too_short' }}
    @@ -157,19 +157,19 @@ ng-model="user.password_confirmation" class="form-control" id="user_password_confirmation" - placeholder="{{ 'confirmation_of_new_password' | translate }}" + placeholder="{{ 'app.shared.user.confirmation_of_new_password' | translate }}" ng-minlength="8" required match="user.password"/>
    - {{ 'confirmation_of_password_is_required' }} - {{ 'confirmation_of_password_is_too_short' }} - {{ 'confirmation_mismatch_with_password' }} + {{ 'app.shared.user.confirmation_of_password_is_required' }} + {{ 'app.shared.user.confirmation_of_password_is_too_short' }} + {{ 'app.shared.user.confirmation_mismatch_with_password' }}
    - + @@ -177,16 +177,16 @@ name="user[invoicing_profile_attributes][organization_attributes][name]" ng-model="user.invoicing_profile.organization.name" class="form-control" - placeholder="{{ 'organization_name' | translate }}" + placeholder="{{ 'app.shared.user.organization_name' | translate }}" ng-required="user.invoicing_profile.organization" ng-disabled="preventField['profile.organization_name'] && user.invoicing_profile.organization.name && !userForm['user[invoicing_profile_attributes][organization_attributes][name]'].$dirty">
    - {{ 'organization_name_is_required' }} + {{ 'app.shared.user.organization_name_is_required' }}
    - + @@ -194,16 +194,16 @@ name="user[invoicing_profile_attributes][organization_attributes][address_attributes][address]" ng-model="user.invoicing_profile.organization.address.address" class="form-control" - placeholder="{{ 'organization_address' | translate }}" + placeholder="{{ 'app.shared.user.organization_address' | translate }}" ng-required="user.invoicing_profile.organization" ng-disabled="preventField['profile.organization_address'] && user.invoicing_profile.organization.address.address && !userForm['user[invoicing_profile_attributes][organization_attributes][address_attributes][address]'].$dirty">
    - {{ 'organization_address_is_required' }} + {{ 'app.shared.user.organization_address_is_required' }}
    - + @@ -219,12 +219,12 @@ name="user[statistic_profile_attributes][birthday]" value="{{user.statistic_profile.birthday | toIsoDate}}" />
    - {{ 'date_of_birth_is_required' }} + {{ 'app.shared.user.date_of_birth_is_required' }}
    - + @@ -234,35 +234,35 @@ class="form-control" id="user_address" ng-disabled="preventField['profile.address'] && user.invoicing_profile.address.address && !userForm['user[invoicing_profile_attributes][address_attributes][address]'].$dirty" - placeholder="{{ 'address' | translate }}"/> + placeholder="{{ 'app.shared.user.address' | translate }}"/>
    - +
    - {{ 'phone_number_is_required' }} + {{ 'app.shared.user.phone_number_is_required' }}
    - +
    @@ -275,13 +275,13 @@ ng-model="user.profile.job" class="form-control" id="user_job" - placeholder="{{ 'job' | translate }}" + placeholder="{{ 'app.shared.user.job' | translate }}" ng-disabled="preventField['profile.job'] && user.profile.job && !userForm['user[profile_attributes][job]'].$dirty"/>
    - +
    - - + +
    diff --git a/app/assets/templates/admin/invoices/closePeriodModal.html.erb b/app/assets/templates/admin/invoices/closePeriodModal.html.erb index f2ada5808..7c909bd2c 100644 --- a/app/assets/templates/admin/invoices/closePeriodModal.html.erb +++ b/app/assets/templates/admin/invoices/closePeriodModal.html.erb @@ -1,10 +1,10 @@
    -

    {{ 'invoices.close_accounting_period' }}

    +

    {{ 'app.admin.invoices.close_accounting_period' }}

    - +
    - {{ 'invoices.start_date_is_required' }} + {{ 'app.admin.invoices.start_date_is_required' }} {{ errors.start_at[0] }}
    - +
    - {{ 'invoices.end_date_is_required' }} + {{ 'app.admin.invoices.end_date_is_required' }} {{ errors.end_at[0] }}
    @@ -51,12 +51,12 @@ {{ $parent.invoiceErrorRE.exec(key)[1] }} : {{ value[0] }}
    -

    {{ 'invoices.previous_closings' }}

    +

    {{ 'app.admin.invoices.previous_closings' }}

    - - + + @@ -72,10 +72,10 @@
    {{ 'invoices.start_date' }}{{ 'invoices.end_date' }}{{ 'app.admin.invoices.start_date' }}{{ 'app.admin.invoices.end_date' }}
    -
    {{ 'invoices.no_periods'}}
    +
    {{ 'app.admin.invoices.no_periods'}}
    - - + +
    diff --git a/app/assets/templates/admin/invoices/index.html.erb b/app/assets/templates/admin/invoices/index.html.erb index 9ca28e005..e6ebf5f7d 100644 --- a/app/assets/templates/admin/invoices/index.html.erb +++ b/app/assets/templates/admin/invoices/index.html.erb @@ -7,14 +7,14 @@
    -

    {{ 'invoices.invoices' }}

    +

    {{ 'app.admin.invoices.invoices' }}

    - {{ 'invoices.accounting_periods' | translate }} + {{ 'app.admin.invoices.accounting_periods' | translate }}
    @@ -24,14 +24,14 @@
    - -

    {{ 'invoices.filter_invoices' | translate }}

    + +

    {{ 'app.admin.invoices.filter_invoices' | translate }}

    - {{ 'invoices.invoice_num_' }} + {{ 'app.admin.invoices.invoice_num_' }}
    @@ -40,7 +40,7 @@
    - {{ 'invoices.customer_' }} + {{ 'app.admin.invoices.customer_' }}
    @@ -64,13 +64,13 @@ - {{ 'invoices.invoice_num' | translate }} + {{ 'app.admin.invoices.invoice_num' | translate }} - {{ 'invoices.date' | translate }} + {{ 'app.admin.invoices.date' | translate }} - {{ 'invoices.price' | translate }} + {{ 'app.admin.invoices.price' | translate }} - {{ 'invoices.customer' | translate }} + {{ 'app.admin.invoices.customer' | translate }} @@ -91,13 +91,13 @@
    - {{ 'invoices.download_the_invoice' | translate }} + {{ 'app.admin.invoices.download_the_invoice' | translate }} - {{ 'invoices.download_the_credit_note' | translate }} + {{ 'app.admin.invoices.download_the_credit_note' | translate }} - {{ 'invoices.credit_note' | translate }} + {{ 'app.admin.invoices.credit_note' | translate }}
    @@ -105,9 +105,9 @@
    - +
    -

    {{ 'invoices.no_invoices_for_now' }}

    +

    {{ 'app.admin.invoices.no_invoices_for_now' }}

    @@ -116,10 +116,10 @@ - +
    - {{ 'invoices.john_smith' }} -
    {{ 'invoices.john_smith_at_example_com' }}
    + {{ 'app.admin.invoices.john_smith' }} +
    {{ 'app.admin.invoices.john_smith_at_example_com' }}
    -
    {{ 'invoices.invoice_reference_' | translate }} {{mkReference()}}
    -
    {{ 'invoices.code_' | translate }} {{invoice.code.model}}
    -
    {{ 'invoices.code_disabled' }}
    -
    {{ 'invoices.order_num' | translate }} {{mkNumber()}}
    -
    {{ 'invoices.invoice_issued_on_DATE_at_TIME' | translate:{DATE:(today | amDateFormat:'L'), TIME:(today | amDateFormat:'LT')} }}
    +
    {{ 'app.admin.invoices.invoice_reference_' | translate }} {{mkReference()}}
    +
    {{ 'app.admin.invoices.code_' | translate }} {{invoice.code.model}}
    +
    {{ 'app.admin.invoices.code_disabled' }}
    +
    {{ 'app.admin.invoices.order_num' | translate }} {{mkNumber()}}
    +
    {{ 'app.admin.invoices.invoice_issued_on_DATE_at_TIME' | translate:{DATE:(today | amDateFormat:'L'), TIME:(today | amDateFormat:'LT')} }}
    - {{ 'invoices.object_reservation_of_john_smith_on_DATE_at_TIME' | translate:{DATE:(inOneWeek | amDateFormat:'L'), TIME:(inOneWeek | amDateFormat:'LT')} }} + {{ 'app.admin.invoices.object_reservation_of_john_smith_on_DATE_at_TIME' | translate:{DATE:(inOneWeek | amDateFormat:'L'), TIME:(inOneWeek | amDateFormat:'LT')} }}
    - {{ 'invoices.order_summary' | translate }} + {{ 'app.admin.invoices.order_summary' | translate }} - - + + - + - - + + - + - + - + - +
    {{ 'invoices.details' }}{{ 'invoices.amount' }}{{ 'app.admin.invoices.details' }}{{ 'app.admin.invoices.amount' }}
    {{ 'invoices.machine_booking-3D_printer' | translate }} {{inOneWeek | amDateFormat:'LLL'}} - {{inOneWeekAndOneHour | amDateFormat:'LT'}}{{ 'app.admin.invoices.machine_booking-3D_printer' | translate }} {{inOneWeek | amDateFormat:'LLL'}} - {{inOneWeekAndOneHour | amDateFormat:'LT'}} {{30.0 | currency}}
    {{ 'invoices.total_amount' }}{{ 'invoices.total_including_all_taxes' }}{{ 'app.admin.invoices.total_amount' }}{{ 'app.admin.invoices.total_including_all_taxes' }} {{30.0 | currency}}
    {{ 'invoices.VAT_disabled' }}{{ 'app.admin.invoices.VAT_disabled' }}
    {{ 'invoices.including_VAT' | translate }} {{invoice.VAT.rate}} %{{ 'app.admin.invoices.including_VAT' | translate }} {{invoice.VAT.rate}} % {{30-(30/(invoice.VAT.rate/100+1)) | currency}}
    {{ 'invoices.including_total_excluding_taxes' }}{{ 'app.admin.invoices.including_total_excluding_taxes' }} {{30/(invoice.VAT.rate/100+1) | currency}}
    {{ 'invoices.including_amount_payed_on_ordering' }}{{ 'app.admin.invoices.including_amount_payed_on_ordering' }} {{30.0 | currency}}

    - {{ 'invoices.settlement_by_debit_card_on_DATE_at_TIME_for_an_amount_of_AMOUNT' }} + {{ 'app.admin.invoices.settlement_by_debit_card_on_DATE_at_TIME_for_an_amount_of_AMOUNT' }}

    +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - +
    @@ -333,125 +333,125 @@ @@ -461,33 +461,33 @@ @@ -496,23 +496,23 @@ diff --git a/app/assets/templates/admin/members/_form.html.erb b/app/assets/templates/admin/members/_form.html.erb index a6d9fc7d6..7c311aff5 100644 --- a/app/assets/templates/admin/members/_form.html.erb +++ b/app/assets/templates/admin/members/_form.html.erb @@ -1,18 +1,18 @@
    - {{ 'group_is_required' }} + {{ 'app.shared.user_admin.group_is_required' }}
    - +
    @@ -28,7 +28,7 @@
    - +
    diff --git a/app/assets/templates/admin/members/administrators.html.erb b/app/assets/templates/admin/members/administrators.html.erb index fa2cc4c79..31ce9c3b0 100644 --- a/app/assets/templates/admin/members/administrators.html.erb +++ b/app/assets/templates/admin/members/administrators.html.erb @@ -2,23 +2,23 @@
    - +
    - + - + - + - + - + @@ -36,4 +36,4 @@
    {{ 'surname' | translate }} {{ 'app.admin.members.surname' | translate }} {{ 'first_name' | translate }} {{ 'app.admin.members.first_name' | translate }} {{ 'email' | translate }} {{ 'app.admin.members.email' | translate }} {{ 'phone' | translate }} {{ 'app.admin.members.phone' | translate }}
    -
    \ No newline at end of file +
    diff --git a/app/assets/templates/admin/members/edit.html.erb b/app/assets/templates/admin/members/edit.html.erb index b9d249d22..25fb2add6 100644 --- a/app/assets/templates/admin/members/edit.html.erb +++ b/app/assets/templates/admin/members/edit.html.erb @@ -9,8 +9,8 @@
    -

    {{ 'user' | translate }} {{ user.name }}

    - {{ 'incomplete_profile' }} +

    {{ 'app.shared.user_admin.user' | translate }} {{ user.name }}

    + {{ 'app.shared.user_admin.incomplete_profile' }}
    @@ -18,7 +18,7 @@
    - {{ 'cancel' }} + {{ 'app.shared.buttons.cancel' }}
    @@ -34,11 +34,11 @@ - +
    - {{ 'warning_incomplete_user_profile_probably_imported_from_sso' }} + {{ 'app.shared.user_admin.warning_incomplete_user_profile_probably_imported_from_sso' }}
    @@ -46,21 +46,21 @@
    - + '"> - + '">
    - +
    - +
    @@ -68,24 +68,24 @@

    {{ subscription.plan | humanReadablePlanName }}

    - {{ 'duration' | translate }} {{ subscription.plan.interval | planIntervalFilter: subscription.plan.interval_count }} + {{ 'app.admin.members_edit.duration' | translate }} {{ subscription.plan.interval | planIntervalFilter: subscription.plan.interval_count }}

    - {{ 'expires_at' | translate }} {{ subscription.expired_at | amDateFormat: 'L' }} + {{ 'app.admin.members_edit.expires_at' | translate }} {{ subscription.expired_at | amDateFormat: 'L' }}

    - {{ 'price_' | translate }} {{ subscription.plan.amount | currency}} + {{ 'app.admin.members_edit.price_' | translate }} {{ subscription.plan.amount | currency}}

    - - + +

    - {{ 'user_has_no_current_subscription' }} + {{ 'app.admin.members_edit.user_has_no_current_subscription' }}

    - +
    @@ -93,11 +93,11 @@ - +
    -

    {{ 'next_trainings' | translate }}

    +

    {{ 'app.admin.members_edit.next_trainings' | translate }}

      @@ -105,14 +105,14 @@ {{r.reservable.name}} - {{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }}
    -
    {{ 'no_trainings' }}
    +
    {{ 'app.admin.members_edit.no_trainings' }}
    -

    {{ 'passed_trainings' | translate }}

    +

    {{ 'app.admin.members_edit.passed_trainings' | translate }}

      @@ -125,14 +125,14 @@
    --> -
    {{ 'no_trainings' }}
    +
    {{ 'app.admin.members_edit.no_trainings' }}
    -

    {{ 'validated_trainings' | translate }}

    +

    {{ 'app.admin.members_edit.validated_trainings' | translate }}

      @@ -140,17 +140,17 @@ {{t.name}}
    -
    {{ 'no_trainings' }}
    +
    {{ 'app.admin.members_edit.no_trainings' }}
     - +
    -

    {{ 'next_events' | translate }}

    +

    {{ 'app.admin.members_edit.next_events' | translate }}

      @@ -158,22 +158,22 @@ {{r.reservable.title}} - {{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }}
      - {{ 'NUMBER_full_price_tickets_reserved' }} + {{ 'app.admin.members_edit.NUMBER_full_price_tickets_reserved' }}
      - {{ 'NUMBER_NAME_tickets_reserved' }} + {{ 'app.admin.members_edit.NUMBER_NAME_tickets_reserved' }}
    -
    {{ 'no_upcoming_events' }}
    +
    {{ 'app.admin.members_edit.no_upcoming_events' }}
    -

    {{ 'passed_events' | translate }}

    +

    {{ 'app.admin.members_edit.passed_events' | translate }}

      @@ -181,22 +181,22 @@ {{r.reservable.title}} - {{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }}
    -
    {{ 'no_passed_events' }}
    +
    {{ 'app.admin.members_edit.no_passed_events' }}
     - +
    - - - + + + @@ -209,34 +209,34 @@
    {{ 'invoice_num' }}{{ 'date' }}{{ 'price' }}{{ 'app.admin.members_edit.invoice_num' }}{{ 'app.admin.members_edit.date' }}{{ 'app.admin.members_edit.price' }}
    - {{ 'download_the_invoice' | translate }} + {{ 'app.admin.members_edit.download_the_invoice' | translate }} - {{ 'download_the_refund_invoice' | translate }} + {{ 'app.admin.members_edit.download_the_refund_invoice' | translate }}
    -

    {{ 'no_invoices_for_now' }}

    +

    {{ 'app.admin.members_edit.no_invoices_for_now' }}

     - +
    - + '">
    - +
    - + '">
    diff --git a/app/assets/templates/admin/members/import.html.erb b/app/assets/templates/admin/members/import.html.erb index 8ce03827e..d7c46e128 100644 --- a/app/assets/templates/admin/members/import.html.erb +++ b/app/assets/templates/admin/members/import.html.erb @@ -11,14 +11,14 @@
    -

    {{ 'members_import.import_members' }}

    +

    {{ 'app.admin.members_import.import_members' }}

    - {{ 'members_import.download_example' }} + {{ 'app.admin.members_import.download_example' }}
    @@ -29,7 +29,7 @@

    - {{ 'members_import.info' }} + {{ 'app.admin.members_import.info' }}

    @@ -37,12 +37,12 @@
    -

    {{ 'members_import.groups' }}

    +

    {{ 'app.admin.members_import.groups' }}

    - - + + @@ -59,12 +59,12 @@
    -

    {{ 'members_import.trainings' }}

    +

    {{ 'app.admin.members_import.trainings' }}

    {{ 'members_import.group_name' }}{{ 'members_import.group_identifier' }}{{ 'app.admin.members_import.group_name' }}{{ 'app.admin.members_import.group_identifier' }}
    - - + + @@ -86,12 +86,12 @@
    -

    {{ 'members_import.tags' }}

    +

    {{ 'app.admin.members_import.tags' }}

    {{ 'members_import.training_name' }}{{ 'members_import.training_identifier' }}{{ 'app.admin.members_import.training_name' }}{{ 'app.admin.members_import.training_identifier' }}
    - - + + @@ -119,10 +119,10 @@

    - {{ 'members_import.required_fields' }} + {{ 'app.admin.members_import.required_fields' }}

    - {{ 'members_import.about_example' }} + {{ 'app.admin.members_import.about_example' }}

    @@ -130,8 +130,8 @@
    {{file.attachment}}
    - {{ 'members_import.select_file' }} - {{ 'change' }} + {{ 'app.admin.members_import.select_file' }} + {{ 'app.shared.buttons.change' }}
    - {{ 'members_import.update_field' }} + {{ 'app.admin.members_import.update_field' }}
    @@ -165,7 +165,7 @@
    - +
    diff --git a/app/assets/templates/admin/members/import_result.html b/app/assets/templates/admin/members/import_result.html index 16e7ae9e3..231db53c2 100644 --- a/app/assets/templates/admin/members/import_result.html +++ b/app/assets/templates/admin/members/import_result.html @@ -11,7 +11,7 @@
    -

    {{ 'members_import_result.import_results' }}

    +

    {{ 'app.admin.members_import_result.import_results' }}

    @@ -22,11 +22,11 @@
    -

    {{ 'members_import_result.import_details' | translate:{DATE:(import.created_at | amDateFormat:'L'), USER:import.user.full_name, ID:import.id} }}

    +

    {{ 'app.admin.members_import_result.import_details' | translate:{DATE:(import.created_at | amDateFormat:'L'), USER:import.user.full_name, ID:import.id} }}

    -

    {{ 'members_import_result.pending' }}

    +

    {{ 'app.admin.members_import_result.pending' }}

    -

    {{ 'members_import_result.results' }}

    +

    {{ 'app.admin.members_import_result.results' }}

    @@ -41,21 +41,21 @@
    - {{ 'members_import_result.status_' + resultRow.status | translate:{ID:resultRow.user} }} + {{ 'app.admin.members_import_result.status_' + resultRow.status | translate:{ID:resultRow.user} }} - {{ 'members_import_result.success' }} + {{ 'app.admin.members_import_result.success' }} - {{ 'members_import_result.failed' }} + {{ 'app.admin.members_import_result.failed' }}
    - {{ 'members_import_result.error_details' }}{{resultRow}} + {{ 'app.admin.members_import_result.error_details' }}{{resultRow}}
    diff --git a/app/assets/templates/admin/members/new.html.erb b/app/assets/templates/admin/members/new.html.erb index a4b233c19..4c01fae74 100644 --- a/app/assets/templates/admin/members/new.html.erb +++ b/app/assets/templates/admin/members/new.html.erb @@ -9,7 +9,7 @@
    -

    {{ 'members_new.add_a_member' }}

    +

    {{ 'app.admin.members_new.add_a_member' }}

    @@ -17,7 +17,7 @@
    - {{ 'cancel' }} + {{ 'app.shared.buttons.cancel' }}
    @@ -45,19 +45,19 @@ ng-model="user.organization" ng-change="toggleOrganization()" value="false"/> - +
    - + '"> - + '">
    - +
    diff --git a/app/assets/templates/admin/plans/_form.html.erb b/app/assets/templates/admin/plans/_form.html.erb index c555aefac..a1165c296 100644 --- a/app/assets/templates/admin/plans/_form.html.erb +++ b/app/assets/templates/admin/plans/_form.html.erb @@ -1,19 +1,19 @@ -

    {{ 'plan_form.general_information' }}

    +

    {{ 'app.shared.plan.general_information' }}

    - + - {{ 'plan_form.name_is_required' }} - {{ 'plan_form.name_length_must_be_less_than_24_characters' }} + {{ 'app.shared.plan.name_is_required' }} + {{ 'app.shared.plan.name_length_must_be_less_than_24_characters' }}
    - + - {{ 'plan_form.type_is_required' }} + {{ 'app.shared.plan.type_is_required' }}
    - + - {{ 'plan_form.group_is_required' }} + {{ 'app.shared.plan.group_is_required' }}
    - + - {{ 'plan_form.period_is_required' }} + {{ 'app.shared.plan.period_is_required' }}
    - + - {{ 'plan_form.number_of_periods_is_required' }} + {{ 'app.shared.plan.number_of_periods_is_required' }}
    - +
    {{currencySymbol}}
    - {{ 'plan_form.price_is_required' }} + {{ 'app.shared.plan.price_is_required' }}
    - + - {{ 'plan_form.on_the_subscriptions_page_the_most_prominent_subscriptions_will_be_placed_at_the_top_of_the_list' | translate }} - {{ 'plan_form.an_evelated_number_means_a_higher_prominence' | translate }} + {{ 'app.shared.plan.on_the_subscriptions_page_the_most_prominent_subscriptions_will_be_placed_at_the_top_of_the_list' | translate }} + {{ 'app.shared.plan.an_evelated_number_means_a_higher_prominence' | translate }}
    - + {{ (plan.is_rolling ? 'yes' : 'no') | translate }} - {{ 'plan_form.a_rolling_subscription_will_begin_the_day_of_the_first_training' | translate }} - {{ 'plan_form.otherwise_it_will_begin_as_soon_as_it_is_bought' | translate }} + {{ 'app.shared.plan.a_rolling_subscription_will_begin_the_day_of_the_first_training' | translate }} + {{ 'app.shared.plan.otherwise_it_will_begin_as_soon_as_it_is_bought' | translate }}
    @@ -122,12 +122,12 @@ - +
    {{file.attachment || plan.plan_file_attributes.attachment_identifier}}
    - {{ 'plan_form.attach_an_information_sheet' }} + {{ 'app.shared.plan.attach_an_information_sheet' }} {{ 'change' }} @@ -136,7 +136,7 @@
    - +
    - +
    - {{ 'plan_form.as_part_of_a_partner_subscription_some_notifications_may_be_sent_to_this_user' }} + {{ 'app.shared.plan.as_part_of_a_partner_subscription_some_notifications_may_be_sent_to_this_user' }}
    diff --git a/app/assets/templates/admin/plans/edit.html.erb b/app/assets/templates/admin/plans/edit.html.erb index 509b4c626..3d27d64c6 100644 --- a/app/assets/templates/admin/plans/edit.html.erb +++ b/app/assets/templates/admin/plans/edit.html.erb @@ -7,13 +7,13 @@
    -

    {{ 'edit_plan.subscription_plan' | translate }} {{ plan.base_name }}

    +

    {{ 'app.admin.plans.edit.subscription_plan' | translate }} {{ plan.base_name }}

    - {{ 'cancel' }} + {{ 'app.shared.buttons.cancel' }}
    @@ -28,7 +28,7 @@
    - + '">
    @@ -37,8 +37,8 @@ id="plan[disabled]" type="checkbox" class="form-control" - switch-on-text="{{ 'yes' | translate }}" - switch-off-text="{{ 'no' | translate }}" + switch-on-text="{{ 'app.shared.buttons.yes' | translate }}" + switch-off-text="{{ 'app.shared.buttons.no' | translate }}" switch-animate="true" ng-true-value="'true'" ng-false-value="'false'"/> @@ -46,19 +46,19 @@ {{ 'plan_form.disable_plan_will_not_unsubscribe_users' }}
    -

    {{ 'edit_plan.prices' }}

    +

    {{ 'app.admin.plans.edit.prices' }}

    - +
    -

    {{ 'edit_plan.machines' }}

    +

    {{ 'app.admin.plans.edit.machines' }}

    {{ 'members_import.tag_name' }}{{ 'members_import.tag_identifier' }}{{ 'app.admin.members_import.tag_name' }}{{ 'app.admin.members_import.tag_identifier' }}
    - - + + @@ -75,11 +75,11 @@
    {{ 'edit_plan.machine' }}{{ 'edit_plan.hourly_rate' }}{{ 'app.admin.plans.edit.machine' }}{{ 'app.admin.plans.edit.hourly_rate' }}
    -

    {{ 'edit_plan.spaces' }}

    +

    {{ 'app.admin.plans.edit.spaces' }}

    - - + + @@ -97,7 +97,7 @@
    {{ 'edit_plan.space' }}{{ 'edit_plan.hourly_rate' }}{{ 'app.admin.plans.edit.space' }}{{ 'app.admin.plans.edit.hourly_rate' }}
    - +
    diff --git a/app/assets/templates/admin/plans/new.html.erb b/app/assets/templates/admin/plans/new.html.erb index d1acc9cc6..12ad2d12f 100644 --- a/app/assets/templates/admin/plans/new.html.erb +++ b/app/assets/templates/admin/plans/new.html.erb @@ -7,7 +7,7 @@
    -

    {{ 'new_plan.add_a_subscription_plan' }}

    +

    {{ 'app.admin.plans.new.add_a_subscription_plan' }}

    @@ -20,10 +20,10 @@
    - + '">
    - +
    diff --git a/app/assets/templates/admin/pricing/coupons.html.erb b/app/assets/templates/admin/pricing/coupons.html.erb index 556a00cbb..b1118e4cb 100644 --- a/app/assets/templates/admin/pricing/coupons.html.erb +++ b/app/assets/templates/admin/pricing/coupons.html.erb @@ -1,15 +1,15 @@ -

    {{ 'pricing.list_of_the_coupons' }}

    +

    {{ 'app.admin.pricing.list_of_the_coupons' }}

    @@ -18,10 +18,10 @@ - - - - + + + + @@ -33,7 +33,7 @@ {{coupon.amount_off}} {{currencySymbol}} - +
    {{ 'pricing.name' }}{{ 'pricing.discount' }}{{ 'pricing.nb_of_usages' }}{{ 'pricing.status' }}{{ 'app.admin.pricing.name' }}{{ 'app.admin.pricing.discount' }}{{ 'app.admin.pricing.nb_of_usages' }}{{ 'app.admin.pricing.status' }}
    {{coupon.usages}}{{'pricing.'+coupon.status}}{{'app.admin.pricing.'+coupon.status}} @@ -44,5 +44,5 @@
    - +
    diff --git a/app/assets/templates/admin/pricing/credits.html.erb b/app/assets/templates/admin/pricing/credits.html.erb index 0dfd69f79..0832e9a7a 100644 --- a/app/assets/templates/admin/pricing/credits.html.erb +++ b/app/assets/templates/admin/pricing/credits.html.erb @@ -1,10 +1,10 @@ -

    {{ 'pricing.trainings' }}

    +

    {{ 'app.admin.pricing.trainings' }}

    - - - + + + @@ -35,7 +35,7 @@
    @@ -43,17 +43,17 @@
    {{ 'pricing.subscription' }}{{ 'pricing.credits' }}{{ 'pricing.related_trainings' }}{{ 'app.admin.pricing.subscription' }}{{ 'app.admin.pricing.credits' }}{{ 'app.admin.pricing.related_trainings' }}
    -

    {{ 'pricing.machines' }}

    +

    {{ 'app.admin.pricing.machines' }}

    - +
    - - - + + + @@ -85,10 +85,10 @@
    @@ -96,16 +96,16 @@
    {{ 'pricing.machine' }}{{ 'pricing.hours' | translate:{DURATION:slotDuration} }}{{ 'pricing.related_subscriptions' }}{{ 'app.admin.pricing.machine' }}{{ 'app.admin.pricing.hours' | translate:{DURATION:slotDuration} }}{{ 'app.admin.pricing.related_subscriptions' }}
    -

    {{ 'pricing.spaces' }}

    +

    {{ 'app.admin.pricing.spaces' }}

    - +
    - - - + + + @@ -137,10 +137,10 @@
    diff --git a/app/assets/templates/admin/pricing/index.html.erb b/app/assets/templates/admin/pricing/index.html.erb index c1aff1cb7..2a6b1b10c 100644 --- a/app/assets/templates/admin/pricing/index.html.erb +++ b/app/assets/templates/admin/pricing/index.html.erb @@ -7,7 +7,7 @@
    -

    {{ 'pricing.pricing_management' }}

    +

    {{ 'app.admin.pricing.pricing_management' }}

    @@ -21,28 +21,28 @@
    - - + + '"> - - + + '"> - - + + '"> - - + + '"> - - + + '"> - - + + '">
    diff --git a/app/assets/templates/admin/pricing/machine_hours.html.erb b/app/assets/templates/admin/pricing/machine_hours.html.erb index 3823e42cc..d8ef5780c 100644 --- a/app/assets/templates/admin/pricing/machine_hours.html.erb +++ b/app/assets/templates/admin/pricing/machine_hours.html.erb @@ -1,10 +1,10 @@
    - {{ 'pricing.these_prices_match_machine_hours_rates_' | translate:{DURATION:slotDuration} }} {{ 'pricing._without_subscriptions' }}. + {{ 'app.admin.pricing.these_prices_match_machine_hours_rates_' | translate:{DURATION:slotDuration} }} {{ 'app.admin.pricing._without_subscriptions' }}.
    {{ 'pricing.space' }}{{ 'pricing.hours' | translate:{DURATION:slotDuration} }}{{ 'pricing.related_subscriptions' }}{{ 'app.admin.pricing.space' }}{{ 'app.admin.pricing.hours' | translate:{DURATION:slotDuration} }}{{ 'app.admin.pricing.related_subscriptions' }}
    - + diff --git a/app/assets/templates/admin/pricing/sendCoupon.html.erb b/app/assets/templates/admin/pricing/sendCoupon.html.erb index fad186cd7..83e63e536 100644 --- a/app/assets/templates/admin/pricing/sendCoupon.html.erb +++ b/app/assets/templates/admin/pricing/sendCoupon.html.erb @@ -1,11 +1,11 @@
    -

    {{ 'pricing.send_a_coupon' }}

    +

    {{ 'app.admin.pricing.send_a_coupon' }}

    -

    {{ 'pricing.coupon' }}

    +

    {{ 'app.admin.pricing.coupon' }}

    {{ 'pricing.machines' }}{{ 'app.admin.pricing.machines' }} {{group.name}}
    @@ -13,18 +13,18 @@ - - - - - - + + + + + +
    {{'pricing.code'}} {{coupon.code}}
    {{'pricing.discount'}} {{coupon.percent_off}} %{{coupon.amount_off}} {{currencySymbol}}
    {{'pricing.validity_per_user'}} {{'pricing.'+coupon.validity_per_user}}
    {{'pricing.valid_until'}} {{coupon.valid_until | amDateFormat:'L'}}
    {{'pricing.usages'}} {{coupon.usages}} / {{coupon.max_usages | maxCount}}
    {{'pricing.enabled'}} {{coupon.active | booleanFormat}}
    {{'app.admin.pricing.code'}} {{coupon.code}}
    {{'app.admin.pricing.discount'}} {{coupon.percent_off}} %{{coupon.amount_off}} {{currencySymbol}}
    {{'app.admin.pricing.validity_per_user'}} {{'app.admin.pricing.'+coupon.validity_per_user}}
    {{'app.admin.pricing.valid_until'}} {{coupon.valid_until | amDateFormat:'L'}}
    {{'app.admin.pricing.usages'}} {{coupon.usages}} / {{coupon.max_usages | maxCount}}
    {{'app.admin.pricing.enabled'}} {{coupon.active | booleanFormat}}
    - - -
    \ No newline at end of file + + +
    diff --git a/app/assets/templates/admin/pricing/spaces.html.erb b/app/assets/templates/admin/pricing/spaces.html.erb index 1395f3f83..03675b2e3 100644 --- a/app/assets/templates/admin/pricing/spaces.html.erb +++ b/app/assets/templates/admin/pricing/spaces.html.erb @@ -1,10 +1,10 @@
    - {{ 'pricing.these_prices_match_space_hours_rates_' | translate:{DURATION:slotDuration} }} {{ 'pricing._without_subscriptions' }}. + {{ 'app.admin.pricing.these_prices_match_space_hours_rates_' | translate:{DURATION:slotDuration} }} {{ 'app.admin.pricing._without_subscriptions' }}.
    - + diff --git a/app/assets/templates/admin/pricing/subscriptions.html.erb b/app/assets/templates/admin/pricing/subscriptions.html.erb index bcb98f4bc..8cef00a25 100644 --- a/app/assets/templates/admin/pricing/subscriptions.html.erb +++ b/app/assets/templates/admin/pricing/subscriptions.html.erb @@ -1,21 +1,21 @@ -

    {{ 'pricing.list_of_the_subscription_plans' }}

    +

    {{ 'app.admin.pricing.list_of_the_subscription_plans' }}

    - {{ 'pricing.beware_the_subscriptions_are_disabled_on_this_application' | translate }} - {{ 'pricing.you_can_create_some_but_they_wont_be_available_until_the_project_is_redeployed_by_the_server_manager' | translate }} -
    {{ 'pricing.for_safety_reasons_please_dont_create_subscriptions_if_you_dont_want_intend_to_use_them_later' | translate }} + {{ 'app.admin.pricing.beware_the_subscriptions_are_disabled_on_this_application' | translate }} + {{ 'app.admin.pricing.you_can_create_some_but_they_wont_be_available_until_the_project_is_redeployed_by_the_server_manager' | translate }} +
    {{ 'app.admin.pricing.for_safety_reasons_please_dont_create_subscriptions_if_you_dont_want_intend_to_use_them_later' | translate }}
    @@ -24,12 +24,12 @@
    {{ 'pricing.spaces' }}{{ 'app.admin.pricing.spaces' }} {{group.name}}
    - - - - - - + + + + + + diff --git a/app/assets/templates/admin/pricing/trainings.html.erb b/app/assets/templates/admin/pricing/trainings.html.erb index 2dc0544b6..6c0bde16f 100644 --- a/app/assets/templates/admin/pricing/trainings.html.erb +++ b/app/assets/templates/admin/pricing/trainings.html.erb @@ -1,7 +1,7 @@
    {{ 'pricing.type' | translate }} {{ 'pricing.name' | translate }} {{ 'pricing.duration' | translate }} {{ 'pricing.group' | translate }} {{ 'pricing.price' | translate }} {{ 'app.admin.pricing.type' | translate }} {{ 'app.admin.pricing.name' | translate }} {{ 'app.admin.pricing.duration' | translate }} {{ 'app.admin.pricing.group' | translate }} {{ 'app.admin.pricing.price' | translate }}
    - + @@ -21,4 +21,4 @@ -
    {{ 'pricing.trainings' }}{{ 'app.admin.pricing.trainings' }} {{group.name}}
    \ No newline at end of file + diff --git a/app/assets/templates/admin/subscriptions/create_modal.html.erb b/app/assets/templates/admin/subscriptions/create_modal.html.erb index 7ff44ecdc..3554747eb 100644 --- a/app/assets/templates/admin/subscriptions/create_modal.html.erb +++ b/app/assets/templates/admin/subscriptions/create_modal.html.erb @@ -1,10 +1,10 @@
    -

    {{ 'new_subscription' }}

    +

    {{ 'app.admin.members_edit.new_subscription' }}

    - {{ 'you_are_about_to_purchase_a_subscription_to_NAME' }} + {{ 'app.admin.members_edit.you_are_about_to_purchase_a_subscription_to_NAME' }}

    @@ -15,6 +15,6 @@
    - - + +
    diff --git a/app/assets/templates/admin/tags/index.html.erb b/app/assets/templates/admin/tags/index.html.erb index dd734e01a..ece11564c 100644 --- a/app/assets/templates/admin/tags/index.html.erb +++ b/app/assets/templates/admin/tags/index.html.erb @@ -1,8 +1,8 @@ - + - + @@ -25,7 +25,7 @@
    - + +
    diff --git a/app/assets/templates/admin/events/prices.html.erb b/app/assets/templates/admin/events/prices.html.erb index fcca1229b..bcf00aca2 100644 --- a/app/assets/templates/admin/events/prices.html.erb +++ b/app/assets/templates/admin/events/prices.html.erb @@ -1,12 +1,12 @@
    -

    {{ 'prices_categories' }}

    +

    {{ 'app.admin.events.prices_categories' }}

    - +
    {{ 'tag_name' }}{{ 'app.admin.members.tag_form.tag_name' }}
    - - + + @@ -17,7 +17,7 @@
    {{ 'name' }}{{ 'usages_count' }}{{ 'app.admin.events.name' }}{{ 'app.admin.events.usages_count' }}
    -
    \ No newline at end of file + diff --git a/app/assets/templates/admin/events/reservations.html.erb b/app/assets/templates/admin/events/reservations.html.erb index 954e23d11..105cd7c72 100644 --- a/app/assets/templates/admin/events/reservations.html.erb +++ b/app/assets/templates/admin/events/reservations.html.erb @@ -7,7 +7,7 @@
    -

    {{ 'the_reservations' | translate }} {{event.title}}

    +

    {{ 'app.admin.event_reservations.the_reservations' | translate }} {{event.title}}

    @@ -20,9 +20,9 @@ - - - + + + @@ -33,23 +33,23 @@
    {{ 'user' }}{{ 'payment_date' }}{{ 'reserved_tickets' }}{{ 'app.admin.event_reservations.user' }}{{ 'app.admin.event_reservations.payment_date' }}{{ 'app.admin.event_reservations.reserved_tickets' }}
    {{ reservation.created_at | amDateFormat:'LL LTS' }} - {{ 'full_price_' | translate }} {{reservation.nb_reserve_places}}
     + {{ 'app.admin.event_reservations.full_price_' | translate }} {{reservation.nb_reserve_places}}
     {{ticket.event_price_category.price_category.name}} : {{ticket.booked}} -
    {{ 'canceled' }}
    +
    {{ 'app.admin.event_reservations.canceled' }}
    -

    {{ 'no_reservations_for_now' }}

    +

    {{ 'app.admin.event_reservations.no_reservations_for_now' }}

    - + diff --git a/app/assets/templates/admin/open_api_clients/index.html.erb b/app/assets/templates/admin/open_api_clients/index.html.erb index 8f4e3bf70..4866d812d 100644 --- a/app/assets/templates/admin/open_api_clients/index.html.erb +++ b/app/assets/templates/admin/open_api_clients/index.html.erb @@ -7,7 +7,7 @@
    -

    {{ 'open_api_clients' }}

    +

    {{ 'app.admin.open_api_clients.open_api_clients' }}

    @@ -15,7 +15,7 @@
      - {{ 'api_documentation' }}  + {{ 'app.admin.open_api_clients.api_documentation' }} 
    @@ -28,27 +28,27 @@
    - +
    - +
    - - + +
    - + - + - + - + @@ -62,11 +62,11 @@
    {{ 'name' | translate }} {{ 'app.admin.open_api_clients.name' | translate }} {{ 'calls_count' | translate }} {{ 'app.admin.open_api_clients.calls_count' | translate }} {{ 'token' | translate }}{{ 'app.admin.open_api_clients.token' | translate }}{{ 'created_at' | translate }} {{ 'app.admin.open_api_clients.created_at' | translate }}
    {{ 'app.shared.plan.attach_an_information_sheet' }} - {{ 'change' }}{{ 'app.shared.buttons.change' }} diff --git a/app/assets/templates/admin/project_elements/index.html.erb b/app/assets/templates/admin/project_elements/index.html.erb index 4b9ce21e5..a18d94310 100644 --- a/app/assets/templates/admin/project_elements/index.html.erb +++ b/app/assets/templates/admin/project_elements/index.html.erb @@ -7,12 +7,12 @@
    -

    {{ 'project_elements.projects_elements_management' }}

    +

    {{ 'app.admin.project_elements.projects_elements_management' }}

    - {{ 'project_elements.manage_abuses' }} + {{ 'app.admin.project_elements.manage_abuses' }}
    @@ -24,17 +24,17 @@
    - - + + '"> - - + + '"> - - + + '">
    - \ No newline at end of file + diff --git a/app/assets/templates/admin/project_elements/licences.html.erb b/app/assets/templates/admin/project_elements/licences.html.erb index ac0352d92..afa0f94cf 100644 --- a/app/assets/templates/admin/project_elements/licences.html.erb +++ b/app/assets/templates/admin/project_elements/licences.html.erb @@ -1,10 +1,10 @@ - + - - + + @@ -32,7 +32,7 @@
    {{ 'name' }}{{ 'app.admin.project_elements.name' }}
    \ No newline at end of file +
    diff --git a/app/assets/templates/admin/project_elements/materials.html.erb b/app/assets/templates/admin/project_elements/materials.html.erb index 6ea552964..fb96dc881 100644 --- a/app/assets/templates/admin/project_elements/materials.html.erb +++ b/app/assets/templates/admin/project_elements/materials.html.erb @@ -1,9 +1,9 @@ - + - + @@ -26,7 +26,7 @@
    {{ 'name' }}{{ 'app.admin.project_elements.name' }}
    \ No newline at end of file + diff --git a/app/assets/templates/admin/project_elements/themes.html.erb b/app/assets/templates/admin/project_elements/themes.html.erb index 0650bb470..0583accb1 100644 --- a/app/assets/templates/admin/project_elements/themes.html.erb +++ b/app/assets/templates/admin/project_elements/themes.html.erb @@ -1,9 +1,9 @@ - + - + @@ -26,7 +26,7 @@
    {{ 'name' }}{{ 'app.admin.project_elements.name' }}
    \ No newline at end of file + diff --git a/app/assets/templates/admin/settings/about.html b/app/assets/templates/admin/settings/about.html index c58a5c440..b190fa9ff 100644 --- a/app/assets/templates/admin/settings/about.html +++ b/app/assets/templates/admin/settings/about.html @@ -3,34 +3,34 @@
    -

    - {{ 'settings.shift_enter_to_force_carriage_return' | translate }} - +

    + {{ 'app.admin.settings.shift_enter_to_force_carriage_return' | translate }} +
    -
    - {{ 'settings.drag_and_drop_to_insert_images' | translate }} - + {{ 'app.admin.settings.drag_and_drop_to_insert_images' | translate }} +
    -
    - {{ 'settings.shift_enter_to_force_carriage_return' | translate }} - + {{ 'app.admin.settings.shift_enter_to_force_carriage_return' | translate }} +
    -
    \ No newline at end of file + diff --git a/app/assets/templates/admin/settings/general.html b/app/assets/templates/admin/settings/general.html index f4f9c0514..7fdc8b997 100644 --- a/app/assets/templates/admin/settings/general.html +++ b/app/assets/templates/admin/settings/general.html @@ -1,42 +1,42 @@
    - {{ 'settings.title' }} + {{ 'app.admin.settings.title' }}
    - +
    - +
    - +
    -

    {{ 'settings.title_concordance' }}

    +

    {{ 'app.admin.settings.title_concordance' }}



    - +
    @@ -45,62 +45,62 @@
    - {{ 'settings.customize_information_messages' }} + {{ 'app.admin.settings.customize_information_messages' }}
    -

    {{ 'settings.message_of_the_machine_booking_page' }}

    +

    {{ 'app.admin.settings.message_of_the_machine_booking_page' }}

    - +
    -

    {{ 'settings.warning_message_of_the_training_booking_page'}}

    +

    {{ 'app.admin.settings.warning_message_of_the_training_booking_page'}}

    - +
    -

    {{ 'settings.information_message_of_the_training_reservation_page'}}

    +

    {{ 'app.admin.settings.information_message_of_the_training_reservation_page'}}

    - +
    -

    {{ 'settings.message_of_the_subscriptions_page' }}

    +

    {{ 'app.admin.settings.message_of_the_subscriptions_page' }}

    - +
    -

    {{ 'settings.message_of_the_events_page' }}

    +

    {{ 'app.admin.settings.message_of_the_events_page' }}

    - +
    -

    {{ 'settings.message_of_the_spaces_page' }}

    +

    {{ 'app.admin.settings.message_of_the_spaces_page' }}

    - +
    @@ -108,17 +108,17 @@
    - {{ 'settings.legal_documents'}} + {{ 'app.admin.settings.legal_documents'}}
    - {{ 'settings.if_these_documents_are_not_filled_no_consent_about_them_will_be_asked_to_the_user' }} + {{ 'app.admin.settings.if_these_documents_are_not_filled_no_consent_about_them_will_be_asked_to_the_user' }}
    - +
    @@ -135,14 +135,14 @@
    - +
    - +
    @@ -159,7 +159,7 @@
    - +
    @@ -167,21 +167,21 @@
    - {{ 'settings.customize_the_graphics' }} + {{ 'app.admin.settings.customize_the_graphics' }}
    - {{ 'settings.for_an_optimal_rendering_the_logo_image_must_be_at_the_PNG_format_with_a_transparent_background_and_with_an_aspect_ratio_3.5_times_wider_than_the_height' }}
    - {{ 'settings.concerning_the_favicon_it_must_be_at_ICO_format_with_a_size_of_16x16_pixels' }}
    + {{ 'app.admin.settings.for_an_optimal_rendering_the_logo_image_must_be_at_the_PNG_format_with_a_transparent_background_and_with_an_aspect_ratio_3.5_times_wider_than_the_height' }}
    + {{ 'app.admin.settings.concerning_the_favicon_it_must_be_at_ICO_format_with_a_size_of_16x16_pixels' }}

    - {{ 'settings.remember_to_refresh_the_page_for_the_changes_to_take_effect' }} + {{ 'app.admin.settings.remember_to_refresh_the_page_for_the_changes_to_take_effect' }}
    -

    {{ 'settings.logo_white_background' }}

    +

    {{ 'app.admin.settings.logo_white_background' }}

    @@ -34,10 +34,10 @@ name="first_name" ng-model="user.profile_attributes.first_name" class="form-control" - placeholder="{{ 'your_first_name' | translate }}" + placeholder="{{ 'app.public.common.your_first_name' | translate }}" required> - {{ 'first_name_is_required' }} + {{ 'app.public.common.first_name_is_required' }}
    @@ -45,10 +45,10 @@ name="last_name" ng-model="user.profile_attributes.last_name" class="form-control" - placeholder="{{ 'your_surname' | translate }}" + placeholder="{{ 'app.public.common.your_surname' | translate }}" required> - {{ 'surname_is_required' }} + {{ 'app.public.common.surname_is_required' }}
    @@ -60,11 +60,11 @@ name="username" ng-model="user.username" class="form-control" - placeholder="{{ 'your_pseudonym' | translate }}" + placeholder="{{ 'app.public.common.your_pseudonym' | translate }}" required>
    - {{ 'pseudonym_is_required' }} + {{ 'app.public.common.pseudonym_is_required' }}
    @@ -76,11 +76,11 @@ name="email" ng-model="user.email" class="form-control" - placeholder="{{ 'your_email_address' | translate }}" + placeholder="{{ 'app.public.common.your_email_address' | translate }}" required>
    - - {{ 'email_is_required' }} + + {{ 'app.public.common.email_is_required' }}
    @@ -92,13 +92,13 @@ name="password" ng-model="user.password" class="form-control" - placeholder="{{ 'your_password' | translate }}" + placeholder="{{ 'app.public.common.your_password' | translate }}" required ng-minlength="8">
    - {{ 'password_is_required' }} - {{ 'password_is_too_short' }} + {{ 'app.public.common.password_is_required' }} + {{ 'app.public.common.password_is_too_short' }}
    @@ -110,13 +110,13 @@ name="password_confirmation" ng-model="user.password_confirmation" class="form-control" - placeholder="{{ 'type_your_password_again' | translate }}" + placeholder="{{ 'app.public.common.type_your_password_again' | translate }}" required ng-minlength="8" match="user.password"> - {{ 'password_confirmation_is_required' }} - {{ 'password_does_not_match_with_confirmation' }} + {{ 'app.public.common.password_confirmation_is_required' }} + {{ 'app.public.common.password_does_not_match_with_confirmation' }} @@ -127,7 +127,7 @@ id="organization" ng-model="user.organization" value="false"/> - + @@ -139,11 +139,11 @@ name="organization_name" ng-model="user.profile_attributes.organization_attributes.name" class="form-control" - placeholder="{{ 'name_of_your_organization' | translate }}" + placeholder="{{ 'app.public.common.name_of_your_organization' | translate }}" ng-required="user.organization"> - - {{ 'organization_name_is_required' }} + + {{ 'app.public.common.organization_name_is_required' }} @@ -155,11 +155,11 @@ name="organization_address" ng-model="user.profile_attributes.organization_attributes.address_attributes.address" class="form-control" - placeholder="{{ 'address_of_your_organization' | translate }}" + placeholder="{{ 'app.public.common.address_of_your_organization' | translate }}" ng-required="user.organization"> - - {{ 'organization_address_is_required' }} + + {{ 'app.public.common.organization_address_is_required' }} @@ -167,11 +167,11 @@
    - +
    - {{ 'user_s_profile_is_required' }} + {{ 'app.public.common.user_s_profile_is_required' }}
    @@ -186,12 +186,12 @@ uib-datepicker-popup="{{datePicker.format}}" datepicker-options="datePicker.options" is-open="datePicker.opened" - placeholder="{{ 'birth_date' | translate }}" + placeholder="{{ 'app.public.common.birth_date' | translate }}" ng-click="openDatePicker($event)" required/> - - {{ 'birth_date_is_required' }} + + {{ 'app.public.common.birth_date_is_required' }} @@ -203,13 +203,13 @@ type="text" name="phone" class="form-control" - placeholder="{{ 'phone_number' | translate }}" + placeholder="{{ 'app.public.common.phone_number' | translate }}" ng-required="phoneRequired"> - + - {{ 'phone_number_is_required' }} + {{ 'app.public.common.phone_number_is_required' }} @@ -220,7 +220,7 @@ id="is_allow_contact" ng-model="user.is_allow_contact" value="true"/> - + @@ -231,7 +231,7 @@ id="is_allow_newsletter" ng-model="user.is_allow_newsletter" value="true"/> - + @@ -244,8 +244,8 @@ value="true" ng-required="cgu != null"/> @@ -257,7 +257,7 @@ - {{ 'field_required' }} + {{ 'app.public.common.field_required' }}
    @@ -266,5 +266,5 @@
    - +
    diff --git a/app/assets/templates/shared/valid_reservation_modal.html.erb b/app/assets/templates/shared/valid_reservation_modal.html.erb index 510b44029..b74fb1ce1 100644 --- a/app/assets/templates/shared/valid_reservation_modal.html.erb +++ b/app/assets/templates/shared/valid_reservation_modal.html.erb @@ -1,17 +1,17 @@
    -

    {{ 'booking_confirmation' }}

    +

    {{ 'app.shared.valid_reservation_modal.booking_confirmation' }}

    {{alert.msg}} - + '"> -

    {{ 'here_is_the_summary_of_the_slots_to_book_for_the_current_user' }}

    +

    {{ 'app.shared.valid_reservation_modal.here_is_the_summary_of_the_slots_to_book_for_the_current_user' }}

    • {{slot.start_at | amDateFormat: 'LL'}} : {{slot.start_at | amDateFormat:'LT'}} - {{slot.end_at | amDateFormat:'LT'}}
    - +
    diff --git a/app/assets/templates/stripe/payment_modal.html.erb b/app/assets/templates/stripe/payment_modal.html.erb index b6f76e509..7f6f70be8 100644 --- a/app/assets/templates/stripe/payment_modal.html.erb +++ b/app/assets/templates/stripe/payment_modal.html.erb @@ -1,7 +1,7 @@
    -

    {{ 'online_payment' }}

    +

    {{ 'app.shared.stripe.online_payment' }}

    {{alert.msg}} @@ -10,8 +10,8 @@
    -

    -

    +

    +

    @@ -19,7 +19,9 @@
    - +
    @@ -28,7 +30,7 @@
    - +
    diff --git a/app/assets/templates/trainings/reserve.html.erb b/app/assets/templates/trainings/reserve.html.erb index 0889d42bf..4d1994bba 100644 --- a/app/assets/templates/trainings/reserve.html.erb +++ b/app/assets/templates/trainings/reserve.html.erb @@ -7,8 +7,8 @@
    -

    {{ 'trainings_planning' }}

    -

    {{ 'planning_of' }} {{training.name}}

    +

    {{ 'app.logged.trainings_reserve.trainings_planning' }}

    +

    {{ 'app.logged.trainings_reserve.planning_of' }} {{training.name}}

    @@ -17,7 +17,7 @@ ui-sref="app.logged.trainings_reserve({id:'all'})" ng-hide="mode == 'all'" role="button" - translate>{{ 'all_trainings' }} + translate>{{ 'app.logged.trainings_reserve.all_trainings' }}
    @@ -27,7 +27,7 @@
    - + '">
    diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index e95f9030b..6d903b5ca 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -86,6 +86,7 @@ fr: edit_event: "Modifier l'évènement" view_reservations: "Voir les réservations" legend: "Légende" + and: "et" icalendar: icalendar_import: "Import iCalendar" @@ -147,7 +148,8 @@ fr: description_is_limited_to_255_characters: "La description est limitée à 255 caractères." description_was_successfully_saved: "La description a bien été enregistrée." training_successfully_deleted: "La formation a bien été supprimée." - unable_to_delete_the_training_because_some_users_alredy_booked_it: "La formation ne peut pas être supprimée car elle a déjà été réservée par des utilisateurs." + unable_to_delete_the_training_because_some_users_already_booked_it: "La formation ne peut pas être supprimée car elle a déjà été réservée par des utilisateurs." + confirmation_required: "Confirmation requise" do_you_really_want_to_delete_this_training: "Êtes-vous sur de vouloir supprimer cette formation ?" status_enabled: "Actifs" status_disabled: "Désactivés" @@ -155,10 +157,9 @@ fr: trainings_new: # créer une nouvelle formation - trainings_new: - add_a_new_training: "Ajouter une nouvelle formation" - beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Attention, lors de la création d'une formation, ses tarifs de réservation sont initialisés à zero." - dont_forget_to_change_them_before_creating_slots_for_this_training: "Pensez à les modifier avant de créer des créneaux pour cette formation." + add_a_new_training: "Ajouter une nouvelle formation" + beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Attention, lors de la création d'une formation, ses tarifs de réservation sont initialisés à zero." + dont_forget_to_change_them_before_creating_slots_for_this_training: "Pensez à les modifier avant de créer des créneaux pour cette formation." events: # gestion et suivi des évènements @@ -590,6 +591,7 @@ fr: groups: "Groupes" tags: "Étiquettes" authentication: "Authentification" + confirmation_required: "Confirmation requise" confirm_delete_member: "Êtes-vous sûr de vouloir supprimer ce membre ? Cette opération est irréversible." member_successfully_deleted: "Le membre a bien été supprimé." unable_to_delete_the_member: "Le membre n'a pas pu être supprimé." @@ -599,6 +601,7 @@ fr: unable_to_delete_the_administrator: "L'administrateur n'a pas pu être supprimé." changes_successfully_saved: "Les modifications ont bien été enregistrées." an_error_occurred_while_saving_changes: "Une erreur est survenue lors de l'enregistrement des modifications." + export_is_running_you_ll_be_notified_when_its_ready: "L'export est en cours. Vous serez notifié lorsqu'il sera prêt." tag_form: tags: "Étiquettes" add_a_tag: "Ajouter une étiquette" @@ -736,6 +739,19 @@ fr: add_an_administrator: "Ajouter un administrateur" administrator_successfully_created_he_will_receive_his_connection_directives_by_email: "L'administrateur a bien été créé. {GENDER, select, female{Elle} other{Il}} recevra ses instructions de connexion par email." failed_to_create_admin: "Impossible de créer l'administrateur :" + man: "Homme" + woman: "Femme" + pseudonym: "Pseudonyme" + pseudonym_is_required: "Le pseudonyme est requis." + first_name: "Votre prénom" + first_name_is_required: "Le prénom est requis." + surname: "Votre nom" + surname_is_required: "Le nom est requis." + email_address: "Votre adresse de courriel" + email_is_required: "L'adresse de courriel est requise." + birth_date: "Date de naissance" + address: "Adresse" + phone_number: "Numéro de téléphone" authentication_new: # ajouter un nouveau fournisseur d'authentification (SSO) diff --git a/config/locales/app.logged.fr.yml b/config/locales/app.logged.fr.yml index 48f44667c..87f3fd526 100644 --- a/config/locales/app.logged.fr.yml +++ b/config/locales/app.logged.fr.yml @@ -1,12 +1,13 @@ fr: app: logged: - profileCompletion: + profile_completion: # page de complétion du profil utilisateur, à la première connexion depuis un SSO confirm_your_new_account: "Confirmez votre nouveau compte" you_ve_just_created_a_new_account_on_the_fablab_by_logging_from: "Vous venez de créer un nouveau compte sur {GENDER, select, male{le} female{la} neutral{} other{les}} {NAME}, en vous connectant depuis" we_need_some_more_details: "Afin de finaliser le paramétrage de la plate-forme, nous avons besoin de quelques renseignements supplémentaires" your_email_is_already_used_by_another_account_on_the_platform: "Il semblerait que votre adresse de courriel soit déjà utilisée par un autre utilisateur. Vérifiez votre adresse électronique et veuillez saisir ci-dessous le code qui vient de vous être envoyé." + or: "ou" please_fill_the_following_form: "Merci de compléter le formulaire suivant" some_data_may_have_already_been_provided_by_provider_and_cannot_be_modified: "Certaines informations peuvent nous avoir été déjà fournies par {NAME} et ne sont pas modifiables" then_click_on_: "Cliquez ensuite sur" @@ -24,8 +25,20 @@ fr: an_unexpected_error_occurred_check_your_authentication_code: "Une erreur inattendue est survenue, vérifiez votre code d'authentification." send_code_again: "Renvoyer le code" email_address_associated_with_your_account: "Adresse électronique associée à votre compte" + email_is_required: "L'adresse mail est requise" email_format_is_incorrect: "Le format de l'adresse email est incorrect" code_successfully_sent_again: "Le code a bien été renvoyé" + used_for_statistics: "Cette donnée sera utilisée à des fins statistiques" + your_user_s_profile: "Votre profil utilisateur" + user_s_profile_is_required: "Le profil utilisateur est requis." + i_ve_read_and_i_accept_: "J'ai lu et j'accepte" + _the_fablab_policy: "la charte d'utilisation du Fab Lab" + change_my_data: "Modifier mes données" + sync_my_profile: "Synchroniser mon profil" + once_your_data_are_up_to_date_: "Une fois vos données à jour," + _click_on_the_synchronization_button_opposite_: "cliquez sur le bouton de synchronisation ci-contre" + _disconnect_then_reconnect_: "déconnectez-vous puis re-connectez vous" + _for_your_changes_to_take_effect: "pour que les modifications soient prises en compte." dashboard: # tableau de bord: profile publique @@ -53,6 +66,7 @@ fr: edit_my_profile: "Éditer votre profil" your_group_has_been_successfully_changed: "Votre groupe a bien été changé." an_unexpected_error_prevented_your_group_from_being_changed: "Une erreur inattendue a empêché votre changement de groupe." + confirmation_required: "Confirmation requise" confirm_delete_your_account: "Êtes-vous sûr de vouloir supprimer votre compte ?" all_data_will_be_lost: "Toutes vos données seront détruites et ne pourront pas être récupérées." invoicing_data_kept: "Conformément à la réglementation, les données relatives à vos facturations seront conservées de manière séparée pendant 10 ans." @@ -156,6 +170,8 @@ fr: planning_of: "Planning de la" # suivi du nom de la formation (eg. "Planning de la formation imprimante 3d") all_trainings: "Toutes les formations" cancel_my_selection: "Annuler ma sélection" + i_change: "Je change" + i_shift: "Je déplace" i_ve_reserved: "J'ai réservé" space_reserve: diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index cd53baa4f..884cf6f16 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -124,18 +124,16 @@ fr: about: # page à propos - about: - read_the_fablab_policy: "Consulter les règles d'utilisation du Fab Lab" - read_the_fablab_s_general_terms_and_conditions: "Consulter les conditions générales de vente du Fab Lab" - your_fablab_s_contacts: "Vos contacts au Fab Lab" - privacy_policy: "Politique de confidentialité" + read_the_fablab_policy: "Consulter les règles d'utilisation du Fab Lab" + read_the_fablab_s_general_terms_and_conditions: "Consulter les conditions générales de vente du Fab Lab" + your_fablab_s_contacts: "Vos contacts au Fab Lab" + privacy_policy: "Politique de confidentialité" privacy: # page 'politique de confidentialité' - privacy: - title: "Politique de confidentialité" - dpo: "Délégué à la protection des données" - last_update: "Dernière mise à jour," + title: "Politique de confidentialité" + dpo: "Délégué à la protection des données" + last_update: "Dernière mise à jour," home: # page d'accueil @@ -239,6 +237,7 @@ fr: book_this_training: "Réserver cette formation" do_you_really_want_to_delete_this_training: "Êtes-vous sur de vouloir supprimer cette formation ?" unauthorized_operation: "Opération non autorisée" + confirmation_required: "Confirmation requise" the_training_cant_be_deleted_because_it_is_already_reserved_by_some_users: "La formation ne peut pas être supprimée car elle a déjà été réservée par des utilisateurs." plans: @@ -269,6 +268,7 @@ fr: subscription_confirmation: "Validation de l'abonnement" here_is_the_NAME_subscription_summary: "Voici le récapitulatif de l'abonnement de {NAME} :" confirm_payment_of_html: "{ROLE, select, admin{Encaisser} other{Payer}} : {AMOUNT}" # (contexte : valider un paiement de 20,00 €) + online_payment_disabled: "Le payment par carte bancaire n'est pas disponible. Merci de contacter directement l'accueil du Fablab." events_list: # liste des évènements du fablab diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 1da4a0449..240be47d6 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -19,38 +19,10 @@ fr: "no": "Non" apply: "Appliquer" - elements: - # traductions variées utilisées à plusieurs reprises dans l'application - group: "Groupe" - confirmation_required: "Confirmation requise" - events: "Évènements" - email_address: "Adresse de courriel" - pseudonym: "Pseudonyme" - all_day: "Toute la journée" - total_: "TOTAL :" - name: "Nom" - step_N: "Étape {INDEX}" - online_payment: "Paiement en ligne" - type: "Type" - partner: "Partenaire" - standard: "Standard" - year: "Année" - or: "ou" - and: "et" - change_my_data: "Modifier mes données" - sync_my_profile: "Synchroniser mon profil" - once_your_data_are_up_to_date_: "Une fois vos données à jour," - _click_on_the_synchronization_button_opposite_: "cliquez sur le bouton de synchronisation ci-contre" - _disconnect_then_reconnect_: "déconnectez-vous puis re-connectez vous" - _for_your_changes_to_take_effect: "pour que les modifications soient prises en compte." - all_themes: "Toutes les thématiques" - filter: 'Filtre' - payment_card_error: "Un problème est survenu avec votre carte bancaire :" - unexpected_error_occurred: "Une erreur inattendue est survenue" - messages: you_will_lose_any_unsaved_modification_if_you_quit_this_page: "Vous perdrez les modifications non enregistrées si vous quittez cette page" you_will_lose_any_unsaved_modification_if_you_reload_this_page: "Vous perdrez les modifications non enregistrées si vous rechargez cette page" + payment_card_error: "Un problème est survenu avec votre carte bancaire :" user: # formulaire d'édition du profil utilisateur @@ -151,10 +123,12 @@ fr: stripe: # fenêtre de paiement stripe + online_payment: "Paiement en ligne" i_have_read_and_accept_: "J'ai bien pris connaissance, et accepte" _the_general_terms_and_conditions: "les conditions générales de vente." credit_amount_for_pay_reservation: "Il vous reste {amount} {currency} à payer pour valider votre réservation" client_credit_amount_for_pay_reservation: "Il reste {amount} {currency} à payer pour valider la réservation" + confirm_payment_of_: "Payer : {AMOUNT}" valid_reservation_modal: # fenêtre de paiement sur place d'une réservation @@ -194,6 +168,8 @@ fr: name_is_required: "Le nom est requis" name_length_must_be_less_than_24_characters: "Le nom doit faire moins de 24 caractères." type: "Type" + partner: "Partenaire" + standard: "Standard" type_is_required: "Le type est requis." group: "Groupe" transversal_all_groups: "Transversal (tout les groupes)" @@ -219,6 +195,11 @@ fr: new_user: "Nouvel utilisateur ..." as_part_of_a_partner_subscription_some_notifications_may_be_sent_to_this_user: "Dans le cadre d'un abonnement partenaire, certaines notifications pourront être adressées à cet utilisateur." new_partner: "Nouveau partenaire" + first_name: "Prénom" + first_name_is_required: "Le prénom est requis" + surname: "Nom" + surname_is_required: "le nom est requis" + email_address: "Adresse de courriel" email_address_is_required: "L'adresse e-mail est requise." disabled: "Désactiver l'abonnement" disable_plan_will_not_unsubscribe_users: "Attention : désactiver l'abonnement ne désabonnera pas les utilisateurs ayant actuellement cet abonnement actif." From c5604bbdf812b45bd67ac1902ef103a2f45e7857 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 18 Dec 2019 13:26:37 +0100 Subject: [PATCH 080/135] harmonize admin.en --- config/locales/app.admin.en.yml | 1299 ++++++++++++++++--------------- config/locales/app.admin.fr.yml | 12 +- 2 files changed, 688 insertions(+), 623 deletions(-) diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 4ad8d1ce2..638fbf46a 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -13,125 +13,132 @@ en: calendar: # manage the trainings & machines slots - admin_calendar: - calendar_management: "Calendar management" - trainings: "Trainings" - machines: "Machines" - spaces: "Spaces" - events: "Eventos" - availabilities: "Availabilities" - availabilities_notice: "Export to an Excel workbook every slots available for reservation, and their occupancy rate." - ongoing_reservations: "Ongoing reservations" - no_reservations: "No reservations" - confirmation_required: "Confirmation required" - do_you_really_want_to_cancel_the_USER_s_reservation_the_DATE_at_TIME_concerning_RESERVATION: "Do you really want to cancel the {USER}'s reservation, the {DATE} at {TIME}, concerning {RESERVATION}?" - reservation_was_successfully_cancelled: "Reservation was successfully cancelled." - reservation_cancellation_failed: "Reservation cancellation failed." - unable_to_remove_the_last_machine_of_the_slot_delete_the_slot_rather: "Unable to remove the last machine of the slot. Delete the slot rather." - do_you_really_want_to_remove_MACHINE_from_this_slot: "Do you really want to remove \"{MACHINE}\" from this slot?" - this_will_prevent_any_new_reservation_on_this_slot_but_wont_cancel_those_existing: "This will prevent any new reservation on this slot but won't cancel those existing." - beware_this_cannot_be_reverted: "Beware: this cannot be reverted." - the_machine_was_successfully_removed_from_the_slot: "The machine was successfully removed from the slot." - deletion_failed: "Deletion failed." - DATE_slot: "{DATE} slot:" - what_kind_of_slot_do_you_want_to_create: "What kind of slot do you want to create?" - training: "Training" - machine: "Machine" - space: "Space" - next: "Next >" - previous: "< Previous" - select_some_machines: "Select some machines" - number_of_tickets: "Number of tickets: " - adjust_the_opening_hours: "Adjust the opening hours" - to_time: "to" # context: time. eg. "from 18:00 to 21:00" - restrict_this_slot_with_labels_optional: "Restrict this slot with labels (optional)" - recurrence: "Recurrence" - enabled: "Enabled" - period: "Period" - week: "Week" - month: "Month" - number_of_periods: "Number of periods" - end_date: "End date" - summary: "Summary" - select_period: "Please select a period for the recurrence" - select_nb_period: "Please select a number of periods for the recurrence" - select_end_date: "Please select the date of the last occurrence" - about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}:" - reservable: "Reservable(s):" - labels: "Label(s):" - none: "None" - slot_successfully_deleted: "The slot {START} - {END} has been successfully deleted" - slots_deleted: "The slot of {START}, and {COUNT, plural, =1{one other} other{{COUNT} others}}}, have been deleted" - unable_to_delete_the_slot: "Unable to delete the slot {START} - {END}, probably because it's already reserved by a member" - slots_not_deleted: "On {TOTAL} slots, {COUNT, plural, =1{one was not deleted} other{{COUNT} were not deleted}}. Some reservations may exist on {COUNT, plural, =1{it} other{them}}." - you_should_select_at_least_a_machine: "You should select at least one machine on this slot." - export_is_running_you_ll_be_notified_when_its_ready: "Export is running. You'll be notified when it's ready." - actions: "Actions" - block_reservations: "Block reservations" - do_you_really_want_to_block_this_slot: "Do you really want to block new reservations on this slot? It will become invisible to users." - locking_success: "Slot successfully locked, it won't appear any longer in the user calendar" - locking_failed: "An error occurred. Slot locking has failed" - allow_reservations: "Allow reservations" - do_you_really_want_to_allow_reservations: "Do you really want to allow booking again on this slot? It will become visible for the users." - unlocking_success: "Slot successfully unlocked, it will appear again in the user calendar" - unlocking_failed: "An error occurred. Slot unlocking has failed" - reservations_locked: "Booking is blocked" - unlockable_because_reservations: "Unable to block booking on this slot because some uncancelled reservations exist on it." - delete_slot: "Delete this slot" - do_you_really_want_to_delete_this_slot: "Do you really want to delete this slot?" - delete_recurring_slot: "You're about to delete a recurring slot. What do you want to do?" - delete_this_slot: "Only this slot" - delete_this_and_next: "This slot and the following" - delete_all: "All slots" - event_in_the_past: "Unable to create a slot in the past." - edit_event: "Edit the event" - view_reservations: "View reservations" - legend: "legend" + calendar_management: "Calendar management" + trainings: "Trainings" + machines: "Machines" + spaces: "Spaces" + events: "Eventos" + availabilities: "Availabilities" + availabilities_notice: "Export to an Excel workbook every slots available for reservation, and their occupancy rate." + ongoing_reservations: "Ongoing reservations" + no_reservations: "No reservations" + confirmation_required: "Confirmation required" + do_you_really_want_to_cancel_the_USER_s_reservation_the_DATE_at_TIME_concerning_RESERVATION: "Do you really want to cancel the {USER}'s reservation, the {DATE} at {TIME}, concerning {RESERVATION}?" + reservation_was_successfully_cancelled: "Reservation was successfully cancelled." + reservation_cancellation_failed: "Reservation cancellation failed." + unable_to_remove_the_last_machine_of_the_slot_delete_the_slot_rather: "Unable to remove the last machine of the slot. Delete the slot rather." + do_you_really_want_to_remove_MACHINE_from_this_slot: "Do you really want to remove \"{MACHINE}\" from this slot?" + this_will_prevent_any_new_reservation_on_this_slot_but_wont_cancel_those_existing: "This will prevent any new reservation on this slot but won't cancel those existing." + beware_this_cannot_be_reverted: "Beware: this cannot be reverted." + the_machine_was_successfully_removed_from_the_slot: "The machine was successfully removed from the slot." + deletion_failed: "Deletion failed." + DATE_slot: "{DATE} slot:" + what_kind_of_slot_do_you_want_to_create: "What kind of slot do you want to create?" + training: "Training" + machine: "Machine" + space: "Space" + next: "Next >" + previous: "< Previous" + select_some_machines: "Select some machines" + number_of_tickets: "Number of tickets: " + adjust_the_opening_hours: "Adjust the opening hours" + to_time: "to" # context: time. eg. "from 18:00 to 21:00" + restrict_this_slot_with_labels_optional: "Restrict this slot with labels (optional)" + recurrence: "Recurrence" + enabled: "Enabled" + period: "Period" + week: "Week" + month: "Month" + number_of_periods: "Number of periods" + end_date: "End date" + summary: "Summary" + select_period: "Please select a period for the recurrence" + select_nb_period: "Please select a number of periods for the recurrence" + select_end_date: "Please select the date of the last occurrence" + about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}:" + reservable: "Reservable(s):" + labels: "Label(s):" + none: "None" + slot_successfully_deleted: "The slot {START} - {END} has been successfully deleted" + slots_deleted: "The slot of {START}, and {COUNT, plural, =1{one other} other{{COUNT} others}}}, have been deleted" + unable_to_delete_the_slot: "Unable to delete the slot {START} - {END}, probably because it's already reserved by a member" + slots_not_deleted: "On {TOTAL} slots, {COUNT, plural, =1{one was not deleted} other{{COUNT} were not deleted}}. Some reservations may exist on {COUNT, plural, =1{it} other{them}}." + you_should_select_at_least_a_machine: "You should select at least one machine on this slot." + export_is_running_you_ll_be_notified_when_its_ready: "Export is running. You'll be notified when it's ready." + actions: "Actions" + block_reservations: "Block reservations" + do_you_really_want_to_block_this_slot: "Do you really want to block new reservations on this slot? It will become invisible to users." + locking_success: "Slot successfully locked, it won't appear any longer in the user calendar" + locking_failed: "An error occurred. Slot locking has failed" + allow_reservations: "Allow reservations" + do_you_really_want_to_allow_reservations: "Do you really want to allow booking again on this slot? It will become visible for the users." + unlocking_success: "Slot successfully unlocked, it will appear again in the user calendar" + unlocking_failed: "An error occurred. Slot unlocking has failed" + reservations_locked: "Booking is blocked" + unlockable_because_reservations: "Unable to block booking on this slot because some uncancelled reservations exist on it." + delete_slot: "Delete this slot" + do_you_really_want_to_delete_this_slot: "Do you really want to delete this slot?" + delete_recurring_slot: "You're about to delete a recurring slot. What do you want to do?" + delete_this_slot: "Only this slot" + delete_this_and_next: "This slot and the following" + delete_all: "All slots" + event_in_the_past: "Unable to create a slot in the past." + edit_event: "Edit the event" + view_reservations: "View reservations" + legend: "legend" + and: "and" icalendar: - icalendar: - icalendar_import: "iCalendar import" - intro: "Fab-manager allows to automatically import calendar events, at RFC 5545 iCalendar format, from external URL. These URL are synchronized every nights and the events are shown in the public calendar." - new_import: "New ICS import" - color: "Colour" - text_color: "Text colour" - url: "URL" - name: "Name" - example: "Example" - display: "Display" - hide_text: "Hide the text" - hidden: "Hidden" - shown: "Shown" - create_error: "Unable to create iCalendar import. Please try again later" - delete_failed: "Unable to delete the iCalendar import. Please try again later" - refresh: "Updating..." - sync_failed: "Unable to synchronize the URL. Please try again later" - confirmation_required: "Confirmation required" - confirm_delete_import: "Do you really want to delete this iCalendar import?" - delete_success: "iCalendar import successfully deleted" + icalendar_import: "iCalendar import" + intro: "Fab-manager allows to automatically import calendar events, at RFC 5545 iCalendar format, from external URL. These URL are synchronized every nights and the events are shown in the public calendar." + new_import: "New ICS import" + color: "Colour" + text_color: "Text colour" + url: "URL" + name: "Name" + example: "Example" + display: "Display" + hide_text: "Hide the text" + hidden: "Hidden" + shown: "Shown" + create_error: "Unable to create iCalendar import. Please try again later" + delete_failed: "Unable to delete the iCalendar import. Please try again later" + refresh: "Updating..." + sync_failed: "Unable to synchronize the URL. Please try again later" + confirmation_required: "Confirmation required" + confirm_delete_import: "Do you really want to delete this iCalendar import?" + delete_success: "iCalendar import successfully deleted" project_elements: # management of the projects' components - project_elements: - projects_elements_management: "Projects elements management" - add_a_material: "Add a material" - add_a_new_theme: "Add a new theme" - licences: "Licences" - add_a_new_licence: "Add a new licence" - manage_abuses: "Manage the reports" + name: "Name" + projects_elements_management: "Projects elements management" + materials: "Materials" + add_a_material: "Add a material" + themes: "Themes" + add_a_new_theme: "Add a new theme" + licences: "Licences" + description: "Description" + add_a_new_licence: "Add a new licence" + manage_abuses: "Manage the reports" trainings: # track and monitor the trainings - training: "Training" + trainings_monitoring: "Trainings monitoring" + trainings: "Trainings" add_a_new_training: "Add a new training" + name: "Nom" associated_machines: "Associated machines" number_of_tickets: "Number of tickets" + select_a_training: "Select a training" + training: "Training" + date: "Date" year_NUMBER: "Year {NUMBER}" month_of_NAME: "Month of {NAME}" NUMBER_reservation: "{NUMBER} {NUMBER, plural, one{reservation} other{reservations}}" none: "None" training_validation: "Training validation" - training_of_the_ : "Training of the " # context: date. eg. "training of the september 1st 2012" + training_of_the_DATE_TIME_html : "Training of the {DATE} - {TIME}" you_can_validate_the_training_of_the_following_members: "You can validate the training of the following members:" deleted_user: "Deleted user" no_reservation: "No reservation" @@ -141,7 +148,8 @@ en: description_is_limited_to_255_characters: "Description is limited to 255 characters." description_was_successfully_saved: "Description was successfully saved." training_successfully_deleted: "Training successfully deleted." - 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_already_booked_it: "Unable to delete the training because some users already booked it." + confirmation_required: "Confirmation required" do_you_really_want_to_delete_this_training: "Do you really want to delete this training?" status_enabled: "Enabled" status_disabled: "Disabled" @@ -149,16 +157,16 @@ en: trainings_new: # create a new training - trainings_new: - add_a_new_training: "Add a new training" - beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Beware, when creating a training, its reservation prices are initialized at zero." - dont_forget_to_change_them_before_creating_slots_for_this_training: "Don't forget to change them before creating slots for this training." + add_a_new_training: "Add a new training" + beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Beware, when creating a training, its reservation prices are initialized at zero." + dont_forget_to_change_them_before_creating_slots_for_this_training: "Don't forget to change them before creating slots for this training." events: # events tracking and management events_monitoring: "Events monitoring" manage_filters: "Manage filters" fablab_events: "Fablab events" + add_an_event: "Add an event" all_events: "All events" passed_events: "Passed events" events_to_come: "Events to come" @@ -166,14 +174,21 @@ en: on_DATE: "on {DATE}" from_DATE: "from {DATE}" from_TIME: "from {TIME}" + to_date: "to" # context: date. eg: "from 01/01 to 01/05" + to_time: "to" # context: time. eg. "from 18:00 to 21:00" + title: "Title" + dates: "Dates" booking: "Booking" sold_out: "Sold out" cancelled: "Cancelled" free_entry: "Free entry" free_admission: "Free admission" view_reservations: "View reservations" + load_the_next_events: "Load the next events..." categories: "Categories" add_a_category: "Add a category" + name: "Name" + themes: "Theme" add_a_theme: "Add a theme" age_ranges: "Age ranges" add_a_range: "Add a range" @@ -203,6 +218,7 @@ en: events_new: # add a new event + add_an_event: "Add an event" none: "None" every_days: "Every days" every_week: "Every week" @@ -215,8 +231,10 @@ en: event_reservations: # event reservations list - the_reservations: "Reservations :" + the_reservations: "Reservations:" + user: "User" payment_date: "Payment date" + full_price_: "Full price:" reserved_tickets: "Reserved tickets" show_the_event: "Show the event" no_reservations_for_now: "No reservation for now." @@ -225,84 +243,84 @@ en: pricing: # subscriptions, prices, credits and coupons management - pricing: - pricing_management: "Pricing management" - subscriptions: "Subscriptions" - trainings: "Trainings" - list_of_the_subscription_plans: "List of the subscription plans" - beware_the_subscriptions_are_disabled_on_this_application: "Beware, the subscriptions are disabled on this application." - you_can_create_some_but_they_wont_be_available_until_the_project_is_redeployed_by_the_server_manager: "You can create some but they won't be available until the project is redeployed by the server manager." - for_safety_reasons_please_dont_create_subscriptions_if_you_dont_want_intend_to_use_them_later: "For safety reasons, please don't create subscriptions if you don't intend to use them later." - add_a_new_subscription_plan: "Add a new subscription plan" - type: "Type" - partner: "Partner" - standard: "Standard" - name: "Name" - duration: "Duration" - group: "Group" - prominence: "Prominence" - price: "Price" - machine_hours: "Machine slots" - these_prices_match_machine_hours_rates_: "These prices match {DURATION} minutes of machine usage, " - _without_subscriptions: "without subscriptions" - machines: "Machines" - credits: "Credits" - subscription: "Subscription" - related_trainings: "Related trainings" - add_a_machine_credit: "Add a machine credit" - machine: "Machine" - hours: "Slots of {DURATION} minutes" - related_subscriptions: "Related subscriptions" - please_specify_a_number: "Please specify a number." - none: "None" # grammar note: concordance with "training". - an_error_occurred_while_saving_the_number_of_credits: "An error occurred while saving the number of credits." - an_error_occurred_while_deleting_credit_with_the_TRAINING: "An error occurred while deleting credit with the {TRAINING}." - an_error_occurred_unable_to_find_the_credit_to_revoke: "An error occurred : unable to find the credit to revoke." - an_error_occurred_while_creating_credit_with_the_TRAINING: "An error occurred while creating credit with the {TRAINING}." - not_set: "Not set" - error_a_credit_linking_this_machine_with_that_subscription_already_exists: "Error : a credit linking this machine with that subscription already exists." - changes_have_been_successfully_saved: "Changes have been successfully saved." - credit_was_successfully_saved: "Credit was successfully saved." - error_creating_credit: "Unable to create credit, an error occurred" - do_you_really_want_to_delete_this_subscription_plan: "Do you really want to delete this subscription plan?" - subscription_plan_was_successfully_deleted: "Subscription plan was successfully deleted." - unable_to_delete_the_specified_subscription_an_error_occurred: "Unable to delete the specified subscription, an error occurred." - coupons: "Coupons" - list_of_the_coupons: "List of the coupons" - discount: "Discount" - nb_of_usages: "Number of usages" - status: "Status" - add_a_new_coupon: "Add a new coupon" - display_more_coupons: "Display the next coupons" - disabled: "Disabled" - expired: "Expired" - sold_out: "Sold out" - active: "Active" - all: "Display all" - confirmation_required: "Confirmation required" - do_you_really_want_to_delete_this_coupon: "Do you really want to delete this coupon?" - coupon_was_successfully_deleted: "Coupon was successfully deleted." - unable_to_delete_the_specified_coupon_already_in_use: "Unable to delete the specified coupon: it is already used with some invoices." - unable_to_delete_the_specified_coupon_an_unexpected_error_occurred: "Unable to delete the specified coupon: an unexpected error occurred." - send_a_coupon: "Send a coupon" - coupon: "Coupon" - usages: "Usages" - coupon_successfully_sent_to_USER: "Coupon successfully sent to {USER}" - an_error_occurred_unable_to_send_the_coupon: "An unexpected error prevent from sending the coupon." - code: "Code" - enabled: "Enabled" - validity_per_user: "Validity per user" - once: "Just once" - forever: "Each use" - valid_until: "Valid until (included)" - spaces: "Spaces" - these_prices_match_space_hours_rates_: "These prices match {DURATION} minutes of space usage, " - add_a_space_credit: "Add a Space credit" - space: "Espace" - error_a_credit_linking_this_space_with_that_subscription_already_exists: "Error : a credit linking this space with that subscription already exists." - status_enabled: "Enabled" - status_disabled: "Disabled" - status_all: "All" + pricing_management: "Pricing management" + subscriptions: "Subscriptions" + trainings: "Trainings" + list_of_the_subscription_plans: "List of the subscription plans" + beware_the_subscriptions_are_disabled_on_this_application: "Beware, the subscriptions are disabled on this application." + you_can_create_some_but_they_wont_be_available_until_the_project_is_redeployed_by_the_server_manager: "You can create some but they won't be available until the project is redeployed by the server manager." + for_safety_reasons_please_dont_create_subscriptions_if_you_dont_want_intend_to_use_them_later: "For safety reasons, please don't create subscriptions if you don't intend to use them later." + add_a_new_subscription_plan: "Add a new subscription plan" + type: "Type" + partner: "Partner" + standard: "Standard" + name: "Name" + duration: "Duration" + group: "Group" + prominence: "Prominence" + price: "Price" + machine_hours: "Machine slots" + these_prices_match_machine_hours_rates_: "These prices match {DURATION} minutes of machine usage, " + _without_subscriptions: "without subscriptions" + machines: "Machines" + credits: "Credits" + subscription: "Subscription" + related_trainings: "Related trainings" + add_a_machine_credit: "Add a machine credit" + machine: "Machine" + hours: "Slots of {DURATION} minutes" + related_subscriptions: "Related subscriptions" + please_specify_a_number: "Please specify a number." + none: "None" # grammar note: concordance with "training". + an_error_occurred_while_saving_the_number_of_credits: "An error occurred while saving the number of credits." + an_error_occurred_while_deleting_credit_with_the_TRAINING: "An error occurred while deleting credit with the {TRAINING}." + an_error_occurred_unable_to_find_the_credit_to_revoke: "An error occurred : unable to find the credit to revoke." + an_error_occurred_while_creating_credit_with_the_TRAINING: "An error occurred while creating credit with the {TRAINING}." + not_set: "Not set" + error_a_credit_linking_this_machine_with_that_subscription_already_exists: "Error : a credit linking this machine with that subscription already exists." + changes_have_been_successfully_saved: "Changes have been successfully saved." + credit_was_successfully_saved: "Credit was successfully saved." + error_creating_credit: "Unable to create credit, an error occurred" + do_you_really_want_to_delete_this_subscription_plan: "Do you really want to delete this subscription plan?" + subscription_plan_was_successfully_deleted: "Subscription plan was successfully deleted." + unable_to_delete_the_specified_subscription_an_error_occurred: "Unable to delete the specified subscription, an error occurred." + coupons: "Coupons" + list_of_the_coupons: "List of the coupons" + discount: "Discount" + nb_of_usages: "Number of usages" + status: "Status" + add_a_new_coupon: "Add a new coupon" + display_more_coupons: "Display the next coupons" + disabled: "Disabled" + expired: "Expired" + sold_out: "Sold out" + active: "Active" + all: "Display all" + confirmation_required: "Confirmation required" + do_you_really_want_to_delete_this_coupon: "Do you really want to delete this coupon?" + coupon_was_successfully_deleted: "Coupon was successfully deleted." + unable_to_delete_the_specified_coupon_already_in_use: "Unable to delete the specified coupon: it is already used with some invoices." + unable_to_delete_the_specified_coupon_an_unexpected_error_occurred: "Unable to delete the specified coupon: an unexpected error occurred." + send_a_coupon: "Send a coupon" + coupon: "Coupon" + usages: "Usages" + unlimited: "Unlimited" + coupon_successfully_sent_to_USER: "Coupon successfully sent to {USER}" + an_error_occurred_unable_to_send_the_coupon: "An unexpected error prevent from sending the coupon." + code: "Code" + enabled: "Enabled" + validity_per_user: "Validity per user" + once: "Just once" + forever: "Each use" + valid_until: "Valid until (included)" + spaces: "Spaces" + these_prices_match_space_hours_rates_: "These prices match {DURATION} minutes of space usage, " + add_a_space_credit: "Add a Space credit" + space: "Space" + error_a_credit_linking_this_space_with_that_subscription_already_exists: "Error : a credit linking this space with that subscription already exists." + status_enabled: "Enabled" + status_disabled: "Disabled" + status_all: "All" coupons_new: # ajouter un code promotionnel @@ -311,265 +329,269 @@ en: coupons_edit: # mettre à jour un code promotionnel + coupon: "Coupon:" unable_to_update_the_coupon_an_error_occurred: "Unable to update the coupon: an error occurred." plans: new: # add a subscription plan on the platform - new_plan: - add_a_subscription_plan: "Add a subscription plan" - unable_to_create_the_subscription_please_try_again: "Unable to create the subscription plan. Please try again." - successfully_created_subscriptions_dont_forget_to_redefine_prices: "Subscription(s) successfully created. Don't forget to redefine prices." - unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Unable to save this user. Check that there isn't an already defined user with the same name." + add_a_subscription_plan: "Add a subscription plan" + unable_to_create_the_subscription_please_try_again: "Unable to create the subscription plan. Please try again." + successfully_created_subscriptions_dont_forget_to_redefine_prices: "Subscription(s) successfully created. Don't forget to redefine prices." + unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Unable to save this user. Check that there isn't an already defined user with the same name." edit: # edit a subscription plan / machine slots prices - edit_plan: - subscription_plan: "Subscription plan:" - prices: "Prices" - copy_prices_from: "Copy prices from" - machines: "Machines" - machine: "Machine" - hourly_rate: "Price by slot" - spaces: "Spaces" - space: "Space" - unable_to_save_subscription_changes_please_try_again: "Unable to save subscription changes. Please try again." - subscription_successfully_changed: "Subscription successfully changed." + subscription_plan: "Subscription plan:" + prices: "Prices" + copy_prices_from: "Copy prices from" + machines: "Machines" + machine: "Machine" + hourly_rate: "Price by slot" + spaces: "Spaces" + space: "Space" + unable_to_save_subscription_changes_please_try_again: "Unable to save subscription changes. Please try again." + subscription_successfully_changed: "Subscription successfully changed." invoices: - invoices: - # list of all invoices & invoicing parameters - invoices: "Invoices" - accounting_periods: "Accounting periods" - invoices_list: "Invoices list" - filter_invoices: "Filter invoices" - invoice_num_: "Invoice #:" - customer_: "Customer:" - date_: "Date:" - invoice_num: "Invoice #" - date: "Date" - price: "Price" - customer: "Customer" - download_the_invoice: "Download the invoice" - download_the_credit_note: "Download the credit note" - credit_note: "Credit note" - display_more_invoices: "Display more invoices..." - no_invoices_for_now: "No invoices for now." - invoicing_settings: "Invoicing settings" - warning_invoices_disabled: "Warning : invoices are not enabled. No invoices will be generated by Fab-manager. Nevertheless, you must correctly fill the information below, especially VAT." - change_logo: "Change logo" - john_smith: "John Smith" - john_smith_at_example_com: "jean.smith@example.com" - invoice_reference_: "Invoice reference:" - code_: "Code:" - code_disabled: "Code disabled" - order_num: "Order #:" - invoice_issued_on_DATE_at_TIME: "Invoice issued on {DATE} at {TIME}" - object_reservation_of_john_smith_on_DATE_at_TIME: "Object: Reservation of John Smith on {DATE} at {TIME}" - order_summary: "Order summary:" - details: "Details" - amount: "Amount" - machine_booking-3D_printer: "Machine booking - 3D printer" - total_amount: "Total amount" - total_including_all_taxes: "Total incl. all taxes" - VAT_disabled: "VAT disabled" - VAT_enabled: "VAT enabled" - including_VAT: "Including VAT" - including_total_excluding_taxes: "Including Total excl. taxes" - including_amount_payed_on_ordering: "Including Amount payed on ordering" - settlement_by_debit_card_on_DATE_at_TIME_for_an_amount_of_AMOUNT: "Settlement by debit card on {DATE} at {TIME}, for an amount of {AMOUNT}" - important_notes: "Important notes" - address_and_legal_information: "Address and legal information" - invoice_reference: "Invoice reference" - year: "Year" - month: "Month" - day: "Day" - num_of_invoice: "# of invoice" - online_sales: "Online sales" - wallet: "Wallet" - refund: "Refund" - model: "Model" - documentation: "Documentation" - 2_digits_year: "2 digits year (eg. 70)" - 4_digits_year: "4 digits year (eg. 1970)" - month_number: "Month number (eg. 1)" - 2_digits_month_number: "2 digits month number (eg. 01)" - 3_characters_month_name: "3 characters month name (eg. JAN)" - day_in_the_month: "Day in the month (eg. 1)" - 2_digits_day_in_the_month: "2 digits in the month (eg. 01)" - n_digits_daily_count_of_invoices: "(n) digits, daily count of invoices (eg. ddd => 002 : 2nd invoice of the day)" - n_digits_monthly_count_of_invoices: "(n) digits, monthly count of invoices (eg. mmmm => 0012 : 12th invoice of the month)" - n_digits_annual_amount_of_invoices: "(n) digits, annual count of invoices (ex. yyyyyy => 000008 : 8th invoice of this year)" - beware_if_the_number_exceed_the_specified_length_it_will_be_truncated_by_the_left: "Beware: if the number exceed the specified length, it will be truncated by the left." - n_digits_count_of_orders: "(n) digits, count of invoices (eg. nnnn => 0327 : 327th order)" - n_digits_daily_count_of_orders: "(n) digits, daily count of orders (eg. ddd => 002 : 2nd order of the day)" - n_digits_monthly_count_of_orders: "(n) digits, monthly count of orders (eg. mmmm => 0012 : 12th order of the month)" - n_digits_annual_amount_of_orders: "(n) digits, annual count of orders (ex. yyyyyy => 000008 : 8th order of this year)" - add_a_notice_regarding_the_online_sales_only_if_the_invoice_is_concerned: "Add a notice regarding the online sales, only if the invoice is concerned." - this_will_never_be_added_when_a_refund_notice_is_present: "This will never be added when a refund notice is present." - eg_XVL_will_add_VL_to_the_invoices_settled_with_stripe: '(eg. X[/VL] will add "/VL" to the invoices settled with stripe)' - add_a_notice_regarding_refunds_only_if_the_invoice_is_concerned: "Add a notice regarding refunds, only if the invoice is concerned." - this_will_never_be_added_when_an_online_sales_notice_is_present: "This will never be added when an online sales notice is present." - eg_RA_will_add_A_to_the_refund_invoices: '(ed. R[/A] will add "/A" to the refund invoices)' - add_a_notice_regarding_the_wallet_only_if_the_invoice_is_concerned: "Add a notice regarding the wallet, only if the invoice is concerned." - eg_WPM_will_add_PM_to_the_invoices_settled_with_wallet: '(eg. W[/PM] will add "/PM" to the invoices settled with wallet)' - code: "Code" - enable_the_code: "Enable the code" - enabled: "Enabled" - disabled: "Disabled" - order_number: "Order number" - elements: "Elements" - VAT: "VAT" - enable_VAT: "Enable VAT" - VAT_rate: "VAT rate" - VAT_history: "VAT rates history" - changed_at: "Changed at" - changed_by: "By" - deleted_user: "Deleted user" - refund_invoice_successfully_created: "Refund invoice successfully created." - create_a_refund_on_this_invoice: "Create a refund on this invoice" - creation_date_for_the_refund: "Creation date for the refund" - creation_date_is_required: "Creation date is required." - refund_mode: "Refund mode:" - do_you_want_to_disable_the_user_s_subscription: "Do you want to disabled the user's subscription:" - elements_to_refund: "Elements to refund" - description: "Description" - description_optional: "Description (optional):" - will_appear_on_the_refund_invoice: "Will appear on the refund invoice." - none: "None" # grammar note: concordance with "payment mean" - by_cash: "By cash" - by_cheque: "By cheque" - by_transfer: "By transfer" - by_wallet: "By wallet" - you_must_select_at_least_one_element_to_create_a_refund: "You must select at least one element, to create a refund." - unable_to_create_the_refund: "Unable to create the refund" - invoice_reference_successfully_saved: "Invoice reference successfully saved." - an_error_occurred_while_saving_invoice_reference: "An error occurred while saving invoice reference." - invoicing_code_succesfully_saved: "Invoicing code successfully saved." - an_error_occurred_while_saving_the_invoicing_code: "An error occurred while saving the invoicing code." - code_successfully_activated: "Code successfully activated." - code_successfully_disabled: "Code successfully disabled." - an_error_occurred_while_activating_the_invoicing_code: "An error occurred while activating the invoicing code." - order_number_successfully_saved: "Order number successfully saved." - an_error_occurred_while_saving_the_order_number: "An error occurred while saving the order number." - VAT_rate_successfully_saved: "VAT rate successfully saved." - an_error_occurred_while_saving_the_VAT_rate: "An error occurred while saving the VAT rate." - VAT_successfully_activated: "VAT successfully activated." - VAT_successfully_disabled: "VAT successfully disabled." - an_error_occurred_while_activating_the_VAT: "An error occurred while activating the VAT." - text_successfully_saved: "Text successfully saved." - an_error_occurred_while_saving_the_text: "An error occurred while saving the text." - address_and_legal_information_successfully_saved: "Address and legal information successfully saved." - an_error_occurred_while_saving_the_address_and_the_legal_information: "An error occurred while saving the address and the legal information." - logo_successfully_saved: "Logo successfully saved." - an_error_occurred_while_saving_the_logo: "An error occurred while saving the logo." - online_payment: "Online payment" - close_accounting_period: "Close an accounting period" - close_from_date: "Close from" - start_date_is_required: "Start date is required" - close_until_date: "Close until" - end_date_is_required: "End date is required" - previous_closings: "Previous closings" - start_date: "From" - end_date: "To" - closed_at: "Closed at" - closed_by: "By" - period_total: "Period total" - perpetual_total: "Perpetual total" - integrity: "Integrity check" - confirmation_required: "Confirmation required" - confirm_close_START_END: "Do you really want to close the accounting period between {START} and {END}? Any subsequent changes will be impossible." - period_must_match_fiscal_year: "A closing must occur at the end of a minimum annual period, or per financial year when it is not calendar-based." - this_may_take_a_while: "This operation will take some time to complete." - period_START_END_closed_success: "The accounting period from {START} to {END} has been successfully closed. Archive generation is running, you'll be notified when it's done." - failed_to_close_period: "An error occurred, unable to close the accounting period" - no_periods: "No closings for now" - accounting_codes: "Accounting codes" - accounting_journal_code: "Journal code" - general_journal_code: "Journal code" - accounting_card_client_code: "Card clients code" - card_client_code: "Accounting code for clients who paid by card" - accounting_card_client_label: "Card clients label" - card_client_label: "Account label for clients who paid by card" - accounting_wallet_client_code: "Wallet clients code" - wallet_client_code: "Accounting code for clients who paid by virtual wallet" - accounting_wallet_client_label: "Wallet clients label" - wallet_client_label: "Account label for clients who paid by virtual wallet" - accounting_other_client_code: "Other means client code" - other_client_code: "Accounting code for clients who paid using another payment means" - accounting_other_client_label: "Other means client label" - other_client_label: "Accounting label for clients who paid using another payment means" - accounting_wallet_code: "Wallet code" - general_wallet_code: "Accounting code for wallet credit" - accounting_wallet_label: "Wallet label" - general_wallet_label: "Account label for wallet credit" - accounting_vat_code: "VAT code" - general_vat_code: "Accounting code for VAT" - accounting_vat_label: "VAT label" - general_vat_label: "VAT account label" - accounting_subscription_code: "Subscriptions code" - general_subscription_code: "Accounting code for all subscriptions" - accounting_subscription_label: "Subscriptions label" - general_subscription_label: "Account label for all subscriptions" - accounting_Machine_code: "Machines code" - general_machine_code: "Accounting code for all machines" - accounting_Machine_label: "Machine label" - general_machine_label: "Account label for all machines" - accounting_Training_code: "Trainings code" - general_training_code: "Accounting code for all trainings" - accounting_Training_label: "Trainings label" - general_training_label: "Account label for all trainings" - accounting_Event_code: "Events code" - general_event_code: "Accounting code for all events" - accounting_Event_label: "Events label" - general_event_label: "Account label for all events" - accounting_Space_code: "Space code" - general_space_code: "Accounting code for all spaces" - accounting_Space_label: "Spaces label" - general_space_label: "Account label for all spaces" - codes_customization_success: "Customization of the accounting codes successfully saved." - export_accounting_data: "Export accounting data" - export_to: "Export to the accounting software" - export_is_running: "Export is running. You'll be notified when it's ready." - acd: "ACD" - export_form_date: "Export from" - export_to_date: "Export until" - format: "File format" - encoding: "Encoding" - separator: "Separator" - dateFormat: "Date format" - labelMaxLength: "Label (max)" - decimalSeparator: "Decimal separator" - exportInvoicesAtZero: "Export invoices equal to 0" - columns: "Columns" - exportColumns: - journal_code: "Journal code" - date: "Entry date" - account_code: "Account code" - account_label: "Account label" - piece: "Document" - line_label: "Entry label" - debit_origin: "Origin debit" - credit_origin: "Origin credit" - debit_euro: "Euro debit" - credit_euro: "Euro credit" - lettering: "Lettering" + # list of all invoices & invoicing parameters + invoices: "Invoices" + accounting_periods: "Accounting periods" + invoices_list: "Invoices list" + filter_invoices: "Filter invoices" + invoice_num_: "Invoice #:" + customer_: "Customer:" + date_: "Date:" + invoice_num: "Invoice #" + date: "Date" + price: "Price" + customer: "Customer" + download_the_invoice: "Download the invoice" + download_the_credit_note: "Download the credit note" + credit_note: "Credit note" + display_more_invoices: "Display more invoices..." + no_invoices_for_now: "No invoices for now." + invoicing_settings: "Invoicing settings" + warning_invoices_disabled: "Warning : invoices are not enabled. No invoices will be generated by Fab-manager. Nevertheless, you must correctly fill the information below, especially VAT." + change_logo: "Change logo" + john_smith: "John Smith" + john_smith_at_example_com: "jean.smith@example.com" + invoice_reference_: "Invoice reference:" + code_: "Code:" + code_disabled: "Code disabled" + order_num: "Order #:" + invoice_issued_on_DATE_at_TIME: "Invoice issued on {DATE} at {TIME}" + object_reservation_of_john_smith_on_DATE_at_TIME: "Object: Reservation of John Smith on {DATE} at {TIME}" + order_summary: "Order summary:" + details: "Details" + amount: "Amount" + machine_booking-3D_printer: "Machine booking - 3D printer" + total_amount: "Total amount" + total_including_all_taxes: "Total incl. all taxes" + VAT_disabled: "VAT disabled" + VAT_enabled: "VAT enabled" + including_VAT: "Including VAT" + including_total_excluding_taxes: "Including Total excl. taxes" + including_amount_payed_on_ordering: "Including Amount payed on ordering" + settlement_by_debit_card_on_DATE_at_TIME_for_an_amount_of_AMOUNT: "Settlement by debit card on {DATE} at {TIME}, for an amount of {AMOUNT}" + important_notes: "Important notes" + address_and_legal_information: "Address and legal information" + invoice_reference: "Invoice reference" + year: "Year" + month: "Month" + day: "Day" + num_of_invoice: "# of invoice" + online_sales: "Online sales" + wallet: "Wallet" + refund: "Refund" + model: "Model" + documentation: "Documentation" + 2_digits_year: "2 digits year (eg. 70)" + 4_digits_year: "4 digits year (eg. 1970)" + month_number: "Month number (eg. 1)" + 2_digits_month_number: "2 digits month number (eg. 01)" + 3_characters_month_name: "3 characters month name (eg. JAN)" + day_in_the_month: "Day in the month (eg. 1)" + 2_digits_day_in_the_month: "2 digits in the month (eg. 01)" + n_digits_daily_count_of_invoices: "(n) digits, daily count of invoices (eg. ddd => 002 : 2nd invoice of the day)" + n_digits_monthly_count_of_invoices: "(n) digits, monthly count of invoices (eg. mmmm => 0012 : 12th invoice of the month)" + n_digits_annual_amount_of_invoices: "(n) digits, annual count of invoices (ex. yyyyyy => 000008 : 8th invoice of this year)" + beware_if_the_number_exceed_the_specified_length_it_will_be_truncated_by_the_left: "Beware: if the number exceed the specified length, it will be truncated by the left." + n_digits_count_of_orders: "(n) digits, count of invoices (eg. nnnn => 0327 : 327th order)" + n_digits_daily_count_of_orders: "(n) digits, daily count of orders (eg. ddd => 002 : 2nd order of the day)" + n_digits_monthly_count_of_orders: "(n) digits, monthly count of orders (eg. mmmm => 0012 : 12th order of the month)" + n_digits_annual_amount_of_orders: "(n) digits, annual count of orders (ex. yyyyyy => 000008 : 8th order of this year)" + add_a_notice_regarding_the_online_sales_only_if_the_invoice_is_concerned: "Add a notice regarding the online sales, only if the invoice is concerned." + this_will_never_be_added_when_a_refund_notice_is_present: "This will never be added when a refund notice is present." + eg_XVL_will_add_VL_to_the_invoices_settled_with_stripe: '(eg. X[/VL] will add "/VL" to the invoices settled with stripe)' + add_a_notice_regarding_refunds_only_if_the_invoice_is_concerned: "Add a notice regarding refunds, only if the invoice is concerned." + this_will_never_be_added_when_an_online_sales_notice_is_present: "This will never be added when an online sales notice is present." + eg_RA_will_add_A_to_the_refund_invoices: '(ed. R[/A] will add "/A" to the refund invoices)' + add_a_notice_regarding_the_wallet_only_if_the_invoice_is_concerned: "Add a notice regarding the wallet, only if the invoice is concerned." + eg_WPM_will_add_PM_to_the_invoices_settled_with_wallet: '(eg. W[/PM] will add "/PM" to the invoices settled with wallet)' + code: "Code" + enable_the_code: "Enable the code" + enabled: "Enabled" + disabled: "Disabled" + order_number: "Order number" + elements: "Elements" + VAT: "VAT" + enable_VAT: "Enable VAT" + VAT_rate: "VAT rate" + VAT_history: "VAT rates history" + changed_at: "Changed at" + changed_by: "By" + deleted_user: "Deleted user" + refund_invoice_successfully_created: "Refund invoice successfully created." + create_a_refund_on_this_invoice: "Create a refund on this invoice" + creation_date_for_the_refund: "Creation date for the refund" + creation_date_is_required: "Creation date is required." + refund_mode: "Refund mode:" + do_you_want_to_disable_the_user_s_subscription: "Do you want to disabled the user's subscription:" + elements_to_refund: "Elements to refund" + description: "Description" + description_optional: "Description (optional):" + will_appear_on_the_refund_invoice: "Will appear on the refund invoice." + none: "None" # grammar note: concordance with "payment mean" + by_cash: "By cash" + by_cheque: "By cheque" + by_transfer: "By transfer" + by_wallet: "By wallet" + you_must_select_at_least_one_element_to_create_a_refund: "You must select at least one element, to create a refund." + unable_to_create_the_refund: "Unable to create the refund" + invoice_reference_successfully_saved: "Invoice reference successfully saved." + an_error_occurred_while_saving_invoice_reference: "An error occurred while saving invoice reference." + invoicing_code_succesfully_saved: "Invoicing code successfully saved." + an_error_occurred_while_saving_the_invoicing_code: "An error occurred while saving the invoicing code." + code_successfully_activated: "Code successfully activated." + code_successfully_disabled: "Code successfully disabled." + an_error_occurred_while_activating_the_invoicing_code: "An error occurred while activating the invoicing code." + order_number_successfully_saved: "Order number successfully saved." + an_error_occurred_while_saving_the_order_number: "An error occurred while saving the order number." + VAT_rate_successfully_saved: "VAT rate successfully saved." + an_error_occurred_while_saving_the_VAT_rate: "An error occurred while saving the VAT rate." + VAT_successfully_activated: "VAT successfully activated." + VAT_successfully_disabled: "VAT successfully disabled." + an_error_occurred_while_activating_the_VAT: "An error occurred while activating the VAT." + text_successfully_saved: "Text successfully saved." + an_error_occurred_while_saving_the_text: "An error occurred while saving the text." + address_and_legal_information_successfully_saved: "Address and legal information successfully saved." + an_error_occurred_while_saving_the_address_and_the_legal_information: "An error occurred while saving the address and the legal information." + logo_successfully_saved: "Logo successfully saved." + an_error_occurred_while_saving_the_logo: "An error occurred while saving the logo." + online_payment: "Online payment" + close_accounting_period: "Close an accounting period" + close_from_date: "Close from" + start_date_is_required: "Start date is required" + close_until_date: "Close until" + end_date_is_required: "End date is required" + previous_closings: "Previous closings" + start_date: "From" + end_date: "To" + closed_at: "Closed at" + closed_by: "By" + period_total: "Period total" + perpetual_total: "Perpetual total" + integrity: "Integrity check" + confirmation_required: "Confirmation required" + confirm_close_START_END: "Do you really want to close the accounting period between {START} and {END}? Any subsequent changes will be impossible." + period_must_match_fiscal_year: "A closing must occur at the end of a minimum annual period, or per financial year when it is not calendar-based." + this_may_take_a_while: "This operation will take some time to complete." + period_START_END_closed_success: "The accounting period from {START} to {END} has been successfully closed. Archive generation is running, you'll be notified when it's done." + failed_to_close_period: "An error occurred, unable to close the accounting period" + no_periods: "No closings for now" + accounting_codes: "Accounting codes" + accounting_journal_code: "Journal code" + general_journal_code: "Journal code" + accounting_card_client_code: "Card clients code" + card_client_code: "Accounting code for clients who paid by card" + accounting_card_client_label: "Card clients label" + card_client_label: "Account label for clients who paid by card" + accounting_wallet_client_code: "Wallet clients code" + wallet_client_code: "Accounting code for clients who paid by virtual wallet" + accounting_wallet_client_label: "Wallet clients label" + wallet_client_label: "Account label for clients who paid by virtual wallet" + accounting_other_client_code: "Other means client code" + other_client_code: "Accounting code for clients who paid using another payment means" + accounting_other_client_label: "Other means client label" + other_client_label: "Accounting label for clients who paid using another payment means" + accounting_wallet_code: "Wallet code" + general_wallet_code: "Accounting code for wallet credit" + accounting_wallet_label: "Wallet label" + general_wallet_label: "Account label for wallet credit" + accounting_vat_code: "VAT code" + general_vat_code: "Accounting code for VAT" + accounting_vat_label: "VAT label" + general_vat_label: "VAT account label" + accounting_subscription_code: "Subscriptions code" + general_subscription_code: "Accounting code for all subscriptions" + accounting_subscription_label: "Subscriptions label" + general_subscription_label: "Account label for all subscriptions" + accounting_Machine_code: "Machines code" + general_machine_code: "Accounting code for all machines" + accounting_Machine_label: "Machine label" + general_machine_label: "Account label for all machines" + accounting_Training_code: "Trainings code" + general_training_code: "Accounting code for all trainings" + accounting_Training_label: "Trainings label" + general_training_label: "Account label for all trainings" + accounting_Event_code: "Events code" + general_event_code: "Accounting code for all events" + accounting_Event_label: "Events label" + general_event_label: "Account label for all events" + accounting_Space_code: "Space code" + general_space_code: "Accounting code for all spaces" + accounting_Space_label: "Spaces label" + general_space_label: "Account label for all spaces" + codes_customization_success: "Customization of the accounting codes successfully saved." + export_accounting_data: "Export accounting data" + export_to: "Export to the accounting software" + export_is_running: "Export is running. You'll be notified when it's ready." + acd: "ACD" + export_form_date: "Export from" + export_to_date: "Export until" + format: "File format" + encoding: "Encoding" + separator: "Separator" + dateFormat: "Date format" + labelMaxLength: "Label (max)" + decimalSeparator: "Decimal separator" + exportInvoicesAtZero: "Export invoices equal to 0" + columns: "Columns" + exportColumns: + journal_code: "Journal code" + date: "Entry date" + account_code: "Account code" + account_label: "Account label" + piece: "Document" + line_label: "Entry label" + debit_origin: "Origin debit" + credit_origin: "Origin credit" + debit_euro: "Euro debit" + credit_euro: "Euro credit" + lettering: "Lettering" members: # management of users, labels, groups, and so on users_management: "Users management" members: "Members" + subscriptions: "Subscriptions" search_for_an_user: "Search for an user" add_a_new_member: "Add a new member" reservations: "Reservations" + surname: "Last name" + first_name: "First name" email: "Email" phone: "Phone" user_type: "User type" + subscription: "Subscription" display_more_users: "Display more users..." administrators: "Administrators" search_for_an_administrator: "Search for an administrator" add_a_new_administrator: "Add a new administrator" groups: "Groups" + tags: "Tags" authentication: "Authentication" + confirmation_required: "Confirmation required" confirm_delete_member: "Do you really want to delete this member? This cannot be undone." member_successfully_deleted: "Member successfully deleted." unable_to_delete_the_member: "Unable to delete the member." @@ -579,25 +601,34 @@ en: unable_to_delete_the_administrator: "Unable to delete the administrator." changes_successfully_saved: "Changes successfully saved." an_error_occurred_while_saving_changes: "An error occurred when saving changes." - add_a_tag: "Add a tag" - tag_name: "Tag name" - new_tag_successfully_saved: "New tag successfully saved." - an_error_occurred_while_saving_the_new_tag: "An error occurred while saving the new tag." - tag_successfully_deleted: "Tag successfully deleted." - an_error_occurred_and_the_tag_deletion_failed: "An error occurred and the tag deletion failed." - search_for_an_authentication_provider: "Search for an authentication provider" - add_a_new_authentication_provider: "Add a new authentication provider" - strategy_name: "Strategy's name" - state: "State" - unknown: "Unknown: " - active: "Active" - pending: "Pending" - previous_provider: "Previous provider" - do_you_really_want_to_delete_the_TYPE_authentication_provider_NAME: "Do you really want to delete the {TYPE} authentication provider: {NAME}?" - authentication_provider_successfully_deleted: "Authentication provider successfully deleted." - an_error_occurred_unable_to_delete_the_specified_provider: "An error occurred: unable to delete the specified provider." - local_database: "Local database" - o_auth2: "OAuth 2.0" + export_is_running_you_ll_be_notified_when_its_ready: "Export is running. You'll be notified when it's ready." + tag_form: + tags: "Tags" + add_a_tag: "Add a tag" + tag_name: "Tag name" + new_tag_successfully_saved: "New tag successfully saved." + an_error_occurred_while_saving_the_new_tag: "An error occurred while saving the new tag." + confirmation_required: "Delete this tag?" + confirm_delete_tag_html: "Do you really want to delete this tag?
    Users and slots currently associated with this tag will be dissociated.
    Warning: This cannot be undone!" + tag_successfully_deleted: "Tag successfully deleted." + an_error_occurred_and_the_tag_deletion_failed: "An error occurred and the tag deletion failed." + authentication_form: + search_for_an_authentication_provider: "Search for an authentication provider" + add_a_new_authentication_provider: "Add a new authentication provider" + name: "Name" + strategy_name: "Strategy's name" + type: "Type" + state: "State" + unknown: "Unknown: " + active: "Active" + pending: "Pending" + previous_provider: "Previous provider" + confirmation_required: "Delete the provider?" + do_you_really_want_to_delete_the_TYPE_authentication_provider_NAME: "Do you really want to delete the {TYPE} authentication provider: {NAME}?" + authentication_provider_successfully_deleted: "Authentication provider successfully deleted." + an_error_occurred_unable_to_delete_the_specified_provider: "An error occurred: unable to delete the specified provider." + local_database: "Local database" + o_auth2: "OAuth 2.0" group_form: add_a_group: "Add a group" group_name: "Group name" @@ -618,52 +649,50 @@ en: members_new: # add a member - members_new: - add_a_member: "Add a member" - user_is_an_organization: "User is an organization" + add_a_member: "Add a member" + user_is_an_organization: "User is an organization" members_import: # members bulk import - members_import: - import_members: "Import members" - info: "You can upload a CSV file to create new members or update existing ones. Your file must user the identifiers below to specify the group, the trainings and the tags of the members." - required_fields: "Your file must contain, at least, the following information for each user to create: email, name, first name and group. If the password is empty, it will be generated. On updates, the empty fields will be kept as is." - about_example: "Please refer to the provided example file to generate a correct CSV file. Be careful to use Unicode UTF-8 encoding." - groups: "Groups" - group_name: "Group name" - group_identifier: "Identifier to use" - trainings: "Trainings" - training_name: "Training name" - training_identifier: "Identifier to use" - plans: "Plans" - plan_name: "Plan name" - plan_identifier: "Identifier to use" - tags: "Tags" - tag_name: "Tag name" - tag_identifier: "Identifier to use" - download_example: "Download the exemple file" - select_file: "Choose a file" - import: "Import" - update_field: "Reference field for users to update" - update_on_id: "ID" - update_on_username: "Username" - update_on_email: "Email address" + import_members: "Import members" + info: "You can upload a CSV file to create new members or update existing ones. Your file must user the identifiers below to specify the group, the trainings and the tags of the members." + required_fields: "Your file must contain, at least, the following information for each user to create: email, name, first name and group. If the password is empty, it will be generated. On updates, the empty fields will be kept as is." + about_example: "Please refer to the provided example file to generate a correct CSV file. Be careful to use Unicode UTF-8 encoding." + groups: "Groups" + group_name: "Group name" + group_identifier: "Identifier to use" + trainings: "Trainings" + training_name: "Training name" + training_identifier: "Identifier to use" + plans: "Plans" + plan_name: "Plan name" + plan_identifier: "Identifier to use" + tags: "Tags" + tag_name: "Tag name" + tag_identifier: "Identifier to use" + download_example: "Download the exemple file" + select_file: "Choose a file" + import: "Import" + update_field: "Reference field for users to update" + update_on_id: "ID" + update_on_username: "Username" + update_on_email: "Email address" members_import_result: # import results - members_import_result: - import_results: "Import results" - import_details: "Import #{ID}, of {DATE}, initiated by {USER}" - results: "Results" - pending: "Pending..." - status_create: "Creating a new user" - status_update: "Updating user {ID}" - success: "Success" - failed: "Failed" - error_details: "Error's details:" + import_results: "Import results" + import_details: "Import #{ID}, of {DATE}, initiated by {USER}" + results: "Results" + pending: "Pending..." + status_create: "Creating a new user" + status_update: "Updating user {ID}" + success: "Success" + failed: "Failed" + error_details: "Error's details:" members_edit: # edit a member + subscription: "Subscription" duration: "Duration:" expires_at: "Expires at:" price_: "Price:" @@ -671,6 +700,8 @@ en: extend_subscription: "Extend subscription" user_has_no_current_subscription: "User has no current subscription." subscribe_to_a_plan: "Subscribe to a plan" + trainings: "Trainings" + no_trainings: "No trainings" next_trainings: "Next trainings" passed_trainings: "Passed trainings" validated_trainings: "Validated trainings" @@ -680,9 +711,14 @@ en: NUMBER_full_price_tickets_reserved: "{NUMBER, plural, =0{} one{1 full price ticket reserved} other{{NUMBER} full price tickets reserved}}" NUMBER_NAME_tickets_reserved: "{NUMBER, plural, =0{} one{1 {NAME} ticket reserved} other{{NUMBER} {NAME} tickets reserved}}" passed_events: "Passed events" + no_passed_events: "No passed events" invoices: "Invoices" invoice_num: "Invoice #" + date: "Date" + price: "Price" + download_the_invoice: "Download the invoice" download_the_refund_invoice: "Download the refund invoice" + no_invoices_for_now: "No invoices for now." expiration_date: "Expiration date" you_intentionally_decide_to_extend_the_user_s_subscription_by_offering_him_free_days: "You intentionally decide to extend the user's subscription by offering him free days." credits_will_remain_unchanged: "The balance of free credits (training / machines / spaces) of the user will remain unchanged." @@ -695,12 +731,27 @@ en: you_are_about_to_purchase_a_subscription_to_NAME: "You are about to purchase a subscription to {NAME}." subscription_successfully_purchased: "Subscription successfully purchased." a_problem_occurred_while_taking_the_subscription: "A problem occurred while taking the subscription" + wallet: "Wallet" + to_credit: 'Credit' admins_new: # add a new administrator to the platform add_an_administrator: "Add an administrator" administrator_successfully_created_he_will_receive_his_connection_directives_by_email: "Administrator successfully created. {GENDER, select, female{She} other{He}} receive {GENDER, select, female{her} other{his}} connection directives by e-mail." failed_to_create_admin: "Unable to create the administrator:" + man: "Man" + woman: "Woman" + pseudonym: "Pseudonym" + pseudonym_is_required: "Pseudonym is required." + first_name: "First name" + first_name_is_required: "First name is required." + surname: "Last name" + surname_is_required: "Last name is required." + email_address: "Email address" + email_is_required: "Email address is required." + birth_date: "Date of birth" + address: "Address" + phone_number: "Phone number" authentication_new: # add a new authentication provider (SSO) @@ -726,6 +777,7 @@ en: statistics: # statistics tables + statistics: "Statistics" evolution: "Evolution" age_filter: "Age filter" from_age: "From" # context: age. eg: from 8 to 40 years old @@ -738,6 +790,8 @@ en: criterion: "Criterion:" value: "Value:" exclude: "Exclude" + from_date: "From" # context: date. eg: "from 01/01 to 01/05" + to_date: "to" # context: date. eg: "from 01/01 to 01/05" entries: "Entries:" revenue_: "Revenue:" average_age: "Average age:" @@ -745,8 +799,11 @@ en: total: "Total" available_hours: "Hours available for booking:" available_tickets: "Tickets available for booking:" + date: "Date" + user: "User" gender: "Gender" age: "Age" + type: "Type" revenue: "Revenue" unknown: "Unknown" user_id: "User ID" @@ -756,155 +813,166 @@ en: export_the_current_search_results: "Export the current search results" export: "Export" deleted_user: "Deleted user" + man: "Man" + woman: "Woman" + export_is_running_you_ll_be_notified_when_its_ready: "Export is running. You'll be notified when it's ready." stats_graphs: # statistics graphs + statistics: "Statistics" data: "Data" day: "Day" week: "Week" + from_date: "From" # context: date. eg: "from 01/01 to 01/05" + to_date: "to" # context: date. eg: "from 01/01 to 01/05" + month: "Month" start: "Start:" end: "End:" + type: "Type" revenue: "Revenue" top_list_of: "Top list of" number: "Number" week_short: "Week" week_of_START_to_END: "Week of {START} to {END}" no_data_for_this_period: "No data for this period" + date: "Date" settings: # global application parameters and customization - settings: - title: "Title" - customize_the_application: "Customize the application" - general: "General" - fablab_title: "FabLab title" - fablab_name: "FabLab name" - title_concordance: "Title concordance" - male: "Male." - female: "Female." - neutral: "Neutral." - eg: "eg:" - about: "About" - male_preposition: "the" - female_preposition: "the" - neutral_preposition: "" - customize_information_messages: "Customize information messages" - message_of_the_machine_booking_page: "Message of the machine booking page:" - type_the_message_content: "Type the message content" - warning_message_of_the_training_booking_page: "Warning message of the training booking page:" - information_message_of_the_training_reservation_page: "Information message of the training reservation page:" - message_of_the_subscriptions_page: "Message of the subscriptions page:" - message_of_the_events_page: "Message of the events page:" - message_of_the_spaces_page: "Message of the spaces page:" - legal_documents: "Legal documents" - if_these_documents_are_not_filled_no_consent_about_them_will_be_asked_to_the_user: "If these documents are not filled, no consent about them will be asked." - general_terms_and_conditions: "General terms and conditions (T&C)" - terms_of_service: "Terms of service (TOS)" - customize_the_graphics: "Customize the graphics" - for_an_optimal_rendering_the_logo_image_must_be_at_the_PNG_format_with_a_transparent_background_and_with_an_aspect_ratio_3.5_times_wider_than_the_height: "For an optimal rendering, the logo image must be at the PNG format with a transparent background and an aspect ratio 3.5 wider than the height." - concerning_the_favicon_it_must_be_at_ICO_format_with_a_size_of_16x16_pixels: "Concerning the favicon, it must be at ICO format with a size of 16x16 pixels." - remember_to_refresh_the_page_for_the_changes_to_take_effect: "Remember to refresh the page for the changes to take effect." - logo_white_background: "Logo (white background)" - change_the_logo: "Change the logo" - logo_black_background: "Logo (black background)" - favicon: "Favicon" - change_the_favicon: "Change the favicon" - main_colour: "Main colour:" - primary: "Primary" - secondary_colour: "Secondary colour:" - secondary: "Secondary" - background_picture_of_the_profile_banner: "Background picture of the profile banner" - change_the_profile_banner: "Change the profile banner" - home_page: "Home page" - news_of_the_home_page: "News of the home page:" - type_your_news_here: "Type your news here" - leave_it_empty_to_not_bring_up_any_news_on_the_home_page: "Leave it empty to not bring up any news on the home page" - twitter_stream: "Twitter Stream:" - name_of_the_twitter_account: "Name of the Twitter account" - title_of_the_about_page: "Title of the About page" - shift_enter_to_force_carriage_return: "SHIFT + ENTER to force carriage return" - input_the_main_content: "Input the main content" - drag_and_drop_to_insert_images: "Drap and drop to insert images" - input_the_fablab_contacts: "Input the FabLab contacts" - reservations: "Reservations" - reservations_parameters: "Reservations parameters" - confine_the_booking_agenda: "Confine the booking agenda" - opening_time: "Opening time" - closing_time: "Closing time" - max_visibility: "Maximum visibility (in months)" - visibility_for_yearly_members: "For currently running subscriptions, at least 1 year long" - visibility_for_other_members: "For all other members" - ability_for_the_users_to_move_their_reservations: "Ability for the users to move their reservations" - reservations_shifting: "Reservations shifting" - prior_period_hours: "Prior period (hours)" - enabled: "Enabled" - disabled: "Disabled" - ability_for_the_users_to_cancel_their_reservations: "Ability for the users to cancel their reservations" - reservations_cancelling: "Reservations cancelling" - reservations_reminders: "Reservations reminders" - notification_sending_before_the_reservation_occurs: "Notification sending before the reservation occurs" - customization_of_SETTING_successfully_saved: "Customization of the {SETTING} successfully saved." - file_successfully_updated: "File successfully updated." - name_genre: "title concordance" - machine_explications_alert: "explanation message on the machine reservation page" - training_explications_alert: "explanation message on the training reservation page" - training_information_message: "information message on the machine reservation page" - subscription_explications_alert: "explanation message on the subscription page" - event_explications_alert: "explanation message on the event reservation page" - space_explications_alert: "explanation message on the space reservation page" - main_color: "main colour" - secondary_color: "secondary colour" - home_blogpost: "homepage's brief" - twitter_name: "Twitter feed name" - about_title: "\"About\" page title" - about_body: "\"About\" page content" - about_contacts: "\"About\" page contacts" - privacy_draft: "privacy policy draft" - privacy_body: "privacy policy" - privacy_dpo: "data protection officer address" - booking_window_start: "opening time" - booking_window_end: "closing time" - booking_move_enable: "reservation moving enabling" - booking_move_delay: "preventive delay of moving" - booking_cancel_enable: "reservation canceling enabling" - booking_cancel_delay: "preventive delay of canceling" - reminder_enable: "reservation reminding enabling" - reminder_delay: "delay before sending the reminder" - default_value_is_24_hours: "If the field is leaved empty: 24 hours." - visibility_yearly: "maximum visibility for annual subscribers" - visibility_others: "maximum visibility for other members" - confidentiality: "Confidentiality" - display_machine_reservation_user_name: "Display the full name of the user who booked a machine slot" - display_name: "Display the name" - display_name_enable: "name display" - machines_sort_by: "machines display order" - elements_ordering: "Elements ordering" - machines_order: "Machines order" - display_machines_sorted_by: "Display machines sorted by" - sort_by: - default: "Default" - name: "Name" - created_at: "Creation date" - updated_at: "Last update date" - privacy: - title: "Privacy policy" - input_the_dpo: "Input the contact of the Data Protection Officer" - current_policy: "Current policy" - draft_from_USER_DATE: "Draft, saved by {USER}, on {DATE}" - save_or_publish: "Save or publish?" - save_or_publish_body: "Do you want to publish a new version of the privacy policy or save it as a draft?" - publish_will_notify: "Publish a new version will send a notification to every users." - publish: "Publish" - users_notified: "Platform users will be notified of the update." + title: "Title" + customize_the_application: "Customize the application" + general: "General" + fablab_title: "FabLab title" + fablab_name: "FabLab name" + title_concordance: "Title concordance" + male: "Male." + female: "Female." + neutral: "Neutral." + eg: "eg:" + about: "About" + male_preposition: "the" + female_preposition: "the" + neutral_preposition: "" + customize_information_messages: "Customize information messages" + message_of_the_machine_booking_page: "Message of the machine booking page:" + type_the_message_content: "Type the message content" + warning_message_of_the_training_booking_page: "Warning message of the training booking page:" + information_message_of_the_training_reservation_page: "Information message of the training reservation page:" + message_of_the_subscriptions_page: "Message of the subscriptions page:" + message_of_the_events_page: "Message of the events page:" + message_of_the_spaces_page: "Message of the spaces page:" + legal_documents: "Legal documents" + if_these_documents_are_not_filled_no_consent_about_them_will_be_asked_to_the_user: "If these documents are not filled, no consent about them will be asked." + general_terms_and_conditions: "General terms and conditions (T&C)" + terms_of_service: "Terms of service (TOS)" + customize_the_graphics: "Customize the graphics" + for_an_optimal_rendering_the_logo_image_must_be_at_the_PNG_format_with_a_transparent_background_and_with_an_aspect_ratio_3.5_times_wider_than_the_height: "For an optimal rendering, the logo image must be at the PNG format with a transparent background and an aspect ratio 3.5 wider than the height." + concerning_the_favicon_it_must_be_at_ICO_format_with_a_size_of_16x16_pixels: "Concerning the favicon, it must be at ICO format with a size of 16x16 pixels." + remember_to_refresh_the_page_for_the_changes_to_take_effect: "Remember to refresh the page for the changes to take effect." + logo_white_background: "Logo (white background)" + change_the_logo: "Change the logo" + logo_black_background: "Logo (black background)" + favicon: "Favicon" + change_the_favicon: "Change the favicon" + main_colour: "Main colour:" + primary: "Primary" + secondary_colour: "Secondary colour:" + secondary: "Secondary" + background_picture_of_the_profile_banner: "Background picture of the profile banner" + change_the_profile_banner: "Change the profile banner" + home_page: "Home page" + news_of_the_home_page: "News of the home page:" + type_your_news_here: "Type your news here" + leave_it_empty_to_not_bring_up_any_news_on_the_home_page: "Leave it empty to not bring up any news on the home page" + twitter_stream: "Twitter Stream:" + name_of_the_twitter_account: "Name of the Twitter account" + title_of_the_about_page: "Title of the About page" + shift_enter_to_force_carriage_return: "SHIFT + ENTER to force carriage return" + input_the_main_content: "Input the main content" + drag_and_drop_to_insert_images: "Drap and drop to insert images" + input_the_fablab_contacts: "Input the FabLab contacts" + reservations: "Reservations" + reservations_parameters: "Reservations parameters" + confine_the_booking_agenda: "Confine the booking agenda" + opening_time: "Opening time" + closing_time: "Closing time" + max_visibility: "Maximum visibility (in months)" + visibility_for_yearly_members: "For currently running subscriptions, at least 1 year long" + visibility_for_other_members: "For all other members" + ability_for_the_users_to_move_their_reservations: "Ability for the users to move their reservations" + reservations_shifting: "Reservations shifting" + prior_period_hours: "Prior period (hours)" + enabled: "Enabled" + disabled: "Disabled" + ability_for_the_users_to_cancel_their_reservations: "Ability for the users to cancel their reservations" + reservations_cancelling: "Reservations cancelling" + reservations_reminders: "Reservations reminders" + notification_sending_before_the_reservation_occurs: "Notification sending before the reservation occurs" + customization_of_SETTING_successfully_saved: "Customization of the {SETTING} successfully saved." + file_successfully_updated: "File successfully updated." + name_genre: "title concordance" + machine_explications_alert: "explanation message on the machine reservation page" + training_explications_alert: "explanation message on the training reservation page" + training_information_message: "information message on the machine reservation page" + subscription_explications_alert: "explanation message on the subscription page" + event_explications_alert: "explanation message on the event reservation page" + space_explications_alert: "explanation message on the space reservation page" + main_color: "main colour" + secondary_color: "secondary colour" + home_blogpost: "homepage's brief" + twitter_name: "Twitter feed name" + about_title: "\"About\" page title" + about_body: "\"About\" page content" + about_contacts: "\"About\" page contacts" + privacy_draft: "privacy policy draft" + privacy_body: "privacy policy" + privacy_dpo: "data protection officer address" + booking_window_start: "opening time" + booking_window_end: "closing time" + booking_move_enable: "reservation moving enabling" + booking_move_delay: "preventive delay of moving" + booking_cancel_enable: "reservation canceling enabling" + booking_cancel_delay: "preventive delay of canceling" + reminder_enable: "reservation reminding enabling" + reminder_delay: "delay before sending the reminder" + default_value_is_24_hours: "If the field is leaved empty: 24 hours." + visibility_yearly: "maximum visibility for annual subscribers" + visibility_others: "maximum visibility for other members" + confidentiality: "Confidentiality" + display_machine_reservation_user_name: "Display the full name of the user who booked a machine slot" + display_name: "Display the name" + display_name_enable: "name display" + machines_sort_by: "machines display order" + elements_ordering: "Elements ordering" + machines_order: "Machines order" + display_machines_sorted_by: "Display machines sorted by" + sort_by: + default: "Default" + name: "Name" + created_at: "Creation date" + updated_at: "Last update date" + privacy: + title: "Privacy policy" + input_the_dpo: "Input the contact of the Data Protection Officer" + current_policy: "Current policy" + draft_from_USER_DATE: "Draft, saved by {USER}, on {DATE}" + save_or_publish: "Save or publish?" + save_or_publish_body: "Do you want to publish a new version of the privacy policy or save it as a draft?" + publish_will_notify: "Publish a new version will send a notification to every users." + publish: "Publish" + users_notified: "Platform users will be notified of the update." open_api_clients: add_new_client: "Create new API client" api_documentation: "API documentation" open_api_clients: "OpenAPI clients" + name: "Name" calls_count: "calls count" + token: "Token" created_at: "Creation date" reset_token: "revoke access" client_name: "Client's name" + confirmation_required: "Confirmation required" do_you_really_want_to_delete_this_open_api_client: "Do you really want to delete this OpenAPI client?" do_you_really_want_to_revoke_this_open_api_access: "Do you really want to revoke this access ? It will erase and replace the current token." client_successfully_created: "Client successfully created." @@ -914,27 +982,24 @@ en: space_new: # create a new space - space_new: - add_a_new_space: "Add a new space" - watch_out_when_creating_a_new_space_its_prices_are_initialized_at_0_for_all_subscriptions: "Watch out! When creating a new space, its prices are initialized at 0 for all subscriptions." - consider_changing_its_prices_before_creating_any_reservation_slot: "Consider changing its prices before creating any reservation slot." - add_this_space: "Add this space" + add_a_new_space: "Add a new space" + watch_out_when_creating_a_new_space_its_prices_are_initialized_at_0_for_all_subscriptions: "Watch out! When creating a new space, its prices are initialized at 0 for all subscriptions." + consider_changing_its_prices_before_creating_any_reservation_slot: "Consider changing its prices before creating any reservation slot." + add_this_space: "Add this space" space_edit: # modify an exiting space - space_edit: - edit_the_space_NAME: "Edit the space: {NAME}" - validate_the_changes: "Validate the changes" + edit_the_space_NAME: "Edit the space: {NAME}" + validate_the_changes: "Validate the changes" manage_abuses: # process and delete abuses reports - manage_abuses: - abuses_list: "Reports list" - no_reports: "No reports for now" - published_by: "published by" - at_date: "on" - has_reported: "made the following report:" - confirmation_required: "Confirm the processing of the report" - report_will_be_destroyed: "Once the report has been processed, it will be deleted. This can't be undone, continue?" - report_removed: "The report has been deleted" - failed_to_remove: "An error occurred, unable to delete the report" + abuses_list: "Reports list" + no_reports: "No reports for now" + published_by: "published by" + at_date: "on" + has_reported: "made the following report:" + confirmation_required: "Confirm the processing of the report" + report_will_be_destroyed: "Once the report has been processed, it will be deleted. This can't be undone, continue?" + report_removed: "The report has been deleted" + failed_to_remove: "An error occurred, unable to delete the report" diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 6d903b5ca..47646a36f 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -184,7 +184,7 @@ fr: free_entry: "Entrée libre" free_admission: "Entrée gratuite" view_reservations: "Consulter les réservations" - load_the_next_events: "Charger les évènements suivants ..." + load_the_next_events: "Charger les évènements suivants..." categories: "Catégories" add_a_category: "Ajouter une catégorie" name: "Nom" @@ -368,7 +368,7 @@ fr: download_the_invoice: "Télécharger la facture" download_the_credit_note: "Télécharger l'avoir" credit_note: "Avoir" - display_more_invoices: "Afficher plus de factures ..." + display_more_invoices: "Afficher plus de factures..." no_invoices_for_now: "Aucune facture pour le moment." invoicing_settings: "Paramètres de facturation" warning_invoices_disabled: "Attention : les factures ne sont pas activées. Aucune facture ne sera générée par Fab-manager. Vous devez néanmoins remplir correctement les informations ci-dessous, particulièrement la TVA." @@ -584,7 +584,7 @@ fr: phone: "Tel." user_type: "Type utilisateur" subscription: "Abonnement" - display_more_users: "Afficher plus d'utilisateurs ..." + display_more_users: "Afficher plus d'utilisateurs..." administrators: "Administrateurs" search_for_an_administrator: "Recherchez un administrateur" add_a_new_administrator: "Ajouter un nouvel administrateur" @@ -743,11 +743,11 @@ fr: woman: "Femme" pseudonym: "Pseudonyme" pseudonym_is_required: "Le pseudonyme est requis." - first_name: "Votre prénom" + first_name: "Prénom" first_name_is_required: "Le prénom est requis." - surname: "Votre nom" + surname: "Nom" surname_is_required: "Le nom est requis." - email_address: "Votre adresse de courriel" + email_address: "Adresse de courriel" email_is_required: "L'adresse de courriel est requise." birth_date: "Date de naissance" address: "Adresse" From ff8319b166332015763bd45ed66d9f2436592867 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 18 Dec 2019 14:35:29 +0100 Subject: [PATCH 081/135] harmonize front translations in english with new model --- config/locales/app.logged.en.yml | 141 +++++++----- config/locales/app.logged.fr.yml | 2 +- config/locales/app.public.en.yml | 152 +++++++----- config/locales/app.public.fr.yml | 6 +- config/locales/app.shared.en.yml | 384 ++++++++++++++----------------- config/locales/app.shared.fr.yml | 4 +- 6 files changed, 359 insertions(+), 330 deletions(-) diff --git a/config/locales/app.logged.en.yml b/config/locales/app.logged.en.yml index 4ea7c29c8..753a20fde 100644 --- a/config/locales/app.logged.en.yml +++ b/config/locales/app.logged.en.yml @@ -1,12 +1,13 @@ en: app: logged: - profileCompletion: + profile_completion: # user's profile completion page when logging from an SSO provider confirm_your_new_account: "Confirm your new account" you_ve_just_created_a_new_account_on_the_fablab_by_logging_from: "You've just created a new account on {GENDER, select, neutral{} other{the}} {NAME}, by logging from" we_need_some_more_details: "To finalize the platform setup, we need some more details" your_email_is_already_used_by_another_account_on_the_platform: "It looks like your email address is already used by another user. Check your email address and please input below the code sent to you." + or: "or" please_fill_the_following_form: "Please fill the following form" some_data_may_have_already_been_provided_by_provider_and_cannot_be_modified: "Some data may have already been provided by {NAME} and cannot be modified" then_click_on_: "Then click on" @@ -24,81 +25,107 @@ en: an_unexpected_error_occurred_check_your_authentication_code: "An unexpected error occurred, please check your authentication code." send_code_again: "Send the code again" email_address_associated_with_your_account: "Email address associated with your account" + email_is_required: "Email address is required" email_format_is_incorrect: "Email format is incorrect" code_successfully_sent_again: "Code successfully sent again" + used_for_statistics: "This data will be used for statistical purposes" + your_user_s_profile: "Your user's profile" + user_s_profile_is_required: "User's profile is required." + i_ve_read_and_i_accept_: "I've read and I accept" + _the_fablab_policy: "the FabLab policy" + change_my_data: "Change my data" + sync_my_profile: "Sync my profile" + once_your_data_are_up_to_date_: "Once your data are up to date," + _click_on_the_synchronization_button_opposite_: "click on the synchronization button opposite" + _disconnect_then_reconnect_: "disconnect then reconnect" + _for_your_changes_to_take_effect: "for your changes to take effect." dashboard: # dashboard: public profile profile: empty: '' settings: - edit_profile: - # dashboard: edit my profile - last_activity_on_: "Last activity on" - i_want_to_change_group: "I want to change group!" - your_subscription_expires_on_: "Your subscription expires on" - no_subscriptions: "No subscriptions" - i_want_to_subscribe: "I want to subscribe!" - to_come: "to come" - approved: "approved" - projects: "Projects" - no_projects: "No projects" - labels: "Labels" - no_labels: "No labels" - cookies: "Cookies" - cookies_accepted: "You have accepted cookies" - cookies_declined: "You have refused cookies" - cookies_unset: "You have not chosen yet" - reset_cookies: "Change my choice" - delete_my_account: "Delete my account" - edit_my_profile: "Edit my profile" - your_group_has_been_successfully_changed: "Your group has been successfully changed." - an_unexpected_error_prevented_your_group_from_being_changed: "An unexpected error prevented your group from being changed." - confirm_delete_your_account: "Do you really want to delete your account?" - all_data_will_be_lost: "All your data will be destroyed and won't be recoverable." - invoicing_data_kept: "According to regulation, all data related to your invoices will be kept separately for 10 years." - statistic_data_anonymized: "Some data (sex, date of birth, group) will be anonymized and kept for statistical purposes." - no_further_access_to_projects: "Your published projects will be anonymized and you won't get any further ability to edit them." - your_user_account_has_been_successfully_deleted_goodbye: "Your user account has been successfully deleted. Goodbye." - an_error_occured_preventing_your_account_from_being_deleted: "An error occurred, preventing your account from being deleted." - used_for_statistics: "This data will be used for statistical purposes" - used_for_invoicing: "This data will be used for billing purposes" - used_for_reservation: "This data will be used in case of change on one of your bookings" - used_for_profile: "This data will only be displayed on your profile" - used_for_pricing_stats: "This data will be used to determine the prices to which you are entitled, and for statistical purposes" - public_profile: "You will have a public profile and other users will be able to associate you in their projects" - trainings: "Trainings" - no_trainings: "No trainings" - subscription: "Subscription" - group: "Group" - or: "or" - confirm_changes: "Confirm changes" - change_my_data: "Change my data" - sync_my_profile: "Sync my profile" - once_your_data_are_up_to_date_: "Once your data are up to date," - _click_on_the_synchronization_button_opposite_: "click on the synchronization button opposite" - _disconnect_then_reconnect_: "disconnect then reconnect" - _for_your_changes_to_take_effect: "for your changes to take effect." + # dashboard: edit my profile + last_activity_on_: "Last activity on" + i_want_to_change_group: "I want to change group!" + your_subscription_expires_on_: "Your subscription expires on" + no_subscriptions: "No subscriptions" + i_want_to_subscribe: "I want to subscribe!" + to_come: "to come" + approved: "approved" + projects: "Projects" + no_projects: "No projects" + labels: "Labels" + no_labels: "No labels" + cookies: "Cookies" + cookies_accepted: "You have accepted cookies" + cookies_declined: "You have refused cookies" + cookies_unset: "You have not chosen yet" + reset_cookies: "Change my choice" + delete_my_account: "Delete my account" + edit_my_profile: "Edit my profile" + your_group_has_been_successfully_changed: "Your group has been successfully changed." + an_unexpected_error_prevented_your_group_from_being_changed: "An unexpected error prevented your group from being changed." + confirmation_required: "Confirmation required" + confirm_delete_your_account: "Do you really want to delete your account?" + all_data_will_be_lost: "All your data will be destroyed and won't be recoverable." + invoicing_data_kept: "According to regulation, all data related to your invoices will be kept separately for 10 years." + statistic_data_anonymized: "Some data (sex, date of birth, group) will be anonymized and kept for statistical purposes." + no_further_access_to_projects: "Your published projects will be anonymized and you won't get any further ability to edit them." + your_user_account_has_been_successfully_deleted_goodbye: "Your user account has been successfully deleted. Goodbye." + an_error_occured_preventing_your_account_from_being_deleted: "An error occurred, preventing your account from being deleted." + used_for_statistics: "This data will be used for statistical purposes" + used_for_invoicing: "This data will be used for billing purposes" + used_for_reservation: "This data will be used in case of change on one of your bookings" + used_for_profile: "This data will only be displayed on your profile" + used_for_pricing_stats: "This data will be used to determine the prices to which you are entitled, and for statistical purposes" + public_profile: "You will have a public profile and other users will be able to associate you in their projects" + trainings: "Trainings" + no_trainings: "No trainings" + subscription: "Subscription" + group: "Group" + or: "or" + confirm_changes: "Confirm changes" + change_my_data: "Change my data" + sync_my_profile: "Sync my profile" + once_your_data_are_up_to_date_: "Once your data are up to date," + _click_on_the_synchronization_button_opposite_: "click on the synchronization button opposite" + _disconnect_then_reconnect_: "disconnect then reconnect" + _for_your_changes_to_take_effect: "for your changes to take effect." projects: # dashboard: my projects you_dont_have_any_projects: "You don't have any projects." + add_a_project: "Add a project" author: "Author" collaborator: "Collaborator" + rough_draft: "Draft" + description: "Description" + machines_and_materials: "Machines and materials" + machines: "Machines" + materials: "Materials" + collaborators: "Collaborators" trainings: # dashboard: my trainings your_next_trainings: "Your next trainings" your_previous_trainings: "Your previous trainings" your_approved_trainings: "Your approved trainings" + no_trainings: "No trainings" events: # dashboard: my events your_next_events: "Your next events" no_events_to_come: "No events to come" your_previous_events: "Your previous events" + no_passed_events: "No passed events" NUMBER_normal_places_reserved: "{NUMBER} {NUMBER, plural, =0{} =1{normal place reserved} other{normal places reserved}}" NUMBER_of_NAME_places_reserved: "{NUMBER} {NUMBER, plural, =0{} =1{of {NAME} place reserved} other{of {NAME} places reserved}}" invoices: # dashboard: my invoices reference_number: "Reference number" + date: "Date" + price: "Price" + download_the_invoice: "Download the invoice" + download_the_credit_note: "Download the refund invoice" + no_invoices_for_now: "No invoices for now." members_show: # public profil of a member @@ -110,16 +137,18 @@ en: display_more_members: "Display more members..." no_members_for_now: "No members for now" avatar: "Avatar" + user: "User" + pseudonym: "Pseudonym" + email_address: "Email address" projects_new: # add a new project add_a_new_project: "Add a new project" - save_button_value: "Save as draft" # "save as draft" projects_edit: # modify an existing project - save_button_value: "Save" # "save" edit_the_project: "Edit the project" + rough_draft: "Draft" publish: "Publish" machines_reserve: @@ -141,19 +170,21 @@ en: planning_of: "Planning of" # followed by the training name (eg. "Planning of 3d printer training") all_trainings: "All trainings" cancel_my_selection: "Cancel my selection" + i_change: "I change" + i_shift: "I shift" i_ve_reserved: "I've reserved" space_reserve: # book a space - space_reserve: - planning_of_space_NAME: "Planning of the {NAME} space" - i_ve_reserved: "I've reserved" - i_shift: "I shift" - i_change: "I change" + planning_of_space_NAME: "Planning of the {NAME} space" + i_ve_reserved: "I've reserved" + i_shift: "I shift" + i_change: "I change" notifications: notifications_center: "Notifications center" mark_all_as_read: "Mark all as read" + date: "Date" notif_title: "Title" no_new_notifications: "No new notifications." archives: "Archives" diff --git a/config/locales/app.logged.fr.yml b/config/locales/app.logged.fr.yml index 87f3fd526..6af4cb177 100644 --- a/config/locales/app.logged.fr.yml +++ b/config/locales/app.logged.fr.yml @@ -134,7 +134,7 @@ fr: members: # liste des membres qui acceptent d'être contactés the_fablab_members: "Les membres du Fab Lab" - display_more_members: "Afficher plus de membres ..." + display_more_members: "Afficher plus de membres..." no_members_for_now: "Pas de membres pour le moment" avatar: "Avatar" user: "Utilisateur" diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml index 38b9e1db8..5fd8df09f 100644 --- a/config/locales/app.public.en.yml +++ b/config/locales/app.public.en.yml @@ -3,7 +3,7 @@ en: public: common: # header and "about" page - about_the_fablab: "About {GENDER, select, neutral{} other{the}} {NAME}" + about_the_fablab: "About {GENDER, select, male{the} female{the} neutral{} other{the}} {NAME}" return: "Return" # cookies @@ -45,7 +45,6 @@ en: # left menu (admin) trainings_monitoring: "Trainings monitoring" - select_a_training: "Select a training" manage_the_calendar: "Manage the Calendar" manage_the_users: "Manage the Users" manage_the_invoices: "Manage the invoices" @@ -125,18 +124,16 @@ en: about: # about page - about: - read_the_fablab_policy: "Read the FabLab policy" - read_the_fablab_s_general_terms_and_conditions: "Read the FabLab's general terms and conditions" - your_fablab_s_contacts: "Your FabLab's contacts" - privacy_policy: "Privacy policy" + read_the_fablab_policy: "Read the FabLab policy" + read_the_fablab_s_general_terms_and_conditions: "Read the FabLab's general terms and conditions" + your_fablab_s_contacts: "Your FabLab's contacts" + privacy_policy: "Privacy policy" privacy: # 'privacy policy' page - privacy: - title: "Privacy policy" - dpo: "Data protection officer" - last_update: "Last update," + title: "Privacy policy" + dpo: "Data protection officer" + last_update: "Last update," home: # home page @@ -161,32 +158,38 @@ en: projects_list: # projects gallery - projects_list: - the_fablab_projects: "The Fab Lab projects" - add_a_project: "Add a project" - search_over_the_whole_network: "Search over the whole Fab Manager network" - tooltip_openlab_projects_switch: "The search over the whole network lets you search over the projects of every Fab-manager using this feature !" - openlab_search_not_available_at_the_moment: "Search over the whole network is not available at the moment. You still can search over the projects of this platform." - project_search_result_is_empty: "Sorry, we found no results matching your search criteria." - reset_all_filters: "Reset all filters" - search: "Search" - all_projects: "All projects" - my_projects: "My projects" - projects_to_whom_i_take_part_in: "Projects to whom I take part in" - all_machines: "All machines" - all_themes: "All themes" - all_materials: "All materials" - load_next_projects: "Load next projects" - rough_draft: "Rough draft" + the_fablab_projects: "The Fab Lab projects" + add_a_project: "Add a project" + search_over_the_whole_network: "Search over the whole Fab Manager network" + tooltip_openlab_projects_switch: "The search over the whole network lets you search over the projects of every Fab-manager using this feature !" + openlab_search_not_available_at_the_moment: "Search over the whole network is not available at the moment. You still can search over the projects of this platform." + project_search_result_is_empty: "Sorry, we found no results matching your search criteria." + reset_all_filters: "Reset all filters" + search: "Search" + all_projects: "All projects" + my_projects: "My projects" + projects_to_whom_i_take_part_in: "Projects to whom I take part in" + all_machines: "All machines" + all_themes: "All themes" + all_materials: "All materials" + load_next_projects: "Load next projects" + rough_draft: "Rough draft" projects_show: # details of a projet + rough_draft: "Draft" project_description: "Project description" by_name: "By {NAME}" + step_N: "Step {INDEX}" + share_on_facebook: "Share on Facebook" + share_on_twitter: "Share on Twitter" deleted_user: "Deleted user" posted_on_: "Posted on" CAD_file_to_download: "{COUNT, plural, =0{No CAD files} =1{CAD file to download} other{CAD files to download}}" + machines_and_materials: "Machines and materials" + collaborators: "Collaborators" licence: "Licence" + confirmation_required: "Confirmation required" report_an_abuse: "Report an abuse" unauthorized_operation: "Unauthorized operation" your_report_was_successful_thanks: "Your report was successful. Thank you." @@ -204,27 +207,29 @@ en: machines_list: # list of machines - machines_list: - the_fablab_s_machines: "The FabLab's machines" - add_a_machine: "Add a machine" - book: "Book" - _or_the_: " or the " - status_enabled: "Enabled" - status_disabled: "Disabled" - status_all: "All" + the_fablab_s_machines: "The FabLab's machines" + add_a_machine: "Add a machine" + book: "Book" + _or_the_: " or the " + status_enabled: "Enabled" + status_disabled: "Disabled" + status_all: "All" machines_show: # details of a machine book_this_machine: "Book this machine" + technical_specifications: "Technical specifications" files_to_download: "Files to download" projects_using_the_machine: "Projects using the machine" _or_the_: " or the " + confirmation_required: "Confirmation required" do_you_really_want_to_delete_this_machine: "Do you really want to delete this machine?" unauthorized_operation: "Unauthorized operation" the_machine_cant_be_deleted_because_it_is_already_reserved_by_some_users: "The machine can't be deleted because it's already reserved by some users." trainings_list: # list of trainings + book: "Book" the_trainings: "The trainings" training_show: @@ -232,6 +237,7 @@ en: book_this_training: "Book this training" do_you_really_want_to_delete_this_training: "Do you really want to delete this training?" unauthorized_operation: "Unauthorized operation" + confirmation_required: "Confirmation required" the_training_cant_be_deleted_because_it_is_already_reserved_by_some_users: "The training can't be deleted because it's already reserved by some users." plans: @@ -246,9 +252,14 @@ en: his_group: "{GENDER, select, male{His} female{Her} other{Its}} group" he_wants_to_change_group: "{ROLE, select, admin{The user wants} other{I want}} to change group" change_my_group: "Change {ROLE, select, admin{{GENDER, select, male{his} female{her} other{its}}} other{my}} group" + summary: "Summary" your_subscription_has_expired_on_the_DATE: "Your subscription has expired on the {DATE}" - you_ve_just_payed_the_: "You've just payed the" + subscription_price: "Subscription price" + you_ve_just_selected_a_subscription_html: "You've just selected a subscription:" + confirm_and_pay: "Valider et payer" + you_ve_just_payed_the_subscription_html: "You've just paid the subscription:" thank_you_your_subscription_is_successful: "Thank you. Your subscription is successful!" + your_invoice_will_be_available_soon_from_your_dashboard: "Your invoice will be available soon from your dashboard" your_group_was_successfully_changed: "Your group was successfully changed." the_user_s_group_was_successfully_changed: "The user's group was successfully changed." an_error_prevented_your_group_from_being_changed: "An error prevented your group from being changed." @@ -256,6 +267,8 @@ en: an_error_occured_during_the_payment_process_please_try_again_later: "An error occurred during the payment process. Please try again later." subscription_confirmation: "Subscription confirmation" here_is_the_NAME_subscription_summary: "Here is the {NAME}'s subscription summary:" + confirm_payment_of_html: "{ROLE, select, admin{Cash} other{Pay}}: {AMOUNT}" # (contexte : validate a payment of $20,00) + online_payment_disabled: "Payment by credit card is not available. Please contact the Fablab's reception directly." events_list: # Fablab's events list @@ -267,25 +280,40 @@ en: free_admission: "Free admission" still_available: "available place(s)" free_entry: "Free entry" + add_an_event: "Add an event" + load_the_next_events: "Load the next events..." + full_price_: "Full price:" + to_date: "to" # context: date. eg: "from 01/01 to 01/05" events_show: # details and booking of an event event_description: "Event description" downloadable_documents: "Downloadable documents" information_and_booking: "Information and booking" + dates: "Dates" beginning: "Beginning:" ending: "Ending:" opening_hours: "Opening hours:" + all_day: "All day" + from_time: "From" # context: time. eg. "from 18:00 to 21:00" + to_time: "to" # context: time. eg. "from 18:00 to 21:00" + full_price_: "Full price:" tickets_still_availables: "Tickets still available:" sold_out: "Sold out." free_entry: "Free entry" cancelled: "Cancelled" ticket: "{NUMBER, plural, one{ticket} other{tickets}}" make_a_gift_of_this_reservation: "Make a gift of this reservation" + thank_you_your_payment_has_been_successfully_registered: "Tank you. Your payment has been successfully registered!" you_can_find_your_reservation_s_details_on_your_: "You can find your reservation's details on your" + dashboard: "dashboard" you_booked_DATE: "You booked ({DATE}):" canceled_reservation_SEATS: "Reservation canceled ({SEATS} seats)" book: "Book" + confirm_and_pay: "Confirm and pay" + confirm_payment_of_html: "{ROLE, select, admin{Cash} other{Pay}}: {AMOUNT}" # (contexte : validate a payment of $20,00) + online_payment_disabled: "Payment by credit card is not available. Please contact the Fablab's reception directly." + please_select_a_member_first: "Please select a member first" change_the_reservation: "Change the reservation" you_can_shift_this_reservation_on_the_following_slots: "You can shift this reservation on the following slots:" confirmation_required: "Confirmation required" @@ -294,41 +322,41 @@ en: unable_to_delete_the_event_because_some_users_alredy_booked_it: "Unable to delete this event, it may have been already reserved by some users." cancel_the_reservation: "Cancel the reservation" do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." + reservation_was_successfully_cancelled: "Reservation was successfully cancelled" cancellation_failed: "Cancellation failed." event_is_over: "The event is over" thanks_for_coming: "Thanks for coming!" view_event_list: "View events to come" + share_on_facebook: "Share on Facebook" + share_on_twitter: "Share on Twitter" calendar: # public calendar - calendar: - calendar: "Calendar" - show_unavailables: "Show unavailable slots" - filter_calendar: "Filter calendar" - trainings: "Trainings" - machines: "Machines" - spaces: "Spaces" - events: "Events" - externals: "Other calendars" + calendar: "Calendar" + show_unavailables: "Show unavailable slots" + filter_calendar: "Filter calendar" + trainings: "Trainings" + machines: "Machines" + spaces: "Spaces" + events: "Events" + externals: "Other calendars" spaces_list: # list of spaces - spaces_list: - the_spaces: "The spaces" - add_a_space: "Add a space" - status_enabled: "Enabled" - status_disabled: "Disabled" - status_all: "All" - book: "Book" + the_spaces: "The spaces" + add_a_space: "Add a space" + status_enabled: "Enabled" + status_disabled: "Disabled" + status_all: "All" + book: "Book" space_show: # display the details of a space - space_show: - book_this_space: "Book this space" - unauthorized_operation: "Unauthorized operation" - confirmation_required: "Confirmation required" - do_you_really_want_to_delete_this_space: "Do you really want to delete this space?" - 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" + book_this_space: "Book this space" + unauthorized_operation: "Unauthorized operation" + confirmation_required: "Confirmation required" + do_you_really_want_to_delete_this_space: "Do you really want to delete this space?" + 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" diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index 884cf6f16..5108d984a 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -120,7 +120,7 @@ fr: version: "Version :" # Notifications - and_NUMBER_other_notifications: "et {NUMBER, plural, =0{aucune autre notification} =1{une autre notification} other{{NUMBER} autres notifications}} ..." + and_NUMBER_other_notifications: "et {NUMBER, plural, =0{aucune autre notification} =1{une autre notification} other{{NUMBER} autres notifications}}..." about: # page à propos @@ -268,7 +268,7 @@ fr: subscription_confirmation: "Validation de l'abonnement" here_is_the_NAME_subscription_summary: "Voici le récapitulatif de l'abonnement de {NAME} :" confirm_payment_of_html: "{ROLE, select, admin{Encaisser} other{Payer}} : {AMOUNT}" # (contexte : valider un paiement de 20,00 €) - online_payment_disabled: "Le payment par carte bancaire n'est pas disponible. Merci de contacter directement l'accueil du Fablab." + online_payment_disabled: "Le paiement par carte bancaire n'est pas disponible. Merci de contacter directement l'accueil du Fablab." events_list: # liste des évènements du fablab @@ -281,7 +281,7 @@ fr: still_available: "place(s) disponible(s)" free_entry: "Accès libre" add_an_event: "Ajouter un évènement" - load_the_next_events: "Charger les évènements suivants ..." + load_the_next_events: "Charger les évènements suivants..." full_price_: "Plein tarif :" to_date: "au" # context: date. eg: "from 01/01 to 01/05" diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index 5408dbd4b..265fd8602 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -19,102 +19,28 @@ en: "no": "No" apply: "Apply" - elements: - # various translations used many times in the application - group: "Group" - subscription: "Subscription" - trainings: "Trainings" - no_trainings: "No trainings" - confirmation_required: "Confirmation required" - description: "Description" - machines: "Machines" - events: "Events" - materials: "Materials" - date: "Date" - price: "Price" - download_the_invoice: "Download the invoice" - download_the_credit_note: "Download the credit note" - no_invoices_for_now: "No invoices for now." - email_address: "Email address" - user: "User" - pseudonym: "Pseudonym" - all_day: "All day" - reservation_was_successfully_cancelled: "Reservation was successfully cancelled." - title: "Title" - total_: "TOTAL :" - full_price_: "Full price:" - rough_draft: "Rough draft" - machines_and_materials: "Machines and materials" - collaborators: "Collaborators" - summary: "Summary" - you_ve_just_selected_a_: "You've just selected a" # you_ve_just_selected_a_ + _subscription - _subscription: "subscription" - confirm_and_pay: "Confirm and pay" - your_invoice_will_be_available_soon_from_your_: "Your invoice will be available soon form your" - add_an_event: "Add an event" - load_the_next_events: "Load the next events..." - no_passed_events: "No passed events" - dates: "Dates:" - thank_you_your_payment_has_been_successfully_registered: "Thank you. Your payment has been successfully registered !" - surname: "Surname" - first_name: "First Name" - address: "Address" - interests: "Interests" - CAD_softwares_mastered: "CAD Softwares mastered" - name: "Name" - step_N: "Step {INDEX}" - themes: "Themes" - tags: "Tags" - technical_specifications: "Technical specifications" - online_payment: "Online payment" - type: "Type" - partner: "Partner" - standard: "Standard" - year: "Year" - month: "Month" - subscription_price: "Subscription price" - model: "Model" - from_date: "From" # context: date. eg: "from 01/01 to 01/05" - from_time: "From" # context: time. eg. "from 18:00 to 21:00" - to_date: "to" # context: date. eg: "from 01/01 to 01/05" - to_time: "to" # context: time. eg. "from 18:00 to 21:00" - or: "or" - and: "and" - change_my_data: "Change my data" - sync_my_profile: "Sync my profile" - once_your_data_are_up_to_date_: "Once your data are up to date," - _click_on_the_synchronization_button_opposite_: "click on the synchronization button opposite" - _disconnect_then_reconnect_: "disconnect then reconnect" - _for_your_changes_to_take_effect: "for your changes to take effect." - add_a_project: "Add a project" - illustration: "Illustration" - add_an_illustration: "Add an illustration." - book: "Book" - description_is_required: "Description is required." - name_is_required: "Name is required." - all_themes: "All themes" - filter: 'Filter' - confirm_payment_of_html: "{ROLE, select, admin{Payment on site} other{Pay}}: {AMOUNT}" # (context: confirm my payment of $20.00) - export_is_running_you_ll_be_notified_when_its_ready: "Export is running. You'll be notified when it's ready." - share_on_facebook: "Share on Facebook" - share_on_twitter: "Share on Twitter" - incomplete_profile: "Incomplete profile" - unlimited: "Unlimited" - payment_card_error: "A problem occurred with your payment card:" - online_payment_disabled: "Online payment is not available. Please contact the Fablab reception directly." - unexpected_error_occurred: "An unexpected error occurred" - messages: you_will_lose_any_unsaved_modification_if_you_quit_this_page: "You will lose any unsaved modification if you quit this page" you_will_lose_any_unsaved_modification_if_you_reload_this_page: "You will lose any unsaved modification if you reload this page" + payment_card_error: "A problem has occurred with your credit card:" user: # user edition form + man: "Man" + woman: "Woman" add_an_avatar: "Add an avatar" pseudonym: "Pseudonym" + pseudonym_is_required: "Pseudonym is required." + first_name: "Your first name" + first_name_is_required: "First name is required." + surname: "Your last name" + surname_is_required: "Last name is required." + email_address: "Email address" email_address_is_required: "E-mail address is required." change_password: "Change password" new_password: "New password" + password_is_required: "Password is required." + password_is_too_short: "Password is too short (at least 8 characters)" confirmation_of_new_password: "Confirmation of new password" confirmation_of_password_is_required: "Confirmation of password is required." confirmation_of_password_is_too_short: "Confirmation of password is too short (minimum 8 characters)." @@ -125,42 +51,65 @@ en: date_of_birth_is_required: "Date of birth is required." website: "Website" job: "Occupation" + interests: "Interests" + CAD_softwares_mastered: "CAD Softwares mastered" + birthday: "Date of birth" + birthday_is_required: "Date of birth is required." + address: "Address" + phone_number: "Phone number" + phone_number_is_required: "Phone number is required." + i_authorize_Fablab_users_registered_on_the_site_to_contact_me: "I authorize FabLab users, registered on the site, to contact me" + i_accept_to_receive_information_from_the_fablab: "I accept to receive information from the FabLab" + used_for_statistics: "This data will be used for statistical purposes" + used_for_invoicing: "This data will be used for billing purposes" + used_for_reservation: "This data will be used in case of change on one of your bookings" + used_for_profile: "This data will only be displayed on your profile" project: # project edition form - illustration: "Illustration" + name: "Name" + name_is_required: "Name is required." + illustration: "Visual" add_an_illustration: "Add an illustration" CAD_file: "CAD file" allowed_extensions: "Allowed extensions:" add_a_new_file: "Add a new file" + description: "Description" + description_is_required: "Description is required." steps: "Steps" + step_N: "Step {INDEX}" step_title: "Step title" add_a_picture: "Add a picture" change_the_picture: "Change the picture" delete_the_step: "Delete the step" + confirmation_required: "Confirmation required" do_you_really_want_to_delete_this_step: "Do you really want to delete this step?" add_a_new_step: "Add a new step" publish_your_project: "Publish your project" + or: "or" employed_materials: "Employed materials" employed_machines: "Employed machines" + collaborators: "Collaborators" creative_commons_licences: "Creative Commons licences" + themes: "Themes" + tags: "Tags" + save_as_draft: "Save as draft" machine: # machine edition form - machine_form: - name: "Name" - name_is_required: "Name is required." - illustration: "Visual" - add_an_illustration: "Add a visual" - description: "Description" - description_is_required: "Description is required." - technical_specifications: "Technical specifications" - technical_specifications_are_required: "Technical specifications are required." - attached_files_pdf: "Attached files (pdf)" - attach_a_file: "Attach a file" - add_an_attachment: "Add an attachment" - disable_machine: "Disable machine" - validate_your_machine: "Validate your machine" + name: "Name" + name_is_required: "Name is required." + illustration: "Visual" + add_an_illustration: "Add a visual" + description: "Description" + description_is_required: "Description is required." + technical_specifications: "Technical specifications" + technical_specifications_are_required: "Technical specifications are required." + attached_files_pdf: "Attached files (pdf)" + attach_a_file: "Attach a file" + add_an_attachment: "Add an attachment" + disable_machine: "Disable machine" + validate_your_machine: "Validate your machine" plan_subscribe: # frame to select a plan to subscribe @@ -171,14 +120,15 @@ en: # admin: choose a member to interact with select_a_member: "Select a member" start_typing: "Start typing..." - please_select_a_member_first: "Please select a member first" stripe: # stripe payment modal + online_payment: "Online payment" i_have_read_and_accept_: "I have read, and accept" _the_general_terms_and_conditions: "the general terms and conditions." credit_amount_for_pay_reservation: "{amount} {currency} remains to be paid to confirm your reservation" client_credit_amount_for_pay_reservation: "{amount} {currency} remains to be paid to confirm reservation of client" + confirm_payment_of_: "Pay: {AMOUNT}" valid_reservation_modal: # dialog of on site payment for reservations @@ -187,9 +137,12 @@ en: event: # event edition form + title: "Title" title_is_required: "Title is required." matching_visual: "Matching visual" choose_a_picture: "Choose a picture" + description: "Description" + description_is_required: "Description is required." attachments: "Attachments" add_a_new_file: "Add a new file" event_type: "Event type" @@ -210,69 +163,80 @@ en: plan: # subscription plan edition form - plan_form: - general_information: "General information" - name: "Name" - name_is_required: "Name is required" - name_length_must_be_less_than_24_characters: "Name length must be less than 24 characters." - type: "Type" - type_is_required: "Type is required." - group: "Group" - transversal_all_groups: "Transversal (all groups)" - group_is_required: "Group is required." - number_of_periods: "Number of periods" - number_of_periods_is_required: "Number of periods is required." - period: "Period" - year: "Year" - month: "Month" - week: "Week" - period_is_required: "Period is required." - subscription_price: "Subscription price" - price_is_required: "Price is required." - visual_prominence_of_the_subscription: "Visual prominence of the subscription" - on_the_subscriptions_page_the_most_prominent_subscriptions_will_be_placed_at_the_top_of_the_list: "On the subscriptions page, the most prominent subscriptions will be placed at the top of the list." - an_evelated_number_means_a_higher_prominence: "An elevated number means a higher prominence." - rolling_subscription: "Rolling subscription?" - a_rolling_subscription_will_begin_the_day_of_the_first_training: "A rolling subscription will begin the day of the first trainings." - otherwise_it_will_begin_as_soon_as_it_is_bought: "Otherwise, it will begin as soon as it is bought." - information_sheet: "Information sheet" - attach_an_information_sheet: "Attach an information sheet" - notified_partner: "Notified partner" - new_user: "New user ..." - as_part_of_a_partner_subscription_some_notifications_may_be_sent_to_this_user: "As part of a partner subscription, some notifications may be sent to this user." - new_partner: "New partner" - email_address_is_required: "Email address is required." - disabled: "Disable subscription" - disable_plan_will_not_unsubscribe_users: "Beware: disabling this plan won't unsubscribe users having active subscriptions with it." + general_information: "General information" + name: "Name" + name_is_required: "Name is required" + name_length_must_be_less_than_24_characters: "Name length must be less than 24 characters." + type: "Type" + partner: "Partner" + standard: "Standard" + type_is_required: "Type is required." + group: "Group" + transversal_all_groups: "Transversal (all groups)" + group_is_required: "Group is required." + number_of_periods: "Number of periods" + number_of_periods_is_required: "Number of periods is required." + period: "Period" + year: "Year" + month: "Month" + week: "Week" + period_is_required: "Period is required." + subscription_price: "Subscription price" + price_is_required: "Price is required." + visual_prominence_of_the_subscription: "Visual prominence of the subscription" + on_the_subscriptions_page_the_most_prominent_subscriptions_will_be_placed_at_the_top_of_the_list: "On the subscriptions page, the most prominent subscriptions will be placed at the top of the list." + an_evelated_number_means_a_higher_prominence: "An elevated number means a higher prominence." + rolling_subscription: "Rolling subscription?" + a_rolling_subscription_will_begin_the_day_of_the_first_training: "A rolling subscription will begin the day of the first trainings." + otherwise_it_will_begin_as_soon_as_it_is_bought: "Otherwise, it will begin as soon as it is bought." + information_sheet: "Information sheet" + attach_an_information_sheet: "Attach an information sheet" + notified_partner: "Notified partner" + new_user: "New user ..." + as_part_of_a_partner_subscription_some_notifications_may_be_sent_to_this_user: "As part of a partner subscription, some notifications may be sent to this user." + new_partner: "New partner" + first_name: "First name" + first_name_is_required: "First name is required." + surname: "Last name" + surname_is_required: "Last name is required." + email_address: "Email address" + email_address_is_required: "Email address is required." + disabled: "Disable subscription" + disable_plan_will_not_unsubscribe_users: "Beware: disabling this plan won't unsubscribe users having active subscriptions with it." trainings: # training edition form - trainings_form: - name: "Name" - name_is_required: "Name is required." - illustration: "Illustration" - add_an_illustration: "Add an illustration" - description: "Description" - description_is_required: "Description is required." - add_a_new_training: "Add a new training" - validate_your_training: "Validate your training" - associated_machines: "Associated machines" - number_of_tickets: "Number of tickets" - public_page: "Show in training lists" - disable_training: "Disable the training" + name: "Name" + name_is_required: "Name is required." + illustration: "Illustration" + add_an_illustration: "Add an illustration" + description: "Description" + description_is_required: "Description is required." + add_a_new_training: "Add a new training" + validate_your_training: "Validate your training" + associated_machines: "Associated machines" + number_of_tickets: "Number of tickets" + public_page: "Show in training lists" + disable_training: "Disable the training" user_admin: # partial form to edit/create an user (admin view) - user_profile: "Profil utilisateur" + user: "User" + incomplete_profile: "Incomplete profile" + user_profile: "User profile" warning_incomplete_user_profile_probably_imported_from_sso: "Warning: This user's profile is incomplete. As \"single sign-on\" (SSO) authentication is currently enabled, it may probably be an imported but non merged account. Do not modify it unless you know what your doing." group: "Group" group_is_required: "Group is required" trainings: "Trainings" + tags: "Tags" authentication: # partial form to edit/create an authentication provider (SSO) + name: "Name" provider_name_is_required: "Provider name is required." authentication_type: "Authentication type" + local_database: "Local database" + o_auth2: "OAuth 2.0" authentication_type_is_required: "Authentication type is required." data_mapping: "Data mapping" expected_data_type: "Expected data type" @@ -298,6 +262,7 @@ en: oauth2_client_secret_is_required: "OAuth 2.0 client secret is required." define_the_fields_mapping: "Define the fields mapping" add_a_match: "Add a match" + model: "Model" field: "Fiels" api_endpoint_url: "API endpoint URL" api_type: "API type" @@ -325,8 +290,7 @@ en: public_profile: # user public profile - last_activity_: "Last activity" - _on_: "on" + last_activity_html: "Last activity
    on {DATE}" to_come: "to come" approved: "approved" projects: "Projects" @@ -334,6 +298,11 @@ en: author: "Author" collaborator: "Collaborator" private_profile: "Private profile" + interests: "Interests" + CAD_softwares_mastered: "CAD softwares mastered" + email_address: "Email address" + trainings: "Trainings" + no_trainings: "No trainings" wallet: # wallet @@ -341,6 +310,7 @@ en: your_wallet_amount: 'Your amount available' wallet_amount: 'Amount available' no_transactions_for_now: 'No transactions for now' + date: "Date" operation: 'Operation' operator: 'Operator' amount: 'Amount' @@ -373,6 +343,8 @@ en: coupon: # promotional coupon (creation/edition form) + name: "Name" + name_is_required: "Name is required." code: "Code" code_is_required: "Code is required." code_must_be_composed_of_capital_letters_digits_and_or_dashes: "The code must be composed of capital letters, digits and/or dashes." @@ -409,62 +381,60 @@ en: space: # form to create/edit a space - space: - name: "Name" - name_is_required: "Name is required." - illustration: "Illustration" - add_an_illustration: "Add an illustration" - description: "Description" - description_is_required: "Description is required." - characteristics: "Characteristics" - characteristics_are_required: "Characteristics are required." - attached_files_pdf: "Attached files (pdf)" - attach_a_file: "Attach a file" - add_an_attachment: "Add an attachment" - default_places: "Default maximum tickets" - default_places_is_required: "Default maximum tickets is required." - disable_space: "Disable space" + name: "Name" + name_is_required: "Name is required." + illustration: "Illustration" + add_an_illustration: "Add an illustration" + description: "Description" + description_is_required: "Description is required." + characteristics: "Characteristics" + characteristics_are_required: "Characteristics are required." + attached_files_pdf: "Attached files (pdf)" + attach_a_file: "Attach a file" + add_an_attachment: "Add an attachment" + default_places: "Default maximum tickets" + default_places_is_required: "Default maximum tickets is required." + disable_space: "Disable space" cart: # module de panier d'achat de réservations - cart: - summary: "Summary" - select_one_or_more_slots_in_the_calendar: "Select one {SINGLE, select, true{slot} other{or more slots}} in the calendar" - you_ve_just_selected_the_slot: "You've just selected the slot:" - datetime_to_time: "{START_DATETIME} to {END_TIME}" # eg: Thursday, September 4 1986 8:30 PM to 10:00 PM - cost_of_TYPE: "Cost of {TYPE, select, Machine{a machine hour} Training{the training} other{the element}}" - offer_this_slot: "Offer this slot" - confirm_this_slot: "Confirm this slot" - remove_this_slot: "Remove this slot" - to_benefit_from_attractive_prices: "To benefit from attractive prices" - view_our_subscriptions: "View our subscriptions" - or: "or" - you_ve_just_selected_a_: "You've just selected a" - _subscription: "subscription" - cost_of_the_subscription: "Cost of the subscription" - confirm_and_pay: "Confirm and pay" - you_have_settled_the_following_TYPE: "You have settled the following {TYPE, select, Machine{machine slots} Training{training} other{elements}}:" - you_have_settled_a_: "You have settled a" - total_: "TOTAL :" - thank_you_your_payment_has_been_successfully_registered: "Thank you. Your payment has been successfully registered !" - your_invoice_will_be_available_soon_from_your_: "Your invoice will be available soon form your" - dashboard: "Dashboard" - i_want_to_change_the_following_reservation: "I want to change the following reservation:" - cancel_my_modification: "Cancel my modification" - select_a_new_slot_in_the_calendar: "Select a new slot in the calendar" - cancel_my_selection: "Cancel my selection" - tags_of_the_original_slot: "Tags of the original slot:" - tags_of_the_destination_slot: "Tags of the destination slot:" - confirm_my_modification: "Confirm my modification" - your_booking_slot_was_successfully_moved_from_: "Your booking slot was successfully moved from" - to_date: "to" # context: date. eg: "from 01/01 to 01/05" - please_select_a_member_first: "Please select a member first" - unable_to_change_the_reservation: "Unable to change the reservation" - confirmation_required: "Confirmation required" - do_you_really_want_to_cancel_this_reservation: "Do you really want to cancel this reservation?" - reservation_was_cancelled_successfully: "Reservation was cancelled successfully." - cancellation_failed: "Cancellation failed." - confirm_payment_of_html: "{ROLE, select, admin{Payment on site} other{Pay}}: {AMOUNT}" # (context: confirm my payment of $20.00) - a_problem_occurred_during_the_payment_process_please_try_again_later: "A problem occurred during the payment process. Please try again later." - none: "None" - online_payment_disabled: "Online payment is not available. Please contact the Fablab reception directly." + summary: "Summary" + select_one_or_more_slots_in_the_calendar: "Select one {SINGLE, select, true{slot} other{or more slots}} in the calendar" + you_ve_just_selected_the_slot: "You've just selected the slot:" + datetime_to_time: "{START_DATETIME} to {END_TIME}" # eg: Thursday, September 4 1986 8:30 PM to 10:00 PM + cost_of_TYPE: "Cost of {TYPE, select, Machine{a machine hour} Training{the training} other{the element}}" + offer_this_slot: "Offer this slot" + confirm_this_slot: "Confirm this slot" + remove_this_slot: "Remove this slot" + to_benefit_from_attractive_prices: "To benefit from attractive prices" + view_our_subscriptions: "View our subscriptions" + or: "or" + you_ve_just_selected_a_: "You've just selected a" + _subscription: "subscription" + cost_of_the_subscription: "Cost of the subscription" + confirm_and_pay: "Confirm and pay" + you_have_settled_the_following_TYPE: "You have settled the following {TYPE, select, Machine{machine slots} Training{training} other{elements}}:" + you_have_settled_a_: "You have settled a" + total_: "TOTAL :" + thank_you_your_payment_has_been_successfully_registered: "Thank you. Your payment has been successfully registered !" + your_invoice_will_be_available_soon_from_your_: "Your invoice will be available soon form your" + dashboard: "Dashboard" + i_want_to_change_the_following_reservation: "I want to change the following reservation:" + cancel_my_modification: "Cancel my modification" + select_a_new_slot_in_the_calendar: "Select a new slot in the calendar" + cancel_my_selection: "Cancel my selection" + tags_of_the_original_slot: "Tags of the original slot:" + tags_of_the_destination_slot: "Tags of the destination slot:" + confirm_my_modification: "Confirm my modification" + your_booking_slot_was_successfully_moved_from_: "Your booking slot was successfully moved from" + to_date: "to" # context: date. eg: "from 01/01 to 01/05" + please_select_a_member_first: "Please select a member first" + unable_to_change_the_reservation: "Unable to change the reservation" + confirmation_required: "Confirmation required" + do_you_really_want_to_cancel_this_reservation: "Do you really want to cancel this reservation?" + reservation_was_cancelled_successfully: "Reservation was cancelled successfully." + cancellation_failed: "Cancellation failed." + confirm_payment_of_html: "{ROLE, select, admin{Payment on site} other{Pay}}: {AMOUNT}" # (context: confirm my payment of $20.00) + a_problem_occurred_during_the_payment_process_please_try_again_later: "A problem occurred during the payment process. Please try again later." + none: "None" + online_payment_disabled: "Online payment is not available. Please contact the Fablab reception directly." diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 240be47d6..020f99302 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -119,7 +119,7 @@ fr: member_select: # admin : choisir un membre avec lequel interagir select_a_member: "Sélectionnez un membre" - start_typing: "Commencez à écrire ..." + start_typing: "Commencez à écrire..." stripe: # fenêtre de paiement stripe @@ -192,7 +192,7 @@ fr: information_sheet: "Fiche descriptive" attach_an_information_sheet: "Joindre une fiche descriptive" notified_partner: "Partenaire notifié" - new_user: "Nouvel utilisateur ..." + new_user: "Nouvel utilisateur..." as_part_of_a_partner_subscription_some_notifications_may_be_sent_to_this_user: "Dans le cadre d'un abonnement partenaire, certaines notifications pourront être adressées à cet utilisateur." new_partner: "Nouveau partenaire" first_name: "Prénom" From 997e60edb4a89a350b601c1d5b3fb6dad794dac5 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 18 Dec 2019 15:02:10 +0100 Subject: [PATCH 082/135] harmonize front translations in spanish with new model --- config/locales/app.admin.en.yml | 2 +- config/locales/app.admin.es.yml | 1296 ++++++++++++++++-------------- config/locales/app.logged.es.yml | 141 ++-- config/locales/app.public.es.yml | 152 ++-- config/locales/app.shared.es.yml | 380 ++++----- 5 files changed, 1032 insertions(+), 939 deletions(-) diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 638fbf46a..9e3e7eed8 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -127,7 +127,7 @@ en: trainings_monitoring: "Trainings monitoring" trainings: "Trainings" add_a_new_training: "Add a new training" - name: "Nom" + name: "Name" associated_machines: "Associated machines" number_of_tickets: "Number of tickets" select_a_training: "Select a training" diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index bf20dbb5a..050fba55c 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -13,125 +13,132 @@ es: calendar: # manage the trainings & machines slots - admin_calendar: - calendar_management: "Administración de calendario" - trainings: "Formación" - machines: "Máquinas" - spaces: "Espacios" - events: "Eventos" - availabilities: "Disponibilidades" - availabilities_notice: "Exportar a un libro de trabajo de Excel cada ranura disponible para reserva, y su ratio de ocupación." - ongoing_reservations: "Reservas en curso" - no_reservations: "Sin reservas" - confirmation_required: "Confirmación requerida" - do_you_really_want_to_cancel_the_USER_s_reservation_the_DATE_at_TIME_concerning_RESERVATION: "Realmente quieres cancelar la reserva del {USER}, en {DATE} a las {TIME}, respecto {RESERVATION}?" - reservation_was_successfully_cancelled: "La reserva fué cancelada con éxito." - reservation_cancellation_failed: "Fallo al cancelar la reserva." - unable_to_remove_the_last_machine_of_the_slot_delete_the_slot_rather: "No se puede quitar la última máquina de la ranura. Eliminar la ranura en su lugar." - do_you_really_want_to_remove_MACHINE_from_this_slot: "Realmente quieres borrar la \"{MACHINE}\" de este espacio?" - this_will_prevent_any_new_reservation_on_this_slot_but_wont_cancel_those_existing: "Esto evitará cualquier nueva reserva en esta ranura, pero no cancelará las existentes." - beware_this_cannot_be_reverted: "Beware: esto no puede ser revertido." - the_machine_was_successfully_removed_from_the_slot: "La máquina se eliminó correctamente de la ranura." - deletion_failed: "Fallo al borrar." - DATE_slot: "{DATE} espacio:" - what_kind_of_slot_do_you_want_to_create: "¿Qué tipo de ranura desea crear??" - training: "Formación" - machine: "Máquina" - space: "Espacio" - next: "Siguiente >" - previous: "< Anterior" - select_some_machines: "Seleccione algunas máquinas" - number_of_tickets: "Número de tickets: " - adjust_the_opening_hours: "Ajustar el horario de apertura" - to_time: "to" # context: hora. ej. "de 18:00 a 21:00" - restrict_this_slot_with_labels_optional: "Restringir esta ranura con etiquetas (opcional)" - recurrence: "Recurrence" # translation_missing - enabled: "Enabled" # translation_missing - period: "Period" # translation_missing - week: "Week" # translation_missing - month: "Month" # translation_missing - number_of_periods: "Number of periods" # translation_missing - end_date: "End date" # translation_missing - summary: "Summary" # translation_missing - select_period: "Please select a period for the recurrence" # translation_missing - select_nb_period: "Please select a number of periods for the recurrence" # translation_missing - select_end_date: "Please select the date of the last occurrence" # translation_missing - about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}:" # translation_missing - reservable: "Reservable(s):" # translation_missing - labels: "Etiqueta(s):" - none: "Ninguna" - slot_successfully_deleted: "La ranura {START} - {END} se ha eliminado correctamente" - slots_deleted: "The slot of {START}, and {COUNT, plural, =1{one other} other{{COUNT} others}}}, have been deleted" # translation_missing - unable_to_delete_the_slot: "No se puede eliminar la ranura {START} - {END}, probablemente porque ya está reservada por un miembror" - slots_not_deleted: "On {TOTAL} slots, {COUNT, plural, =1{one was not deleted} other{{COUNT} were not deleted}}. Some reservations may exist on {COUNT, plural, =1{it} other{them}}." # translation_missing - you_should_select_at_least_a_machine: "Debe seleccionar al menos una máquina en esta ranura." - export_is_running_you_ll_be_notified_when_its_ready: "La exportación se está ejecutando. Se le notificará cuando esté listo." - actions: "Acciones" - block_reservations: "Reservas de bloques" - do_you_really_want_to_block_this_slot: "¿Realmente desea bloquear nuevas reservas en esta ranura? Se volverá invisible para los usuarios." - locking_success: "Ranura correctamente bloqueada, no aparecerá más en el calendario del usuario" - locking_failed: "Ocurrió un error. El bloqueo de la ranura ha fallado" - allow_reservations: "Permitir reservas" - do_you_really_want_to_allow_reservations: "¿Realmente desea permitir la reserva de nuevo en esta ranura? Será visible para los usuarios." - unlocking_success: "Ranura desbloqueada con éxito, aparecerá de nuevo en el calendario de usuario" - unlocking_failed: "Ocurrió un error. El desbloqueo de la ranura ha fallado" - reservations_locked: "La reserva está bloqueada" - unlockable_because_reservations: "No se puede bloquear la reserva en esta ranura porque existen algunas reservas no canceladas." - delete_slot: "Delete this slot" # translation_missing - do_you_really_want_to_delete_this_slot: "Do you really want to delete this slot?" # translation_missing - delete_recurring_slot: "You're about to delete a recurring slot. What do you want to do?"# translation_missing - delete_this_slot: "Only this slot" # translation_missing - delete_this_and_next: "This slot and the following" # translation_missing - delete_all: "All slots" # translation_missing - event_in_the_past: "Unable to create a slot in the past." # translation_missing - edit_event: "Edit the event" # translation_missing - view_reservations: "Ver reservas" # translation_missing - legend: "leyenda" + calendar_management: "Administración de calendario" + trainings: "Formación" + machines: "Máquinas" + spaces: "Espacios" + events: "Eventos" + availabilities: "Disponibilidades" + availabilities_notice: "Exportar a un libro de trabajo de Excel cada ranura disponible para reserva, y su ratio de ocupación." + ongoing_reservations: "Reservas en curso" + no_reservations: "Sin reservas" + confirmation_required: "Confirmación requerida" + do_you_really_want_to_cancel_the_USER_s_reservation_the_DATE_at_TIME_concerning_RESERVATION: "Realmente quieres cancelar la reserva del {USER}, en {DATE} a las {TIME}, respecto {RESERVATION}?" + reservation_was_successfully_cancelled: "La reserva fué cancelada con éxito." + reservation_cancellation_failed: "Fallo al cancelar la reserva." + unable_to_remove_the_last_machine_of_the_slot_delete_the_slot_rather: "No se puede quitar la última máquina de la ranura. Eliminar la ranura en su lugar." + do_you_really_want_to_remove_MACHINE_from_this_slot: "Realmente quieres borrar la \"{MACHINE}\" de este espacio?" + this_will_prevent_any_new_reservation_on_this_slot_but_wont_cancel_those_existing: "Esto evitará cualquier nueva reserva en esta ranura, pero no cancelará las existentes." + beware_this_cannot_be_reverted: "Beware: esto no puede ser revertido." + the_machine_was_successfully_removed_from_the_slot: "La máquina se eliminó correctamente de la ranura." + deletion_failed: "Fallo al borrar." + DATE_slot: "{DATE} espacio:" + what_kind_of_slot_do_you_want_to_create: "¿Qué tipo de ranura desea crear??" + training: "Formación" + machine: "Máquina" + space: "Espacio" + next: "Siguiente >" + previous: "< Anterior" + select_some_machines: "Seleccione algunas máquinas" + number_of_tickets: "Número de tickets: " + adjust_the_opening_hours: "Ajustar el horario de apertura" + to_time: "to" # context: hora. ej. "de 18:00 a 21:00" + restrict_this_slot_with_labels_optional: "Restringir esta ranura con etiquetas (opcional)" + recurrence: "Recurrence" # translation_missing + enabled: "Enabled" # translation_missing + period: "Period" # translation_missing + week: "Week" # translation_missing + month: "Month" # translation_missing + number_of_periods: "Number of periods" # translation_missing + end_date: "End date" # translation_missing + summary: "Summary" # translation_missing + select_period: "Please select a period for the recurrence" # translation_missing + select_nb_period: "Please select a number of periods for the recurrence" # translation_missing + select_end_date: "Please select the date of the last occurrence" # translation_missing + about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}:" # translation_missing + reservable: "Reservable(s):" # translation_missing + labels: "Etiqueta(s):" + none: "Ninguna" + slot_successfully_deleted: "La ranura {START} - {END} se ha eliminado correctamente" + slots_deleted: "The slot of {START}, and {COUNT, plural, =1{one other} other{{COUNT} others}}}, have been deleted" # translation_missing + unable_to_delete_the_slot: "No se puede eliminar la ranura {START} - {END}, probablemente porque ya está reservada por un miembror" + slots_not_deleted: "On {TOTAL} slots, {COUNT, plural, =1{one was not deleted} other{{COUNT} were not deleted}}. Some reservations may exist on {COUNT, plural, =1{it} other{them}}." # translation_missing + you_should_select_at_least_a_machine: "Debe seleccionar al menos una máquina en esta ranura." + export_is_running_you_ll_be_notified_when_its_ready: "La exportación se está ejecutando. Se le notificará cuando esté listo." + actions: "Acciones" + block_reservations: "Reservas de bloques" + do_you_really_want_to_block_this_slot: "¿Realmente desea bloquear nuevas reservas en esta ranura? Se volverá invisible para los usuarios." + locking_success: "Ranura correctamente bloqueada, no aparecerá más en el calendario del usuario" + locking_failed: "Ocurrió un error. El bloqueo de la ranura ha fallado" + allow_reservations: "Permitir reservas" + do_you_really_want_to_allow_reservations: "¿Realmente desea permitir la reserva de nuevo en esta ranura? Será visible para los usuarios." + unlocking_success: "Ranura desbloqueada con éxito, aparecerá de nuevo en el calendario de usuario" + unlocking_failed: "Ocurrió un error. El desbloqueo de la ranura ha fallado" + reservations_locked: "La reserva está bloqueada" + unlockable_because_reservations: "No se puede bloquear la reserva en esta ranura porque existen algunas reservas no canceladas." + delete_slot: "Delete this slot" # translation_missing + do_you_really_want_to_delete_this_slot: "Do you really want to delete this slot?" # translation_missing + delete_recurring_slot: "You're about to delete a recurring slot. What do you want to do?"# translation_missing + delete_this_slot: "Only this slot" # translation_missing + delete_this_and_next: "This slot and the following" # translation_missing + delete_all: "All slots" # translation_missing + event_in_the_past: "Unable to create a slot in the past." # translation_missing + edit_event: "Edit the event" # translation_missing + view_reservations: "Ver reservas" # translation_missing + legend: "leyenda" + and: "y" icalendar: - icalendar: - icalendar_import: "iCalendar import" # translation_missing - intro: "Fab-manager allows to automatically import calendar events, at RFC 5545 iCalendar format, from external URL. These URL are synchronized every nights and the events are shown in the public calendar." # translation_missing - new_import: "New ICS import" # translation_missing - color: "Colour" # translation_missing - text_color: "Text colour" # translation_missing - url: "URL" # translation_missing - name: "Name" # translation_missing - example: "Example" # translation_missing - display: "Display" # translation_missing - hide_text: "Hide the text" # translation_missing - hidden: "Hidden" # translation_missing - shown: "Shown" # translation_missing - create_error: "Unable to create iCalendar import. Please try again later" # translation_missing - delete_failed: "Unable to delete the iCalendar import. Please try again later" # translation_missing - refresh: "Updating..." # translation_missing - sync_failed: "Unable to synchronize the URL. Please try again later" # translation_missing - confirmation_required: "Confirmation required" # translation_missing - confirm_delete_import: "Do you really want to delete this iCalendar import?" # translation_missing - delete_success: "iCalendar import successfully deleted" # translation_missing + icalendar_import: "iCalendar import" # translation_missing + intro: "Fab-manager allows to automatically import calendar events, at RFC 5545 iCalendar format, from external URL. These URL are synchronized every nights and the events are shown in the public calendar." # translation_missing + new_import: "New ICS import" # translation_missing + color: "Colour" # translation_missing + text_color: "Text colour" # translation_missing + url: "URL" # translation_missing + name: "Name" # translation_missing + example: "Example" # translation_missing + display: "Display" # translation_missing + hide_text: "Hide the text" # translation_missing + hidden: "Hidden" # translation_missing + shown: "Shown" # translation_missing + create_error: "Unable to create iCalendar import. Please try again later" # translation_missing + delete_failed: "Unable to delete the iCalendar import. Please try again later" # translation_missing + refresh: "Updating..." # translation_missing + sync_failed: "Unable to synchronize the URL. Please try again later" # translation_missing + confirmation_required: "Confirmation required" # translation_missing + confirm_delete_import: "Do you really want to delete this iCalendar import?" # translation_missing + delete_success: "iCalendar import successfully deleted" # translation_missing project_elements: # management of the projects' components - project_elements: - projects_elements_management: "Gestión de elementos de proyectos" - add_a_material: "Añadir un material" - add_a_new_theme: "Añadir un nuevo tema" - licences: "Licencias" - add_a_new_licence: "Agregar una nueva licencia" - manage_abuses: "Administrar informes" + name: "Name" + projects_elements_management: "Gestión de elementos de proyectos" + materials: "Materials" + add_a_material: "Añadir un material" + themes: "Themes" + add_a_new_theme: "Añadir un nuevo tema" + licences: "Licencias" + description: "Description" + add_a_new_licence: "Agregar una nueva licencia" + manage_abuses: "Administrar informes" trainings: # track and monitor the trainings - training: "Formación" + trainings_monitoring: "Trainings monitoring" + trainings: "Trainings" add_a_new_training: "Add a new training" # translation_missing + name: "Nombre" associated_machines: "Associated machines" # translation_missing number_of_tickets: "Number of tickets" # translation_missing + select_a_training: "Select a training" + training: "Training" + date: "Date" year_NUMBER: "Año {NUMBER}" month_of_NAME: "Mes of {NAME}" NUMBER_reservation: "{NUMBER} {NUMBER, plural, one{reservation} other{reservations}}" none: "Nada" training_validation: "Validación de la formación" - training_of_the_ : "Training of the " # context: fecha. p.ej. "entrenamiento del 1 de septiembre 2012" + training_of_the_DATE_TIME_html : "Training of the {DATE} - {TIME}" you_can_validate_the_training_of_the_following_members: "Puede validar la formación de los siguientes miembros:" deleted_user: "Usario eliminado" no_reservation: "Sin reserva" @@ -141,7 +148,8 @@ es: description_is_limited_to_255_characters: "La descripción está limitada a 255 caracteres." description_was_successfully_saved: "La descripción se ha guardado correctamente." training_successfully_deleted: "Entrenamiento eliminado correctamente." - unable_to_delete_the_training_because_some_users_alredy_booked_it: "No se puede eliminar el entrenamiento porque algunos usuarios ya lo han reservado." + unable_to_delete_the_training_because_some_users_already_booked_it: "No se puede eliminar el entrenamiento porque algunos usuarios ya lo han reservado." + confirmation_required: "Confirmation required" do_you_really_want_to_delete_this_training: "¿De verdad quieres eliminar este entrenamiento?" status_enabled: "Enabled" # translation_missing status_disabled: "Disabled" # translation_missing @@ -149,16 +157,16 @@ es: trainings_new: # create a new training - trainings_new: - add_a_new_training: "Add a new training" # translation_missing - beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Tenga cuidado, al crear una formación, sus precios de reserva se inicializan en cero." - dont_forget_to_change_them_before_creating_slots_for_this_training: "No olvides cambiarlos antes de crear espacios para esta formación." + add_a_new_training: "Add a new training" # translation_missing + beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Tenga cuidado, al crear una formación, sus precios de reserva se inicializan en cero." + dont_forget_to_change_them_before_creating_slots_for_this_training: "No olvides cambiarlos antes de crear espacios para esta formación." events: # events tracking and management events_monitoring: "Monitoreo de eventos" manage_filters: "Administrar filtros" fablab_events: "Eventos de Fablab" + add_an_event: "Add an event" all_events: "Todos los eventos" passed_events: "Eventos pasados" events_to_come: "Eventos por venir" @@ -166,14 +174,21 @@ es: on_DATE: "on {DATE}" # translation_missing from_DATE: "Desde {DATE}" # translation_missing from_TIME: "Desde {TIME}" # translation_missing + to_date: "to" # context: date. eg: "from 01/01 to 01/05" + to_time: "to" # context: time. eg. "from 18:00 to 21:00" + title: "Title" + dates: "Dates" booking: "Booking" # translation_missing sold_out: "Sold out" # translation_missing cancelled: "Cancelled" # translation_missing free_entry: "Free entry" # translation_missing free_admission: "Free admission" # translation_missing view_reservations: "Ver reservas" + load_the_next_events: "Load the next events..." categories: "Categorías" add_a_category: "Añadir una categoría" + name: "Name" + themes: "Theme" add_a_theme: "Añadir un tema" age_ranges: "Rango de edad" add_a_range: "Añadir un rango" @@ -203,6 +218,7 @@ es: events_new: # add a new event + add_an_event: "Add an event" none: "Nada" every_days: "Todos los dias" every_week: "Cada semana" @@ -216,7 +232,9 @@ es: event_reservations: # event reservations list the_reservations: "Reservas :" + user: "User" payment_date: "Fecha de pago" + full_price_: "Full price:" reserved_tickets: "Tickets reservados " show_the_event: "Mostrar el evento" no_reservations_for_now: "No hay reservas por ahora." @@ -225,84 +243,84 @@ es: pricing: # subscriptions, prices, credits and coupons management - pricing: - pricing_management: "Gestión de precios" - subscriptions: "Suscripciones" - trainings: "Formaciones" - list_of_the_subscription_plans: "Lista de los planes de suscripción" - beware_the_subscriptions_are_disabled_on_this_application: "Atención, las suscripciones están inhabilitadas en esta aplicación." - you_can_create_some_but_they_wont_be_available_until_the_project_is_redeployed_by_the_server_manager: "Puede crear algunos, pero no estarán disponibles hasta que el proyecto sea reasignado por el administrador del servidor." - for_safety_reasons_please_dont_create_subscriptions_if_you_dont_want_intend_to_use_them_later: "Por razones de seguridad, no cree suscripciones si no tiene la intención de usarlas más tarde." - add_a_new_subscription_plan: "Agregar un nuevo plan de suscripción" - type: "Tipo" - partner: "Socio" - standard: "Estándar" - name: "Nombre" - duration: "Duración" - group: "Grupo" - prominence: "Prominencia" - price: "Precio" - machine_hours: "Machine slots" # translation_missing - these_prices_match_machine_hours_rates_: "Estos precios se ajustan a la tarifas de máquina por {DURATION} minutas" - _without_subscriptions: "Sin suscripciones" - machines: "Máquinas" - credits: "Créditos" - subscription: "Suscripción" - related_trainings: "Formación relacionada" - add_a_machine_credit: "Agregar un crédito de máquina" - machine: "Máquina" - hours: "Slots of {DURATION} minutes" # translation_missing - related_subscriptions: "Suscripciónes relacionada" - please_specify_a_number: "Por favor, especifique un número." - none: "Nada" # nota gramatical: concordancia con "formación". - an_error_occurred_while_saving_the_number_of_credits: "Se ha producido un error al guardar el número de créditos." - an_error_occurred_while_deleting_credit_with_the_TRAINING: "Se ha producido un error al eliminar el crédito con la {TRAINING}." - an_error_occurred_unable_to_find_the_credit_to_revoke: "Se ha producido un error: no se puede encontrar el crédito a revocar." - an_error_occurred_while_creating_credit_with_the_TRAINING: "Se ha producido un error al crear crédito con la {TRAINING}." - not_set: "No establecido" - error_a_credit_linking_this_machine_with_that_subscription_already_exists: "Error: un crédito que vincula esta máquina con esa suscripción ya existe." - changes_have_been_successfully_saved: "Los cambios se han guardado correctamented." - credit_was_successfully_saved: "El crédito se ha guardado correctamente." - error_creating_credit: "Unable to create credit, an error occurred" # translation_missing - do_you_really_want_to_delete_this_subscription_plan: "¿Realmente desea eliminar este plan de suscripción?" - subscription_plan_was_successfully_deleted: "Plan de suscripción eliminado correctamente." - unable_to_delete_the_specified_subscription_an_error_occurred: "No se pudo eliminar la suscripción especificada, se produjo un error.." - coupons: "Cupones" - list_of_the_coupons: "Lista de los cupones" - discount: "Descuento" - nb_of_usages: "Número de usos" - status: "Estado" - add_a_new_coupon: "Añadir un nuevo cupón" - display_more_coupons: "Display the next coupons" # translation_missing - disabled: "Desactivado" - expired: "Expirado" - sold_out: "Agotado" - active: "Activo" - all: "Display all" # translation_missing - confirmation_required: "Confirmación requerida" - do_you_really_want_to_delete_this_coupon: "¿Desea realmente eliminar este cupón?" - coupon_was_successfully_deleted: "El cupón se eliminó correctamente." - unable_to_delete_the_specified_coupon_already_in_use: "No se puede eliminar el cupón especificado: ya se utiliza con algunas facturas." - unable_to_delete_the_specified_coupon_an_unexpected_error_occurred: "No se pudo eliminar el cupón especificado: se produjo un error inesperado." - send_a_coupon: "Enviar un cupón" - coupon: "Cupón" - usages: "Usos" - coupon_successfully_sent_to_USER: "Cupón enviado correctamente a {USER}" - an_error_occurred_unable_to_send_the_coupon: "Un error inesperado impidió el envío del cupón.." - code: "Código" - enabled: "Habilitado" - validity_per_user: "Validez por usuario" - once: "Sólo una vez" - forever: "Cada uso" - valid_until: "Válido hasta (incluido)" - spaces: "Espacios" - these_prices_match_space_hours_rates_: "Estos precios coinciden con las tarifas de espacio por {DURATION} minutas" - add_a_space_credit: "Añadir un crédito de espacio" - space: "Espacio" - error_a_credit_linking_this_space_with_that_subscription_already_exists: "Error: un crédito que vincula este espacio con esa suscripción ya existe." - status_enabled: "Enabled" # translation_missing - status_disabled: "Disabled" # translation_missing - status_all: "All" # translation_missing + pricing_management: "Gestión de precios" + subscriptions: "Suscripciones" + trainings: "Formaciones" + list_of_the_subscription_plans: "Lista de los planes de suscripción" + beware_the_subscriptions_are_disabled_on_this_application: "Atención, las suscripciones están inhabilitadas en esta aplicación." + you_can_create_some_but_they_wont_be_available_until_the_project_is_redeployed_by_the_server_manager: "Puede crear algunos, pero no estarán disponibles hasta que el proyecto sea reasignado por el administrador del servidor." + for_safety_reasons_please_dont_create_subscriptions_if_you_dont_want_intend_to_use_them_later: "Por razones de seguridad, no cree suscripciones si no tiene la intención de usarlas más tarde." + add_a_new_subscription_plan: "Agregar un nuevo plan de suscripción" + type: "Tipo" + partner: "Socio" + standard: "Estándar" + name: "Nombre" + duration: "Duración" + group: "Grupo" + prominence: "Prominencia" + price: "Precio" + machine_hours: "Machine slots" # translation_missing + these_prices_match_machine_hours_rates_: "Estos precios se ajustan a la tarifas de máquina por {DURATION} minutas" + _without_subscriptions: "Sin suscripciones" + machines: "Máquinas" + credits: "Créditos" + subscription: "Suscripción" + related_trainings: "Formación relacionada" + add_a_machine_credit: "Agregar un crédito de máquina" + machine: "Máquina" + hours: "Slots of {DURATION} minutes" # translation_missing + related_subscriptions: "Suscripciónes relacionada" + please_specify_a_number: "Por favor, especifique un número." + none: "Nada" # nota gramatical: concordancia con "formación". + an_error_occurred_while_saving_the_number_of_credits: "Se ha producido un error al guardar el número de créditos." + an_error_occurred_while_deleting_credit_with_the_TRAINING: "Se ha producido un error al eliminar el crédito con la {TRAINING}." + an_error_occurred_unable_to_find_the_credit_to_revoke: "Se ha producido un error: no se puede encontrar el crédito a revocar." + an_error_occurred_while_creating_credit_with_the_TRAINING: "Se ha producido un error al crear crédito con la {TRAINING}." + not_set: "No establecido" + error_a_credit_linking_this_machine_with_that_subscription_already_exists: "Error: un crédito que vincula esta máquina con esa suscripción ya existe." + changes_have_been_successfully_saved: "Los cambios se han guardado correctamented." + credit_was_successfully_saved: "El crédito se ha guardado correctamente." + error_creating_credit: "Unable to create credit, an error occurred" # translation_missing + do_you_really_want_to_delete_this_subscription_plan: "¿Realmente desea eliminar este plan de suscripción?" + subscription_plan_was_successfully_deleted: "Plan de suscripción eliminado correctamente." + unable_to_delete_the_specified_subscription_an_error_occurred: "No se pudo eliminar la suscripción especificada, se produjo un error.." + coupons: "Cupones" + list_of_the_coupons: "Lista de los cupones" + discount: "Descuento" + nb_of_usages: "Número de usos" + status: "Estado" + add_a_new_coupon: "Añadir un nuevo cupón" + display_more_coupons: "Display the next coupons" # translation_missing + disabled: "Desactivado" + expired: "Expirado" + sold_out: "Agotado" + active: "Activo" + all: "Display all" # translation_missing + confirmation_required: "Confirmación requerida" + do_you_really_want_to_delete_this_coupon: "¿Desea realmente eliminar este cupón?" + coupon_was_successfully_deleted: "El cupón se eliminó correctamente." + unable_to_delete_the_specified_coupon_already_in_use: "No se puede eliminar el cupón especificado: ya se utiliza con algunas facturas." + unable_to_delete_the_specified_coupon_an_unexpected_error_occurred: "No se pudo eliminar el cupón especificado: se produjo un error inesperado." + send_a_coupon: "Enviar un cupón" + coupon: "Cupón" + usages: "Usos" + unlimited: "Unlimited" + coupon_successfully_sent_to_USER: "Cupón enviado correctamente a {USER}" + an_error_occurred_unable_to_send_the_coupon: "Un error inesperado impidió el envío del cupón.." + code: "Código" + enabled: "Habilitado" + validity_per_user: "Validez por usuario" + once: "Sólo una vez" + forever: "Cada uso" + valid_until: "Válido hasta (incluido)" + spaces: "Espacios" + these_prices_match_space_hours_rates_: "Estos precios coinciden con las tarifas de espacio por {DURATION} minutas" + add_a_space_credit: "Añadir un crédito de espacio" + space: "Espacio" + error_a_credit_linking_this_space_with_that_subscription_already_exists: "Error: un crédito que vincula este espacio con esa suscripción ya existe." + status_enabled: "Enabled" # translation_missing + status_disabled: "Disabled" # translation_missing + status_all: "All" # translation_missing coupons_new: # ajouter un code promotionnel @@ -311,264 +329,267 @@ es: coupons_edit: # mettre à jour un code promotionnel + coupon: "Coupon:" unable_to_update_the_coupon_an_error_occurred: "No se puede actualizar el cupón: se ha producido un error." plans: new: # add a subscription plan on the platform - new_plan: - add_a_subscription_plan: "Agregar un plan de suscripción" - unable_to_create_the_subscription_please_try_again: "No se puede crear el plan de suscripción. Por favor, inténtelo de nuevo." - successfully_created_subscriptions_dont_forget_to_redefine_prices: "Suscripción(es) creada correctamente. No olvide redefinir los precios." - unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "No se puede guardar este usuario. Compruebe que no hay un usuario ya definido con el mismo nombre." + add_a_subscription_plan: "Agregar un plan de suscripción" + unable_to_create_the_subscription_please_try_again: "No se puede crear el plan de suscripción. Por favor, inténtelo de nuevo." + successfully_created_subscriptions_dont_forget_to_redefine_prices: "Suscripción(es) creada correctamente. No olvide redefinir los precios." + unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "No se puede guardar este usuario. Compruebe que no hay un usuario ya definido con el mismo nombre." edit: # edit a subscription plan / machine slot prices - edit_plan: - subscription_plan: "Plan de suscripción:" - prices: "Precios" - copy_prices_from: "Copia los precios desde" - machines: "Máquinas" - machine: "Máquina" - hourly_rate: "Tarifa por slot" # translation_missing - spaces: "Espacios" - space: "Espacio" - unable_to_save_subscription_changes_please_try_again: "No se pueden guardar los cambios de suscripción. Por favor, inténtelo de nuevo." - subscription_successfully_changed: "Suscripción cambiada correctamente." + subscription_plan: "Plan de suscripción:" + prices: "Precios" + copy_prices_from: "Copia los precios desde" + machines: "Máquinas" + machine: "Máquina" + hourly_rate: "Tarifa por slot" # translation_missing + spaces: "Espacios" + space: "Espacio" + unable_to_save_subscription_changes_please_try_again: "No se pueden guardar los cambios de suscripción. Por favor, inténtelo de nuevo." + subscription_successfully_changed: "Suscripción cambiada correctamente." invoices: - invoices: - # list of all invoices & invoicing parameters - invoices: "Facturas" - accounting_periods: "Accounting periods" # missing translation - invoices_list: "Lista de facturas" - filter_invoices: "Filtrar facturas" - invoice_num_: "Factura #:" - customer_: "Cliente:" - date_: "Fecha:" - invoice_num: "Factura #" - date: "Día" - price: "Precio" - customer: "Cliente" - download_the_invoice: "Descargar factura" - download_the_credit_note: "Descargar nota de crédito" - credit_note: "Nota de crédito" - display_more_invoices: "Mostrar más facturas..." - no_invoices_for_now: "Sin facturas por ahora." - invoicing_settings: "Configuración de facturación" - warning_invoices_disabled: "Warning : invoices are not enabled. No invoices will be generated by Fab-manager. Nevertheless, you must correctly fill the information below, especially VAT." # missing translation - change_logo: "Cambio de logotipo" - john_smith: "John Smith" - john_smith_at_example_com: "jean.smith@example.com" - invoice_reference_: "Referencia de factura:" - code_: "Código:" - code_disabled: "Código inhabilitado" - order_num: "Orden #:" - invoice_issued_on_DATE_at_TIME: "Factura emitida el {DATE} a las {TIME}" - object_reservation_of_john_smith_on_DATE_at_TIME: "Objeto: Reserva de John Smith el {DATE} a las {TIME}" - order_summary: "Resumen del pedido:" - details: "Detalles" - amount: "Cantidad" - machine_booking-3D_printer: "Reserva de la máquina- Impresora 3D" - total_amount: "Cantidad total" - total_including_all_taxes: "Total incl. todos los impuestos" - VAT_disabled: "IVA desactivado" - VAT_enabled: "IVA activado" - including_VAT: "Incluido IVA" - including_total_excluding_taxes: "Incluido Total excl. impuestos" - including_amount_payed_on_ordering: "Incluido el monto pagado en el pedido" - settlement_by_debit_card_on_DATE_at_TIME_for_an_amount_of_AMOUNT: "Liquidación por tarjeta de débito el {DATE} a las {TIME}, por una cantidad de {AMOUNT}" - important_notes: "Notas importantes" - address_and_legal_information: "Dirección e información legal" - invoice_reference: "Referencia de factura" - year: "Año" - month: "Mes" - day: "Día" - num_of_invoice: "# de factura" - online_sales: "Ventas en línea" - wallet: "Cartera" - refund: "Reembolso" - model: "Modelo" - documentation: "Documentación" - 2_digits_year: "2 dígitos del año (por ejemplo, 70)" - 4_digits_year: "4 dígitos del año (por ejemplo, 70)" - month_number: "Número del mes (por ejemplo, 1)" - 2_digits_month_number: "Número de mes de 2 dígitos (por ejemplo, 01)" - 3_characters_month_name: "3 caracteres nombre del mes (por ejemplo, ENE)" - day_in_the_month: "Día del mes (por ejemplo, 1)" - 2_digits_day_in_the_month: "2 dígitos en el mes (por ejemplo, 01)" - n_digits_daily_count_of_invoices: "(n) dígitos, cuenta diaria de facturas (por ejemplo, ddd => 002: 2ª factura del día)" - n_digits_monthly_count_of_invoices: "(n) dígitos, recuento mensual de facturas (por ejemplo, mmmm => 0012: 12ª factura del mes)" - n_digits_annual_amount_of_invoices: "(n) dígitos, recuento anual de facturas (ej. aaaaa => 000008: 8ª factura de este año)" - beware_if_the_number_exceed_the_specified_length_it_will_be_truncated_by_the_left: "Cuidado: si el número excede la longitud especificada, será aproximado por la izquierda." - n_digits_count_of_orders: "(n) dígitos, cuenta diaria de órdenes (eg ddd => 002: segunda orden del día)" - n_digits_daily_count_of_orders: "((n) dígitos, cuenta diaria de órdenes (eg ddd => 002: segunda orden del día)" - n_digits_monthly_count_of_orders: "(n) dígitos, recuento mensual de pedidos (por ejemplo, mmmm => 0012: 12º orden del mes)" - n_digits_annual_amount_of_orders: "(n) dígitos, recuento anual de órdenes (ej: aaaaa => 000008: octava orden de este año)" - add_a_notice_regarding_the_online_sales_only_if_the_invoice_is_concerned: "Añadir un aviso con respecto a las ventas en línea, sólo si la factura es de interés." - this_will_never_be_added_when_a_refund_notice_is_present: "Esto nunca se agregará cuando se presente un aviso de reembolso." - eg_XVL_will_add_VL_to_the_invoices_settled_with_stripe: '(por ejemplo, X [/ VL] agregará "/ VL" a las facturas liquidadas con la raya)' - add_a_notice_regarding_refunds_only_if_the_invoice_is_concerned: "Añada un aviso con respecto a los reembolsos, sólo si la factura es de interés." - this_will_never_be_added_when_an_online_sales_notice_is_present: "Esto nunca se agregará cuando un aviso de venta en línea está presente." - eg_RA_will_add_A_to_the_refund_invoices: '(ed. R[/A] añadirá "/A" a las facturas de reembolso)' - add_a_notice_regarding_the_wallet_only_if_the_invoice_is_concerned: "Añadir un aviso con respecto a la cartera, sólo si la factura es de interés." - eg_WPM_will_add_PM_to_the_invoices_settled_with_wallet: '(eg. W[/PM] añadirá "/PM" a las facturas liquidadas con cartera)' - code: "Código" - enable_the_code: "Habilitar el código" - enabled: "Habilitado" - disabled: "Desactivado" - order_number: "Número de orden" - elements: "Elementos" - VAT: "IVA" - enable_VAT: "Habilitar IVA" - VAT_rate: "Ratio IVA" - VAT_history: "Historial de ratios de IVA" - changed_at: "Cambiado en" - changed_by: "Por" - deleted_user: "Usario eliminado" - refund_invoice_successfully_created: "Factura de reembolso creada correctamente." - create_a_refund_on_this_invoice: "Crear un reembolso en esta factura" - creation_date_for_the_refund: "Fecha de creación del reembolso" - creation_date_is_required: "Se requiere la fecha de creación." - refund_mode: "Modo de reembolso:" - do_you_want_to_disable_the_user_s_subscription: "¿Quieres inhabilitar la suscripción del usuario?:" - elements_to_refund: "Elementos a reembolsar" - description: "Descripción" - description_optional: "Descripción (opcional):" - will_appear_on_the_refund_invoice: "Aparecerá en la factura de reembolso." - none: "Nada" # grammar note: concordancia con "medio de pago"" - by_cash: "En efectivo" - by_cheque: "Mediante cheque" - by_transfer: "Por transferencia" - by_wallet: "Por cartera" - you_must_select_at_least_one_element_to_create_a_refund: "Debe seleccionar al menos un elemento, para crear un reembolso." - unable_to_create_the_refund: "No se puede crear el reembolso" - invoice_reference_successfully_saved: "Referencia de factura guardada correctamente." - an_error_occurred_while_saving_invoice_reference: "Se ha producido un error al guardar la referencia de la factura." - invoicing_code_succesfully_saved: "Código de facturación guardado correctamente." - an_error_occurred_while_saving_the_invoicing_code: "Se ha producido un error al guardar el código de facturación.." - code_successfully_activated: "Código activado correctamente." - code_successfully_disabled: "Código deshabilitado correctamente." - an_error_occurred_while_activating_the_invoicing_code: "Se ha producido un error al activar el código de facturación." - order_number_successfully_saved: "Número de pedido guardado correctamente." - an_error_occurred_while_saving_the_order_number: "Se ha producido un error al guardar el número de orden." - VAT_rate_successfully_saved: "VAT rate successfully saved." # translation_missing - an_error_occurred_while_saving_the_VAT_rate: "La tasa de IVA se ha guardado correctamente." - VAT_successfully_activated: "IVA activado correctamente." - VAT_successfully_disabled: "IVA desactivado correctamente." - an_error_occurred_while_activating_the_VAT: "Se ha producido un error al activar el IVA." - text_successfully_saved: "Texto guardado correctamente." - an_error_occurred_while_saving_the_text: "Se ha producido un error al guardar el texto." - address_and_legal_information_successfully_saved: "Dirección e información legal guardada correctamente." - an_error_occurred_while_saving_the_address_and_the_legal_information: "Se ha producido un error al guardar la dirección y la información legal." - logo_successfully_saved: "Logo guardado correctamente." - an_error_occurred_while_saving_the_logo: "Se ha producido un error al guardar el logotipo.." - online_payment: "Pago online" - close_accounting_period: "Close an accounting period" # translation_missing - close_from_date: "Close from" # translation_missing - start_date_is_required: "Start date is required" # translation_missing - close_until_date: "Close until" # translation_missing - end_date_is_required: "End date is required" # translation_missing - previous_closings: "Previous closings" # translation_missing - start_date: "From" # translation_missing - end_date: "To" # translation_missing - closed_at: "Closed at" # translation_missing - closed_by: "By" # translation_missing - period_total: "Period total" # translation_missing - perpetual_total: "Perpetual total" # translation_missing - integrity: "Verificación de integridad" - confirmation_required: "Confirmation required" # translation_missing - confirm_close_START_END: "Do you really want to close the accounting period between {START} and {END}? Any subsequent changes will be impossible." # translation_missing - period_must_match_fiscal_year: "A closing must occur at the end of a minimum annual period, or per financial year when it is not calendar-based." # translation_missing - this_may_take_a_while: "This operation will take some time to complete." # translation_missing - period_START_END_closed_success: "The accounting period from {START} to {END} has been successfully closed. Archive generation is running, you'll be notified when it's done." # translation_missing - failed_to_close_period: "An error occurred, unable to close the accounting period" # translation_missing - no_periods: "No closings for now" # translation_missing - accounting_codes: "Accounting codes" # translation_missing - accounting_journal_code: "Journal code" # translation_missing - general_journal_code: "Journal code" # translation_missing - accounting_card_client_code: "Card clients code" # translation_missing - card_client_code: "Accounting code for clients who paid by card" # translation_missing - accounting_card_client_label: "Card clients label" # translation_missing - card_client_label: "Account label for clients who paid by card" # translation_missing - accounting_wallet_client_code: "Wallet clients code" # translation_missing - wallet_client_code: "Accounting code for clients who paid by virtual wallet" # translation_missing - accounting_wallet_client_label: "Wallet clients label" # translation_missing - wallet_client_label: "Account label for clients who paid by virtual wallet" # translation_missing - accounting_other_client_code: "Other means client code" # translation_missing - other_client_code: "Accounting code for clients who paid using another payment means" # translation_missing - accounting_other_client_label: "Other means client label" # translation_missing - other_client_label: "Accounting label for clients who paid using another payment means" # translation_missing - accounting_wallet_code: "Wallet code" # translation_missing - general_wallet_code: "Accounting code for wallet credit" # translation_missing - accounting_wallet_label: "Wallet label" # translation_missing - general_wallet_label: "Account label for wallet credit" # translation_missing - accounting_vat_code: "VAT code" # translation_missing - general_vat_code: "Accounting code for VAT" # translation_missing - accounting_vat_label: "VAT label" # translation_missing - general_vat_label: "VAT account label" # translation_missing - accounting_subscription_code: "Subscriptions code" # translation_missing - general_subscription_code: "Accounting code for all subscriptions" # translation_missing - accounting_subscription_label: "Subscriptions label" # translation_missing - general_subscription_label: "Account label for all subscriptions" # translation_missing - accounting_Machine_code: "Machines code" # translation_missing - general_machine_code: "Accounting code for all machines" # translation_missing - accounting_Machine_label: "Machine label" # translation_missing - general_machine_label: "Account label for all machines" # translation_missing - accounting_Training_code: "Trainings code" # translation_missing - general_training_code: "Accounting code for all trainings" # translation_missing - accounting_Training_label: "Trainings label" # translation_missing - general_training_label: "Account label for all trainings" # translation_missing - accounting_Event_code: "Events code" # translation_missing - general_event_code: "Accounting code for all events" # translation_missing - accounting_Event_label: "Events label" # translation_missing - general_event_label: "Account label for all events" # translation_missing - accounting_Space_code: "Space code" # translation_missing - general_space_code: "Accounting code for all spaces" # translation_missing - accounting_Space_label: "Spaces label" # translation_missing - general_space_label: "Account label for all spaces" # translation_missing - codes_customization_success: "Customization of accounting codes successfully saved." # translation_missing - export_accounting_data: "Export accounting data" # translation_missing - export_to: "Export to the accounting software" # translation_missing - export_is_running: "Exportando, será notificado cuando esté listo." - acd: "ACD" # translation_missing - export_form_date: "Export from" # translation_missing - export_to_date: "Export until" # translation_missing - format: "File format" # translation_missing - encoding: "Encoding" # translation_missing - separator: "Separator" # translation_missing - dateFormat: "Date format" # translation_missing - labelMaxLength: "Label maximum length" # translation_missing - decimalSeparator: "Decimal separator" # translation_missing - exportInvoicesAtZero: "Export invoices equal to 0" # translation_missing - columns: "Columns" # translation_missing - exportColumns: # translation_missing - journal_code: "Journal code" # translation_missing - date: "Entry date" # translation_missing - account_code: "Account code" # translation_missing - account_label: "Account label" # translation_missing - piece: "Document" # translation_missing - line_label: "Entry label" # translation_missing - debit_origin: "Origin debit" # translation_missing - credit_origin: "Origin credit" # translation_missing - debit_euro: "Euro debit" # translation_missing - credit_euro: "Euro credit" # translation_missing - lettering: "Lettering" # translation_missing + # list of all invoices & invoicing parameters + invoices: "Facturas" + accounting_periods: "Accounting periods" # missing translation + invoices_list: "Lista de facturas" + filter_invoices: "Filtrar facturas" + invoice_num_: "Factura #:" + customer_: "Cliente:" + date_: "Fecha:" + invoice_num: "Factura #" + date: "Día" + price: "Precio" + customer: "Cliente" + download_the_invoice: "Descargar factura" + download_the_credit_note: "Descargar nota de crédito" + credit_note: "Nota de crédito" + display_more_invoices: "Mostrar más facturas..." + no_invoices_for_now: "Sin facturas por ahora." + invoicing_settings: "Configuración de facturación" + warning_invoices_disabled: "Warning : invoices are not enabled. No invoices will be generated by Fab-manager. Nevertheless, you must correctly fill the information below, especially VAT." # missing translation + change_logo: "Cambio de logotipo" + john_smith: "John Smith" + john_smith_at_example_com: "jean.smith@example.com" + invoice_reference_: "Referencia de factura:" + code_: "Código:" + code_disabled: "Código inhabilitado" + order_num: "Orden #:" + invoice_issued_on_DATE_at_TIME: "Factura emitida el {DATE} a las {TIME}" + object_reservation_of_john_smith_on_DATE_at_TIME: "Objeto: Reserva de John Smith el {DATE} a las {TIME}" + order_summary: "Resumen del pedido:" + details: "Detalles" + amount: "Cantidad" + machine_booking-3D_printer: "Reserva de la máquina- Impresora 3D" + total_amount: "Cantidad total" + total_including_all_taxes: "Total incl. todos los impuestos" + VAT_disabled: "IVA desactivado" + VAT_enabled: "IVA activado" + including_VAT: "Incluido IVA" + including_total_excluding_taxes: "Incluido Total excl. impuestos" + including_amount_payed_on_ordering: "Incluido el monto pagado en el pedido" + settlement_by_debit_card_on_DATE_at_TIME_for_an_amount_of_AMOUNT: "Liquidación por tarjeta de débito el {DATE} a las {TIME}, por una cantidad de {AMOUNT}" + important_notes: "Notas importantes" + address_and_legal_information: "Dirección e información legal" + invoice_reference: "Referencia de factura" + year: "Año" + month: "Mes" + day: "Día" + num_of_invoice: "# de factura" + online_sales: "Ventas en línea" + wallet: "Cartera" + refund: "Reembolso" + model: "Modelo" + documentation: "Documentación" + 2_digits_year: "2 dígitos del año (por ejemplo, 70)" + 4_digits_year: "4 dígitos del año (por ejemplo, 70)" + month_number: "Número del mes (por ejemplo, 1)" + 2_digits_month_number: "Número de mes de 2 dígitos (por ejemplo, 01)" + 3_characters_month_name: "3 caracteres nombre del mes (por ejemplo, ENE)" + day_in_the_month: "Día del mes (por ejemplo, 1)" + 2_digits_day_in_the_month: "2 dígitos en el mes (por ejemplo, 01)" + n_digits_daily_count_of_invoices: "(n) dígitos, cuenta diaria de facturas (por ejemplo, ddd => 002: 2ª factura del día)" + n_digits_monthly_count_of_invoices: "(n) dígitos, recuento mensual de facturas (por ejemplo, mmmm => 0012: 12ª factura del mes)" + n_digits_annual_amount_of_invoices: "(n) dígitos, recuento anual de facturas (ej. aaaaa => 000008: 8ª factura de este año)" + beware_if_the_number_exceed_the_specified_length_it_will_be_truncated_by_the_left: "Cuidado: si el número excede la longitud especificada, será aproximado por la izquierda." + n_digits_count_of_orders: "(n) dígitos, cuenta diaria de órdenes (eg ddd => 002: segunda orden del día)" + n_digits_daily_count_of_orders: "((n) dígitos, cuenta diaria de órdenes (eg ddd => 002: segunda orden del día)" + n_digits_monthly_count_of_orders: "(n) dígitos, recuento mensual de pedidos (por ejemplo, mmmm => 0012: 12º orden del mes)" + n_digits_annual_amount_of_orders: "(n) dígitos, recuento anual de órdenes (ej: aaaaa => 000008: octava orden de este año)" + add_a_notice_regarding_the_online_sales_only_if_the_invoice_is_concerned: "Añadir un aviso con respecto a las ventas en línea, sólo si la factura es de interés." + this_will_never_be_added_when_a_refund_notice_is_present: "Esto nunca se agregará cuando se presente un aviso de reembolso." + eg_XVL_will_add_VL_to_the_invoices_settled_with_stripe: '(por ejemplo, X [/ VL] agregará "/ VL" a las facturas liquidadas con la raya)' + add_a_notice_regarding_refunds_only_if_the_invoice_is_concerned: "Añada un aviso con respecto a los reembolsos, sólo si la factura es de interés." + this_will_never_be_added_when_an_online_sales_notice_is_present: "Esto nunca se agregará cuando un aviso de venta en línea está presente." + eg_RA_will_add_A_to_the_refund_invoices: '(ed. R[/A] añadirá "/A" a las facturas de reembolso)' + add_a_notice_regarding_the_wallet_only_if_the_invoice_is_concerned: "Añadir un aviso con respecto a la cartera, sólo si la factura es de interés." + eg_WPM_will_add_PM_to_the_invoices_settled_with_wallet: '(eg. W[/PM] añadirá "/PM" a las facturas liquidadas con cartera)' + code: "Código" + enable_the_code: "Habilitar el código" + enabled: "Habilitado" + disabled: "Desactivado" + order_number: "Número de orden" + elements: "Elementos" + VAT: "IVA" + enable_VAT: "Habilitar IVA" + VAT_rate: "Ratio IVA" + VAT_history: "Historial de ratios de IVA" + changed_at: "Cambiado en" + changed_by: "Por" + deleted_user: "Usario eliminado" + refund_invoice_successfully_created: "Factura de reembolso creada correctamente." + create_a_refund_on_this_invoice: "Crear un reembolso en esta factura" + creation_date_for_the_refund: "Fecha de creación del reembolso" + creation_date_is_required: "Se requiere la fecha de creación." + refund_mode: "Modo de reembolso:" + do_you_want_to_disable_the_user_s_subscription: "¿Quieres inhabilitar la suscripción del usuario?:" + elements_to_refund: "Elementos a reembolsar" + description: "Descripción" + description_optional: "Descripción (opcional):" + will_appear_on_the_refund_invoice: "Aparecerá en la factura de reembolso." + none: "Nada" # grammar note: concordancia con "medio de pago"" + by_cash: "En efectivo" + by_cheque: "Mediante cheque" + by_transfer: "Por transferencia" + by_wallet: "Por cartera" + you_must_select_at_least_one_element_to_create_a_refund: "Debe seleccionar al menos un elemento, para crear un reembolso." + unable_to_create_the_refund: "No se puede crear el reembolso" + invoice_reference_successfully_saved: "Referencia de factura guardada correctamente." + an_error_occurred_while_saving_invoice_reference: "Se ha producido un error al guardar la referencia de la factura." + invoicing_code_succesfully_saved: "Código de facturación guardado correctamente." + an_error_occurred_while_saving_the_invoicing_code: "Se ha producido un error al guardar el código de facturación.." + code_successfully_activated: "Código activado correctamente." + code_successfully_disabled: "Código deshabilitado correctamente." + an_error_occurred_while_activating_the_invoicing_code: "Se ha producido un error al activar el código de facturación." + order_number_successfully_saved: "Número de pedido guardado correctamente." + an_error_occurred_while_saving_the_order_number: "Se ha producido un error al guardar el número de orden." + VAT_rate_successfully_saved: "VAT rate successfully saved." # translation_missing + an_error_occurred_while_saving_the_VAT_rate: "La tasa de IVA se ha guardado correctamente." + VAT_successfully_activated: "IVA activado correctamente." + VAT_successfully_disabled: "IVA desactivado correctamente." + an_error_occurred_while_activating_the_VAT: "Se ha producido un error al activar el IVA." + text_successfully_saved: "Texto guardado correctamente." + an_error_occurred_while_saving_the_text: "Se ha producido un error al guardar el texto." + address_and_legal_information_successfully_saved: "Dirección e información legal guardada correctamente." + an_error_occurred_while_saving_the_address_and_the_legal_information: "Se ha producido un error al guardar la dirección y la información legal." + logo_successfully_saved: "Logo guardado correctamente." + an_error_occurred_while_saving_the_logo: "Se ha producido un error al guardar el logotipo.." + online_payment: "Pago online" + close_accounting_period: "Close an accounting period" # translation_missing + close_from_date: "Close from" # translation_missing + start_date_is_required: "Start date is required" # translation_missing + close_until_date: "Close until" # translation_missing + end_date_is_required: "End date is required" # translation_missing + previous_closings: "Previous closings" # translation_missing + start_date: "From" # translation_missing + end_date: "To" # translation_missing + closed_at: "Closed at" # translation_missing + closed_by: "By" # translation_missing + period_total: "Period total" # translation_missing + perpetual_total: "Perpetual total" # translation_missing + integrity: "Verificación de integridad" + confirmation_required: "Confirmation required" # translation_missing + confirm_close_START_END: "Do you really want to close the accounting period between {START} and {END}? Any subsequent changes will be impossible." # translation_missing + period_must_match_fiscal_year: "A closing must occur at the end of a minimum annual period, or per financial year when it is not calendar-based." # translation_missing + this_may_take_a_while: "This operation will take some time to complete." # translation_missing + period_START_END_closed_success: "The accounting period from {START} to {END} has been successfully closed. Archive generation is running, you'll be notified when it's done." # translation_missing + failed_to_close_period: "An error occurred, unable to close the accounting period" # translation_missing + no_periods: "No closings for now" # translation_missing + accounting_codes: "Accounting codes" # translation_missing + accounting_journal_code: "Journal code" # translation_missing + general_journal_code: "Journal code" # translation_missing + accounting_card_client_code: "Card clients code" # translation_missing + card_client_code: "Accounting code for clients who paid by card" # translation_missing + accounting_card_client_label: "Card clients label" # translation_missing + card_client_label: "Account label for clients who paid by card" # translation_missing + accounting_wallet_client_code: "Wallet clients code" # translation_missing + wallet_client_code: "Accounting code for clients who paid by virtual wallet" # translation_missing + accounting_wallet_client_label: "Wallet clients label" # translation_missing + wallet_client_label: "Account label for clients who paid by virtual wallet" # translation_missing + accounting_other_client_code: "Other means client code" # translation_missing + other_client_code: "Accounting code for clients who paid using another payment means" # translation_missing + accounting_other_client_label: "Other means client label" # translation_missing + other_client_label: "Accounting label for clients who paid using another payment means" # translation_missing + accounting_wallet_code: "Wallet code" # translation_missing + general_wallet_code: "Accounting code for wallet credit" # translation_missing + accounting_wallet_label: "Wallet label" # translation_missing + general_wallet_label: "Account label for wallet credit" # translation_missing + accounting_vat_code: "VAT code" # translation_missing + general_vat_code: "Accounting code for VAT" # translation_missing + accounting_vat_label: "VAT label" # translation_missing + general_vat_label: "VAT account label" # translation_missing + accounting_subscription_code: "Subscriptions code" # translation_missing + general_subscription_code: "Accounting code for all subscriptions" # translation_missing + accounting_subscription_label: "Subscriptions label" # translation_missing + general_subscription_label: "Account label for all subscriptions" # translation_missing + accounting_Machine_code: "Machines code" # translation_missing + general_machine_code: "Accounting code for all machines" # translation_missing + accounting_Machine_label: "Machine label" # translation_missing + general_machine_label: "Account label for all machines" # translation_missing + accounting_Training_code: "Trainings code" # translation_missing + general_training_code: "Accounting code for all trainings" # translation_missing + accounting_Training_label: "Trainings label" # translation_missing + general_training_label: "Account label for all trainings" # translation_missing + accounting_Event_code: "Events code" # translation_missing + general_event_code: "Accounting code for all events" # translation_missing + accounting_Event_label: "Events label" # translation_missing + general_event_label: "Account label for all events" # translation_missing + accounting_Space_code: "Space code" # translation_missing + general_space_code: "Accounting code for all spaces" # translation_missing + accounting_Space_label: "Spaces label" # translation_missing + general_space_label: "Account label for all spaces" # translation_missing + codes_customization_success: "Customization of accounting codes successfully saved." # translation_missing + export_accounting_data: "Export accounting data" # translation_missing + export_to: "Export to the accounting software" # translation_missing + export_is_running: "Exportando, será notificado cuando esté listo." + acd: "ACD" # translation_missing + export_form_date: "Export from" # translation_missing + export_to_date: "Export until" # translation_missing + format: "File format" # translation_missing + encoding: "Encoding" # translation_missing + separator: "Separator" # translation_missing + dateFormat: "Date format" # translation_missing + labelMaxLength: "Label maximum length" # translation_missing + decimalSeparator: "Decimal separator" # translation_missing + exportInvoicesAtZero: "Export invoices equal to 0" # translation_missing + columns: "Columns" # translation_missing + exportColumns: # translation_missing + journal_code: "Journal code" # translation_missing + date: "Entry date" # translation_missing + account_code: "Account code" # translation_missing + account_label: "Account label" # translation_missing + piece: "Document" # translation_missing + line_label: "Entry label" # translation_missing + debit_origin: "Origin debit" # translation_missing + credit_origin: "Origin credit" # translation_missing + debit_euro: "Euro debit" # translation_missing + credit_euro: "Euro credit" # translation_missing + lettering: "Lettering" # translation_missing members: # management of users, labels, groups, and so on users_management: "Gestión de usuarios" members: "Miembros" + subscriptions: "Subscriptions" search_for_an_user: "Buscar un usuario" add_a_new_member: "Añadir un nuevo miembro" reservations: "Reservas" + surname: "Last name" + first_name: "First name" email: "Email" phone: "Teléfono" user_type: "Tipo de usuario" + subscription: "Subscription" display_more_users: "Mostrar más usuarios...." administrators: "Administradores" search_for_an_administrator: "Buscar un administrador" add_a_new_administrator: "Agregar un nuevo administrador" groups: "Grupos" + tags: "Tags" authentication: "Autenticación" confirm_delete_member: "¿Desea realmente eliminar este usario? Esto no se puede deshacer." member_successfully_deleted: "Usario eliminado correctamente." @@ -579,25 +600,34 @@ es: unable_to_delete_the_administrator: "No se puede eliminar el administrador." changes_successfully_saved: "Cambios guardados correctamente." an_error_occurred_while_saving_changes: "Se ha producido un error al guardar los cambios." - add_a_tag: "Añadir una etiqueta" - tag_name: "Nombre de la etiqueta" - new_tag_successfully_saved: "Nueva etiqueta guardada correctamente." - an_error_occurred_while_saving_the_new_tag: "Se ha producido un error al guardar la nueva etiqueta.." - tag_successfully_deleted: "Etiqueta eliminada correctamente." - an_error_occurred_and_the_tag_deletion_failed: "Se ha producido un error y no se ha podido eliminar la etiqueta.." - search_for_an_authentication_provider: "Buscar un proveedor de autenticación" - add_a_new_authentication_provider: "Agregar un nuevo proveedor de autenticación" - strategy_name: "Nombre de la estrategia" - state: "Estado" - unknown: "Desconocido: " - active: "Activo" - pending: "Pendiente" - previous_provider: "Proveedor anteriorr" - do_you_really_want_to_delete_the_TYPE_authentication_provider_NAME: "¿Realmente desea eliminar la {TYPE} proveedor de autenticación: {NAME}?" - authentication_provider_successfully_deleted: "El proveedor de autenticación se eliminó correctamente." - an_error_occurred_unable_to_delete_the_specified_provider: "Se ha producido un error: no se puede eliminar el proveedor especificado." - local_database: "Base de datos local" - o_auth2: "OAuth 2.0" + export_is_running_you_ll_be_notified_when_its_ready: "Export is running. You'll be notified when it's ready." + tag_form: + tags: "Tags" + add_a_tag: "Añadir una etiqueta" + tag_name: "Nombre de la etiqueta" + new_tag_successfully_saved: "Nueva etiqueta guardada correctamente." + an_error_occurred_while_saving_the_new_tag: "Se ha producido un error al guardar la nueva etiqueta.." + confirmation_required: "Delete this tag?" + confirm_delete_tag_html: "Do you really want to delete this tag?
    Users and slots currently associated with this tag will be dissociated.
    Warning: This cannot be undone!" + tag_successfully_deleted: "Etiqueta eliminada correctamente." + an_error_occurred_and_the_tag_deletion_failed: "Se ha producido un error y no se ha podido eliminar la etiqueta.." + authentication_form: + search_for_an_authentication_provider: "Buscar un proveedor de autenticación" + add_a_new_authentication_provider: "Agregar un nuevo proveedor de autenticación" + name: "Name" + strategy_name: "Nombre de la estrategia" + type: "Type" + state: "Estado" + unknown: "Desconocido: " + active: "Activo" + pending: "Pendiente" + previous_provider: "Proveedor anteriorr" + confirmation_required: "Delete the provider?" + do_you_really_want_to_delete_the_TYPE_authentication_provider_NAME: "¿Realmente desea eliminar la {TYPE} proveedor de autenticación: {NAME}?" + authentication_provider_successfully_deleted: "El proveedor de autenticación se eliminó correctamente." + an_error_occurred_unable_to_delete_the_specified_provider: "Se ha producido un error: no se puede eliminar el proveedor especificado." + local_database: "Base de datos local" + o_auth2: "OAuth 2.0" group_form: add_a_group: "Añadir un grupo" group_name: "Nombre del grupo" @@ -618,52 +648,50 @@ es: members_new: # add a member - members_new: - add_a_member: "Agregar un miembro" - user_is_an_organization: "El usuario es una organización" + add_a_member: "Agregar un miembro" + user_is_an_organization: "El usuario es una organización" members_import: # members bulk import - members_import: - import_members: "Import members" # translation_missing - info: "You can upload a CSV file to create new members or update existing ones. Your file must user the identifiers below to specify the group, the trainings and the tags of the members." # translation_missing - required_fields: "Your file must contain, at least, the following information for each user to create: email, name, first name and group. If the password is empty, it will be generated. On updates, the empty fields will be kept as is." # translation_missing - about_example: "Please refer to the provided example file to generate a correct CSV file. Be careful to use Unicode UTF-8 encoding." # translation_missing - groups: "Groups" # translation_missing - group_name: "Group name" # translation_missing - group_identifier: "Identifier to use" # translation_missing - trainings: "Trainings" # translation_missing - training_name: "Training name" # translation_missing - training_identifier: "Identifier to use" # translation_missing - plans: "Plans" # translation_missing - plan_name: "Plan name" # translation_missing - plan_identifier: "Identifier to use" # translation_missing - tags: "Tags" # translation_missing - tag_name: "Tag name" # translation_missing - tag_identifier: "Identifier to use" # translation_missing - download_example: "Download the exemple file" # translation_missing - select_file: "Choose a file" # translation_missing - import: "Import" # translation_missing - update_field: "Reference field for users to update" # translation_missing - update_on_id: "ID" # translation_missing - update_on_username: "Username" # translation_missing - update_on_email: "Email address" # translation_missing + import_members: "Import members" # translation_missing + info: "You can upload a CSV file to create new members or update existing ones. Your file must user the identifiers below to specify the group, the trainings and the tags of the members." # translation_missing + required_fields: "Your file must contain, at least, the following information for each user to create: email, name, first name and group. If the password is empty, it will be generated. On updates, the empty fields will be kept as is." # translation_missing + about_example: "Please refer to the provided example file to generate a correct CSV file. Be careful to use Unicode UTF-8 encoding." # translation_missing + groups: "Groups" # translation_missing + group_name: "Group name" # translation_missing + group_identifier: "Identifier to use" # translation_missing + trainings: "Trainings" # translation_missing + training_name: "Training name" # translation_missing + training_identifier: "Identifier to use" # translation_missing + plans: "Plans" # translation_missing + plan_name: "Plan name" # translation_missing + plan_identifier: "Identifier to use" # translation_missing + tags: "Tags" # translation_missing + tag_name: "Tag name" # translation_missing + tag_identifier: "Identifier to use" # translation_missing + download_example: "Download the exemple file" # translation_missing + select_file: "Choose a file" # translation_missing + import: "Import" # translation_missing + update_field: "Reference field for users to update" # translation_missing + update_on_id: "ID" # translation_missing + update_on_username: "Username" # translation_missing + update_on_email: "Email address" # translation_missing members_import_result: # import results - members_import_result: - import_results: "Import results" # translation_missing - import_details: "Import #{ID}, of {DATE}, initiated by {USER}" # translation_missing - results: "Results" # translation_missing - pending: "Pending..." # translation_missing - status_create: "Creating a new user" # translation_missing - status_update: "Updating user {ID}" # translation_missing - success: "Success" # translation_missing - failed: "Failed" # translation_missing - error_details: "Error's details:" # translation_missing + import_results: "Import results" # translation_missing + import_details: "Import #{ID}, of {DATE}, initiated by {USER}" # translation_missing + results: "Results" # translation_missing + pending: "Pending..." # translation_missing + status_create: "Creating a new user" # translation_missing + status_update: "Updating user {ID}" # translation_missing + success: "Success" # translation_missing + failed: "Failed" # translation_missing + error_details: "Error's details:" # translation_missing members_edit: # edit a member + subscription: "Subscription" duration: "Duración:" expires_at: "Caduca en:" price_: "Precio:" @@ -671,6 +699,8 @@ es: extend_subscription: "Ampliar suscripción" user_has_no_current_subscription: "El usuario no tiene una suscripción actual." subscribe_to_a_plan: "Suscribirse a un plan" + trainings: "Trainings" + no_trainings: "No trainings" next_trainings: "Próxima formación" passed_trainings: "Formación completada" validated_trainings: "Formación validada" @@ -680,9 +710,14 @@ es: NUMBER_full_price_tickets_reserved: "{NUMBER, plural, =0{} one{1 full price ticket reserved} other{{NUMBER} full price tickets reserved}}" # translation_missing NUMBER_NAME_tickets_reserved: "{NUMBER, plural, =0{} one{1 {NAME} ticket reserved} other{{NUMBER} {NAME} tickets reserved}}" # translation_missing passed_events: "Eventos pasados" + no_passed_events: "No passed events" invoices: "Facturas" invoice_num: "Factura #" + date: "Date" + price: "Price" + download_the_invoice: "Download the invoice" download_the_refund_invoice: "Descargar la factura de reembolso" + no_invoices_for_now: "No invoices for now." expiration_date: "Fecha de caducidad" you_intentionally_decide_to_extend_the_user_s_subscription_by_offering_him_free_days: "Usted intencionalmente decide extender la suscripción del usuario ofreciéndole días libres." credits_will_remain_unchanged: "El saldo de créditos gratuitos (entrenamiento / máquinas / espacios) del usuario permanecerá sin cambios." @@ -695,12 +730,27 @@ es: you_are_about_to_purchase_a_subscription_to_NAME: "Estás a punto de comprar una suscripción a {NAME}." subscription_successfully_purchased: "Suscripción comprada correctamente." a_problem_occurred_while_taking_the_subscription: "Se ha producido un problema al realizar la suscripción." + wallet: "Wallet" + to_credit: 'Credit' admins_new: # add a new administrator to the platform add_an_administrator: "Agregar un administrador" administrator_successfully_created_he_will_receive_his_connection_directives_by_email: "administrador creado correctamente. {GENDER, select, female{She} other{He}} receive {GENDER, select, female{her} other{his}} directivas de conexión por e-mail." failed_to_create_admin: "No se puede crear el administrador :" + man: "Man" + woman: "Woman" + pseudonym: "Pseudonym" + pseudonym_is_required: "Pseudonym is required." + first_name: "First name" + first_name_is_required: "First name is required." + surname: "Last name" + surname_is_required: "Last name is required." + email_address: "Email address" + email_is_required: "Email address is required." + birth_date: "Date of birth" + address: "Address" + phone_number: "Phone number" authentication_new: # add a new authentication provider (SSO) @@ -726,6 +776,7 @@ es: statistics: # statistics tables + statistics: "Statistics" evolution: "Evolución" age_filter: "Filtro de edad" from_age: "Desde" # contexto: edad. por ejemplo: de 8 a 40 años @@ -738,6 +789,8 @@ es: criterion: "Criterio:" value: "Valor:" exclude: "Excluir" + from_date: "From" # context: date. eg: "from 01/01 to 01/05" + to_date: "to" # context: date. eg: "from 01/01 to 01/05" entries: "Entradas:" revenue_: "Ingresos:" average_age: "Edad media:" @@ -745,8 +798,11 @@ es: total: "Total" available_hours: "Horas disponibles para reservar:" available_tickets: "Tickets disponibles para reservar:" + date: "Date" + user: "User" gender: "Genero" age: "Edad" + type: "Type" revenue: "Ingresos" unknown: "Desconocido" user_id: "ID de usuario" @@ -756,155 +812,166 @@ es: export_the_current_search_results: "Exportar los resultados de búsqueda actuales" export: "Exportar" deleted_user: "Usario eliminado" + man: "Man" + woman: "Woman" + export_is_running_you_ll_be_notified_when_its_ready: "Export is running. You'll be notified when it's ready." stats_graphs: # statistics graphs + statistics: "Statistics" data: "Datos" day: "Dia" week: "Semana" + from_date: "From" # context: date. eg: "from 01/01 to 01/05" + to_date: "to" # context: date. eg: "from 01/01 to 01/05" + month: "Month" start: "Inicio:" end: "Final:" + type: "Type" revenue: "Ingresos" top_list_of: "Lista top de" number: "Número" week_short: "Semana" week_of_START_to_END: "Semana del {START} a {END}" no_data_for_this_period: "No hay datos para este periodo" + date: "Date" settings: # global application parameters and customization - settings: - title: "Título" - customize_the_application: "Personalizar la aplicación" - general: "General" - fablab_title: "Título del FabLab" - fablab_name: "Nombre del FabLab " - title_concordance: "Concordancia de título" - male: "Masculino." - female: "Hembra." - neutral: "Neutral" - eg: "ej:" - about: "Sobre" - male_preposition: "el" - female_preposition: "la" - neutral_preposition: "" - customize_information_messages: "Personalizar mensajes de información" - message_of_the_machine_booking_page: "Mensaje de la página de reserva de la máquina:" - type_the_message_content: "Escriba el contenido del mensaje" - warning_message_of_the_training_booking_page: "Warning message of the training booking page:" # translation_missing - information_message_of_the_training_reservation_page: "Information message of the training reservation page:" # translation_missing - message_of_the_subscriptions_page: "Mensaje de advertencia de la página de reserva de formación:" - message_of_the_events_page: "Mensaje de la página de eventos:" - message_of_the_spaces_page: "Mensaje de la página de espacios:" - legal_documents: "Documentos legales" - if_these_documents_are_not_filled_no_consent_about_them_will_be_asked_to_the_user: "Si no se llenan estos documentos, no se pedirá su consentimiento." - general_terms_and_conditions: "Términos Generales y Condiciones (T&C)" - terms_of_service: "Términos de servicio (TOS)" - customize_the_graphics: "Personalizar los gráficos" - for_an_optimal_rendering_the_logo_image_must_be_at_the_PNG_format_with_a_transparent_background_and_with_an_aspect_ratio_3.5_times_wider_than_the_height: "Para una representación óptima, la imagen del logotipo debe estar en el formato PNG con un fondo transparente y una relación de aspecto 3,5 más ancha que la altura." - concerning_the_favicon_it_must_be_at_ICO_format_with_a_size_of_16x16_pixels: "En cuanto al favicon, debe estar en formato ICO con un tamaño de 16x16 píxeles." - remember_to_refresh_the_page_for_the_changes_to_take_effect: "Recuerde actualizar la página para que los cambios surtan efecto." - logo_white_background: "Logo (fondo blanco)" - change_the_logo: "Cambiar el logotipo" - logo_black_background: "Logo (fondo negro)" - favicon: "Favicon" - change_the_favicon: "Cambiar el favicon" - main_colour: "Color principal:" - primary: "Primario" - secondary_colour: "Color secundario:" - secondary: "Secundario" - background_picture_of_the_profile_banner: "Imagen de fondo de la bandera del perfil" - change_the_profile_banner: "Cambiar la bandera del perfil" - home_page: "Página de inicio" - news_of_the_home_page: "Noticias de la página principal:" - type_your_news_here: "Escriba sus noticias aquí" - leave_it_empty_to_not_bring_up_any_news_on_the_home_page: "Déjelo vacío para no abrir ninguna noticia en la página principal" - twitter_stream: "Twitter Stream:" # translation_missing - name_of_the_twitter_account: "Nombre de la cuenta de Twitter" - title_of_the_about_page: "Título de la página Acerca de" - shift_enter_to_force_carriage_return: "MAYÚS + ENTRAR para forzar el retorno de carro" - input_the_main_content: "Introduzca el contenido principal" - drag_and_drop_to_insert_images: "Arrastrar y soltar para insertar imágenes" - input_the_fablab_contacts: "Ingrese los contactos de FabLab" - reservations: "Reservas" - reservations_parameters: "Parámetros de reservas" - confine_the_booking_agenda: "Confine la agenda de reserva" - opening_time: "Hora de apertura" - closing_time: "Tiempo de cierre" - max_visibility: "Máxima visibilidad (en meses)" - visibility_for_yearly_members: "Para las suscripciones en curso, por lo menos 1 año" - visibility_for_other_members: "Para todos los demás miembros" - ability_for_the_users_to_move_their_reservations: "Capacidad para que los usuarios muevan sus reservas" - reservations_shifting: "Cambio de reservas" - prior_period_hours: "Período anterior (horas)" - enabled: "Habilitado" - disabled: "Deshabilitado" - ability_for_the_users_to_cancel_their_reservations: "Capacidad para que los usuarios cancelen sus reservas" - reservations_cancelling: "Cancelaciones de reservas" - reservations_reminders: "Recordatorios de reservas" - notification_sending_before_the_reservation_occurs: "Envío de notificaciones antes de la reserva" - customization_of_SETTING_successfully_saved: "Personalización de la {SETTING} guardado con éxito." - file_successfully_updated: "Archivo actualizado correctamente." - name_genre: "Concordancia del título" - machine_explications_alert: "mensaje de explicación en la página de reserva de la máquina" - training_explications_alert: "mensaje de explicación en la página de reserva de formación" - training_information_message: "mensaje de información en la página de reserva de la máquina" - subscription_explications_alert: "mensaje de explicación en la página de suscripción" - event_explications_alert: "mensaje de explicación en la página de reserva del evento" - space_explications_alert: "mensaje de explicación en la página de reserva de espacio" - main_color: "Color principal" - secondary_color: "color secundario" - home_blogpost: "Resumen de la página de inicio" - twitter_name: "Twitter feed name" # translation_missing - about_title: "Título de la página \"Acerca de\"" - about_body: "Contenido de la página \"Acerca de\"" - about_contacts: "Página contactos\"Acerca de\"" - privacy_draft: "privacy policy draft" # translation_missing - privacy_body: "privacy policy" # translation_missing - privacy_dpo: "data protection officer address" # translation_missing - booking_window_start: "hora de apertura" - booking_window_end: "hora de cierre" - booking_move_enable: "Activar cambio de reserva" - booking_move_delay: "Demora de reserva" - booking_cancel_enable: "Habilitar cancelar reserva" - booking_cancel_delay: "Cancelar demora de reserva" - reminder_enable: "Recordatorio de reserva" - reminder_delay: "demora antes de enviar el recordatorio" - default_value_is_24_hours: "Si el campo es dejado vacio: 24 horas." - visibility_yearly: "máxima visibilidad para suscriptores anuales" - visibility_others: "máxima visibilidad para otros miembros" - confidentiality: "Confidencialidad" - display_machine_reservation_user_name: "Mostrar el nombre del usuario que ha reservado una maquina" - display_name: "Mostrar el nombre" - display_name_enable: "la visualización del nombre" - machines_sort_by: "del orden de visualización de las máquinas" - elements_ordering: "Orden de visualización de los elementos" - machines_order: "Orden de las máquinas" - display_machines_sorted_by: "Ver máquinas ordenadas por" - sort_by: - default: "Defecto" - name: "Nombre" - created_at: "Fecha de creación" - updated_at: "Fecha de actualización" - privacy: - title: "Política de privacidad" - input_the_dpo: "Input the contact of the Data Protection Officer" # translation_missing - current_policy: "Current policy" # translation_missing - draft_from_USER_DATE: "Draft, saved by {USER}, on {DATE}" # translation_missing - save_or_publish: "Save or publish?" # translation_missing - save_or_publish_body: "Do you want to publish a new version of the privacy policy or save it as a draft?" # translation_missing - publish_will_notify: "Publish a new version will send a notification to every users." # translation_missing - publish: "Publish" # translation_missing - users_notified: "Platform users will be notified of the update." # translation_missing + title: "Título" + customize_the_application: "Personalizar la aplicación" + general: "General" + fablab_title: "Título del FabLab" + fablab_name: "Nombre del FabLab " + title_concordance: "Concordancia de título" + male: "Masculino." + female: "Hembra." + neutral: "Neutral" + eg: "ej:" + about: "Sobre" + male_preposition: "el" + female_preposition: "la" + neutral_preposition: "" + customize_information_messages: "Personalizar mensajes de información" + message_of_the_machine_booking_page: "Mensaje de la página de reserva de la máquina:" + type_the_message_content: "Escriba el contenido del mensaje" + warning_message_of_the_training_booking_page: "Warning message of the training booking page:" # translation_missing + information_message_of_the_training_reservation_page: "Information message of the training reservation page:" # translation_missing + message_of_the_subscriptions_page: "Mensaje de advertencia de la página de reserva de formación:" + message_of_the_events_page: "Mensaje de la página de eventos:" + message_of_the_spaces_page: "Mensaje de la página de espacios:" + legal_documents: "Documentos legales" + if_these_documents_are_not_filled_no_consent_about_them_will_be_asked_to_the_user: "Si no se llenan estos documentos, no se pedirá su consentimiento." + general_terms_and_conditions: "Términos Generales y Condiciones (T&C)" + terms_of_service: "Términos de servicio (TOS)" + customize_the_graphics: "Personalizar los gráficos" + for_an_optimal_rendering_the_logo_image_must_be_at_the_PNG_format_with_a_transparent_background_and_with_an_aspect_ratio_3.5_times_wider_than_the_height: "Para una representación óptima, la imagen del logotipo debe estar en el formato PNG con un fondo transparente y una relación de aspecto 3,5 más ancha que la altura." + concerning_the_favicon_it_must_be_at_ICO_format_with_a_size_of_16x16_pixels: "En cuanto al favicon, debe estar en formato ICO con un tamaño de 16x16 píxeles." + remember_to_refresh_the_page_for_the_changes_to_take_effect: "Recuerde actualizar la página para que los cambios surtan efecto." + logo_white_background: "Logo (fondo blanco)" + change_the_logo: "Cambiar el logotipo" + logo_black_background: "Logo (fondo negro)" + favicon: "Favicon" + change_the_favicon: "Cambiar el favicon" + main_colour: "Color principal:" + primary: "Primario" + secondary_colour: "Color secundario:" + secondary: "Secundario" + background_picture_of_the_profile_banner: "Imagen de fondo de la bandera del perfil" + change_the_profile_banner: "Cambiar la bandera del perfil" + home_page: "Página de inicio" + news_of_the_home_page: "Noticias de la página principal:" + type_your_news_here: "Escriba sus noticias aquí" + leave_it_empty_to_not_bring_up_any_news_on_the_home_page: "Déjelo vacío para no abrir ninguna noticia en la página principal" + twitter_stream: "Twitter Stream:" # translation_missing + name_of_the_twitter_account: "Nombre de la cuenta de Twitter" + title_of_the_about_page: "Título de la página Acerca de" + shift_enter_to_force_carriage_return: "MAYÚS + ENTRAR para forzar el retorno de carro" + input_the_main_content: "Introduzca el contenido principal" + drag_and_drop_to_insert_images: "Arrastrar y soltar para insertar imágenes" + input_the_fablab_contacts: "Ingrese los contactos de FabLab" + reservations: "Reservas" + reservations_parameters: "Parámetros de reservas" + confine_the_booking_agenda: "Confine la agenda de reserva" + opening_time: "Hora de apertura" + closing_time: "Tiempo de cierre" + max_visibility: "Máxima visibilidad (en meses)" + visibility_for_yearly_members: "Para las suscripciones en curso, por lo menos 1 año" + visibility_for_other_members: "Para todos los demás miembros" + ability_for_the_users_to_move_their_reservations: "Capacidad para que los usuarios muevan sus reservas" + reservations_shifting: "Cambio de reservas" + prior_period_hours: "Período anterior (horas)" + enabled: "Habilitado" + disabled: "Deshabilitado" + ability_for_the_users_to_cancel_their_reservations: "Capacidad para que los usuarios cancelen sus reservas" + reservations_cancelling: "Cancelaciones de reservas" + reservations_reminders: "Recordatorios de reservas" + notification_sending_before_the_reservation_occurs: "Envío de notificaciones antes de la reserva" + customization_of_SETTING_successfully_saved: "Personalización de la {SETTING} guardado con éxito." + file_successfully_updated: "Archivo actualizado correctamente." + name_genre: "Concordancia del título" + machine_explications_alert: "mensaje de explicación en la página de reserva de la máquina" + training_explications_alert: "mensaje de explicación en la página de reserva de formación" + training_information_message: "mensaje de información en la página de reserva de la máquina" + subscription_explications_alert: "mensaje de explicación en la página de suscripción" + event_explications_alert: "mensaje de explicación en la página de reserva del evento" + space_explications_alert: "mensaje de explicación en la página de reserva de espacio" + main_color: "Color principal" + secondary_color: "color secundario" + home_blogpost: "Resumen de la página de inicio" + twitter_name: "Twitter feed name" # translation_missing + about_title: "Título de la página \"Acerca de\"" + about_body: "Contenido de la página \"Acerca de\"" + about_contacts: "Página contactos\"Acerca de\"" + privacy_draft: "privacy policy draft" # translation_missing + privacy_body: "privacy policy" # translation_missing + privacy_dpo: "data protection officer address" # translation_missing + booking_window_start: "hora de apertura" + booking_window_end: "hora de cierre" + booking_move_enable: "Activar cambio de reserva" + booking_move_delay: "Demora de reserva" + booking_cancel_enable: "Habilitar cancelar reserva" + booking_cancel_delay: "Cancelar demora de reserva" + reminder_enable: "Recordatorio de reserva" + reminder_delay: "demora antes de enviar el recordatorio" + default_value_is_24_hours: "Si el campo es dejado vacio: 24 horas." + visibility_yearly: "máxima visibilidad para suscriptores anuales" + visibility_others: "máxima visibilidad para otros miembros" + confidentiality: "Confidencialidad" + display_machine_reservation_user_name: "Mostrar el nombre del usuario que ha reservado una maquina" + display_name: "Mostrar el nombre" + display_name_enable: "la visualización del nombre" + machines_sort_by: "del orden de visualización de las máquinas" + elements_ordering: "Orden de visualización de los elementos" + machines_order: "Orden de las máquinas" + display_machines_sorted_by: "Ver máquinas ordenadas por" + sort_by: + default: "Defecto" + name: "Nombre" + created_at: "Fecha de creación" + updated_at: "Fecha de actualización" + privacy: + title: "Política de privacidad" + input_the_dpo: "Input the contact of the Data Protection Officer" # translation_missing + current_policy: "Current policy" # translation_missing + draft_from_USER_DATE: "Draft, saved by {USER}, on {DATE}" # translation_missing + save_or_publish: "Save or publish?" # translation_missing + save_or_publish_body: "Do you want to publish a new version of the privacy policy or save it as a draft?" # translation_missing + publish_will_notify: "Publish a new version will send a notification to every users." # translation_missing + publish: "Publish" # translation_missing + users_notified: "Platform users will be notified of the update." # translation_missing open_api_clients: add_new_client: "Crear un nuevo cliente de API" api_documentation: "Documentation API" open_api_clients: "Clientes OpenAPI" + name: "Name" calls_count: "Número de llamadas" + token: "Token" created_at: "Fecha de creación" reset_token: "revocar el acceso" client_name: "Nombre del cliente" + confirmation_required: "Confirmation required" do_you_really_want_to_delete_this_open_api_client: "¿Desea realmente eliminar este cliente OpenAPI?" do_you_really_want_to_revoke_this_open_api_access: "¿Realmente desea revocar este acceso? Se borrará y reemplazará el token actual." client_successfully_created: "Cliente creado correctamente." @@ -914,27 +981,24 @@ es: space_new: # create a new space - space_new: - add_a_new_space: "Añadir un espacio nuevo" - watch_out_when_creating_a_new_space_its_prices_are_initialized_at_0_for_all_subscriptions: "¡Cuidado! Al crear un nuevo espacio, sus precios se inicializan en 0 para todas las suscripciones." - consider_changing_its_prices_before_creating_any_reservation_slot: "Considere cambiar sus precios antes de crear cualquier espacio de reserva." - add_this_space: "Añadir este espacio" + add_a_new_space: "Añadir un espacio nuevo" + watch_out_when_creating_a_new_space_its_prices_are_initialized_at_0_for_all_subscriptions: "¡Cuidado! Al crear un nuevo espacio, sus precios se inicializan en 0 para todas las suscripciones." + consider_changing_its_prices_before_creating_any_reservation_slot: "Considere cambiar sus precios antes de crear cualquier espacio de reserva." + add_this_space: "Añadir este espacio" space_edit: # modify an exiting space - space_edit: - edit_the_space_NAME: "Edit the space: {NAME}" # translation_missing - validate_the_changes: "Validar los cambios" + edit_the_space_NAME: "Edit the space: {NAME}" # translation_missing + validate_the_changes: "Validar los cambios" manage_abuses: # process and delete abuses reports - manage_abuses: - abuses_list: "Lista de informes" - no_reports: "No informes por ahora" - published_by: "published by" # translation_missing - at_date: "on" # translation_missing - has_reported: "made the following report:" # translation_missing - confirmation_required: "Confirm the processing of the report" # translation_missing - report_will_be_destroyed: "Once the report has been processed, it will be deleted. This can't be undone, continue?" # translation_missing - report_removed: "The report has been deleted" # translation_missing - failed_to_remove: "An error occurred, unable to delete the report" # translation_missing + abuses_list: "Lista de informes" + no_reports: "No informes por ahora" + published_by: "published by" # translation_missing + at_date: "on" # translation_missing + has_reported: "made the following report:" # translation_missing + confirmation_required: "Confirm the processing of the report" # translation_missing + report_will_be_destroyed: "Once the report has been processed, it will be deleted. This can't be undone, continue?" # translation_missing + report_removed: "The report has been deleted" # translation_missing + failed_to_remove: "An error occurred, unable to delete the report" # translation_missing diff --git a/config/locales/app.logged.es.yml b/config/locales/app.logged.es.yml index dd72cf458..9918982c2 100644 --- a/config/locales/app.logged.es.yml +++ b/config/locales/app.logged.es.yml @@ -1,12 +1,13 @@ es: app: logged: - profileCompletion: + profile_completion: # user's profile completion page when logging from an SSO provider confirm_your_new_account: "Confirme su nueva cuenta" you_ve_just_created_a_new_account_on_the_fablab_by_logging_from: "Acaba de crear una nueva cuenta en {GENDER, select, male{el} female{la} neutral{} other{las}} {NAME}, al iniciar sesión desde" we_need_some_more_details: "Para finalizar la configuración de la plataforma, necesitamos algunos detalles más." your_email_is_already_used_by_another_account_on_the_platform: "Parece que su dirección de correo electrónico ya está siendo utilizada por otro usuario. Compruebe su dirección de correo electrónico e ingrese debajo del código que le hemos enviado." + or: "or" please_fill_the_following_form: "rellene el siguiente formulario, por favor" some_data_may_have_already_been_provided_by_provider_and_cannot_be_modified: "Algunos datos pueden haber sido proporcionados ya por {NAME} y no pueden modificarse" then_click_on_: "haz click en" @@ -24,81 +25,107 @@ es: an_unexpected_error_occurred_check_your_authentication_code: "Ha ocurrido un error inesperado, por favor, revise su código de autentificación." send_code_again: "Enviar el código de nuevo" email_address_associated_with_your_account: "Email asociado con su cuenta" + email_is_required: "Email address is required" email_format_is_incorrect: "El formato de email incorrecto" code_successfully_sent_again: "El mail ha sido enviado otra vez con éxito" + used_for_statistics: "This data will be used for statistical purposes" + your_user_s_profile: "Your user's profile" + user_s_profile_is_required: "User's profile is required." + i_ve_read_and_i_accept_: "I've read and I accept" + _the_fablab_policy: "the FabLab policy" + change_my_data: "Change my data" + sync_my_profile: "Sync my profile" + once_your_data_are_up_to_date_: "Once your data are up to date," + _click_on_the_synchronization_button_opposite_: "click on the synchronization button opposite" + _disconnect_then_reconnect_: "disconnect then reconnect" + _for_your_changes_to_take_effect: "for your changes to take effect." dashboard: # dashboard: public profile profile: empty: '' settings: - edit_profile: - # dashboard: edit my profile - last_activity_on_: "Última vez activo" - i_want_to_change_group: "Quiero cambiar de grupo" - your_subscription_expires_on_: "su suscripción acaba el" - no_subscriptions: "Sin suscripciones" - i_want_to_subscribe: "Quiero suscribirme" - to_come: "por venir" - approved: "aprobado" - projects: "Projectos" - no_projects: "Sin projectos" - labels: "Etiquetas" - no_labels: "Sin etiquetas" - cookies: "Cookies" - cookies_accepted: "Has aceptado las cookies" - cookies_declined: "Has negado las cookies" - cookies_unset: "No has elegido aún" - reset_cookies: "Cambiar mi elección" - delete_my_account: "Eliminar mi cuenta" - edit_my_profile: "Editar mi perfil" - your_group_has_been_successfully_changed: "Su grupo ha sido cambiado con exito." - an_unexpected_error_prevented_your_group_from_being_changed: "Un error inesperado impidió que su grupo fuese cambiado." - confirm_delete_your_account: "¿Está seguro de querer eliminar su cuenta?" - all_data_will_be_lost: "All your data will be destroyed and won't be recoverable." # missing translation - invoicing_data_kept: "According to regulation, all data related to your invoices will be kept separately for 10 years." # missing translation - statistic_data_anonymized: "Some data (sex, date of birth, group) will be anonymized and kept for statistical purposes." # missing translation - no_further_access_to_projects: "Your published projects will be anonymized and you won't get any further ability to edit them." # missing translation - your_user_account_has_been_successfully_deleted_goodbye: "Su cuenta ha sido eliminada con éxito. Adiós" - an_error_occured_preventing_your_account_from_being_deleted: "Un error inesperado impidió que su cuenta fuese eliminada." - used_for_statistics: "This data will be used for statistical purposes" # translation missing - used_for_invoicing: "This data will be used for billing purposes" # translation missing - used_for_reservation: "This data will be used in case of change on one of your bookings" # translation missing - used_for_profile: "This data will only be displayed on your profile" # translation missing - used_for_pricing_stats: "This data will be used to determine the prices to which you are entitled, and for statistical purposes" # translation missing - public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing - trainings: "Cursos" - no_trainings: "Sin cursos" - subscription: "Suscripción" - group: "Grupo" - or: "ó" - confirm_changes: "Confirmar cambios" - change_my_data: "Cambiar mis datos" - sync_my_profile: "Sincronizar mi perfil" - once_your_data_are_up_to_date_: "Una vez sus datos hayan sido actualizados," - _click_on_the_synchronization_button_opposite_: "haz clic en el botón de sincronización" - _disconnect_then_reconnect_: "reconectarse" - _for_your_changes_to_take_effect: "para que sus cambios sean aplicados." + # dashboard: edit my profile + last_activity_on_: "Última vez activo" + i_want_to_change_group: "Quiero cambiar de grupo" + your_subscription_expires_on_: "su suscripción acaba el" + no_subscriptions: "Sin suscripciones" + i_want_to_subscribe: "Quiero suscribirme" + to_come: "por venir" + approved: "aprobado" + projects: "Projectos" + no_projects: "Sin projectos" + labels: "Etiquetas" + no_labels: "Sin etiquetas" + cookies: "Cookies" + cookies_accepted: "Has aceptado las cookies" + cookies_declined: "Has negado las cookies" + cookies_unset: "No has elegido aún" + reset_cookies: "Cambiar mi elección" + delete_my_account: "Eliminar mi cuenta" + edit_my_profile: "Editar mi perfil" + your_group_has_been_successfully_changed: "Su grupo ha sido cambiado con exito." + an_unexpected_error_prevented_your_group_from_being_changed: "Un error inesperado impidió que su grupo fuese cambiado." + confirmation_required: "Confirmation required" + confirm_delete_your_account: "¿Está seguro de querer eliminar su cuenta?" + all_data_will_be_lost: "All your data will be destroyed and won't be recoverable." # missing translation + invoicing_data_kept: "According to regulation, all data related to your invoices will be kept separately for 10 years." # missing translation + statistic_data_anonymized: "Some data (sex, date of birth, group) will be anonymized and kept for statistical purposes." # missing translation + no_further_access_to_projects: "Your published projects will be anonymized and you won't get any further ability to edit them." # missing translation + your_user_account_has_been_successfully_deleted_goodbye: "Su cuenta ha sido eliminada con éxito. Adiós" + an_error_occured_preventing_your_account_from_being_deleted: "Un error inesperado impidió que su cuenta fuese eliminada." + used_for_statistics: "This data will be used for statistical purposes" # translation missing + used_for_invoicing: "This data will be used for billing purposes" # translation missing + used_for_reservation: "This data will be used in case of change on one of your bookings" # translation missing + used_for_profile: "This data will only be displayed on your profile" # translation missing + used_for_pricing_stats: "This data will be used to determine the prices to which you are entitled, and for statistical purposes" # translation missing + public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing + trainings: "Cursos" + no_trainings: "Sin cursos" + subscription: "Suscripción" + group: "Grupo" + or: "ó" + confirm_changes: "Confirmar cambios" + change_my_data: "Cambiar mis datos" + sync_my_profile: "Sincronizar mi perfil" + once_your_data_are_up_to_date_: "Una vez sus datos hayan sido actualizados," + _click_on_the_synchronization_button_opposite_: "haz clic en el botón de sincronización" + _disconnect_then_reconnect_: "reconectarse" + _for_your_changes_to_take_effect: "para que sus cambios sean aplicados." projects: # dashboard: my projects you_dont_have_any_projects: "Aún no tiene proyectos." + add_a_project: "Add a project" author: "Autor" collaborator: "Colaborador" + rough_draft: "Draft" + description: "Description" + machines_and_materials: "Machines and materials" + machines: "Machines" + materials: "Materials" + collaborators: "Collaborators" trainings: # dashboard: my trainings your_next_trainings: "Sus próximos cursos" your_previous_trainings: "Sus cursos anteriores" your_approved_trainings: "Sus cursos aprobados" + no_trainings: "No trainings" events: # dashboard: my events your_next_events: "Sus próximos eventos" no_events_to_come: "No hay próximos eventos" your_previous_events: "Sus eventos anteriores" + no_passed_events: "No passed events" NUMBER_normal_places_reserved: "{NUMBER} {NUMBER, plural, =0{} =1{normal place reserved} other{normal places reserved}}" NUMBER_of_NAME_places_reserved: "{NUMBER} {NUMBER, plural, =0{} =1{of {NAME} place reserved} other{of {NAME} places reserved}}" invoices: # dashboard: my invoices reference_number: "Numero de referencia" + date: "Date" + price: "Price" + download_the_invoice: "Download the invoice" + download_the_credit_note: "Download the refund invoice" + no_invoices_for_now: "No invoices for now." members_show: # public profil of a member @@ -110,16 +137,18 @@ es: display_more_members: "Ver más miembros" no_members_for_now: "Aún no hay miembros" avatar: "Avatar" + user: "User" + pseudonym: "Pseudonym" + email_address: "Email address" projects_new: # add a new project add_a_new_project: "Añadir nuevo proyecto" - save_button_value: "Guardar borrador" # "Guardar borrador" projects_edit: # modify an existing project - save_button_value: "Guardar" # "Guardar" edit_the_project: "Editar proyecto" + rough_draft: "Draft" publish: "Publicar" machines_reserve: @@ -141,19 +170,21 @@ es: planning_of: "Plan de " # followed by the training name (eg. "Planning of 3d printer training") all_trainings: "Todos los cursos" cancel_my_selection: "Cancelar mi selección" + i_change: "I change" + i_shift: "I shift" i_ve_reserved: "He reservado" space_reserve: # book a space - space_reserve: - planning_of_space_NAME: "Planes de {NAME} " - i_ve_reserved: "he reservado" - i_shift: "reemplazo" - i_change: "cambio" + planning_of_space_NAME: "Planes de {NAME} " + i_ve_reserved: "he reservado" + i_shift: "reemplazo" + i_change: "cambio" notifications: notifications_center: "Centro de notificaciones" mark_all_as_read: "Marcar como leido" + date: "Date" notif_title: "Titulo" no_new_notifications: "No hay notificaciones nuevas." archives: "Archivos" diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml index d8d4ffc57..d478b3e7c 100644 --- a/config/locales/app.public.es.yml +++ b/config/locales/app.public.es.yml @@ -45,7 +45,6 @@ es: # left menu (admin) trainings_monitoring: "Monitorización de cursos" - select_a_training: "Selecionar un curso" manage_the_calendar: "Gestionar calendario" manage_the_users: "Gestionar usuarios" manage_the_invoices: "Gestionar facturas" @@ -125,18 +124,16 @@ es: about: # about page - about: - read_the_fablab_policy: "Leer la politica del FabLab" - read_the_fablab_s_general_terms_and_conditions: "Leer los terminos y condiciones del FabLab" - your_fablab_s_contacts: "Sus contactos del FabLab" - privacy_policy: "Política de privacidad" + read_the_fablab_policy: "Leer la politica del FabLab" + read_the_fablab_s_general_terms_and_conditions: "Leer los terminos y condiciones del FabLab" + your_fablab_s_contacts: "Sus contactos del FabLab" + privacy_policy: "Política de privacidad" privacy: # 'privacy policy' page - privacy: - title: "Política de privacidad" - dpo: "Oficial de protección de datos" - last_update: "Última actualización," + title: "Política de privacidad" + dpo: "Oficial de protección de datos" + last_update: "Última actualización," home: # home page @@ -161,32 +158,38 @@ es: projects_list: # projects gallery - projects_list: - the_fablab_projects: "Los proyectos del FabLab" - add_a_project: "Añadir un proyecto" - search_over_the_whole_network: "Buscar en toda la red de FabLab" - tooltip_openlab_projects_switch: "La busqueda en toda la red le permite buscar los proyectos de todos los FabLab que usan esta característica" - openlab_search_not_available_at_the_moment: "La busqueda en toda la red no está disponible en este momento. Puede seguir buscando proyectos en este FabLab." - project_search_result_is_empty: "Lo sentimos, no hemos encontrado nada." - reset_all_filters: "Limpiar filtros" - search: "Buscar" - all_projects: "Todos los proyectos" - my_projects: "Mis proyectos" - projects_to_whom_i_take_part_in: "Proyectos de los que formo parte" - all_machines: "Todas las máquinas" - all_themes: "Todos los temas" - all_materials: "Todo el material" - load_next_projects: "Cargar más proyectos" - rough_draft: "Borrador" + the_fablab_projects: "Los proyectos del FabLab" + add_a_project: "Añadir un proyecto" + search_over_the_whole_network: "Buscar en toda la red de FabLab" + tooltip_openlab_projects_switch: "La busqueda en toda la red le permite buscar los proyectos de todos los FabLab que usan esta característica" + openlab_search_not_available_at_the_moment: "La busqueda en toda la red no está disponible en este momento. Puede seguir buscando proyectos en este FabLab." + project_search_result_is_empty: "Lo sentimos, no hemos encontrado nada." + reset_all_filters: "Limpiar filtros" + search: "Buscar" + all_projects: "Todos los proyectos" + my_projects: "Mis proyectos" + projects_to_whom_i_take_part_in: "Proyectos de los que formo parte" + all_machines: "Todas las máquinas" + all_themes: "Todos los temas" + all_materials: "Todo el material" + load_next_projects: "Cargar más proyectos" + rough_draft: "Borrador" projects_show: # details of a projet + rough_draft: "Draft" project_description: "Descripción de proyecto" by_name: "Por {NAME}" + step_N: "Step {INDEX}" + share_on_facebook: "Share on Facebook" + share_on_twitter: "Share on Twitter" deleted_user: "Deleted user" #translation_missing posted_on_: "Subido el" CAD_file_to_download: "{COUNT, plural, =0{No CAD files} =1{CAD file to download} other{CAD files to download}}" + machines_and_materials: "Machines and materials" + collaborators: "Collaborators" licence: "Licencia" + confirmation_required: "Confirmation required" report_an_abuse: "Reportar una infracción" unauthorized_operation: "Operación no autorizada" your_report_was_successful_thanks: "Su informe se ha enviado con éxito. Gracias." @@ -204,27 +207,29 @@ es: machines_list: # list of machines - machines_list: - the_fablab_s_machines: "Las máquinas del FabLab" - add_a_machine: "Añadir una máquina" - book: "Book" #translation_missing - _or_the_: " o el " - status_enabled: "Enabled" #translation_missing - status_disabled: "Disabled" #translation_missing - status_all: "All" #translation_missing + the_fablab_s_machines: "Las máquinas del FabLab" + add_a_machine: "Añadir una máquina" + book: "Book" #translation_missing + _or_the_: " o el " + status_enabled: "Enabled" #translation_missing + status_disabled: "Disabled" #translation_missing + status_all: "All" #translation_missing machines_show: # details of a machine book_this_machine: "Alquilar máquina" + technical_specifications: "Technical specifications" files_to_download: "Archivos a descargar" projects_using_the_machine: "Proyectos que utilizan esta máquina" _or_the_: " o el " + confirmation_required: "Confirmation required" do_you_really_want_to_delete_this_machine: "¿Está seguro de querer eliminar esta máquina?" unauthorized_operation: "Unauthorized operation" the_machine_cant_be_deleted_because_it_is_already_reserved_by_some_users: "La máquina no puede borrarse porque está siendo usada o ha sido reservada por algún usuario." trainings_list: # list of trainings + book: "Book" the_trainings: "Lista de cursos" training_show: @@ -232,6 +237,7 @@ es: book_this_training: "reservar plaza en este curso" do_you_really_want_to_delete_this_training: "Está seguro de querer eliminar este curso?" unauthorized_operation: "Operación no autorizada" + confirmation_required: "Confirmation required" the_training_cant_be_deleted_because_it_is_already_reserved_by_some_users: "El curso no puede borrarse porque ya ha sido reservado por algún usuario." plans: @@ -246,9 +252,14 @@ es: his_group: "{GENDER, select, male{His} female{Her} other{Its}} group" he_wants_to_change_group: "{ROLE, select, admin{The user wants} other{I want}} cambiar el grupo" change_my_group: "Cambiar {ROLE, select, admin{{GENDER, select, male{his} female{her} other{its}}} other{my}} grupo" + summary: "Summary" your_subscription_has_expired_on_the_DATE: "Sus suscripcion expiró el {DATE}" - you_ve_just_payed_the_: "acaba de pagar" + subscription_price: "Subscription price" + you_ve_just_selected_a_subscription_html: "You've just selected a subscription:" + confirm_and_pay: "Valider et payer" + you_ve_just_payed_the_subscription_html: "You've just paid the subscription:" thank_you_your_subscription_is_successful: "Gracias. Su suscripción ha tenido éxito" + your_invoice_will_be_available_soon_from_your_dashboard: "Your invoice will be available soon from your dashboard" your_group_was_successfully_changed: "Su grupo ha sido cambiado correctamente." the_user_s_group_was_successfully_changed: "Los usuarios del grupo han cambiado correctamente." an_error_prevented_your_group_from_being_changed: "Un error impidió que su grupo fuese cambiado." @@ -256,6 +267,8 @@ es: an_error_occured_during_the_payment_process_please_try_again_later: "Ha ocurrido un error mientras se procesaba el pago. Intentelo en unos minutos." subscription_confirmation: "Confirmar suscripción" here_is_the_NAME_subscription_summary: "Resumen de la suscrpición de {NAME}:" + confirm_payment_of_html: "{ROLE, select, admin{Cash} other{Pay}}: {AMOUNT}" # (contexte : validate a payment of $20,00) + online_payment_disabled: "Payment by credit card is not available. Please contact the Fablab's reception directly." events_list: # Fablab's events list @@ -266,26 +279,41 @@ es: cancelled: "Cancelled" #translation_missing free_admission: "Free admission" #translation_missing still_available: "available place(s)" #translation_missing - free_entry: "Free entry" #translation_missing + free_entry: "Free entry" + add_an_event: "Add an event" + load_the_next_events: "Load the next events..." + full_price_: "Full price:" + to_date: "to" # context: date. eg: "from 01/01 to 01/05" #translation_missing events_show: # details and booking of an event event_description: "Descripción del evento" downloadable_documents: "Archivos descargables" information_and_booking: "Información y reservas" + dates: "Dates" beginning: "Empieza:" ending: "Termina:" opening_hours: "Hora de apertura:" + all_day: "All day" + from_time: "From" # context: time. eg. "from 18:00 to 21:00" + to_time: "to" # context: time. eg. "from 18:00 to 21:00" + full_price_: "Full price:" tickets_still_availables: "Entradas disponibles:" sold_out: "Entradas vendidas." free_entry: "Entrada gratuita" cancelled: "Cancelled" #translation_missing ticket: "{NUMBER, plural, one{ticket} other{tickets}}" make_a_gift_of_this_reservation: "Regalar esta reserva" + thank_you_your_payment_has_been_successfully_registered: "Tank you. Your payment has been successfully registered!" you_can_find_your_reservation_s_details_on_your_: "Puede encontrar los detalles de su reserva en" + dashboard: "dashboard" you_booked_DATE: "You booked ({DATE}):" canceled_reservation_SEATS: "Reservation canceled ({SEATS} seats)" #translation_missing book: "Reservar" + confirm_and_pay: "Confirm and pay" + confirm_payment_of_html: "{ROLE, select, admin{Cash} other{Pay}}: {AMOUNT}" # (contexte : validate a payment of $20,00) + online_payment_disabled: "Payment by credit card is not available. Please contact the Fablab's reception directly." + please_select_a_member_first: "Please select a member first" change_the_reservation: "Cambiar la reserva" you_can_shift_this_reservation_on_the_following_slots: "Puede cambiar la reserva en los siguientes campos:" confirmation_required: "Confirmation required" #translation_missing @@ -294,41 +322,41 @@ es: unable_to_delete_the_event_because_some_users_alredy_booked_it: "Unable to delete this event, it may have been already reserved by some users." #translation_missing cancel_the_reservation: "Cancel the reservation" #translation_missing do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." #translation_missing + reservation_was_successfully_cancelled: "Reservation was successfully cancelled" cancellation_failed: "Cancellation failed." #translation_missing event_is_over: "The event is over" #translation_missing thanks_for_coming: "Thanks for coming!" #translation_missing view_event_list: "View events to come" #translation_missing + share_on_facebook: "Share on Facebook" + share_on_twitter: "Share on Twitter" calendar: # public calendar - calendar: - calendar: "Calendario" - show_unavailables: "Mostrar campos inválidos" - filter_calendar: "Filtrar calendario" - trainings: "Cursos" - machines: "Máquinas" - spaces: "Espacios" - events: "Eventos" - externals: "Otros calendarios" + calendar: "Calendario" + show_unavailables: "Mostrar campos inválidos" + filter_calendar: "Filtrar calendario" + trainings: "Cursos" + machines: "Máquinas" + spaces: "Espacios" + events: "Eventos" + externals: "Otros calendarios" spaces_list: # list of spaces - spaces_list: - the_spaces: "Espacios" - add_a_space: "Añadir espacios" - status_enabled: "Enabled" #translation_missing - status_disabled: "Disabled" #translation_missing - status_all: "All" #translation_missing - book: "Book" #translation_missing + the_spaces: "Espacios" + add_a_space: "Añadir espacios" + status_enabled: "Enabled" #translation_missing + status_disabled: "Disabled" #translation_missing + status_all: "All" #translation_missing + book: "Book" #translation_missing space_show: # display the details of a space - space_show: - book_this_space: "Reservar este espacio" - unauthorized_operation: "Operación no autorizada" - confirmation_required: "Confirmación requerida" - do_you_really_want_to_delete_this_space: "¿Está seguro de que quiere borrar este espacio?" - the_space_cant_be_deleted_because_it_is_already_reserved_by_some_users: "No puede borrarse este espacio porque está siendo usado por otros usuarios." - characteristics: "Características" - files_to_download: "Archivos para descargar" - projects_using_the_space: "Proyectos que usan el espacio" + book_this_space: "Reservar este espacio" + unauthorized_operation: "Operación no autorizada" + confirmation_required: "Confirmación requerida" + do_you_really_want_to_delete_this_space: "¿Está seguro de que quiere borrar este espacio?" + the_space_cant_be_deleted_because_it_is_already_reserved_by_some_users: "No puede borrarse este espacio porque está siendo usado por otros usuarios." + characteristics: "Características" + files_to_download: "Archivos para descargar" + projects_using_the_space: "Proyectos que usan el espacio" diff --git a/config/locales/app.shared.es.yml b/config/locales/app.shared.es.yml index 5a86e39e3..313fdd942 100644 --- a/config/locales/app.shared.es.yml +++ b/config/locales/app.shared.es.yml @@ -19,102 +19,28 @@ es: "no": "No" apply: "Aplicar" - elements: - # various translations used many times in the application - group: "Grupo" - subscription: "Suscripción" - trainings: "Cursos" - no_trainings: "Sin cursos" - confirmation_required: "Confirmación requerida" - description: "Descripción" - machines: "Máquinas" - events: "Eventos" - materials: "Materiales" - date: "Día" - price: "Precio" - download_the_invoice: "Descargar factura" - download_the_credit_note: "Descargar nota de crédito" - no_invoices_for_now: "Sin facturas por ahora." - email_address: "dirección email " - user: "Usuario" - pseudonym: "Seudónimo" - all_day: "Todo el día" - reservation_was_successfully_cancelled: "La reserva ha sido cancelada con éxito." - title: "Titulo" - total_: "TOTAL :" - full_price_: "Precio final:" - rough_draft: "Borrador" - machines_and_materials: "Máquinas y materiales" - collaborators: "Colaboradores" - summary: "Resumen" - you_ve_just_selected_a_: "Acaba de seleccionar" # you_ve_just_selected_a_ + _subscription - _subscription: "suscripción" - confirm_and_pay: "Confirmar y pagar" - your_invoice_will_be_available_soon_from_your_: "Su factura pronto estará disponible desde su " - add_an_event: "Añadir evento" - load_the_next_events: "Cargar próximos eventos" - no_passed_events: "Sin eventos anteriores" - dates: "Fechas:" - thank_you_your_payment_has_been_successfully_registered: "Gracias. Su pago se ha registrado correctamente" - surname: "Apellidos" - first_name: "Nombre" - address: "Dirección" - interests: "Intereses" - CAD_softwares_mastered: "Softwares dominados" - name: "Nombre" - step_N: "Paso {INDEX}" - themes: "Temas" - tags: "Etiquetas" - technical_specifications: "Especificaciones técnicas" - online_payment: "Pago online" - type: "Tipo" - partner: "Compañero" - standard: "Estándar" - year: "año" - month: "Mes" - subscription_price: "Precio de la suscripción" - model: "Modelo" - from_date: "Desde" # context: date. eg: "Desde 01/01 to 01/05" - from_time: "Desde" # context: time. eg. "Desde 18:00 to 21:00" - to_date: "Hasta" # context: date. eg: "Hasta 01/01 to 01/05" - to_time: "Hasta" # context: time. eg. "Hasta 18:00 to 21:00" - or: "ó" - and: "y" - change_my_data: "Cambiar mis datos" - sync_my_profile: "Sincronizar mi perfil" - once_your_data_are_up_to_date_: "Una vez sus datos hayan sido actualizados," - _click_on_the_synchronization_button_opposite_: "haz clic en el botón de sincronización" - _disconnect_then_reconnect_: "reconectarse" - _for_your_changes_to_take_effect: "para que sus cambios sean aplicados." - add_a_project: "Añadir un proyecto" - illustration: "Ilustración" - add_an_illustration: "Añadir una ilustración." - book: "Reservar" - description_is_required: "Se requiere una descripción." - name_is_required: "Se requiere un nombre." - all_themes: "Todos los temas" - filter: 'Filtro' - confirm_payment_of_html: "{ROLE, select, admin{Payment on site} other{Pay}}: {AMOUNT}" # (context: confirm my payment of $20.00) - export_is_running_you_ll_be_notified_when_its_ready: "Exportando, será notificado cuando esté listo." - share_on_facebook: "Compartir en Facebook" - share_on_twitter: "Compartir en Twitter" - incomplete_profile: "Perfil completo" - unlimited: "Ilimitado" - payment_card_error: "Hubo un problema con su tarjeta:" - online_payment_disabled: "El pago en línea no está disponible. Póngase en contacto directamente con la recepción de Fablab." - unexpected_error_occurred: "Ocurrió un error inesperado" - messages: you_will_lose_any_unsaved_modification_if_you_quit_this_page: "Si cierra la página se perderán todas las modificaciones que no se hayan guardado" you_will_lose_any_unsaved_modification_if_you_reload_this_page: "Si recarga la página se perderán todas las modificaciones que no se hayan guardado" + payment_card_error: "A problem has occurred with your credit card:" user: # user edition form + man: "Man" + woman: "Woman" add_an_avatar: "Añadir un avatar" pseudonym: "Seudónimo" + pseudonym_is_required: "Pseudonym is required." + first_name: "Your first name" + first_name_is_required: "First name is required." + surname: "Your last name" + surname_is_required: "Last name is required." + email_address: "Email address" email_address_is_required: "Se requiere un email." change_password: "Cambiar contraseña" new_password: "Nueva contraseña" + password_is_required: "Password is required." + password_is_too_short: "Password is too short (at least 8 characters)" confirmation_of_new_password: "Confirmar nueva contraseña" confirmation_of_password_is_required: "Se requiere confirmar la contraseña." confirmation_of_password_is_too_short: "la contraseña es demasiado corta (minimo 8 caracteres)." @@ -125,42 +51,65 @@ es: date_of_birth_is_required: "Se requiere una fecha de nacimiento." website: "Página web" job: "Ocupación" + interests: "Interests" + CAD_softwares_mastered: "CAD Softwares mastered" + birthday: "Date of birth" + birthday_is_required: "Date of birth is required." + address: "Address" + phone_number: "Phone number" + phone_number_is_required: "Phone number is required." + i_authorize_Fablab_users_registered_on_the_site_to_contact_me: "I authorize FabLab users, registered on the site, to contact me" + i_accept_to_receive_information_from_the_fablab: "I accept to receive information from the FabLab" + used_for_statistics: "This data will be used for statistical purposes" + used_for_invoicing: "This data will be used for billing purposes" + used_for_reservation: "This data will be used in case of change on one of your bookings" + used_for_profile: "This data will only be displayed on your profile" project: # project edition form + name: "Name" + name_is_required: "Name is required." illustration: "Ilustración" add_an_illustration: "Añadir una ilustración" CAD_file: "Fichero CAD" allowed_extensions: "Extensiones permitidas:" add_a_new_file: "Añadir un nuevo archivo" + description: "Description" + description_is_required: "Description is required." steps: "Pasos" + step_N: "Step {INDEX}" step_title: "Título de los pasos" add_a_picture: "Añadir imagen" change_the_picture: "Cambiar imagen" delete_the_step: "Eliminar el paso" + confirmation_required: "Confirmation required" do_you_really_want_to_delete_this_step: "Está seguro de querer borrar el paso?" add_a_new_step: "añadir un nuevo paso" publish_your_project: "Publicar proyecto" + or: "or" employed_materials: "Material empleados" employed_machines: "Máquinas empleadas" + collaborators: "Collaborators" creative_commons_licences: "Licencias Creative Commons" + themes: "Themes" + tags: "Tags" + save_as_draft: "Save as draft" machine: # machine edition form - machine_form: - name: "Nombre" - name_is_required: "Se requiere un nombre." - illustration: "Ilustración" - add_an_illustration: "añadir una ilustración" - description: "descripción" - description_is_required: "Se requiere una descripción." - technical_specifications: "Technical specifications" - technical_specifications_are_required: "Se requieren especificaciones técnicas." - attached_files_pdf: "archivos anclados (pdf)" - attach_a_file: "adjuntar archivo" - add_an_attachment: "añadir archivo adjunto" - disable_machine: "Disable machine" #translation_missing - validate_your_machine: "Validar su máquina" + name: "Nombre" + name_is_required: "Se requiere un nombre." + illustration: "Ilustración" + add_an_illustration: "añadir una ilustración" + description: "descripción" + description_is_required: "Se requiere una descripción." + technical_specifications: "Technical specifications" + technical_specifications_are_required: "Se requieren especificaciones técnicas." + attached_files_pdf: "archivos anclados (pdf)" + attach_a_file: "adjuntar archivo" + add_an_attachment: "añadir archivo adjunto" + disable_machine: "Disable machine" #translation_missing + validate_your_machine: "Validar su máquina" plan_subscribe: # frame to select a plan to subscribe @@ -171,14 +120,15 @@ es: # admin: choose a member to interact with select_a_member: "Selecciona un miembro" start_typing: "Empezar a escribir..." - please_select_a_member_first: "Por favor, selecciona un miembro de la lista" stripe: # stripe payment modal + online_payment: "Online payment" i_have_read_and_accept_: "He leido y acepto" _the_general_terms_and_conditions: "Los términos y condiciones." credit_amount_for_pay_reservation: "{amount} {currency} falta por pagar para efectuar su reserva" client_credit_amount_for_pay_reservation: "{amount} {currency} falta por pagar para efectuar la reserva del cliente" + confirm_payment_of_: "Pay: {AMOUNT}" valid_reservation_modal: # dialog of on site payment for reservations @@ -187,9 +137,12 @@ es: event: # event edition form + title: "Title" title_is_required: "Se requiere un título." matching_visual: "Coincidencia visual" choose_a_picture: "Selecciona una imagen" + description: "Description" + description_is_required: "Description is required." attachments: "Adjuntos" add_a_new_file: "añadir un archivo" event_type: "Tipo de evento" @@ -210,69 +163,80 @@ es: plan: # subscription plan edition form - plan_form: - general_information: "Información general" - name: "Nombre" - name_is_required: "Se requiere un nombre." - name_length_must_be_less_than_24_characters: "el nombre debe contener menos de 24 caracteres." - type: "Tipo" - type_is_required: "Se requiere un tipo." - group: "Grupo" - transversal_all_groups: "Transversal (todos los grupos)" - group_is_required: "Se requiere un tipo." - number_of_periods: "Numero de periodos" - number_of_periods_is_required: "El numero de periodos es obligatorio." - period: "Periodo" - year: "Año" - month: "Mes" - week: "Semana" - period_is_required: "Se requiere un periodo." - subscription_price: "Precio de la suscripción" - price_is_required: "Se requiere un precio." - visual_prominence_of_the_subscription: "Relevancia visual de la suscripción" - on_the_subscriptions_page_the_most_prominent_subscriptions_will_be_placed_at_the_top_of_the_list: "Las suscripciónes se ordenaran por orden de relevancia en la página de suscripciónes" - an_evelated_number_means_a_higher_prominence: "Un número elevado indica mayor relevancia." - rolling_subscription: "¿Suscripción continua?" - a_rolling_subscription_will_begin_the_day_of_the_first_training: "Una suscripción continuada empezará el día que se dé el primer curso." - otherwise_it_will_begin_as_soon_as_it_is_bought: "De otro modo, empezará tan pronto como se haya adquirido." - information_sheet: "hoja de información" - attach_an_information_sheet: "adjuntar una hoja de infomación" - notified_partner: "Compañero notificado" - new_user: "Nuevo usuario ..." - as_part_of_a_partner_subscription_some_notifications_may_be_sent_to_this_user: "Como parte de la suscripción, algunas notificaciones podrían ser enviadas a este usuario." - new_partner: "Nuevo compañero" - email_address_is_required: "Se requiere un mail." - disabled: "Disable subscription" #translation_missing - disable_plan_will_not_unsubscribe_users: "Beware: disabling this plan won't unsubscribe users having active subscriptions with it." #translation_missing + general_information: "Información general" + name: "Nombre" + name_is_required: "Se requiere un nombre." + name_length_must_be_less_than_24_characters: "el nombre debe contener menos de 24 caracteres." + type: "Tipo" + partner: "Partner" + standard: "Standard" + type_is_required: "Se requiere un tipo." + group: "Grupo" + transversal_all_groups: "Transversal (todos los grupos)" + group_is_required: "Se requiere un tipo." + number_of_periods: "Numero de periodos" + number_of_periods_is_required: "El numero de periodos es obligatorio." + period: "Periodo" + year: "Año" + month: "Mes" + week: "Semana" + period_is_required: "Se requiere un periodo." + subscription_price: "Precio de la suscripción" + price_is_required: "Se requiere un precio." + visual_prominence_of_the_subscription: "Relevancia visual de la suscripción" + on_the_subscriptions_page_the_most_prominent_subscriptions_will_be_placed_at_the_top_of_the_list: "Las suscripciónes se ordenaran por orden de relevancia en la página de suscripciónes" + an_evelated_number_means_a_higher_prominence: "Un número elevado indica mayor relevancia." + rolling_subscription: "¿Suscripción continua?" + a_rolling_subscription_will_begin_the_day_of_the_first_training: "Una suscripción continuada empezará el día que se dé el primer curso." + otherwise_it_will_begin_as_soon_as_it_is_bought: "De otro modo, empezará tan pronto como se haya adquirido." + information_sheet: "hoja de información" + attach_an_information_sheet: "adjuntar una hoja de infomación" + notified_partner: "Compañero notificado" + new_user: "Nuevo usuario ..." + as_part_of_a_partner_subscription_some_notifications_may_be_sent_to_this_user: "Como parte de la suscripción, algunas notificaciones podrían ser enviadas a este usuario." + new_partner: "Nuevo compañero" + first_name: "First name" + first_name_is_required: "First name is required." + surname: "Last name" + surname_is_required: "Last name is required." + email_address: "Email address" + email_address_is_required: "Se requiere un mail." + disabled: "Disable subscription" #translation_missing + disable_plan_will_not_unsubscribe_users: "Beware: disabling this plan won't unsubscribe users having active subscriptions with it." #translation_missing trainings: # training edition form - trainings_form: - name: "Nombre" - name_is_required: "Se requiere un nombre." - illustration: "Ilustración" - add_an_illustration: "añadir una ilustración" - description: "descripción" - description_is_required: "Se requiere una descripción." - add_a_new_training: "Añadir curso" - validate_your_training: "Validar curso" - associated_machines: "Máquinas asociadas" - number_of_tickets: "Número de entradas" - public_page: "Hacer curso público" - disable_training: "Disable the training" #translation_missing + name: "Nombre" + name_is_required: "Se requiere un nombre." + illustration: "Ilustración" + add_an_illustration: "añadir una ilustración" + description: "descripción" + description_is_required: "Se requiere una descripción." + add_a_new_training: "Añadir curso" + validate_your_training: "Validar curso" + associated_machines: "Máquinas asociadas" + number_of_tickets: "Número de entradas" + public_page: "Hacer curso público" + disable_training: "Disable the training" #translation_missing user_admin: # partial form to edit/create an user (admin view) + user: "User" + incomplete_profile: "Incomplete profile" user_profile: "Profil utilisateur" warning_incomplete_user_profile_probably_imported_from_sso: "Advertencia: Este perfil de usuario está incompleto. Como el método de autenticación SSO está activo, puede que la cuenta sea importada pero no fusionada. No la modifique a no ser que sepa lo que hace." group: "Grupo" group_is_required: "Se requiere un grupo" trainings: "Cursos" + tags: "Tags" authentication: # partial form to edit/create an authentication provider (SSO) + name: "Nombre" provider_name_is_required: "Se requiere el nombre del proveedor." authentication_type: "Tipo de autenticación" + local_database: "Local database" + o_auth2: "OAuth 2.0" authentication_type_is_required: "Se requiere el tipo de autenticación." data_mapping: "Mapeo de datos" expected_data_type: "Tipo de datos esperado" @@ -298,6 +262,7 @@ es: oauth2_client_secret_is_required: "Se requiere el secreto de cliente OAuth 2.0." define_the_fields_mapping: "Definir el mapeo de campos" add_a_match: "agregar coincidencia" + model: "Model" field: "Campos" api_endpoint_url: "API final de URL" api_type: "Tipo de API" @@ -325,8 +290,7 @@ es: public_profile: # user public profile - last_activity_: "Úlitma actividad" - _on_: "el" + last_activity_html: "Last activity
    on {DATE}" to_come: "por llegar" approved: "aprobada" projects: "Proyectos" @@ -334,6 +298,11 @@ es: author: "Autor" collaborator: "Colaborador" private_profile: "Perfil privado" + interests: "Interests" + CAD_softwares_mastered: "CAD softwares mastered" + email_address: "Email address" + trainings: "Trainings" + no_trainings: "No trainings" wallet: # wallet @@ -341,6 +310,7 @@ es: your_wallet_amount: 'Su dinero disponible' wallet_amount: 'Cantidad disponible' no_transactions_for_now: 'Sin transacciones aún' + date: "Date" operation: 'Operación' operator: 'Operador' amount: 'Cantidad' @@ -373,6 +343,8 @@ es: coupon: # promotional coupon (creation/edition form) + name: "Nombre" + name_is_required: "Name is required." code: "Código" code_is_required: "Se requiere un código." code_must_be_composed_of_capital_letters_digits_and_or_dashes: "El código debe estar compuesto de mayúsculas, dígitos y / o guiones." @@ -409,62 +381,60 @@ es: space: # form to create/edit a space - space: - name: "Nombre" - name_is_required: "Se requiere un nombre." - illustration: "Ilustración" - add_an_illustration: "añadir una ilustración" - description: "descripción" - description_is_required: "Se requiere una descripción." - characteristics: "Características" - characteristics_are_required: "Las características son obligatorias." - attached_files_pdf: "Archivos adjuntos (pdf)" - attach_a_file: "Adjuntar archvo" - add_an_attachment: "Añadir adjunto" - default_places: "Máximo de entradas predeterminado" - default_places_is_required: "Se requiere un máximo de entradas predeterminado." - disable_space: "Disable space" #translation_missing + name: "Nombre" + name_is_required: "Se requiere un nombre." + illustration: "Ilustración" + add_an_illustration: "añadir una ilustración" + description: "descripción" + description_is_required: "Se requiere una descripción." + characteristics: "Características" + characteristics_are_required: "Las características son obligatorias." + attached_files_pdf: "Archivos adjuntos (pdf)" + attach_a_file: "Adjuntar archvo" + add_an_attachment: "Añadir adjunto" + default_places: "Máximo de entradas predeterminado" + default_places_is_required: "Se requiere un máximo de entradas predeterminado." + disable_space: "Disable space" #translation_missing cart: # module de panier d'achat de réservations - cart: - summary: "Resumen" - select_one_or_more_slots_in_the_calendar: "Selecciona uno {SINGLE, select, true{slot} other{or more slots}} en el calendario" - you_ve_just_selected_the_slot: "Acaba de seleccionar el espacio :" - datetime_to_time: "{START_DATETIME} hasta {END_TIME}" # eg: Thursday, September 4 1986 8:30 PM to 10:00 PM - cost_of_TYPE: "Coste de {TYPE, select, Machine{a machine hour} Training{the training} other{the element}}" - offer_this_slot: "Ofertar este espacio" - confirm_this_slot: "Confirmar este espacio" - remove_this_slot: "Eliminar este espacio" - to_benefit_from_attractive_prices: "Para beneficiarse de precios" - view_our_subscriptions: "Ver nuestras suscripciónes" - or: "ó" - you_ve_just_selected_a_: "Acaba de seleccionar" - _subscription: "suscripción" - cost_of_the_subscription: "Coste de la suscripción" - confirm_and_pay: "Confirmar y pagar" - you_have_settled_the_following_TYPE: "Acaba de seleccionar {TYPE, select, Machine{machine slots} Training{training} other{elements}}:" #translation_missing - you_have_settled_a_: "Ha establecido una" - total_: "TOTAL :" - thank_you_your_payment_has_been_successfully_registered: "Gracias. Su pago se ha registrado con éxito." - your_invoice_will_be_available_soon_from_your_: "Su factura pronto estará disponible" - dashboard: "Panel" - i_want_to_change_the_following_reservation: "Deseo cambiar la siguiente reserva:" - cancel_my_modification: "Cancelar modificación" - select_a_new_slot_in_the_calendar: "Seleccionar nuevo espacio en el calendario" - cancel_my_selection: "Cancelar mi selección" - tags_of_the_original_slot: "Etiquetas del espacio original:" - tags_of_the_destination_slot: "Etiquetas del espacio final:" - confirm_my_modification: "Confirmar modificación" - your_booking_slot_was_successfully_moved_from_: "Tu reserva de espacio ha sido reemplazada con éxito" - to_date: "a" # context: date. eg: "from 01/01 to 01/05" - please_select_a_member_first: "Por favor, selecciona un miembro de la lista" - unable_to_change_the_reservation: "Imposible cambiar reserva" - confirmation_required: "Confirmación requerida" - do_you_really_want_to_cancel_this_reservation: "¿Está seguro de querer cancelar la reserva?" - reservation_was_cancelled_successfully: "La reserva se ha cancelado con éxito." - cancellation_failed: "Cancelación fallida." - confirm_payment_of_html: "{ROLE, select, admin{Payment on site} other{Pay}}: {AMOUNT}" # (context: confirm my payment of $20.00) - a_problem_occurred_during_the_payment_process_please_try_again_later: "A problem occurred during the payment process. Please try again later." - none: "Ninguno" - online_payment_disabled: "El pago en línea no está disponible. Póngase en contacto directamente con la recepción de Fablab." + summary: "Resumen" + select_one_or_more_slots_in_the_calendar: "Selecciona uno {SINGLE, select, true{slot} other{or more slots}} en el calendario" + you_ve_just_selected_the_slot: "Acaba de seleccionar el espacio :" + datetime_to_time: "{START_DATETIME} hasta {END_TIME}" # eg: Thursday, September 4 1986 8:30 PM to 10:00 PM + cost_of_TYPE: "Coste de {TYPE, select, Machine{a machine hour} Training{the training} other{the element}}" + offer_this_slot: "Ofertar este espacio" + confirm_this_slot: "Confirmar este espacio" + remove_this_slot: "Eliminar este espacio" + to_benefit_from_attractive_prices: "Para beneficiarse de precios" + view_our_subscriptions: "Ver nuestras suscripciónes" + or: "ó" + you_ve_just_selected_a_: "Acaba de seleccionar" + _subscription: "suscripción" + cost_of_the_subscription: "Coste de la suscripción" + confirm_and_pay: "Confirmar y pagar" + you_have_settled_the_following_TYPE: "Acaba de seleccionar {TYPE, select, Machine{machine slots} Training{training} other{elements}}:" #translation_missing + you_have_settled_a_: "Ha establecido una" + total_: "TOTAL :" + thank_you_your_payment_has_been_successfully_registered: "Gracias. Su pago se ha registrado con éxito." + your_invoice_will_be_available_soon_from_your_: "Su factura pronto estará disponible" + dashboard: "Panel" + i_want_to_change_the_following_reservation: "Deseo cambiar la siguiente reserva:" + cancel_my_modification: "Cancelar modificación" + select_a_new_slot_in_the_calendar: "Seleccionar nuevo espacio en el calendario" + cancel_my_selection: "Cancelar mi selección" + tags_of_the_original_slot: "Etiquetas del espacio original:" + tags_of_the_destination_slot: "Etiquetas del espacio final:" + confirm_my_modification: "Confirmar modificación" + your_booking_slot_was_successfully_moved_from_: "Tu reserva de espacio ha sido reemplazada con éxito" + to_date: "a" # context: date. eg: "from 01/01 to 01/05" + please_select_a_member_first: "Por favor, selecciona un miembro de la lista" + unable_to_change_the_reservation: "Imposible cambiar reserva" + confirmation_required: "Confirmación requerida" + do_you_really_want_to_cancel_this_reservation: "¿Está seguro de querer cancelar la reserva?" + reservation_was_cancelled_successfully: "La reserva se ha cancelado con éxito." + cancellation_failed: "Cancelación fallida." + confirm_payment_of_html: "{ROLE, select, admin{Payment on site} other{Pay}}: {AMOUNT}" # (context: confirm my payment of $20.00) + a_problem_occurred_during_the_payment_process_please_try_again_later: "A problem occurred during the payment process. Please try again later." + none: "Ninguno" + online_payment_disabled: "El pago en línea no está disponible. Póngase en contacto directamente con la recepción de Fablab." From 3a458871eb1896c07355e0febcdfb9b542fed8a3 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 18 Dec 2019 15:21:44 +0100 Subject: [PATCH 083/135] harmonize front translations in portuguese with new model --- config/locales/app.admin.pt.yml | 1303 ++++++++++++++++-------------- config/locales/app.logged.pt.yml | 141 ++-- config/locales/app.public.pt.yml | 638 ++++++++------- config/locales/app.shared.pt.yml | 380 ++++----- 4 files changed, 1278 insertions(+), 1184 deletions(-) diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index ecdf77f6d..c6c402bd1 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -13,125 +13,132 @@ pt: calendar: # manage the trainings & machines slots - admin_calendar: - calendar_management: "Gerenciamento do calendário" - trainings: "Treinamentos" - machines: "Máquinas" - spaces: "Espaços" - events: "Eventos" - availabilities: "Disponíveis" - availabilities_notice: "Exportar para Excel livro com todos os slots disponíveis para reserva, e suas ocupações." - ongoing_reservations: "Reservas em curso" - no_reservations: "Sem reservas" - confirmation_required: "Confirmação Obrigatória" - do_you_really_want_to_cancel_the_USER_s_reservation_the_DATE_at_TIME_concerning_RESERVATION: "Você realmente deseja cancelar a reserva do usuário {USER}, em {DATE} ás {TIME}, sobre {RESERVATION}?" - reservation_was_successfully_cancelled: "A reserva foi cancelada com sucesso" - reservation_cancellation_failed: "Reservation cancellation failed." - unable_to_remove_the_last_machine_of_the_slot_delete_the_slot_rather: "Não é possível remover a última máquina do slot. Delete o slot primeiramente." - do_you_really_want_to_remove_MACHINE_from_this_slot: "Você realmente deseja remover \"{MACHINE}\" desse slot?" - this_will_prevent_any_new_reservation_on_this_slot_but_wont_cancel_those_existing: "Isso impedirá qualquer nova reserva neste slot, mas não cancelará os existentes." - beware_this_cannot_be_reverted: "Cuidado: isso não pode ser revertido." - the_machine_was_successfully_removed_from_the_slot: "A máquina foi removida com sucesso desse slot." - deletion_failed: "Falha ao deletar." - DATE_slot: "{DATE} slot:" - what_kind_of_slot_do_you_want_to_create: "Qual tipo de slot você deseja criar?" - training: "Treinamento" - machine: "Máquina" - space: "Espaço" - next: "Próximo >" - previous: "< Voltar" - select_some_machines: "Selecionar algumas máquinas" - number_of_tickets: "Número de vagas: " - adjust_the_opening_hours: "Ajustar o horário de funcionamento" - to_time: "ás" # context: time. eg. "from 18:00 to 21:00" - restrict_this_slot_with_labels_optional: "Restrinja este slot com etiquetas (opcional)" - recurrence: "Recurrence" # translation_missing - enabled: "Enabled" # translation_missing - period: "Period" # translation_missing - week: "Week" # translation_missing - month: "Month" # translation_missing - number_of_periods: "Number of periods" # translation_missing - end_date: "End date" # translation_missing - summary: "Summary" # translation_missing - select_period: "Please select a period for the recurrence" # translation_missing - select_nb_period: "Please select a number of periods for the recurrence" # translation_missing - select_end_date: "Please select the date of the last occurrence" # translation_missing - about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}:" # translation_missing - reservable: "Reservable(s) :" # translation_missing - labels: "Etiqueta(s):" - none: "Nenhuma" - slot_successfully_deleted: "O slot {START} - {END} foi deletado com sucesso" - slots_deleted: "The slot of {START}, and {COUNT, plural, =1{one other} other{{COUNT} others}}}, have been deleted" # translation_missing - unable_to_delete_the_slot: "Não é possível deletar o slot {START} - {END}, provavelmente porque já foi reservado por um membro" - slots_not_deleted: "On {TOTAL} slots, {COUNT, plural, =1{one was not deleted} other{{COUNT} were not deleted}}. Some reservations may exist on {COUNT, plural, =1{it} other{them}}." # translation_missing - you_should_select_at_least_a_machine: "Você deveria selecionar a última máquina neste slot." - export_is_running_you_ll_be_notified_when_its_ready: "A Exportação está em andamento. Você será notificado quando terminar." - actions: "Ações" - block_reservations: "Impedir reservas" - do_you_really_want_to_block_this_slot: "Você realmente quer bloquear novas reservas neste slot? Isso se tornará invisível para os usuários." - locking_success: "Slot bloqueado com êxito, ela não aparecerá mais tempo no calendário do usuário" - locking_failed: "Um erro ocorreu. O bloqueio do slot falhou" - allow_reservations: "Permitir a reserva" - do_you_really_want_to_allow_reservations: "Você realmente quer permitir a reserva novamente neste slot? Será visível para os usuários." - unlocking_success: "Slot desbloqueado com sucesso, ele aparecerá novamente no calendário do usuário" - unlocking_failed: "Um erro ocorreu. O desbloqueio do slot falhou" - reservations_locked: "Reserva é bloqueado" - unlockable_because_reservations: "Não é possível bloquear a reserva neste slot porque existem algumas reservas não cancelados nele." - delete_slot: "Exclua o slot" - do_you_really_want_to_delete_this_slot: "Você realmente quer excluir esse slot?" - delete_recurring_slot: "You're about to delete a recurring slot. What do you want to do?"# translation_missing - delete_this_slot: "Only this slot" # translation_missing - delete_this_and_next: "This slot and the following" # translation_missing - delete_all: "All slots" # translation_missing - event_in_the_past: "Unable to create a slot in the past." # translation_missing - edit_event: "Edit the event" # translation_missing - view_reservations: "Ver reservas" # translation_missing - legend: "legenda" + calendar_management: "Gerenciamento do calendário" + trainings: "Treinamentos" + machines: "Máquinas" + spaces: "Espaços" + events: "Eventos" + availabilities: "Disponíveis" + availabilities_notice: "Exportar para Excel livro com todos os slots disponíveis para reserva, e suas ocupações." + ongoing_reservations: "Reservas em curso" + no_reservations: "Sem reservas" + confirmation_required: "Confirmação Obrigatória" + do_you_really_want_to_cancel_the_USER_s_reservation_the_DATE_at_TIME_concerning_RESERVATION: "Você realmente deseja cancelar a reserva do usuário {USER}, em {DATE} ás {TIME}, sobre {RESERVATION}?" + reservation_was_successfully_cancelled: "A reserva foi cancelada com sucesso" + reservation_cancellation_failed: "Reservation cancellation failed." + unable_to_remove_the_last_machine_of_the_slot_delete_the_slot_rather: "Não é possível remover a última máquina do slot. Delete o slot primeiramente." + do_you_really_want_to_remove_MACHINE_from_this_slot: "Você realmente deseja remover \"{MACHINE}\" desse slot?" + this_will_prevent_any_new_reservation_on_this_slot_but_wont_cancel_those_existing: "Isso impedirá qualquer nova reserva neste slot, mas não cancelará os existentes." + beware_this_cannot_be_reverted: "Cuidado: isso não pode ser revertido." + the_machine_was_successfully_removed_from_the_slot: "A máquina foi removida com sucesso desse slot." + deletion_failed: "Falha ao deletar." + DATE_slot: "{DATE} slot:" + what_kind_of_slot_do_you_want_to_create: "Qual tipo de slot você deseja criar?" + training: "Treinamento" + machine: "Máquina" + space: "Espaço" + next: "Próximo >" + previous: "< Voltar" + select_some_machines: "Selecionar algumas máquinas" + number_of_tickets: "Número de vagas: " + adjust_the_opening_hours: "Ajustar o horário de funcionamento" + to_time: "ás" # context: time. eg. "from 18:00 to 21:00" + restrict_this_slot_with_labels_optional: "Restrinja este slot com etiquetas (opcional)" + recurrence: "Recurrence" # translation_missing + enabled: "Enabled" # translation_missing + period: "Period" # translation_missing + week: "Week" # translation_missing + month: "Month" # translation_missing + number_of_periods: "Number of periods" # translation_missing + end_date: "End date" # translation_missing + summary: "Summary" # translation_missing + select_period: "Please select a period for the recurrence" # translation_missing + select_nb_period: "Please select a number of periods for the recurrence" # translation_missing + select_end_date: "Please select the date of the last occurrence" # translation_missing + about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}:" # translation_missing + reservable: "Reservable(s) :" # translation_missing + labels: "Etiqueta(s):" + none: "Nenhuma" + slot_successfully_deleted: "O slot {START} - {END} foi deletado com sucesso" + slots_deleted: "The slot of {START}, and {COUNT, plural, =1{one other} other{{COUNT} others}}}, have been deleted" # translation_missing + unable_to_delete_the_slot: "Não é possível deletar o slot {START} - {END}, provavelmente porque já foi reservado por um membro" + slots_not_deleted: "On {TOTAL} slots, {COUNT, plural, =1{one was not deleted} other{{COUNT} were not deleted}}. Some reservations may exist on {COUNT, plural, =1{it} other{them}}." # translation_missing + you_should_select_at_least_a_machine: "Você deveria selecionar a última máquina neste slot." + export_is_running_you_ll_be_notified_when_its_ready: "A Exportação está em andamento. Você será notificado quando terminar." + actions: "Ações" + block_reservations: "Impedir reservas" + do_you_really_want_to_block_this_slot: "Você realmente quer bloquear novas reservas neste slot? Isso se tornará invisível para os usuários." + locking_success: "Slot bloqueado com êxito, ela não aparecerá mais tempo no calendário do usuário" + locking_failed: "Um erro ocorreu. O bloqueio do slot falhou" + allow_reservations: "Permitir a reserva" + do_you_really_want_to_allow_reservations: "Você realmente quer permitir a reserva novamente neste slot? Será visível para os usuários." + unlocking_success: "Slot desbloqueado com sucesso, ele aparecerá novamente no calendário do usuário" + unlocking_failed: "Um erro ocorreu. O desbloqueio do slot falhou" + reservations_locked: "Reserva é bloqueado" + unlockable_because_reservations: "Não é possível bloquear a reserva neste slot porque existem algumas reservas não cancelados nele." + delete_slot: "Exclua o slot" + do_you_really_want_to_delete_this_slot: "Você realmente quer excluir esse slot?" + delete_recurring_slot: "You're about to delete a recurring slot. What do you want to do?"# translation_missing + delete_this_slot: "Only this slot" # translation_missing + delete_this_and_next: "This slot and the following" # translation_missing + delete_all: "All slots" # translation_missing + event_in_the_past: "Unable to create a slot in the past." # translation_missing + edit_event: "Edit the event" # translation_missing + view_reservations: "Ver reservas" # translation_missing + legend: "legenda" + and: "and" icalendar: - icalendar: - icalendar_import: "iCalendar import" # translation_missing - intro: "Fab-manager allows to automatically import calendar events, at RFC 5545 iCalendar format, from external URL. These URL are synchronized every nights and the events are shown in the public calendar." # translation_missing - new_import: "New ICS import" # translation_missing - color: "Colour" # translation_missing - text_color: "Text colour" # translation_missing - url: "URL" # translation_missing - name: "Name" # translation_missing - example: "Example" # translation_missing - display: "Display" # translation_missing - hide_text: "Hide the text" # translation_missing - hidden: "Hidden" # translation_missing - shown: "Shown" # translation_missing - create_error: "Unable to create iCalendar import. Please try again later" # translation_missing - delete_failed: "Unable to delete the iCalendar import. Please try again later" # translation_missing - refresh: "Updating..." # translation_missing - sync_failed: "Unable to synchronize the URL. Please try again later" # translation_missing - confirmation_required: "Confirmation required" # translation_missing - confirm_delete_import: "Do you really want to delete this iCalendar import?" # translation_missing - delete_success: "iCalendar import successfully deleted" # translation_missing + icalendar_import: "iCalendar import" # translation_missing + intro: "Fab-manager allows to automatically import calendar events, at RFC 5545 iCalendar format, from external URL. These URL are synchronized every nights and the events are shown in the public calendar." # translation_missing + new_import: "New ICS import" # translation_missing + color: "Colour" # translation_missing + text_color: "Text colour" # translation_missing + url: "URL" # translation_missing + name: "Name" # translation_missing + example: "Example" # translation_missing + display: "Display" # translation_missing + hide_text: "Hide the text" # translation_missing + hidden: "Hidden" # translation_missing + shown: "Shown" # translation_missing + create_error: "Unable to create iCalendar import. Please try again later" # translation_missing + delete_failed: "Unable to delete the iCalendar import. Please try again later" # translation_missing + refresh: "Updating..." # translation_missing + sync_failed: "Unable to synchronize the URL. Please try again later" # translation_missing + confirmation_required: "Confirmation required" # translation_missing + confirm_delete_import: "Do you really want to delete this iCalendar import?" # translation_missing + delete_success: "iCalendar import successfully deleted" # translation_missing project_elements: # management of the projects' components - project_elements: - projects_elements_management: "Gerenciar projetos e elementos" - add_a_material: "Adicionar um material" - add_a_new_theme: "Adicionar um novo tema" - licences: "Licenças" - add_a_new_licence: "Adicionar uma nova licença" - manage_abuses: "Gerenciar relatórios" + name: "Name" + projects_elements_management: "Gerenciar projetos e elementos" + materials: "Materials" + add_a_material: "Adicionar um material" + themes: "Themes" + add_a_new_theme: "Adicionar um novo tema" + licences: "Licenças" + description: "Description" + add_a_new_licence: "Adicionar uma nova licença" + manage_abuses: "Gerenciar relatórios" trainings: # track and monitor the trainings - training: "Treinamento" + trainings_monitoring: "Trainings monitoring" + trainings: "Treinamentos" add_a_new_training: "Adicionar um novo treinamento" + name: "Name" associated_machines: "Máquinas associadas" number_of_tickets: "Número de vagas" + select_a_training: "Select a training" + training: "Training" + date: "Date" year_NUMBER: "Ano {NUMBER}" month_of_NAME: "Mês de {NAME}" NUMBER_reservation: "{NUMBER} {NUMBER, plural, one{reserva} other{reservas}}" none: "Vazio" training_validation: "Validação de treinamentos" - training_of_the_ : "Treinamento de " # context: date. eg. "training of the september 1st 2012" + training_of_the_DATE_TIME_html : "Training of the {DATE} - {TIME}" you_can_validate_the_training_of_the_following_members: "Você pode validar um treinamento dos seguintes membros:" deleted_user: "Deleted user" # translation_missing no_reservation: "Sem reservas" @@ -141,7 +148,8 @@ pt: description_is_limited_to_255_characters: "A descrição é limitada em 255 caracteres." description_was_successfully_saved: "A descrição foi salva com sucesso." training_successfully_deleted: "O treinamento foi deletado com sucesso." - unable_to_delete_the_training_because_some_users_alredy_booked_it: "Não é possível deletar o treinamento, pois alguns membros já o reservaram." + unable_to_delete_the_training_because_some_users_already_booked_it: "Não é possível deletar o treinamento, pois alguns membros já o reservaram." + confirmation_required: "Confirmation required" do_you_really_want_to_delete_this_training: "Você realmente quer deletar este treinamento?" status_enabled: "Ativos" status_disabled: "Desabilitados" @@ -149,16 +157,16 @@ pt: trainings_new: # create a new training - trainings_new: - add_a_new_training: "Adicionar um novo treinamento" - beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Cuidado, ao criar um treinamento, seu preço de reserva é inicializado em zero." - dont_forget_to_change_them_before_creating_slots_for_this_training: "Não se esqueça de alterá-lo antes de criar slots para este treinamento." + add_a_new_training: "Adicionar um novo treinamento" + beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Cuidado, ao criar um treinamento, seu preço de reserva é inicializado em zero." + dont_forget_to_change_them_before_creating_slots_for_this_training: "Não se esqueça de alterá-lo antes de criar slots para este treinamento." events: # events tracking and management events_monitoring: "Monitoramento de eventos" manage_filters: "Gerenciar filtros" fablab_events: "Eventos do FabLab" + add_an_event: "Add an event" all_events: "Todos eventos" passed_events: "Eventos anteriores" events_to_come: "Eventos futuros" @@ -166,14 +174,21 @@ pt: on_DATE: "No {DATE}" from_DATE: "Em {DATE}" from_TIME: "Ás {TIME}" + to_date: "to" # context: date. eg: "from 01/01 to 01/05" + to_time: "to" # context: time. eg. "from 18:00 to 21:00" + title: "Title" + dates: "Dates" booking: "Reserva" sold_out: "Esgotado" cancelled: "Cancelado" free_entry: "Entrada gratuita" free_admission: "Admissão gratuita" view_reservations: "Ver reservas" + load_the_next_events: "Load the next events..." categories: "Categorias" add_a_category: "Adicionar categoria" + name: "Name" + themes: "Theme" add_a_theme: "Adicionar tema" age_ranges: "Faixa etária" add_a_range: "Adicionar faixa etária" @@ -203,6 +218,7 @@ pt: events_new: # add a new event + add_an_event: "Add an event" none: "Vazio" every_days: "Todos os dias" every_week: "Toda semana" @@ -216,7 +232,9 @@ pt: event_reservations: # event reservations list the_reservations: "Reservas :" + user: "User" payment_date: "Data de pagamento" + full_price_: "Full price:" reserved_tickets: "Vagas reservadas" show_the_event: "Mostrar evento" no_reservations_for_now: "Nenhuma reserva." @@ -225,84 +243,84 @@ pt: pricing: # subscriptions, prices, credits and coupons management - pricing: - pricing_management: "Gerenciamento de preços" - subscriptions: "Inscrições" - trainings: "Treinamentos" - list_of_the_subscription_plans: "Lista dos planos de assinatura" - beware_the_subscriptions_are_disabled_on_this_application: "Atenção, as assinaturas estão desativadas nesta aplicação." - you_can_create_some_but_they_wont_be_available_until_the_project_is_redeployed_by_the_server_manager: "Você pode criar alguns, mas eles não estarão disponíveis até que o projeto seja reimplantado pelo gerenciador de servidores." - for_safety_reasons_please_dont_create_subscriptions_if_you_dont_want_intend_to_use_them_later: "Por razões de segurança, não crie inscrições se não pretender utilizá-las posteriormente." - add_a_new_subscription_plan: "Adicionar novo plano de assinatura" - type: "Tipo" - partner: "Parceiro" - standard: "Padrão" - name: "Nome" - duration: "Duração" - group: "Grupo" - prominence: "Relevância" - price: "Preço" - machine_hours: "Machine slots" # translation_missing - these_prices_match_machine_hours_rates_: "Estes preços correspondem às {DURATION} minutos de trabalho" - _without_subscriptions: "sem assinaturas" - machines: "Máquinas" - credits: "Créditos" - subscription: "Inscrições" - related_trainings: "Treinamentos relacionados" - add_a_machine_credit: "Adicionar crédito de máquina" - machine: "Máquina" - hours: "Slots of {DURATION} minutes" # translation_missing - related_subscriptions: "Assinaturas relacionadas" - please_specify_a_number: "Por favor especifique um número." - none: "Vazio" # grammar note: concordance with "training". - an_error_occurred_while_saving_the_number_of_credits: "Um erro ocorreu enquanto era salvo o número de créditos." - an_error_occurred_while_deleting_credit_with_the_TRAINING: "Um erro ocorreu enquanto o crédito era deletado do {TRAINING}." - an_error_occurred_unable_to_find_the_credit_to_revoke: "Um erro ocorreu : incapaz de encontrar o crédito para revogar." - an_error_occurred_while_creating_credit_with_the_TRAINING: "Ocorreu um erro ao criar o crédito com o {TRAINING}." - not_set: "Not set" - error_a_credit_linking_this_machine_with_that_subscription_already_exists: "Erro : um link de crédito entre esta máquina e esta assinatura já existe." - changes_have_been_successfully_saved: "As modificações foram salvas com sucesso." - credit_was_successfully_saved: "Crédito salvo com sucesso." - error_creating_credit: "Não foi possível criar crédito, um erro ocorreu" - do_you_really_want_to_delete_this_subscription_plan: "Você realmente deletar esse plano de assinatura?" - subscription_plan_was_successfully_deleted: "Plano de assinatura foi deletado com sucesso." - unable_to_delete_the_specified_subscription_an_error_occurred: "Não é possível deletar a assinatura específicada, um erro ocorreu." - coupons: "Cupons" - list_of_the_coupons: "Lista de cupons" - discount: "Desconto" - nb_of_usages: "Número de usos" - status: "Status" - add_a_new_coupon: "Adicionar novo cupom" - display_more_coupons: "Display the next coupons" # translation_missing - disabled: "Desabilitado" - expired: "Expirado" - sold_out: "Esgotado" - active: "Ativo" - all: "Display all" # translation_missing - confirmation_required: "Confirmação obrigatória" - do_you_really_want_to_delete_this_coupon: "Você realmente deseja deletar este cupom?" - coupon_was_successfully_deleted: "O cupom foi deletado com sucesso." - unable_to_delete_the_specified_coupon_already_in_use: "Não é possível excluir o cupom especificado: ele já é usado com algumas faturas." - unable_to_delete_the_specified_coupon_an_unexpected_error_occurred: "Não é possível excluir o cupom especificado: ocorreu um erro inesperado." - send_a_coupon: "Enviar cupom" - coupon: "Cupom" - usages: "Usos" - coupon_successfully_sent_to_USER: "Cupon enviado com sucesso para {USER}" - an_error_occurred_unable_to_send_the_coupon: "Um erro inesperado impede o envio do cupom." - code: "Código" - enabled: "Ativo" - validity_per_user: "Válido por usuário" - once: "Apenas um" - forever: "Cada uso" - valid_until: "Válido até (incluindo)" - spaces: "Espaços" - these_prices_match_space_hours_rates_: "Estes preços correspondem às {DURATION} minutos de espaço" - add_a_space_credit: "Adicionar espaço de crédito" - space: "Espaço" - error_a_credit_linking_this_space_with_that_subscription_already_exists: "Erro: um crédito que vincula esse espaço com essa assinatura já existe." - status_enabled: "Ativos" - status_disabled: "Desabilitados" - status_all: "Todos" + pricing_management: "Gerenciamento de preços" + subscriptions: "Inscrições" + trainings: "Treinamentos" + list_of_the_subscription_plans: "Lista dos planos de assinatura" + beware_the_subscriptions_are_disabled_on_this_application: "Atenção, as assinaturas estão desativadas nesta aplicação." + you_can_create_some_but_they_wont_be_available_until_the_project_is_redeployed_by_the_server_manager: "Você pode criar alguns, mas eles não estarão disponíveis até que o projeto seja reimplantado pelo gerenciador de servidores." + for_safety_reasons_please_dont_create_subscriptions_if_you_dont_want_intend_to_use_them_later: "Por razões de segurança, não crie inscrições se não pretender utilizá-las posteriormente." + add_a_new_subscription_plan: "Adicionar novo plano de assinatura" + type: "Tipo" + partner: "Parceiro" + standard: "Padrão" + name: "Nome" + duration: "Duração" + group: "Grupo" + prominence: "Relevância" + price: "Preço" + machine_hours: "Machine slots" # translation_missing + these_prices_match_machine_hours_rates_: "Estes preços correspondem às {DURATION} minutos de trabalho" + _without_subscriptions: "sem assinaturas" + machines: "Máquinas" + credits: "Créditos" + subscription: "Inscrições" + related_trainings: "Treinamentos relacionados" + add_a_machine_credit: "Adicionar crédito de máquina" + machine: "Máquina" + hours: "Slots of {DURATION} minutes" # translation_missing + related_subscriptions: "Assinaturas relacionadas" + please_specify_a_number: "Por favor especifique um número." + none: "Vazio" # grammar note: concordance with "training". + an_error_occurred_while_saving_the_number_of_credits: "Um erro ocorreu enquanto era salvo o número de créditos." + an_error_occurred_while_deleting_credit_with_the_TRAINING: "Um erro ocorreu enquanto o crédito era deletado do {TRAINING}." + an_error_occurred_unable_to_find_the_credit_to_revoke: "Um erro ocorreu : incapaz de encontrar o crédito para revogar." + an_error_occurred_while_creating_credit_with_the_TRAINING: "Ocorreu um erro ao criar o crédito com o {TRAINING}." + not_set: "Not set" + error_a_credit_linking_this_machine_with_that_subscription_already_exists: "Erro : um link de crédito entre esta máquina e esta assinatura já existe." + changes_have_been_successfully_saved: "As modificações foram salvas com sucesso." + credit_was_successfully_saved: "Crédito salvo com sucesso." + error_creating_credit: "Não foi possível criar crédito, um erro ocorreu" + do_you_really_want_to_delete_this_subscription_plan: "Você realmente deletar esse plano de assinatura?" + subscription_plan_was_successfully_deleted: "Plano de assinatura foi deletado com sucesso." + unable_to_delete_the_specified_subscription_an_error_occurred: "Não é possível deletar a assinatura específicada, um erro ocorreu." + coupons: "Cupons" + list_of_the_coupons: "Lista de cupons" + discount: "Desconto" + nb_of_usages: "Número de usos" + status: "Status" + add_a_new_coupon: "Adicionar novo cupom" + display_more_coupons: "Display the next coupons" # translation_missing + disabled: "Desabilitado" + expired: "Expirado" + sold_out: "Esgotado" + active: "Ativo" + all: "Display all" # translation_missing + confirmation_required: "Confirmação obrigatória" + do_you_really_want_to_delete_this_coupon: "Você realmente deseja deletar este cupom?" + coupon_was_successfully_deleted: "O cupom foi deletado com sucesso." + unable_to_delete_the_specified_coupon_already_in_use: "Não é possível excluir o cupom especificado: ele já é usado com algumas faturas." + unable_to_delete_the_specified_coupon_an_unexpected_error_occurred: "Não é possível excluir o cupom especificado: ocorreu um erro inesperado." + send_a_coupon: "Enviar cupom" + coupon: "Cupom" + usages: "Usos" + unlimited: "Unlimited" + coupon_successfully_sent_to_USER: "Cupon enviado com sucesso para {USER}" + an_error_occurred_unable_to_send_the_coupon: "Um erro inesperado impede o envio do cupom." + code: "Código" + enabled: "Ativo" + validity_per_user: "Válido por usuário" + once: "Apenas um" + forever: "Cada uso" + valid_until: "Válido até (incluindo)" + spaces: "Espaços" + these_prices_match_space_hours_rates_: "Estes preços correspondem às {DURATION} minutos de espaço" + add_a_space_credit: "Adicionar espaço de crédito" + space: "Espaço" + error_a_credit_linking_this_space_with_that_subscription_already_exists: "Erro: um crédito que vincula esse espaço com essa assinatura já existe." + status_enabled: "Ativos" + status_disabled: "Desabilitados" + status_all: "Todos" coupons_new: # ajouter un code promotionnel @@ -311,265 +329,269 @@ pt: coupons_edit: # mettre à jour un code promotionnel + coupon: "Coupon:" unable_to_update_the_coupon_an_error_occurred: "Impossível atualizar cupom: um erro ocorreu." plans: new: # add a subscription plan on the platform - new_plan: - add_a_subscription_plan: "Adicionar plano de assinatura" - unable_to_create_the_subscription_please_try_again: "Não é possível criar plano de assinatura. por favor tente novamente." - successfully_created_subscriptions_dont_forget_to_redefine_prices: "Assinaturas criadas com sucesso. Não se esqueça de redefinir os preços." - unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Impossível salvar este usuário. Certifique-se que ele não possui o mesmo nome de outro usuário." + add_a_subscription_plan: "Adicionar plano de assinatura" + unable_to_create_the_subscription_please_try_again: "Não é possível criar plano de assinatura. por favor tente novamente." + successfully_created_subscriptions_dont_forget_to_redefine_prices: "Assinaturas criadas com sucesso. Não se esqueça de redefinir os preços." + unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Impossível salvar este usuário. Certifique-se que ele não possui o mesmo nome de outro usuário." edit: # edit a subscription plan / machine slot prices - edit_plan: - subscription_plan: "Plano de assinatura:" - prices: "Preços" - copy_prices_from: "Copiar preços de" - machines: "Máquinas" - machine: "Máquina" - hourly_rate: "Price by slot" # translation_missing - spaces: "Espaços" - space: "Espaço" - unable_to_save_subscription_changes_please_try_again: "Impossível salvar mudanças da assinatura. Por favor tente novamente." - subscription_successfully_changed: "Assinatura alterada com sucesso." + subscription_plan: "Plano de assinatura:" + prices: "Preços" + copy_prices_from: "Copiar preços de" + machines: "Máquinas" + machine: "Máquina" + hourly_rate: "Price by slot" # translation_missing + spaces: "Espaços" + space: "Espaço" + unable_to_save_subscription_changes_please_try_again: "Impossível salvar mudanças da assinatura. Por favor tente novamente." + subscription_successfully_changed: "Assinatura alterada com sucesso." invoices: - invoices: - # list of all invoices & invoicing parameters - invoices: "Faturas" - accounting_periods: "Accounting periods" # missing translation - invoices_list: "Lista de faturas" - filter_invoices: "Filtrar faturas" - invoice_num_: "Fatura #:" - customer_: "Cliente:" - date_: "Data:" - invoice_num: "Fatura #" - date: "Data" - price: "Preço" - customer: "Cliente" - download_the_invoice: "Baixar a fatura" - download_the_credit_note: "Baixar a nota de crédito" - credit_note: "Nota de crédito" - display_more_invoices: "Mostrar mais faturas..." - no_invoices_for_now: "Nenhuma fatura." - invoicing_settings: "Configurações do faturamento" - warning_invoices_disabled: "Warning : invoices are not enabled. No invoices will be generated by Fab-manager. Nevertheless, you must correctly fill the information below, especially VAT." # missing translation - change_logo: "Mudar o logo" - john_smith: "John Smith" - john_smith_at_example_com: "jean.smith@example.com" - invoice_reference_: "Referencia de fatura:" - code_: "Código:" - code_disabled: "Código desabilitado" - order_num: "Ordem #:" - invoice_issued_on_DATE_at_TIME: "Fatura emitida em {DATE} ás {TIME}" - object_reservation_of_john_smith_on_DATE_at_TIME: "Objeto: Reserva do John Smith em {DATE} ás {TIME}" - order_summary: "Sumário de ordem:" - details: "Detalhes" - amount: "Montante" - machine_booking-3D_printer: "Reserva de máquina - 3D printer" - total_amount: "Montante total" - total_including_all_taxes: "Total incluindo todas as taxas" - VAT_disabled: "IVA desativado" - VAT_enabled: "IVA activado" - including_VAT: "Incluindo IVA" - including_total_excluding_taxes: "Incluindo o total de taxas excluidas" - including_amount_payed_on_ordering: "Incluindo o valor pago na compra" - settlement_by_debit_card_on_DATE_at_TIME_for_an_amount_of_AMOUNT: "Pagamento por cartão de débito em {DATE} ás {TIME}, no valor de {AMOUNT}" - important_notes: "Notas importantes" - address_and_legal_information: "Endereço e informações legais" - invoice_reference: "Referencia de fatura" - year: "Ano" - month: "Mês" - day: "Dia" - num_of_invoice: "# da fatura" - online_sales: "Vendas online" - wallet: "Carteira" - refund: "Restituição" - model: "Modelo" - documentation: "Documentação" - 2_digits_year: "2 dígitos ano (ex 70)" - 4_digits_year: "4 dígitos ano (ex. 1970)" - month_number: "Número do mês (eg. 1)" - 2_digits_month_number: "2 digits month number (eg. 01)" - 3_characters_month_name: "3 characters month name (eg. JAN)" - day_in_the_month: "Day in the month (eg. 1)" - 2_digits_day_in_the_month: "2 digits in the month (eg. 01)" - n_digits_daily_count_of_invoices: "(n) digits, daily count of invoices (eg. ddd => 002 : 2nd invoice of the day)" - n_digits_monthly_count_of_invoices: "(n) digits, monthly count of invoices (eg. mmmm => 0012 : 12th invoice of the month)" - n_digits_annual_amount_of_invoices: "(n) digits, annual count of invoices (ex. yyyyyy => 000008 : 8th invoice of this year)" - beware_if_the_number_exceed_the_specified_length_it_will_be_truncated_by_the_left: "Beware: if the number exceed the specified length, it will be truncated by the left." - n_digits_count_of_orders: "(n) digits, count of invoices (eg. nnnn => 0327 : 327th order)" - n_digits_daily_count_of_orders: "(n) digits, daily count of orders (eg. ddd => 002 : 2nd order of the day)" - n_digits_monthly_count_of_orders: "(n) digits, monthly count of orders (eg. mmmm => 0012 : 12th order of the month)" - n_digits_annual_amount_of_orders: "(n) digits, annual count of orders (ex. yyyyyy => 000008 : 8th order of this year)" - add_a_notice_regarding_the_online_sales_only_if_the_invoice_is_concerned: "Add a notice regarding the online sales, only if the invoice is concerned." - this_will_never_be_added_when_a_refund_notice_is_present: "This will never be added when a refund notice is present." - eg_XVL_will_add_VL_to_the_invoices_settled_with_stripe: '(eg. X[/VL] will add "/VL" to the invoices settled with stripe)' - add_a_notice_regarding_refunds_only_if_the_invoice_is_concerned: "Add a notice regarding refunds, only if the invoice is concerned." - this_will_never_be_added_when_an_online_sales_notice_is_present: "This will never be added when an online sales notice is present." - eg_RA_will_add_A_to_the_refund_invoices: '(ed. R[/A] will add "/A" to the refund invoices)' - add_a_notice_regarding_the_wallet_only_if_the_invoice_is_concerned: "Add a notice regarding the wallet, only if the invoice is concerned." - eg_WPM_will_add_PM_to_the_invoices_settled_with_wallet: '(eg. W[/PM] will add "/PM" to the invoices settled with wallet)' - code: "Código" - enable_the_code: "Ativar código" - enabled: "Ativar" - disabled: "Desativar" - order_number: "Número de ordem" - elements: "Elementos" - VAT: "VAT" - enable_VAT: "Ativar VAT" - VAT_rate: "VAT taxa" - VAT_history: "VAT rates history" #translation_missing - changed_at: "Changed at" #translation_missing - changed_by: "By" #translation_missing - deleted_user: "Deleted user" #translation_missing - refund_invoice_successfully_created: "Restituição de fatura criada com sucesso." - create_a_refund_on_this_invoice: "Criar restituição de fatura" - creation_date_for_the_refund: "Criação de data de restituição" - creation_date_is_required: "Data de criação é obrigatório." - refund_mode: "Modo de restituição:" - do_you_want_to_disable_the_user_s_subscription: "Você deseja desativar a inscrição de usuários:" - elements_to_refund: "Elementos para restituição" - description: "Descrição" - description_optional: "Descrição (optional):" - will_appear_on_the_refund_invoice: "Aparecerá na fatura de reembolso." - none: "Vazio" # grammar note: concordance with "payment mean" - by_cash: "Em dinheiro" - by_cheque: "Em cheque" - by_transfer: "Por transferência" - by_wallet: "Pela carteira" - you_must_select_at_least_one_element_to_create_a_refund: "Você deve selecionar pelo menos um elemento, para criar um reembolso." - unable_to_create_the_refund: "Não foi possível criar reembolso" - invoice_reference_successfully_saved: "Referência de fatura salva com sucesso." - an_error_occurred_while_saving_invoice_reference: "Um erro ocorreu enquanto era salvo a fatura de referência." - invoicing_code_succesfully_saved: "Invoicing code successfully saved." - an_error_occurred_while_saving_the_invoicing_code: "An error occurred while saving the invoicing code." - code_successfully_activated: "Código ativado com sucesso." - code_successfully_disabled: "Código desativado com êxito." - an_error_occurred_while_activating_the_invoicing_code: "Ocorreu um erro ao ativar o código de faturamento." - order_number_successfully_saved: "Número de ordem salvo com sucesso." - an_error_occurred_while_saving_the_order_number: "Ocorreu um erro ao salvar o número da ordem." - VAT_rate_successfully_saved: "Taxa VAT salva com sucesso." - an_error_occurred_while_saving_the_VAT_rate: "Um erro ocorreu ao salvar a taxa VAT." - VAT_successfully_activated: "VAT ativado com sucesso." - VAT_successfully_disabled: "VAT desativada com sucesso." - an_error_occurred_while_activating_the_VAT: "Um erro ocorreu ao ativar VAT." - text_successfully_saved: "Texto salvo com sucesso." - an_error_occurred_while_saving_the_text: "Um erro ocorreu ao salvar texto." - address_and_legal_information_successfully_saved: "Endereço e informações legais salvos com sucesso." - an_error_occurred_while_saving_the_address_and_the_legal_information: "Um erro ocorreu ao salvar o endereço e informações legais." - logo_successfully_saved: "Logo salvo com sucesso." - an_error_occurred_while_saving_the_logo: "Um erro ocorreu ao salvar o logo." - online_payment: "Pagamento Online" - close_accounting_period: "Close an accounting period" # translation_missing - close_from_date: "Close from" # translation_missing - start_date_is_required: "Start date is required" # translation_missing - close_until_date: "Close until" # translation_missing - end_date_is_required: "End date is required" # translation_missing - previous_closings: "Previous closings" # translation_missing - start_date: "From" # translation_missing - end_date: "To" # translation_missing - closed_at: "Closed at" # translation_missing - closed_by: "By" # translation_missing - period_total: "Period total" # translation_missing - perpetual_total: "Perpetual total" # translation_missing - integrity: "Verificação de integridade" - confirmation_required: "Confirmation required" # translation_missing - confirm_close_START_END: "Do you really want to close the accounting period between {START} and {END}? Any subsequent changes will be impossible" # translation_missing - period_must_match_fiscal_year: "A closing must occur at the end of a minimum annual period, or per financial year when it is not calendar-based." # translation_missing - this_may_take_a_while: "This operation will take some time to complete." # translation_missing - period_START_END_closed_success: "The accounting period from {START} to {END} has been successfully closed. Archive generation is running, you'll be notified when it's done." # translation_missing - failed_to_close_period: "An error occurred, unable to close the accounting period" # translation_missing - no_periods: "No closings for now" # translation_missing - accounting_codes: "Accounting codes" # translation_missing - accounting_journal_code: "Journal code" # translation_missing - general_journal_code: "Journal code" # translation_missing - accounting_card_client_code: "Card clients code" # translation_missing - card_client_code: "Accounting code for clients who paid by card" # translation_missing - accounting_card_client_label: "Card clients label" # translation_missing - card_client_label: "Account label for clients who paid by card" # translation_missing - accounting_wallet_client_code: "Wallet clients code" # translation_missing - wallet_client_code: "Accounting code for clients who paid by virtual wallet" # translation_missing - accounting_wallet_client_label: "Wallet clients label" # translation_missing - wallet_client_label: "Account label for clients who paid by virtual wallet" # translation_missing - accounting_other_client_code: "Other payment client code" # translation_missing - other_client_code: "Accounting code for clients who paid using another payment means" # translation_missing - accounting_other_client_label: "Other payment client label" # translation_missing - other_client_label: "Accounting label for clients who paid using another payment means" # translation_missing - accounting_wallet_code: "Wallet code" # translation_missing - general_wallet_code: "Accounting code for wallet credit" # translation_missing - accounting_wallet_label: "Wallet label" # translation_missing - general_wallet_label: "Account label for wallet credit" # translation_missing - accounting_vat_code: "VAT code" # translation_missing - general_vat_code: "Accounting code for VAT" # translation_missing - accounting_vat_label: "VAT label" # translation_missing - general_vat_label: "VAT account label" # translation_missing - accounting_subscription_code: "Subscriptions code" # translation_missing - general_subscription_code: "Accounting code for all subscriptions" # translation_missing - accounting_subscription_label: "Subscriptions label" # translation_missing - general_subscription_label: "Account label for all subscriptions" # translation_missing - accounting_Machine_code: "Machines code" # translation_missing - general_machine_code: "Accounting code for all machines" # translation_missing - accounting_Machine_label: "Machine label" # translation_missing - general_machine_label: "Account label for all machines" # translation_missing - accounting_Training_code: "Trainings code" # translation_missing - general_training_code: "Accounting code for all trainings" # translation_missing - accounting_Training_label: "Trainings label" # translation_missing - general_training_label: "Account label for all trainings" # translation_missing - accounting_Event_code: "Events code" # translation_missing - general_event_code: "Accounting code for all events" # translation_missing - accounting_Event_label: "Events label" # translation_missing - general_event_label: "Account label for all events" # translation_missing - accounting_Space_code: "Space code" # translation_missing - general_space_code: "Accounting code for all spaces" # translation_missing - accounting_Space_label: "Spaces label" # translation_missing - general_space_label: "Account label for all spaces" # translation_missing - codes_customization_success: "Customization of accounting codes successfully saved." # translation_missing - export_accounting_data: "Export accounting data" # translation_missing - export_to: "Export to the accounting software" # translation_missing - export_is_running: "A Exportação está em andamento. Você será notificado quando terminar." - acd: "ACD" # translation_missing - export_form_date: "Export from" # translation_missing - export_to_date: "Export until" # translation_missing - format: "File format" # translation_missing - encoding: "Encoding" # translation_missing - separator: "Separator" # translation_missing - dateFormat: "Date format" # translation_missing - labelMaxLength: "Label maximum length" # translation_missing - decimalSeparator: "Decimal separator" # translation_missing - exportInvoicesAtZero: "Export invoices equal to 0" # translation_missing - columns: "Columns" # translation_missing - exportColumns: # translation_missing - journal_code: "Journal code" # translation_missing - date: "Entry date" # translation_missing - account_code: "Account code" # translation_missing - account_label: "Account label" # translation_missing - piece: "Document" # translation_missing - line_label: "Entry label" # translation_missing - debit_origin: "Origin debit" # translation_missing - credit_origin: "Origin credit" # translation_missing - debit_euro: "Euro debit" # translation_missing - credit_euro: "Euro credit" # translation_missing - lettering: "Lettering" # translation_missing + # list of all invoices & invoicing parameters + invoices: "Faturas" + accounting_periods: "Accounting periods" # missing translation + invoices_list: "Lista de faturas" + filter_invoices: "Filtrar faturas" + invoice_num_: "Fatura #:" + customer_: "Cliente:" + date_: "Data:" + invoice_num: "Fatura #" + date: "Data" + price: "Preço" + customer: "Cliente" + download_the_invoice: "Baixar a fatura" + download_the_credit_note: "Baixar a nota de crédito" + credit_note: "Nota de crédito" + display_more_invoices: "Mostrar mais faturas..." + no_invoices_for_now: "Nenhuma fatura." + invoicing_settings: "Configurações do faturamento" + warning_invoices_disabled: "Warning : invoices are not enabled. No invoices will be generated by Fab-manager. Nevertheless, you must correctly fill the information below, especially VAT." # missing translation + change_logo: "Mudar o logo" + john_smith: "John Smith" + john_smith_at_example_com: "jean.smith@example.com" + invoice_reference_: "Referencia de fatura:" + code_: "Código:" + code_disabled: "Código desabilitado" + order_num: "Ordem #:" + invoice_issued_on_DATE_at_TIME: "Fatura emitida em {DATE} ás {TIME}" + object_reservation_of_john_smith_on_DATE_at_TIME: "Objeto: Reserva do John Smith em {DATE} ás {TIME}" + order_summary: "Sumário de ordem:" + details: "Detalhes" + amount: "Montante" + machine_booking-3D_printer: "Reserva de máquina - 3D printer" + total_amount: "Montante total" + total_including_all_taxes: "Total incluindo todas as taxas" + VAT_disabled: "IVA desativado" + VAT_enabled: "IVA activado" + including_VAT: "Incluindo IVA" + including_total_excluding_taxes: "Incluindo o total de taxas excluidas" + including_amount_payed_on_ordering: "Incluindo o valor pago na compra" + settlement_by_debit_card_on_DATE_at_TIME_for_an_amount_of_AMOUNT: "Pagamento por cartão de débito em {DATE} ás {TIME}, no valor de {AMOUNT}" + important_notes: "Notas importantes" + address_and_legal_information: "Endereço e informações legais" + invoice_reference: "Referencia de fatura" + year: "Ano" + month: "Mês" + day: "Dia" + num_of_invoice: "# da fatura" + online_sales: "Vendas online" + wallet: "Carteira" + refund: "Restituição" + model: "Modelo" + documentation: "Documentação" + 2_digits_year: "2 dígitos ano (ex 70)" + 4_digits_year: "4 dígitos ano (ex. 1970)" + month_number: "Número do mês (eg. 1)" + 2_digits_month_number: "2 digits month number (eg. 01)" + 3_characters_month_name: "3 characters month name (eg. JAN)" + day_in_the_month: "Day in the month (eg. 1)" + 2_digits_day_in_the_month: "2 digits in the month (eg. 01)" + n_digits_daily_count_of_invoices: "(n) digits, daily count of invoices (eg. ddd => 002 : 2nd invoice of the day)" + n_digits_monthly_count_of_invoices: "(n) digits, monthly count of invoices (eg. mmmm => 0012 : 12th invoice of the month)" + n_digits_annual_amount_of_invoices: "(n) digits, annual count of invoices (ex. yyyyyy => 000008 : 8th invoice of this year)" + beware_if_the_number_exceed_the_specified_length_it_will_be_truncated_by_the_left: "Beware: if the number exceed the specified length, it will be truncated by the left." + n_digits_count_of_orders: "(n) digits, count of invoices (eg. nnnn => 0327 : 327th order)" + n_digits_daily_count_of_orders: "(n) digits, daily count of orders (eg. ddd => 002 : 2nd order of the day)" + n_digits_monthly_count_of_orders: "(n) digits, monthly count of orders (eg. mmmm => 0012 : 12th order of the month)" + n_digits_annual_amount_of_orders: "(n) digits, annual count of orders (ex. yyyyyy => 000008 : 8th order of this year)" + add_a_notice_regarding_the_online_sales_only_if_the_invoice_is_concerned: "Add a notice regarding the online sales, only if the invoice is concerned." + this_will_never_be_added_when_a_refund_notice_is_present: "This will never be added when a refund notice is present." + eg_XVL_will_add_VL_to_the_invoices_settled_with_stripe: '(eg. X[/VL] will add "/VL" to the invoices settled with stripe)' + add_a_notice_regarding_refunds_only_if_the_invoice_is_concerned: "Add a notice regarding refunds, only if the invoice is concerned." + this_will_never_be_added_when_an_online_sales_notice_is_present: "This will never be added when an online sales notice is present." + eg_RA_will_add_A_to_the_refund_invoices: '(ed. R[/A] will add "/A" to the refund invoices)' + add_a_notice_regarding_the_wallet_only_if_the_invoice_is_concerned: "Add a notice regarding the wallet, only if the invoice is concerned." + eg_WPM_will_add_PM_to_the_invoices_settled_with_wallet: '(eg. W[/PM] will add "/PM" to the invoices settled with wallet)' + code: "Código" + enable_the_code: "Ativar código" + enabled: "Ativar" + disabled: "Desativar" + order_number: "Número de ordem" + elements: "Elementos" + VAT: "VAT" + enable_VAT: "Ativar VAT" + VAT_rate: "VAT taxa" + VAT_history: "VAT rates history" #translation_missing + changed_at: "Changed at" #translation_missing + changed_by: "By" #translation_missing + deleted_user: "Deleted user" #translation_missing + refund_invoice_successfully_created: "Restituição de fatura criada com sucesso." + create_a_refund_on_this_invoice: "Criar restituição de fatura" + creation_date_for_the_refund: "Criação de data de restituição" + creation_date_is_required: "Data de criação é obrigatório." + refund_mode: "Modo de restituição:" + do_you_want_to_disable_the_user_s_subscription: "Você deseja desativar a inscrição de usuários:" + elements_to_refund: "Elementos para restituição" + description: "Descrição" + description_optional: "Descrição (optional):" + will_appear_on_the_refund_invoice: "Aparecerá na fatura de reembolso." + none: "Vazio" # grammar note: concordance with "payment mean" + by_cash: "Em dinheiro" + by_cheque: "Em cheque" + by_transfer: "Por transferência" + by_wallet: "Pela carteira" + you_must_select_at_least_one_element_to_create_a_refund: "Você deve selecionar pelo menos um elemento, para criar um reembolso." + unable_to_create_the_refund: "Não foi possível criar reembolso" + invoice_reference_successfully_saved: "Referência de fatura salva com sucesso." + an_error_occurred_while_saving_invoice_reference: "Um erro ocorreu enquanto era salvo a fatura de referência." + invoicing_code_succesfully_saved: "Invoicing code successfully saved." + an_error_occurred_while_saving_the_invoicing_code: "An error occurred while saving the invoicing code." + code_successfully_activated: "Código ativado com sucesso." + code_successfully_disabled: "Código desativado com êxito." + an_error_occurred_while_activating_the_invoicing_code: "Ocorreu um erro ao ativar o código de faturamento." + order_number_successfully_saved: "Número de ordem salvo com sucesso." + an_error_occurred_while_saving_the_order_number: "Ocorreu um erro ao salvar o número da ordem." + VAT_rate_successfully_saved: "Taxa VAT salva com sucesso." + an_error_occurred_while_saving_the_VAT_rate: "Um erro ocorreu ao salvar a taxa VAT." + VAT_successfully_activated: "VAT ativado com sucesso." + VAT_successfully_disabled: "VAT desativada com sucesso." + an_error_occurred_while_activating_the_VAT: "Um erro ocorreu ao ativar VAT." + text_successfully_saved: "Texto salvo com sucesso." + an_error_occurred_while_saving_the_text: "Um erro ocorreu ao salvar texto." + address_and_legal_information_successfully_saved: "Endereço e informações legais salvos com sucesso." + an_error_occurred_while_saving_the_address_and_the_legal_information: "Um erro ocorreu ao salvar o endereço e informações legais." + logo_successfully_saved: "Logo salvo com sucesso." + an_error_occurred_while_saving_the_logo: "Um erro ocorreu ao salvar o logo." + online_payment: "Pagamento Online" + close_accounting_period: "Close an accounting period" # translation_missing + close_from_date: "Close from" # translation_missing + start_date_is_required: "Start date is required" # translation_missing + close_until_date: "Close until" # translation_missing + end_date_is_required: "End date is required" # translation_missing + previous_closings: "Previous closings" # translation_missing + start_date: "From" # translation_missing + end_date: "To" # translation_missing + closed_at: "Closed at" # translation_missing + closed_by: "By" # translation_missing + period_total: "Period total" # translation_missing + perpetual_total: "Perpetual total" # translation_missing + integrity: "Verificação de integridade" + confirmation_required: "Confirmation required" # translation_missing + confirm_close_START_END: "Do you really want to close the accounting period between {START} and {END}? Any subsequent changes will be impossible" # translation_missing + period_must_match_fiscal_year: "A closing must occur at the end of a minimum annual period, or per financial year when it is not calendar-based." # translation_missing + this_may_take_a_while: "This operation will take some time to complete." # translation_missing + period_START_END_closed_success: "The accounting period from {START} to {END} has been successfully closed. Archive generation is running, you'll be notified when it's done." # translation_missing + failed_to_close_period: "An error occurred, unable to close the accounting period" # translation_missing + no_periods: "No closings for now" # translation_missing + accounting_codes: "Accounting codes" # translation_missing + accounting_journal_code: "Journal code" # translation_missing + general_journal_code: "Journal code" # translation_missing + accounting_card_client_code: "Card clients code" # translation_missing + card_client_code: "Accounting code for clients who paid by card" # translation_missing + accounting_card_client_label: "Card clients label" # translation_missing + card_client_label: "Account label for clients who paid by card" # translation_missing + accounting_wallet_client_code: "Wallet clients code" # translation_missing + wallet_client_code: "Accounting code for clients who paid by virtual wallet" # translation_missing + accounting_wallet_client_label: "Wallet clients label" # translation_missing + wallet_client_label: "Account label for clients who paid by virtual wallet" # translation_missing + accounting_other_client_code: "Other payment client code" # translation_missing + other_client_code: "Accounting code for clients who paid using another payment means" # translation_missing + accounting_other_client_label: "Other payment client label" # translation_missing + other_client_label: "Accounting label for clients who paid using another payment means" # translation_missing + accounting_wallet_code: "Wallet code" # translation_missing + general_wallet_code: "Accounting code for wallet credit" # translation_missing + accounting_wallet_label: "Wallet label" # translation_missing + general_wallet_label: "Account label for wallet credit" # translation_missing + accounting_vat_code: "VAT code" # translation_missing + general_vat_code: "Accounting code for VAT" # translation_missing + accounting_vat_label: "VAT label" # translation_missing + general_vat_label: "VAT account label" # translation_missing + accounting_subscription_code: "Subscriptions code" # translation_missing + general_subscription_code: "Accounting code for all subscriptions" # translation_missing + accounting_subscription_label: "Subscriptions label" # translation_missing + general_subscription_label: "Account label for all subscriptions" # translation_missing + accounting_Machine_code: "Machines code" # translation_missing + general_machine_code: "Accounting code for all machines" # translation_missing + accounting_Machine_label: "Machine label" # translation_missing + general_machine_label: "Account label for all machines" # translation_missing + accounting_Training_code: "Trainings code" # translation_missing + general_training_code: "Accounting code for all trainings" # translation_missing + accounting_Training_label: "Trainings label" # translation_missing + general_training_label: "Account label for all trainings" # translation_missing + accounting_Event_code: "Events code" # translation_missing + general_event_code: "Accounting code for all events" # translation_missing + accounting_Event_label: "Events label" # translation_missing + general_event_label: "Account label for all events" # translation_missing + accounting_Space_code: "Space code" # translation_missing + general_space_code: "Accounting code for all spaces" # translation_missing + accounting_Space_label: "Spaces label" # translation_missing + general_space_label: "Account label for all spaces" # translation_missing + codes_customization_success: "Customization of accounting codes successfully saved." # translation_missing + export_accounting_data: "Export accounting data" # translation_missing + export_to: "Export to the accounting software" # translation_missing + export_is_running: "A Exportação está em andamento. Você será notificado quando terminar." + acd: "ACD" # translation_missing + export_form_date: "Export from" # translation_missing + export_to_date: "Export until" # translation_missing + format: "File format" # translation_missing + encoding: "Encoding" # translation_missing + separator: "Separator" # translation_missing + dateFormat: "Date format" # translation_missing + labelMaxLength: "Label maximum length" # translation_missing + decimalSeparator: "Decimal separator" # translation_missing + exportInvoicesAtZero: "Export invoices equal to 0" # translation_missing + columns: "Columns" # translation_missing + exportColumns: # translation_missing + journal_code: "Journal code" # translation_missing + date: "Entry date" # translation_missing + account_code: "Account code" # translation_missing + account_label: "Account label" # translation_missing + piece: "Document" # translation_missing + line_label: "Entry label" # translation_missing + debit_origin: "Origin debit" # translation_missing + credit_origin: "Origin credit" # translation_missing + debit_euro: "Euro debit" # translation_missing + credit_euro: "Euro credit" # translation_missing + lettering: "Lettering" # translation_missing members: # management of users, labels, groups, and so on users_management: "Gerenciamento de usuários" members: "Membros" + subscriptions: "Subscriptions" search_for_an_user: "Buscar por usuário" add_a_new_member: "Adicionar novo membro" reservations: "Reservas" + surname: "Last name" + first_name: "First name" email: "Email" phone: "Telefone" user_type: "Tipo de usuário" + subscription: "Subscription" display_more_users: "Mostrar mais usuários..." administrators: "Administradores" search_for_an_administrator: "Buscar por administrador" add_a_new_administrator: "Adicionar novo administrador" groups: "Grupos" + tags: "Tags" authentication: "Autenticação" + confirmation_required: "Confirmation required" confirm_delete_member: "Você realmente deseja excluir este usuário? Isso não pode ser revertido." member_successfully_deleted: "Usuário excluído com sucesso." unable_to_delete_the_member: "Impossível excluir membro." @@ -578,26 +600,35 @@ pt: administrator_successfully_deleted: "Administrator excluído com sucesso." unable_to_delete_the_administrator: "Impossível excluir administrador." changes_successfully_saved: "Mudanças salvas com sucesso." - an_error_occurred_when_saving_the_new_group: "Um erro ocorreu ao salvar novo grupo." - add_a_tag: "Adicionar tag" - tag_name: "Nome da tag" - new_tag_successfully_saved: "Nova tag salva com sucesso." - an_error_occurred_while_saving_the_new_tag: "Um erro ocorreu ao salvar nova tag." - tag_successfully_deleted: "Tag excluída com sucesso." - an_error_occurred_and_the_tag_deletion_failed: "Um erro ocorreu ao excluir tag." - search_for_an_authentication_provider: "Procurar um provedor de autenticação" - add_a_new_authentication_provider: "Adicionar um novo provedor de autenticação" - strategy_name: "Nome da estratégia" - state: "Estado" - unknown: "Desconhecido: " - active: "Ativo" - pending: "Pendente" - previous_provider: "Fornecedor anterior" - do_you_really_want_to_delete_the_TYPE_authentication_provider_NAME: "Deseja realmente excluir o provedor de autenticação {TYPE}: {NAME}?" - authentication_provider_successfully_deleted: "Provedor de autenticação excluido com sucesso." - an_error_occurred_unable_to_delete_the_specified_provider: "Ocorreu um erro: não é possível excluir o provedor especificado." - local_database: "Database local" - o_auth2: "OAuth 2.0" + an_error_occurred_while_saving_changes: "An error occurred when saving changes." + export_is_running_you_ll_be_notified_when_its_ready: "Export is running. You'll be notified when it's ready." + tag_form: + tags: "Tags" + add_a_tag: "Adicionar tag" + tag_name: "Nome da tag" + new_tag_successfully_saved: "Nova tag salva com sucesso." + an_error_occurred_while_saving_the_new_tag: "Um erro ocorreu ao salvar nova tag." + confirmation_required: "Delete this tag?" + confirm_delete_tag_html: "Do you really want to delete this tag?
    Users and slots currently associated with this tag will be dissociated.
    Warning: This cannot be undone!" + tag_successfully_deleted: "Tag excluída com sucesso." + an_error_occurred_and_the_tag_deletion_failed: "Um erro ocorreu ao excluir tag." + authentication_form: + search_for_an_authentication_provider: "Procurar um provedor de autenticação" + add_a_new_authentication_provider: "Adicionar um novo provedor de autenticação" + name: "Name" + strategy_name: "Nome da estratégia" + type: "Type" + state: "Estado" + unknown: "Desconhecido: " + active: "Ativo" + pending: "Pendente" + previous_provider: "Fornecedor anterior" + confirmation_required: "Delete the provider?" + do_you_really_want_to_delete_the_TYPE_authentication_provider_NAME: "Deseja realmente excluir o provedor de autenticação {TYPE}: {NAME}?" + authentication_provider_successfully_deleted: "Provedor de autenticação excluido com sucesso." + an_error_occurred_unable_to_delete_the_specified_provider: "Ocorreu um erro: não é possível excluir o provedor especificado." + local_database: "Database local" + o_auth2: "OAuth 2.0" group_form: add_a_group: "Adicionar grupo" group_name: "Nome do grupo" @@ -618,52 +649,50 @@ pt: members_new: # add a member - members_new: - add_a_member: "Adicionar membro" - user_is_an_organization: "Usuário é uma organização" + add_a_member: "Adicionar membro" + user_is_an_organization: "Usuário é uma organização" members_import: # members bulk import - members_import: - import_members: "Import members" # translation_missing - info: "You can upload a CSV file to create new members or update existing ones. Your file must user the identifiers below to specify the group, the trainings and the tags of the members." # translation_missing - required_fields: "Your file must contain, at least, the following information for each user to create: email, name, first name and group. If the password is empty, it will be generated. On updates, the empty fields will be kept as is." # translation_missing - about_example: "Please refer to the provided example file to generate a correct CSV file. Be careful to use Unicode UTF-8 encoding." # translation_missing - groups: "Groups" # translation_missing - group_name: "Group name" # translation_missing - group_identifier: "Identifier to use" # translation_missing - trainings: "Trainings" # translation_missing - training_name: "Training name" # translation_missing - training_identifier: "Identifier to use" # translation_missing - plans: "Plans" # translation_missing - plan_name: "Plan name" # translation_missing - plan_identifier: "Identifier to use" # translation_missing - tags: "Tags" # translation_missing - tag_name: "Tag name" # translation_missing - tag_identifier: "Identifier to use" # translation_missing - download_example: "Download the exemple file" # translation_missing - select_file: "Choose a file" # translation_missing - import: "Import" # translation_missing - update_field: "Reference field for users to update" # translation_missing - update_on_id: "ID" # translation_missing - update_on_username: "Username" # translation_missing - update_on_email: "Email address" # translation_missing + import_members: "Import members" # translation_missing + info: "You can upload a CSV file to create new members or update existing ones. Your file must user the identifiers below to specify the group, the trainings and the tags of the members." # translation_missing + required_fields: "Your file must contain, at least, the following information for each user to create: email, name, first name and group. If the password is empty, it will be generated. On updates, the empty fields will be kept as is." # translation_missing + about_example: "Please refer to the provided example file to generate a correct CSV file. Be careful to use Unicode UTF-8 encoding." # translation_missing + groups: "Groups" # translation_missing + group_name: "Group name" # translation_missing + group_identifier: "Identifier to use" # translation_missing + trainings: "Trainings" # translation_missing + training_name: "Training name" # translation_missing + training_identifier: "Identifier to use" # translation_missing + plans: "Plans" # translation_missing + plan_name: "Plan name" # translation_missing + plan_identifier: "Identifier to use" # translation_missing + tags: "Tags" # translation_missing + tag_name: "Tag name" # translation_missing + tag_identifier: "Identifier to use" # translation_missing + download_example: "Download the exemple file" # translation_missing + select_file: "Choose a file" # translation_missing + import: "Import" # translation_missing + update_field: "Reference field for users to update" # translation_missing + update_on_id: "ID" # translation_missing + update_on_username: "Username" # translation_missing + update_on_email: "Email address" # translation_missing members_import_result: # import results - members_import_result: - import_results: "Import results" # translation_missing - import_details: "Import #{ID}, of {DATE}, initiated by {USER}" # translation_missing - results: "Results" # translation_missing - pending: "Pending..." # translation_missing - status_create: "Creating a new user" # translation_missing - status_update: "Updating user {ID}" # translation_missing - success: "Success" # translation_missing - failed: "Failed" # translation_missing - error_details: "Error's details:" # translation_missing + import_results: "Import results" # translation_missing + import_details: "Import #{ID}, of {DATE}, initiated by {USER}" # translation_missing + results: "Results" # translation_missing + pending: "Pending..." # translation_missing + status_create: "Creating a new user" # translation_missing + status_update: "Updating user {ID}" # translation_missing + success: "Success" # translation_missing + failed: "Failed" # translation_missing + error_details: "Error's details:" # translation_missing members_edit: # edit a member + subscription: "Subscription" duration: "Duração:" expires_at: "Experia em:" price_: "Preço:" @@ -671,6 +700,8 @@ pt: extend_subscription: "Estender inscrição" user_has_no_current_subscription: "O usuário não possui inscrição." subscribe_to_a_plan: "Plano de inscrição" + trainings: "Trainings" + no_trainings: "No trainings" next_trainings: "Próximos treinamentos" passed_trainings: "Treinamentos anteriores" validated_trainings: "Treinamentos validados" @@ -680,27 +711,47 @@ pt: NUMBER_full_price_tickets_reserved: "{NUMBER, plural, =0{} one{1 ticket com preço total reservado} other{{NUMBER} tickets com preço total reservados}}" NUMBER_NAME_tickets_reserved: "{NUMBER, plural, =0{} one{1 {NAME} ticket reservado} other{{NUMBER} {NAME} tickets reservados}}" passed_events: "Eventos anteriores" + no_passed_events: "No passed events" invoices: "Faturas" invoice_num: "Faturas #" + date: "Date" + price: "Price" + download_the_invoice: "Download the invoice" download_the_refund_invoice: "Baixar fatura de reembolso" + no_invoices_for_now: "No invoices for now." expiration_date: "Data de expiração" you_intentionally_decide_to_extend_the_user_s_subscription_by_offering_him_free_days: "Você intencionalmente decidir estender a inscrição do usuário, oferecendo-lhe dias livres." - you_intentionally_decide_to_extend_the_user_s_subscription_by_charging_him_again_for_his_current_subscription: "Você decide intencionalmente estender a assinatura do usuário cobrando-o novamente por sua assinatura atual." credits_will_remain_unchanged: "O saldo de créditos gratuitos (treinamento / máquinas / espaços) do usuário permanecerá inalterado." - until_expiration_date: "Até (data de expiração):" + you_intentionally_decide_to_extend_the_user_s_subscription_by_charging_him_again_for_his_current_subscription: "Você decide intencionalmente estender a assinatura do usuário cobrando-o novamente por sua assinatura atual." credits_will_be_reset: "O saldo de créditos gratuitos (treinamento / máquinas / espaços) do usuário será redefinido, os créditos não utilizados serão perdidos." + until_expiration_date: "Até (data de expiração):" you_successfully_changed_the_expiration_date_of_the_user_s_subscription: "Você alterou com êxito a data de expiração da assinatura do usuário" a_problem_occurred_while_saving_the_date: "Um erro ocorreu ao salvar a data." new_subscription: "Nova inscrição" you_are_about_to_purchase_a_subscription_to_NAME: "Você está prestes a comprar uma assinatura para {NAME}." subscription_successfully_purchased: "Assinatura adquirida com êxito." a_problem_occurred_while_taking_the_subscription: "Ocorreu um problema ao fazer a assinatura" + wallet: "Wallet" + to_credit: 'Credit' admins_new: # add a new administrator to the platform add_an_administrator: "Adicionar administrador" administrator_successfully_created_he_will_receive_his_connection_directives_by_email: "Administrator criado com sucesso. {GENDER, select, female{Ela} other{Ele}} receberá {GENDER, select, female{sua} other{seu}} diretivas de conexão por e-mail." failed_to_create_admin: "Não é possível criar administrador:" + man: "Man" + woman: "Woman" + pseudonym: "Pseudonym" + pseudonym_is_required: "Pseudonym is required." + first_name: "First name" + first_name_is_required: "First name is required." + surname: "Last name" + surname_is_required: "Last name is required." + email_address: "Email address" + email_is_required: "Email address is required." + birth_date: "Date of birth" + address: "Address" + phone_number: "Phone number" authentication_new: # add a new authentication provider (SSO) @@ -726,6 +777,7 @@ pt: statistics: # statistics tables + statistics: "Statistics" evolution: "Evolução" age_filter: "Filtro de idade" from_age: "Dos" # context: age. eg: from 8 to 40 years old @@ -738,6 +790,8 @@ pt: criterion: "Critério:" value: "Valor:" exclude: "Excluir" + from_date: "From" # context: date. eg: "from 01/01 to 01/05" + to_date: "to" # context: date. eg: "from 01/01 to 01/05" entries: "Entradas:" revenue_: "Receita:" average_age: "Idade média:" @@ -745,8 +799,11 @@ pt: total: "Total" available_hours: "Horas disponíveis para reserva:" available_tickets: "Vagas disponíveis para reserva:" + date: "Date" + user: "User" gender: "Gênero" age: "Ano" + type: "Type" revenue: "Receita" unknown: "Desconhecido" user_id: "ID do usuário" @@ -756,155 +813,166 @@ pt: export_the_current_search_results: "Exportar resultados encontrados" export: "Exportar" deleted_user: "Deleted user" # translation_missing + man: "Man" + woman: "Woman" + export_is_running_you_ll_be_notified_when_its_ready: "Export is running. You'll be notified when it's ready." stats_graphs: # statistics graphs + statistics: "Statistics" data: "Dado" day: "Dia" week: "Semana" + from_date: "From" # context: date. eg: "from 01/01 to 01/05" + to_date: "to" # context: date. eg: "from 01/01 to 01/05" + month: "Month" start: "Início:" end: "Fim:" + type: "Type" revenue: "Receita" top_list_of: "Topo da lista de" number: "Número" week_short: "Semana" week_of_START_to_END: "Semana de {START} á {END}" no_data_for_this_period: "Nenhum dado para este período" + date: "Date" settings: # global application parameters and customization - settings: - tittle: "Title" - customize_the_application: "Customizar a aplicação" - general: "Geral" - fablab_title: "Título do FabLab" - fablab_name: "Nome do FabLab" - title_concordance: "Tírulo concordância" - male: "Masculino." - female: "Feminino." - neutral: "Neutro." #TODO - eg: "ex:" - about: "Sobre" - male_preposition: "o" - female_preposition: "a" - neutral_preposition: "" - customize_information_messages: "Customizar mensagens" - message_of_the_machine_booking_page: "Mensagem na página de reserva de máquina:" - type_the_message_content: "Digite o conteúdo da mensagem" - warning_message_of_the_training_booking_page: "Mensagem de aviso da página de reserva de treinamento:" - information_message_of_the_training_reservation_page: "Mensagem de informação da página de reservas de treinamentos:" - message_of_the_subscriptions_page: "Mensagem da página de inscrições:" - message_of_the_events_page: "Mensagem da página de eventos:" - message_of_the_spaces_page: "Mensagem da página de espaços:" - legal_documents: "Documentos legais" - if_these_documents_are_not_filled_no_consent_about_them_will_be_asked_to_the_user: "Se estes documentos não forem preenchidos, não será solicitado consentimento." - general_terms_and_conditions: "Termos gerais e condições" - terms_of_service: "Termos de serviço" - customize_the_graphics: "Customização gráfica" - for_an_optimal_rendering_the_logo_image_must_be_at_the_PNG_format_with_a_transparent_background_and_with_an_aspect_ratio_3.5_times_wider_than_the_height: "Para uma renderização ideal, a imagem do logotipo deve estar no formato PNG com um fundo transparente e uma relação de aspecto 3,5 mais larga do que a altura." - concerning_the_favicon_it_must_be_at_ICO_format_with_a_size_of_16x16_pixels: "Em relação ao favicon, ele deve estar no formato ICO com um tamanho de 16x16 pixels." - remember_to_refresh_the_page_for_the_changes_to_take_effect: "Lembre-se de recarregar a página para que estas alterações tenham efeito." - logo_white_background: "Logo (fundo branco)" - change_the_logo: "Mudar logo" - logo_black_background: "Logo (fundo preto)" - favicon: "Favicon" - change_the_favicon: "Trocar favicon" - main_colour: "Cor principal:" - primary: "Primária" - secondary_colour: "Cor secundária:" - secondary: "Secundária" - background_picture_of_the_profile_banner: "Imagem de plano de fundo do perfil" - change_the_profile_banner: "Alterar a capa do perfil" - home_page: "Página inicial" - news_of_the_home_page: "Notícias da página inicial:" - type_your_news_here: "Escreva aqui suas notícias" - leave_it_empty_to_not_bring_up_any_news_on_the_home_page: "Deixe vazio para não abrir nenhuma notícia na home page" - twitter_stream: "Twitter Stream:" - name_of_the_twitter_account: "Nome da conta do Twitter" - title_of_the_about_page: "Título da página sobre" - shift_enter_to_force_carriage_return: "SHIFT + ENTER para forçar o retorno" - input_the_main_content: "Introduza o conteúdo principal" - drag_and_drop_to_insert_images: "Arrastar e soltar para inserir imagens" - input_the_fablab_contacts: "Insira os contatos do FabLab" - reservations: "Reservas" - reservations_parameters: "Parâmetros das reservas" - confine_the_booking_agenda: "Confine a agenda de reserva" - opening_time: "Horário de abertura" - closing_time: "Horário de fechamento" - max_visibility: "Visibilidade máxima (em meses)" - visibility_for_yearly_members: "Para inscrições atuais de pelo menos 1 ano" - visibility_for_other_members: "Para todos os outros membros" - ability_for_the_users_to_move_their_reservations: "Habilidade para os usuários mover suas reservas" - reservations_shifting: "Mudança de reservas" - prior_period_hours: "Período anterior (horas)" - enabled: "Ativado" - disabled: "Desativado" - ability_for_the_users_to_cancel_their_reservations: "Habilidade para os usuários cancelarem suas reservas" - reservations_cancelling: "Cancelamento de reservas" - reservations_reminders: "Lembretes de reservas" - notification_sending_before_the_reservation_occurs: "Notificação de lembrete da reserva" - customization_of_SETTING_successfully_saved: "Personalização do {SETTING} salvo com êxito." - file_successfully_updated: "Arquivo modificado com sucesso." - name_genre: "Título de concordância" - machine_explications_alert: "Mensagem explicativa na página de reserva da máquina" - training_explications_alert: "Mensagem de explicação na página de reservas de treinamento" - training_information_message: "Mensagem de informação na página de reserva da máquina" - subscription_explications_alert: "Mensagem de explicação na página de inscrição" - event_explications_alert: "mensagem de explicação do evento na página de reserva" - space_explications_alert: "mensagem de explicação na página de reserva de espaço" - main_color: "Cor principal" - secondary_color: "Cor secundária" - home_blogpost: "Resumo da página inicial" - twitter_name: "Nome do feed do Twitter" - about_title: "\"Sobre\" título da página" - about_body: "\"Sobre\" conteúdo da página" - about_contacts: "\"Sobre\" página de contatos" - privacy_draft: "privacy policy draft" # translation_missing - privacy_body: "privacy policy" # translation_missing - privacy_dpo: "data protection officer address" # translation_missing - booking_window_start: "Horário de abertura" - booking_window_end: "Horário de fechamento" - booking_move_enable: "Mover reserva habilitado" - booking_move_delay: "Atraso preventivo da mudança" - booking_cancel_enable: "Cancelamento de reserva permitindo" - booking_cancel_delay: "Atraso preventivo de cancelamento" - reminder_enable: "Recordar reserva ativo" - reminder_delay: "Atraso antes de enviar o lembrete" - default_value_is_24_hours: "Se o campo estiver vazio: 24 horas." - visibility_yearly: "visibilidade máxima para assinantes anuais" - visibility_others: "visibilidade máxima para outros membros" - confidentiality: "TODO" - display_machine_reservation_user_name: "TODO" - display_name: "TODO" - display_name_enable: "TODO" - machines_sort_by: "TODO" - elements_ordering: "TODO" - machines_order: "TODO" - display_machines_sorted_by: "TODO" - sort_by: - default: "TODO" - name: "Nome" - created_at: "TODO" - updated_at: "TODO" - privacy: - title: "Política de privacidade" - input_the_dpo: "Input the contact of the Data Protection Officer" # translation_missing - current_policy: "Current policy" # translation_missing - draft_from_USER_DATE: "Draft, saved by {USER}, on {DATE}" # translation_missing - save_or_publish: "Save or publish?" # translation_missing - save_or_publish_body: "Do you want to publish a new version of the privacy policy or save it as a draft?" # translation_missing - publish_will_notify: "Publish a new version will send a notification to every users." # translation_missing - publish: "Publish" # translation_missing - users_notified: "Platform users will be notified of the update." # translation_missing + title: "Title" + customize_the_application: "Customizar a aplicação" + general: "Geral" + fablab_title: "Título do FabLab" + fablab_name: "Nome do FabLab" + title_concordance: "Tírulo concordância" + male: "Masculino." + female: "Feminino." + neutral: "Neutro." #TODO + eg: "ex:" + about: "Sobre" + male_preposition: "o" + female_preposition: "a" + neutral_preposition: "" + customize_information_messages: "Customizar mensagens" + message_of_the_machine_booking_page: "Mensagem na página de reserva de máquina:" + type_the_message_content: "Digite o conteúdo da mensagem" + warning_message_of_the_training_booking_page: "Mensagem de aviso da página de reserva de treinamento:" + information_message_of_the_training_reservation_page: "Mensagem de informação da página de reservas de treinamentos:" + message_of_the_subscriptions_page: "Mensagem da página de inscrições:" + message_of_the_events_page: "Mensagem da página de eventos:" + message_of_the_spaces_page: "Mensagem da página de espaços:" + legal_documents: "Documentos legais" + if_these_documents_are_not_filled_no_consent_about_them_will_be_asked_to_the_user: "Se estes documentos não forem preenchidos, não será solicitado consentimento." + general_terms_and_conditions: "Termos gerais e condições" + terms_of_service: "Termos de serviço" + customize_the_graphics: "Customização gráfica" + for_an_optimal_rendering_the_logo_image_must_be_at_the_PNG_format_with_a_transparent_background_and_with_an_aspect_ratio_3.5_times_wider_than_the_height: "Para uma renderização ideal, a imagem do logotipo deve estar no formato PNG com um fundo transparente e uma relação de aspecto 3,5 mais larga do que a altura." + concerning_the_favicon_it_must_be_at_ICO_format_with_a_size_of_16x16_pixels: "Em relação ao favicon, ele deve estar no formato ICO com um tamanho de 16x16 pixels." + remember_to_refresh_the_page_for_the_changes_to_take_effect: "Lembre-se de recarregar a página para que estas alterações tenham efeito." + logo_white_background: "Logo (fundo branco)" + change_the_logo: "Mudar logo" + logo_black_background: "Logo (fundo preto)" + favicon: "Favicon" + change_the_favicon: "Trocar favicon" + main_colour: "Cor principal:" + primary: "Primária" + secondary_colour: "Cor secundária:" + secondary: "Secundária" + background_picture_of_the_profile_banner: "Imagem de plano de fundo do perfil" + change_the_profile_banner: "Alterar a capa do perfil" + home_page: "Página inicial" + news_of_the_home_page: "Notícias da página inicial:" + type_your_news_here: "Escreva aqui suas notícias" + leave_it_empty_to_not_bring_up_any_news_on_the_home_page: "Deixe vazio para não abrir nenhuma notícia na home page" + twitter_stream: "Twitter Stream:" + name_of_the_twitter_account: "Nome da conta do Twitter" + title_of_the_about_page: "Título da página sobre" + shift_enter_to_force_carriage_return: "SHIFT + ENTER para forçar o retorno" + input_the_main_content: "Introduza o conteúdo principal" + drag_and_drop_to_insert_images: "Arrastar e soltar para inserir imagens" + input_the_fablab_contacts: "Insira os contatos do FabLab" + reservations: "Reservas" + reservations_parameters: "Parâmetros das reservas" + confine_the_booking_agenda: "Confine a agenda de reserva" + opening_time: "Horário de abertura" + closing_time: "Horário de fechamento" + max_visibility: "Visibilidade máxima (em meses)" + visibility_for_yearly_members: "Para inscrições atuais de pelo menos 1 ano" + visibility_for_other_members: "Para todos os outros membros" + ability_for_the_users_to_move_their_reservations: "Habilidade para os usuários mover suas reservas" + reservations_shifting: "Mudança de reservas" + prior_period_hours: "Período anterior (horas)" + enabled: "Ativado" + disabled: "Desativado" + ability_for_the_users_to_cancel_their_reservations: "Habilidade para os usuários cancelarem suas reservas" + reservations_cancelling: "Cancelamento de reservas" + reservations_reminders: "Lembretes de reservas" + notification_sending_before_the_reservation_occurs: "Notificação de lembrete da reserva" + customization_of_SETTING_successfully_saved: "Personalização do {SETTING} salvo com êxito." + file_successfully_updated: "Arquivo modificado com sucesso." + name_genre: "Título de concordância" + machine_explications_alert: "Mensagem explicativa na página de reserva da máquina" + training_explications_alert: "Mensagem de explicação na página de reservas de treinamento" + training_information_message: "Mensagem de informação na página de reserva da máquina" + subscription_explications_alert: "Mensagem de explicação na página de inscrição" + event_explications_alert: "mensagem de explicação do evento na página de reserva" + space_explications_alert: "mensagem de explicação na página de reserva de espaço" + main_color: "Cor principal" + secondary_color: "Cor secundária" + home_blogpost: "Resumo da página inicial" + twitter_name: "Nome do feed do Twitter" + about_title: "\"Sobre\" título da página" + about_body: "\"Sobre\" conteúdo da página" + about_contacts: "\"Sobre\" página de contatos" + privacy_draft: "privacy policy draft" # translation_missing + privacy_body: "privacy policy" # translation_missing + privacy_dpo: "data protection officer address" # translation_missing + booking_window_start: "Horário de abertura" + booking_window_end: "Horário de fechamento" + booking_move_enable: "Mover reserva habilitado" + booking_move_delay: "Atraso preventivo da mudança" + booking_cancel_enable: "Cancelamento de reserva permitindo" + booking_cancel_delay: "Atraso preventivo de cancelamento" + reminder_enable: "Recordar reserva ativo" + reminder_delay: "Atraso antes de enviar o lembrete" + default_value_is_24_hours: "Se o campo estiver vazio: 24 horas." + visibility_yearly: "visibilidade máxima para assinantes anuais" + visibility_others: "visibilidade máxima para outros membros" + confidentiality: "TODO" + display_machine_reservation_user_name: "TODO" + display_name: "TODO" + display_name_enable: "TODO" + machines_sort_by: "TODO" + elements_ordering: "TODO" + machines_order: "TODO" + display_machines_sorted_by: "TODO" + sort_by: + default: "TODO" + name: "Nome" + created_at: "TODO" + updated_at: "TODO" + privacy: + title: "Política de privacidade" + input_the_dpo: "Input the contact of the Data Protection Officer" # translation_missing + current_policy: "Current policy" # translation_missing + draft_from_USER_DATE: "Draft, saved by {USER}, on {DATE}" # translation_missing + save_or_publish: "Save or publish?" # translation_missing + save_or_publish_body: "Do you want to publish a new version of the privacy policy or save it as a draft?" # translation_missing + publish_will_notify: "Publish a new version will send a notification to every users." # translation_missing + publish: "Publish" # translation_missing + users_notified: "Platform users will be notified of the update." # translation_missing open_api_clients: add_new_client: "Criar novo cliente de API" api_documentation: "Documentação da API" open_api_clients: "Cliente OpenAPI" + name: "Name" calls_count: "Contagem de chamadas" + token: "Token" created_at: "Data de criação" reset_token: "revogar acesso" client_name: "Nome do cliente" + confirmation_required: "Confirmation required" do_you_really_want_to_delete_this_open_api_client: "Deseja realmente excluir este cliente OpenAPI??" do_you_really_want_to_revoke_this_open_api_access: "Deseja mesmo revogar este acesso? Ele apagará e substituirá o token atual." client_successfully_created: "Cliente criado com sucesso." @@ -914,27 +982,24 @@ pt: space_new: # create a new space - space_new: - add_a_new_space: "Adicionar um novo espaço" - watch_out_when_creating_a_new_space_its_prices_are_initialized_at_0_for_all_subscriptions: "Cuidado! Ao criar um novo espaço, seus preços são inicializados em 0 para todas as assinaturas." - consider_changing_its_prices_before_creating_any_reservation_slot: "Considere alterar seus preços antes de criar qualquer slot de reserva." - add_this_space: "Adicionar este espaço" + add_a_new_space: "Adicionar um novo espaço" + watch_out_when_creating_a_new_space_its_prices_are_initialized_at_0_for_all_subscriptions: "Cuidado! Ao criar um novo espaço, seus preços são inicializados em 0 para todas as assinaturas." + consider_changing_its_prices_before_creating_any_reservation_slot: "Considere alterar seus preços antes de criar qualquer slot de reserva." + add_this_space: "Adicionar este espaço" space_edit: # modify an exiting space - space_edit: - edit_the_space_NAME: "Editar o espaço: {NAME}" - validate_the_changes: "Validar mudanças" + edit_the_space_NAME: "Editar o espaço: {NAME}" + validate_the_changes: "Validar mudanças" manage_abuses: # process and delete abuses reports - manage_abuses: - abuses_list: "Lista de relatórios" - no_reports: "Não há relatos de agora" - published_by: "published by" # translation_missing - at_date: "on" # translation_missing - has_reported: "made the following report:" # translation_missing - confirmation_required: "Confirm the processing of the report" # translation_missing - report_will_be_destroyed: "Once the report has been processed, it will be deleted. This can't be undone, continue?" # translation_missing - report_removed: "The report has been deleted" # translation_missing - failed_to_remove: "An error occurred, unable to delete the report" # translation_missing + abuses_list: "Lista de relatórios" + no_reports: "Não há relatos de agora" + published_by: "published by" # translation_missing + at_date: "on" # translation_missing + has_reported: "made the following report:" # translation_missing + confirmation_required: "Confirm the processing of the report" # translation_missing + report_will_be_destroyed: "Once the report has been processed, it will be deleted. This can't be undone, continue?" # translation_missing + report_removed: "The report has been deleted" # translation_missing + failed_to_remove: "An error occurred, unable to delete the report" # translation_missing diff --git a/config/locales/app.logged.pt.yml b/config/locales/app.logged.pt.yml index d763283a8..6ea5dec9a 100755 --- a/config/locales/app.logged.pt.yml +++ b/config/locales/app.logged.pt.yml @@ -1,12 +1,13 @@ pt: app: logged: - profileCompletion: + profile_completion: # user's profile completion page when logging from an SSO provider confirm_your_new_account: "Confirme sua nova conta" you_ve_just_created_a_new_account_on_the_fablab_by_logging_from: "Você acabou de criar uma nova conta como {GENDER, select, male{o} female{a} neutral{} other{do}} {NAME}" we_need_some_more_details: "Para finalizar a configuração da plataforma, precisamos de mais detalhes" your_email_is_already_used_by_another_account_on_the_platform: "Parece que seu endereço de e-mail já é usado por outro usuário. Verifique seu endereço de e-mail e insira abaixo o código enviado para você." + or: "or" please_fill_the_following_form: "Preencha o seguinte formulário" some_data_may_have_already_been_provided_by_provider_and_cannot_be_modified: "Alguns dados podem já ter sido fornecidos por {NAME} e não podem ser modificados" then_click_on_: "Em seguida, clique em" @@ -24,81 +25,107 @@ pt: an_unexpected_error_occurred_check_your_authentication_code: "Um erro inexperado ocorreu, por favor cheque seu código de autenticação." send_code_again: "Enviar código novamente" email_address_associated_with_your_account: "Email associado com sua conta" + email_is_required: "Email address is required" email_format_is_incorrect: "Formato de email incorreto" code_successfully_sent_again: "Código enviado novamente com sucesso" + used_for_statistics: "This data will be used for statistical purposes" + your_user_s_profile: "Your user's profile" + user_s_profile_is_required: "User's profile is required." + i_ve_read_and_i_accept_: "I've read and I accept" + _the_fablab_policy: "the FabLab policy" + change_my_data: "Change my data" + sync_my_profile: "Sync my profile" + once_your_data_are_up_to_date_: "Once your data are up to date," + _click_on_the_synchronization_button_opposite_: "click on the synchronization button opposite" + _disconnect_then_reconnect_: "disconnect then reconnect" + _for_your_changes_to_take_effect: "for your changes to take effect." dashboard: # dashboard: public profile profile: empty: '' settings: - edit_profile: - # dashboard: edit my profile - last_activity_on_: "Última atividade em" - i_want_to_change_group: "Eu quero trocar de grupo!" - your_subscription_expires_on_: "Sua inscrição expira em" - no_subscriptions: "Sem inscrições" - i_want_to_subscribe: "Eu quero me inscrever!" - to_come: "futuros" - approved: "aprovado" - projects: "Projetos" - no_projects: "Sem projetos" - labels: "Etiquetas" - no_labels: "Sem etiquetas" - cookies: "Cookies" - cookies_accepted: "Você aceitou cookies" - cookies_declined: "Você recusou cookies" - cookies_unset: "Você ainda não escolheu" - reset_cookies: "Mude minha escolha" - delete_my_account: "Deletar minha conta" - edit_my_profile: "Editar meu perfil" - your_group_has_been_successfully_changed: "Seu grupo foi modificado com sucesso." - an_unexpected_error_prevented_your_group_from_being_changed: "Um erro inesperado impediu o seu grupo de ser alterado." - confirm_delete_your_account: "Você realmente deseja deletar sua conta?" - all_data_will_be_lost: "All your data will be destroyed and won't be recoverable." # missing translation - invoicing_data_kept: "According to regulation, all data related to your invoices will be kept separately for 10 years." # missing translation - statistic_data_anonymized: "Some data (sex, date of birth, group) will be anonymized and kept for statistical purposes." # missing translation - no_further_access_to_projects: "Your published projects will be anonymized and you won't get any further ability to edit them." # missing translation - your_user_account_has_been_successfully_deleted_goodbye: "Sua conta de usuário foi excluída com êxito. Até mais." - an_error_occured_preventing_your_account_from_being_deleted: "Ocorreu um erro, impedindo que sua conta fosse excluída." - used_for_statistics: "This data will be used for statistical purposes" # translation missing - used_for_invoicing: "This data will be used for billing purposes" # translation missing - used_for_reservation: "This data will be used in case of change on one of your bookings" # translation missing - used_for_profile: "This data will only be displayed on your profile" # translation missing - used_for_pricing_stats: "This data will be used to determine the prices to which you are entitled, and for statistical purposes" # translation missing - public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing - trainings: "Treinamentos" - no_trainings: "Sem treinamentos" - subscription: "Assinatura" - group: "Grupo" - or: "ou" - confirm_changes: "Confirmar mudanças" - change_my_data: "Alterar meus dados" - sync_my_profile: "Sincronizar meu perfil" - once_your_data_are_up_to_date_: "Uma vez que seus dados estão atualizados," - _click_on_the_synchronization_button_opposite_: "clique no botão de sincronização" - _disconnect_then_reconnect_: "disconecte e se conecte novamente" - _for_your_changes_to_take_effect: "para que suas alterações tenham efeitos." + # dashboard: edit my profile + last_activity_on_: "Última atividade em" + i_want_to_change_group: "Eu quero trocar de grupo!" + your_subscription_expires_on_: "Sua inscrição expira em" + no_subscriptions: "Sem inscrições" + i_want_to_subscribe: "Eu quero me inscrever!" + to_come: "futuros" + approved: "aprovado" + projects: "Projetos" + no_projects: "Sem projetos" + labels: "Etiquetas" + no_labels: "Sem etiquetas" + cookies: "Cookies" + cookies_accepted: "Você aceitou cookies" + cookies_declined: "Você recusou cookies" + cookies_unset: "Você ainda não escolheu" + reset_cookies: "Mude minha escolha" + delete_my_account: "Deletar minha conta" + edit_my_profile: "Editar meu perfil" + your_group_has_been_successfully_changed: "Seu grupo foi modificado com sucesso." + an_unexpected_error_prevented_your_group_from_being_changed: "Um erro inesperado impediu o seu grupo de ser alterado." + confirmation_required: "Confirmation required" + confirm_delete_your_account: "Você realmente deseja deletar sua conta?" + all_data_will_be_lost: "All your data will be destroyed and won't be recoverable." # missing translation + invoicing_data_kept: "According to regulation, all data related to your invoices will be kept separately for 10 years." # missing translation + statistic_data_anonymized: "Some data (sex, date of birth, group) will be anonymized and kept for statistical purposes." # missing translation + no_further_access_to_projects: "Your published projects will be anonymized and you won't get any further ability to edit them." # missing translation + your_user_account_has_been_successfully_deleted_goodbye: "Sua conta de usuário foi excluída com êxito. Até mais." + an_error_occured_preventing_your_account_from_being_deleted: "Ocorreu um erro, impedindo que sua conta fosse excluída." + used_for_statistics: "This data will be used for statistical purposes" # translation missing + used_for_invoicing: "This data will be used for billing purposes" # translation missing + used_for_reservation: "This data will be used in case of change on one of your bookings" # translation missing + used_for_profile: "This data will only be displayed on your profile" # translation missing + used_for_pricing_stats: "This data will be used to determine the prices to which you are entitled, and for statistical purposes" # translation missing + public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing + trainings: "Treinamentos" + no_trainings: "Sem treinamentos" + subscription: "Assinatura" + group: "Grupo" + or: "ou" + confirm_changes: "Confirmar mudanças" + change_my_data: "Alterar meus dados" + sync_my_profile: "Sincronizar meu perfil" + once_your_data_are_up_to_date_: "Uma vez que seus dados estão atualizados," + _click_on_the_synchronization_button_opposite_: "clique no botão de sincronização" + _disconnect_then_reconnect_: "disconecte e se conecte novamente" + _for_your_changes_to_take_effect: "para que suas alterações tenham efeitos." projects: # dashboard: my projects you_dont_have_any_projects: "Você não tem nenhum projeto." + add_a_project: "Add a project" author: "Autor" collaborator: "Colaborador" + rough_draft: "Draft" + description: "Description" + machines_and_materials: "Machines and materials" + machines: "Machines" + materials: "Materials" + collaborators: "Collaborators" trainings: # dashboard: my trainings your_next_trainings: "Seus próximos treinamentos" your_previous_trainings: "Seus treinamentos anteriores" your_approved_trainings: "Seus treinamentos aprovados" + no_trainings: "No trainings" events: # dashboard: my events your_next_events: "Seus próximos eventos" no_events_to_come: "Sem eventos futuros" your_previous_events: "Seus eventos anteriores" + no_passed_events: "No passed events" NUMBER_normal_places_reserved: "{NUMBER} {NUMBER, plural, =0{} =1{lugar normal reservado} other{lugares normais reservados}}" NUMBER_of_NAME_places_reserved: "{NUMBER} {NUMBER, plural, =0{} =1{{NAME} lugar reservado} other{{NAME} lugares reservados}}" invoices: # dashboard: my invoices reference_number: "Número de referência" + date: "Date" + price: "Price" + download_the_invoice: "Download the invoice" + download_the_credit_note: "Download the refund invoice" + no_invoices_for_now: "No invoices for now." members_show: # public profil of a member @@ -110,16 +137,18 @@ pt: display_more_members: "Mostrar mais membros..." no_members_for_now: "Sem membros" avatar: "Avatar" + user: "User" + pseudonym: "Pseudonym" + email_address: "Email address" projects_new: # add a new project add_a_new_project: "Adicionar novo projeto" - save_button_value: "Salvar como rascunho" # "save as draft" projects_edit: # modify an existing project - save_button_value: "Salvar" # "save" edit_the_project: "Editar projeto" + rough_draft: "Draft" publish: "Publicar" machines_reserve: @@ -141,19 +170,21 @@ pt: planning_of: "Planejamento de" # followed by the training name (eg. "Planning of 3d printer training") all_trainings: "Todos treinamentos" cancel_my_selection: "Cancelar minha seleção" + i_change: "I change" + i_shift: "I shift" i_ve_reserved: "Eu reservei" space_reserve: # book a space - space_reserve: - planning_of_space_NAME: "Plano de {NAME} espaço" - i_ve_reserved: "Eu reservei" - i_shift: "Eu troco" - i_change: "Eu altero" + planning_of_space_NAME: "Plano de {NAME} espaço" + i_ve_reserved: "Eu reservei" + i_shift: "Eu troco" + i_change: "Eu altero" notifications: notifications_center: "Centro de notificações" mark_all_as_read: "Marcar todas como lidas" + date: "Date" notif_title: "Título" no_new_notifications: "Nenhuma nova notificação." archives: "Arquivos" diff --git a/config/locales/app.public.pt.yml b/config/locales/app.public.pt.yml index f89408171..19d91af4d 100755 --- a/config/locales/app.public.pt.yml +++ b/config/locales/app.public.pt.yml @@ -1,334 +1,362 @@ pt: - app: - public: - common: - # header and "about" page - about_the_fablab: "Sobre {GENDER, select, male{o} female{a} neutral{} other{do}} {NAME}" - return: "Voltar" + app: + public: + common: + # header and "about" page + about_the_fablab: "Sobre {GENDER, select, male{o} female{a} neutral{} other{do}} {NAME}" + return: "Voltar" - # cookies - cookies: - about_cookies: "Este site usa cookies para fins de medição de audiência." - learn_more: "Saber mais" - accept: "Aceitar cookies" - decline: "Recusar" + # cookies + cookies: + about_cookies: "Este site usa cookies para fins de medição de audiência." + learn_more: "Saber mais" + accept: "Aceitar cookies" + decline: "Recusar" - # dashboard sections - dashboard: "Dashboard" - my_profile: "Meu Perfil" - my_settings: "Minhas Configurações" - my_projects: "Meus Projetos" - my_trainings: "Meus Treinamentos" - my_events: "Meus Eventos" - my_invoices: "Minhas Contas" - my_wallet: "Minha Carteira" + # dashboard sections + dashboard: "Dashboard" + my_profile: "Meu Perfil" + my_settings: "Minhas Configurações" + my_projects: "Meus Projetos" + my_trainings: "Meus Treinamentos" + my_events: "Meus Eventos" + my_invoices: "Minhas Contas" + my_wallet: "Minha Carteira" - # login/logout - sign_out: "Sair" - sign_up: "Cadastrar" - sign_in: "Entrar" + # login/logout + sign_out: "Sair" + sign_up: "Cadastrar" + sign_in: "Entrar" - # left menu - notifications: "Nofificações" - admin: "Admin" - reduce_panel: "Reduzir painel" + # left menu + notifications: "Nofificações" + admin: "Admin" + reduce_panel: "Reduzir painel" - # left menu (public) - home: "Início" - reserve_a_machine: "Reservar Máquina" - trainings_registrations: "Registro de treinamentos" - events_registrations: "Registro de Eventos" - reserve_a_space: "Reserva de espaço" - projects_gallery: "Galeria de Projetos" - subscriptions: "Assinaturas" - public_calendar: "Calendário" + # left menu (public) + home: "Início" + reserve_a_machine: "Reservar Máquina" + trainings_registrations: "Registro de treinamentos" + events_registrations: "Registro de Eventos" + reserve_a_space: "Reserva de espaço" + projects_gallery: "Galeria de Projetos" + subscriptions: "Assinaturas" + public_calendar: "Calendário" - # left menu (admin) - trainings_monitoring: "Treinamentos" - select_a_training: "Selecionar treinamento" - manage_the_calendar: "Gerenciar calendário" - manage_the_users: "Gerenciar usuários" - manage_the_invoices: "Gerenciar contas" - subscriptions_and_prices: "Assinaturas e Preços" - manage_the_events: "Gerenciar eventos" - manage_the_machines: "Gerenciar Máquinas" - manage_the_spaces: "Gerenciar espaços" - manage_the_projects_elements: "Gerenciar Elementos de Projeto" - statistics: "Estatísticas" - customization: "Customizações" - open_api_clients: "OpenAPI clients" + # left menu (admin) + trainings_monitoring: "Treinamentos" + manage_the_calendar: "Gerenciar calendário" + manage_the_users: "Gerenciar usuários" + manage_the_invoices: "Gerenciar contas" + subscriptions_and_prices: "Assinaturas e Preços" + manage_the_events: "Gerenciar eventos" + manage_the_machines: "Gerenciar Máquinas" + manage_the_spaces: "Gerenciar espaços" + manage_the_projects_elements: "Gerenciar Elementos de Projeto" + statistics: "Estatísticas" + customization: "Customizações" + open_api_clients: "OpenAPI clients" - # account creation modal - create_your_account: "Criar sua conta" - man: "Masculino" - woman: "Feminino" - gender_is_required: "Gênero é obrigatório." - your_first_name: "Seu primeiro nome" - first_name_is_required: "Primeiro nome é obrigatório." - your_surname: "Seu sobrenome" - surname_is_required: "Sobrenome é obrigatório." - your_pseudonym: "Seu apelido" - pseudonym_is_required: "Apelido é obrigatório." - your_email_address: "Seu e-mail" - email_is_required: "E-mail é obrigatório." - your_password: "Sua senha" - password_is_required: "Senha é obrigatório." - password_is_too_short: "Senha muito curta (mínimo 8 caracteres)" - type_your_password_again: "Digite sua senha novamente" - password_confirmation_is_required: "Confirmação de senha é obrigatório." - password_does_not_match_with_confirmation: "A senha não é igual ao da confirmação." - i_am_an_organization: "Eu sou uma organização" - name_of_your_organization: "Nome da sua organização" - organization_name_is_required: "Nome da organização é obrigatório." - address_of_your_organization: "Endereço da sua organização" - organization_address_is_required: "Endereço da organização é obrigatório." - your_user_s_profile: "Seu perfil de usuário" - user_s_profile_is_required: "Seu perfil de usuário é obrigatório." - birth_date: "Data de nascimento" - birth_date_is_required: "Data de nascimento é obrigatório." - phone_number: "Número de telefone" - phone_number_is_required: "Número de telefone é obrigatório." - i_authorize_Fablab_users_registered_on_the_site_to_contact_me: "Eu autorizo usuários do FabLab, registrados no site, a entrarem em contato comigo" - i_accept_to_receive_information_from_the_fablab: "Eu aceito receber informações do FabLab" - i_ve_read_and_i_accept_: "Eu li e aceito" - _the_fablab_policy: "a política do FabLab" - field_required: "Field required" # translation missing - unexpected_error_occurred: "An unexpected error occurred. Please try again later." # translation missing - used_for_statistics: "This data will be used for statistical purposes" # translation missing - used_for_invoicing: "This data will be used for billing purposes" # translation missing - used_for_reservation: "This data will be used in case of change on one of your bookings" # translation missing - used_for_profile: "This data will only be displayed on your profile" # translation missing - public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing + # account creation modal + create_your_account: "Criar sua conta" + man: "Masculino" + woman: "Feminino" + gender_is_required: "Gênero é obrigatório." + your_first_name: "Seu primeiro nome" + first_name_is_required: "Primeiro nome é obrigatório." + your_surname: "Seu sobrenome" + surname_is_required: "Sobrenome é obrigatório." + your_pseudonym: "Seu apelido" + pseudonym_is_required: "Apelido é obrigatório." + your_email_address: "Seu e-mail" + email_is_required: "E-mail é obrigatório." + your_password: "Sua senha" + password_is_required: "Senha é obrigatório." + password_is_too_short: "Senha muito curta (mínimo 8 caracteres)" + type_your_password_again: "Digite sua senha novamente" + password_confirmation_is_required: "Confirmação de senha é obrigatório." + password_does_not_match_with_confirmation: "A senha não é igual ao da confirmação." + i_am_an_organization: "Eu sou uma organização" + name_of_your_organization: "Nome da sua organização" + organization_name_is_required: "Nome da organização é obrigatório." + address_of_your_organization: "Endereço da sua organização" + organization_address_is_required: "Endereço da organização é obrigatório." + your_user_s_profile: "Seu perfil de usuário" + user_s_profile_is_required: "Seu perfil de usuário é obrigatório." + birth_date: "Data de nascimento" + birth_date_is_required: "Data de nascimento é obrigatório." + phone_number: "Número de telefone" + phone_number_is_required: "Número de telefone é obrigatório." + i_authorize_Fablab_users_registered_on_the_site_to_contact_me: "Eu autorizo usuários do FabLab, registrados no site, a entrarem em contato comigo" + i_accept_to_receive_information_from_the_fablab: "Eu aceito receber informações do FabLab" + i_ve_read_and_i_accept_: "Eu li e aceito" + _the_fablab_policy: "a política do FabLab" + field_required: "Field required" # translation missing + unexpected_error_occurred: "An unexpected error occurred. Please try again later." # translation missing + used_for_statistics: "This data will be used for statistical purposes" # translation missing + used_for_invoicing: "This data will be used for billing purposes" # translation missing + used_for_reservation: "This data will be used in case of change on one of your bookings" # translation missing + used_for_profile: "This data will only be displayed on your profile" # translation missing + public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing - # password modification modal - change_your_password: "Mudar sua senha" - your_new_password: "Sua nova senha" - your_password_was_successfully_changed: "Sua senha foi mudada com sucesso." + # password modification modal + change_your_password: "Mudar sua senha" + your_new_password: "Sua nova senha" + your_password_was_successfully_changed: "Sua senha foi mudada com sucesso." - # connection modal - connection: "Login" - password_forgotten: "Esqueceu sua senha?" - not_registered_to_the_fablab: "Ainda não registrado no Fablab?" - create_an_account: "Criar conta" - wrong_email_or_password: "E-mail ou senha incorretos." - caps_lock_is_on: "A tecla Caps Lock está ativada." + # connection modal + connection: "Login" + password_forgotten: "Esqueceu sua senha?" + not_registered_to_the_fablab: "Ainda não registrado no Fablab?" + create_an_account: "Criar conta" + wrong_email_or_password: "E-mail ou senha incorretos." + caps_lock_is_on: "A tecla Caps Lock está ativada." - # forgotten password modal - your_email_address_is_unknown: "Seu e-mail não está cadastrado." - you_will_receive_in_a_moment_an_email_with_instructions_to_reset_your_password: "Você irá receber um e-mail com as instruções para resetar sua senha." + # forgotten password modal + your_email_address_is_unknown: "Seu e-mail não está cadastrado." + you_will_receive_in_a_moment_an_email_with_instructions_to_reset_your_password: "Você irá receber um e-mail com as instruções para resetar sua senha." - # Fab-manager's version - version: "Versão:" + # Fab-manager's version + version: "Versão:" - # Notifications - and_NUMBER_other_notifications: "and {NUMBER, plural, =0{no other notifications} =1{one other notification} other{{NUMBER} other notifications}}..." + # Notifications + and_NUMBER_other_notifications: "and {NUMBER, plural, =0{no other notifications} =1{one other notification} other{{NUMBER} other notifications}}..." - about: - # about page - about: - read_the_fablab_policy: "Ler a política do FabLab" - read_the_fablab_s_general_terms_and_conditions: "Ler os termos e condições do FabLab" - your_fablab_s_contacts: "Nossos contatos" - privacy_policy: "Política de privacidade" + about: + # about page + read_the_fablab_policy: "Ler a política do FabLab" + read_the_fablab_s_general_terms_and_conditions: "Ler os termos e condições do FabLab" + your_fablab_s_contacts: "Nossos contatos" + privacy_policy: "Política de privacidade" - privacy: - # 'privacy policy' page - privacy: - title: "Política de privacidade" - dpo: "Oficial de proteção de dados" - last_update: "Última atualização," + privacy: + # 'privacy policy' page + title: "Política de privacidade" + dpo: "Oficial de proteção de dados" + last_update: "Última atualização," - home: - # home page - latest_documented_projects: "Últimos projetos documentados" - follow_us: "Siga nos" - latest_tweets: "Os últimos tweets" - latest_registered_members: "Últimos membros registrados" - create_an_account: "Criar uma conta" - discover_members: "Ver membros" + home: + # home page + latest_documented_projects: "Últimos projetos documentados" + follow_us: "Siga nos" + latest_tweets: "Os últimos tweets" + latest_registered_members: "Últimos membros registrados" + create_an_account: "Criar uma conta" + discover_members: "Ver membros" - # 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}" - on_the_date: "Em {DATE}" - from_time_to_time: "Das {START} até {END}" - free_entry: "Entrada franca" - free_admission: "Admissão grátis" - full_price: "Valor inteira" - event_full: "Evento lotado" - still_available: "Locais disponíveis" + # 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}" + on_the_date: "Em {DATE}" + from_time_to_time: "Das {START} até {END}" + free_entry: "Entrada franca" + free_admission: "Admissão grátis" + full_price: "Valor inteira" + event_full: "Evento lotado" + still_available: "Locais disponíveis" - projects_list: - # projects gallery - projects_list: - the_fablab_projects: "Projetos do Fab Lab" - add_a_project: "Adicionar projeto" - search_over_the_whole_network: "Pesquisar em todos os FabLabs" - tooltip_openlab_projects_switch: "A busca em todos os FabLabs busca projetos em todos os FabLabs que usam o Fab-manager !" - openlab_search_not_available_at_the_moment: "A busca em toda a rede de FabLabs não está disponível no momento. Você pode procurar por projetos nesta plataforma." - project_search_result_is_empty: "Desculpe, nós não achamos nenhum resultado para sua pesquisa." - reset_all_filters: "Resetar todos os filtros" - search: "Procurar" - all_projects: "Todos os projetos" - my_projects: "Meus Projetos" - projects_to_whom_i_take_part_in: "Projetos que eu participo" - all_machines: "Todas as máquinas" - all_themes: "Todos temas" - all_materials: "Todos os materiais" - load_next_projects: "Carregar próximos projetos" - rough_draft: "Rascunho" + projects_list: + # projects gallery + the_fablab_projects: "Projetos do Fab Lab" + add_a_project: "Adicionar projeto" + search_over_the_whole_network: "Pesquisar em todos os FabLabs" + tooltip_openlab_projects_switch: "A busca em todos os FabLabs busca projetos em todos os FabLabs que usam o Fab-manager !" + openlab_search_not_available_at_the_moment: "A busca em toda a rede de FabLabs não está disponível no momento. Você pode procurar por projetos nesta plataforma." + project_search_result_is_empty: "Desculpe, nós não achamos nenhum resultado para sua pesquisa." + reset_all_filters: "Resetar todos os filtros" + search: "Procurar" + all_projects: "Todos os projetos" + my_projects: "Meus Projetos" + projects_to_whom_i_take_part_in: "Projetos que eu participo" + all_machines: "Todas as máquinas" + all_themes: "Todos temas" + all_materials: "Todos os materiais" + load_next_projects: "Carregar próximos projetos" + rough_draft: "Rascunho" - projects_show: - # details of a projet - project_description: "Descrição do projeto" - by_name: "Por {NAME}" - deleted_user: "Deleted user" #translation_missing - posted_on_: "Criado em" - CAD_file_to_download: "{COUNT, plural, =0{No CAD files} =1{CAD file to download} other{CAD files to download}}" - licence: "Licença" - report_an_abuse: "Denunciar" - unauthorized_operation: "Operação não autorizada" - your_report_was_successful_thanks: "Sua denúncia foi enviada com sucesso. Obrigado." - an_error_occured_while_sending_your_report: "Um erro ocorreu ao enviar sua denúncia." - your_first_name: "Seu primeiro nome" - your_first_name_is_required: "Seu primeiro nome é requerido." - your_surname: "Seu sobrenome" - your_surname_is_required: "Seu sobrenome é obrigatório." - your_email_address: "Seu e-mail" - your_email_address_is_required: "Seu e-mail é obrigatório." - tell_us_why_this_looks_abusive: "Nos diga porque esse projeto é abusivo" - message_is_required: "Menssagem é obrigatório." - report: "Enviar" - do_you_really_want_to_delete_this_project: "Você quer realmente deletar esse projeto?" + projects_show: + # details of a projet + rough_draft: "Draft" + project_description: "Descrição do projeto" + by_name: "Por {NAME}" + step_N: "Step {INDEX}" + share_on_facebook: "Share on Facebook" + share_on_twitter: "Share on Twitter" + deleted_user: "Deleted user" #translation_missing + posted_on_: "Criado em" + CAD_file_to_download: "{COUNT, plural, =0{No CAD files} =1{CAD file to download} other{CAD files to download}}" + machines_and_materials: "Machines and materials" + collaborators: "Collaborators" + licence: "Licença" + confirmation_required: "Confirmation required" + report_an_abuse: "Denunciar" + unauthorized_operation: "Operação não autorizada" + your_report_was_successful_thanks: "Sua denúncia foi enviada com sucesso. Obrigado." + an_error_occured_while_sending_your_report: "Um erro ocorreu ao enviar sua denúncia." + your_first_name: "Seu primeiro nome" + your_first_name_is_required: "Seu primeiro nome é requerido." + your_surname: "Seu sobrenome" + your_surname_is_required: "Seu sobrenome é obrigatório." + your_email_address: "Seu e-mail" + your_email_address_is_required: "Seu e-mail é obrigatório." + tell_us_why_this_looks_abusive: "Nos diga porque esse projeto é abusivo" + message_is_required: "Menssagem é obrigatório." + report: "Enviar" + do_you_really_want_to_delete_this_project: "Você quer realmente deletar esse projeto?" - machines_list: - # list of machines - machines_list: - the_fablab_s_machines: "Lista de máquinas no FabLab" - add_a_machine: "Adicionar uma máquina" - book: "Reservar" - _or_the_: " ou o " - status_enabled: "Ativo" - status_disabled: "Desabilitado" - status_all: "Todos" + machines_list: + # list of machines + the_fablab_s_machines: "Lista de máquinas no FabLab" + add_a_machine: "Adicionar uma máquina" + book: "Reservar" + _or_the_: " ou o " + status_enabled: "Ativo" + status_disabled: "Desabilitado" + status_all: "Todos" - machines_show: - # details of a machine - book_this_machine: "Reservar essa máquina" - files_to_download: "Arquivos para download" - projects_using_the_machine: "Projetos usando esta máquina" - _or_the_: " ou o " - do_you_really_want_to_delete_this_machine: "Você realmente quer deletar essa máquina?" - unauthorized_operation: "Operação não autorizada" - the_machine_cant_be_deleted_because_it_is_already_reserved_by_some_users: "Esta máquina não pode ser deletada, pois já está em reservada por alguns usuários." + machines_show: + # details of a machine + book_this_machine: "Reservar essa máquina" + technical_specifications: "Technical specifications" + files_to_download: "Arquivos para download" + projects_using_the_machine: "Projetos usando esta máquina" + _or_the_: " ou o " + confirmation_required: "Confirmation required" + do_you_really_want_to_delete_this_machine: "Você realmente quer deletar essa máquina?" + unauthorized_operation: "Operação não autorizada" + the_machine_cant_be_deleted_because_it_is_already_reserved_by_some_users: "Esta máquina não pode ser deletada, pois já está em reservada por alguns usuários." - trainings_list: - # list of trainings - the_trainings: "Os treinamentos" + trainings_list: + # list of trainings + book: "Book" + the_trainings: "Os treinamentos" - training_show: - # details of a training - book_this_training: "Reservar este treinamento" - do_you_really_want_to_delete_this_training: "Você realmente quer deletar esse treinamento?" - unauthorized_operation: "Operação não autorizada" - the_training_cant_be_deleted_because_it_is_already_reserved_by_some_users: "O treinamento não pode ser deletado pois já foi reservado por alguns usuários." + training_show: + # details of a training + book_this_training: "Reservar este treinamento" + do_you_really_want_to_delete_this_training: "Você realmente quer deletar esse treinamento?" + unauthorized_operation: "Operação não autorizada" + confirmation_required: "Confirmation required" + the_training_cant_be_deleted_because_it_is_already_reserved_by_some_users: "O treinamento não pode ser deletado pois já foi reservado por alguns usuários." - plans: - # summary of the subscriptions - subcriptions: "Assinaturas" - i_choose_that_plan: "Eu escolho esse plano" - i_subscribe_online: "Me inscrever online" - i_already_subscribed: "Eu já estou inscrito" - more_information: "Mais informação" - your_subscription_expires_on_the_DATE: "Sua inscrição expira em {DATE}" - my_group: "Meu grupo" - his_group: "{GENDER, select, male{Ele} female{Ela} other{Esses}} grupo" - he_wants_to_change_group: "{ROLE, select, admin{O usuário quer} other{Eu quero}} trocar de grupo" - change_my_group: "Mudar {ROLE, select, admin{{GENDER, select, male{dele} female{dela} other{esses}}} other{meu}} grupo" - your_subscription_has_expired_on_the_DATE: "Sua inscrição expirou em {DATE}" - you_ve_just_payed_the_: "Você acabou de pagar o" - thank_you_your_subscription_is_successful: "Obrigado. Sua inscrição foi feita com sucesso!" - your_group_was_successfully_changed: "Seu grupo foi alterado com sucesso." - the_user_s_group_was_successfully_changed: "O grupo de usuários foi alterado com sucesso." - an_error_prevented_your_group_from_being_changed: "Um erro impediu que seu grupo fosse alterado." - an_error_prevented_to_change_the_user_s_group: "Um erro impediu que o grupo de usuários fosse alterado com sucesso." - an_error_occured_during_the_payment_process_please_try_again_later: "Um erro ocorreu durante o processo de pagamento. Por favor tente novamente mais tarde." - subscription_confirmation: "Inscrição confirmada" - here_is_the_NAME_subscription_summary: "Aqui é o sumário de inscrição do {NAME}:" + plans: + # summary of the subscriptions + subcriptions: "Assinaturas" + i_choose_that_plan: "Eu escolho esse plano" + i_subscribe_online: "Me inscrever online" + i_already_subscribed: "Eu já estou inscrito" + more_information: "Mais informação" + your_subscription_expires_on_the_DATE: "Sua inscrição expira em {DATE}" + my_group: "Meu grupo" + his_group: "{GENDER, select, male{Ele} female{Ela} other{Esses}} grupo" + he_wants_to_change_group: "{ROLE, select, admin{O usuário quer} other{Eu quero}} trocar de grupo" + change_my_group: "Mudar {ROLE, select, admin{{GENDER, select, male{dele} female{dela} other{esses}}} other{meu}} grupo" + summary: "Summary" + your_subscription_has_expired_on_the_DATE: "Sua inscrição expirou em {DATE}" + subscription_price: "Subscription price" + you_ve_just_selected_a_subscription_html: "You've just selected a subscription:" + confirm_and_pay: "Valider et payer" + you_ve_just_payed_the_subscription_html: "Você acabou de pagar o inscrição:" + thank_you_your_subscription_is_successful: "Obrigado. Sua inscrição foi feita com sucesso!" + your_invoice_will_be_available_soon_from_your_dashboard: "Your invoice will be available soon from your dashboard" + your_group_was_successfully_changed: "Seu grupo foi alterado com sucesso." + the_user_s_group_was_successfully_changed: "O grupo de usuários foi alterado com sucesso." + an_error_prevented_your_group_from_being_changed: "Um erro impediu que seu grupo fosse alterado." + an_error_prevented_to_change_the_user_s_group: "Um erro impediu que o grupo de usuários fosse alterado com sucesso." + an_error_occured_during_the_payment_process_please_try_again_later: "Um erro ocorreu durante o processo de pagamento. Por favor tente novamente mais tarde." + subscription_confirmation: "Inscrição confirmada" + here_is_the_NAME_subscription_summary: "Aqui é o sumário de inscrição do {NAME}:" + confirm_payment_of_html: "{ROLE, select, admin{Cash} other{Pay}}: {AMOUNT}" # (contexte : validate a payment of $20,00) + online_payment_disabled: "Payment by credit card is not available. Please contact the Fablab's reception directly." - events_list: - # Fablab's events list - the_fablab_s_events: "Eventos do Fablab" - all_categories: "Todas categorias" - for_all: "Para todos" - sold_out: "Esgotado." - cancelled: "Cancelado" - free_admission: "Admissão grátis" - still_available: "lugares disponíveis" - free_entry: "Entrada franca" + events_list: + # Fablab's events list + the_fablab_s_events: "Eventos do Fablab" + all_categories: "Todas categorias" + for_all: "Para todos" + sold_out: "Esgotado." + cancelled: "Cancelado" + free_admission: "Admissão grátis" + still_available: "lugares disponíveis" + free_entry: "Entrada franca" + add_an_event: "Add an event" + load_the_next_events: "Load the next events..." + full_price_: "Full price:" + to_date: "to" # context: date. eg: "from 01/01 to 01/05" - events_show: - # details and booking of an event - event_description: "Descrição do evento" - downloadable_documents: "Documentos para download" - information_and_booking: "Informações e reservas" - beginning: "Início:" - ending: "Término:" - opening_hours: "Abre ás:" - tickets_still_availables: "Tickets ainda disponíveis:" - sold_out: "Esgotado." - free_entry: "Entrada franca" - cancelled: "Cancelado" - ticket: "{NUMBER, plural, one{ticket} other{tickets}}" - 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" - you_booked_DATE: "Sua reserva ({DATE}):" - canceled_reservation_SEATS: "Reservation canceled ({SEATS} seats)" #translation_missing - book: "Reservar" - change_the_reservation: "Alterar reserva" - you_can_shift_this_reservation_on_the_following_slots: "Você pode alterar essa reserva nos campos a seguir:" - confirmation_required: "Confirmação obrigatória" - do_you_really_want_to_delete_this_event: "Vocêrealmente deseja remover este evento?" - event_successfully_deleted: "Evento excluído com sucesso" - unable_to_delete_the_event_because_some_users_alredy_booked_it: "Não foi possível excluir este evento, já pode ter sido reservado por alguns usuários." - cancel_the_reservation: "Cancel the reservation" #translation_missing - do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." #translation_missing - cancellation_failed: "Cancellation failed." #translation_missin - event_is_over: "The event is over" #translation_missing - thanks_for_coming: "Thanks for coming!" #translation_missing - view_event_list: "View events to come" #translation_missing + events_show: + # details and booking of an event + event_description: "Descrição do evento" + downloadable_documents: "Documentos para download" + information_and_booking: "Informações e reservas" + dates: "Dates" + beginning: "Início:" + ending: "Término:" + opening_hours: "Abre ás:" + all_day: "All day" + from_time: "From" # context: time. eg. "from 18:00 to 21:00" + to_time: "to" # context: time. eg. "from 18:00 to 21:00" + full_price_: "Full price:" + tickets_still_availables: "Tickets ainda disponíveis:" + sold_out: "Esgotado." + free_entry: "Entrada franca" + cancelled: "Cancelado" + ticket: "{NUMBER, plural, one{ticket} other{tickets}}" + make_a_gift_of_this_reservation: "Doe esta reserva" + thank_you_your_payment_has_been_successfully_registered: "Tank you. Your payment has been successfully registered!" + you_can_find_your_reservation_s_details_on_your_: "Você pode encontrar detalhes da sua reserva em seu" + dashboard: "dashboard" + you_booked_DATE: "Sua reserva ({DATE}):" + canceled_reservation_SEATS: "Reservation canceled ({SEATS} seats)" #translation_missing + book: "Reservar" + confirm_and_pay: "Confirm and pay" + confirm_payment_of_html: "{ROLE, select, admin{Cash} other{Pay}}: {AMOUNT}" # (contexte : validate a payment of $20,00) + online_payment_disabled: "Payment by credit card is not available. Please contact the Fablab's reception directly." + please_select_a_member_first: "Please select a member first" + change_the_reservation: "Alterar reserva" + you_can_shift_this_reservation_on_the_following_slots: "Você pode alterar essa reserva nos campos a seguir:" + confirmation_required: "Confirmação obrigatória" + do_you_really_want_to_delete_this_event: "Vocêrealmente deseja remover este evento?" + event_successfully_deleted: "Evento excluído com sucesso" + unable_to_delete_the_event_because_some_users_alredy_booked_it: "Não foi possível excluir este evento, já pode ter sido reservado por alguns usuários." + cancel_the_reservation: "Cancel the reservation" #translation_missing + do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." #translation_missing + reservation_was_successfully_cancelled: "Reservation was successfully cancelled" + cancellation_failed: "Cancellation failed." #translation_missin + event_is_over: "The event is over" #translation_missing + thanks_for_coming: "Thanks for coming!" #translation_missing + view_event_list: "View events to come" #translation_missing + share_on_facebook: "Share on Facebook" + share_on_twitter: "Share on Twitter" - calendar: - # public calendar - calendar: - calendar: "Calendário" - show_unavailables: "Mostrar slots não disponíveis" - filter_calendar: "Filtrar calendário" - trainings: "Treinamentos" - machines: "Máquinas" - spaces: "Espaços" - events: "Eventos" - externals: "Outras agendas" + calendar: + # public calendar + calendar: "Calendário" + show_unavailables: "Mostrar slots não disponíveis" + filter_calendar: "Filtrar calendário" + trainings: "Treinamentos" + machines: "Máquinas" + spaces: "Espaços" + events: "Eventos" + externals: "Outras agendas" - spaces_list: - # list of spaces - spaces_list: - the_spaces: "Os espaços" - add_a_space: "Adicionar espaço" - status_enabled: "Ativo" - status_disabled: "Desabilitado" - status_all: "Todos" - book: "Reservar" + spaces_list: + # list of spaces + the_spaces: "Os espaços" + add_a_space: "Adicionar espaço" + status_enabled: "Ativo" + status_disabled: "Desabilitado" + status_all: "Todos" + book: "Reservar" - space_show: - # display the details of a space - space_show: - book_this_space: "Marcar este espaço" - unauthorized_operation: "Operação não autorizada" - confirmation_required: "Confirmação obrigatória" - do_you_really_want_to_delete_this_space: "Você realmente deseja remover este espaço?" - 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" + space_show: + # display the details of a space + book_this_space: "Marcar este espaço" + unauthorized_operation: "Operação não autorizada" + confirmation_required: "Confirmação obrigatória" + do_you_really_want_to_delete_this_space: "Você realmente deseja remover este espaço?" + 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" diff --git a/config/locales/app.shared.pt.yml b/config/locales/app.shared.pt.yml index 9e64cd7c7..7c51aeeb5 100755 --- a/config/locales/app.shared.pt.yml +++ b/config/locales/app.shared.pt.yml @@ -19,102 +19,28 @@ pt: "no": "Não" apply: "Aplicar" - elements: - # various translations used many times in the application - group: "Grupo" - subscription: "Assinaturas" - trainings: "Treinamentos" - no_trainings: "Sem treinamentos" - confirmation_required: "Confirmação obrigatória" - description: "Descrição" - machines: "Máquinas" - events: "Eventos" - materials: "Materiais" - date: "Data" - price: "Preço" - download_the_invoice: "Baixar a fatura" - download_the_credit_note: "Baixar a nota de crédito" - no_invoices_for_now: "Nenhuma fatura." - email_address: "Email" - user: "Usuário" - pseudonym: "Apelido" - all_day: "Dia todo" - reservation_was_successfully_cancelled: "Reserva cancelada com sucesso." - title: "Título" - total_: "TOTAL :" - full_price_: "Valor inteira:" - rough_draft: "Rascunho" - machines_and_materials: "Máquinas e materiais" - collaborators: "Colaboradores" - summary: "Sumário" - you_ve_just_selected_a_: "Você selecionou apenas o" # you_ve_just_selected_a_ + _subscription - _subscription: "inscrição" - confirm_and_pay: "Confirmar e pagar" - your_invoice_will_be_available_soon_from_your_: "Sua fatura estará disponível em breve" - add_an_event: "Adicionar um evento" - load_the_next_events: "Carregar próximos eventos..." - no_passed_events: "Sem eventos" - dates: "Datas:" - thank_you_your_payment_has_been_successfully_registered: "Obrigado. Seu pagamento foi registrado com sucesso !" - surname: "Sobrenome" - first_name: "Primeiro nome" - address: "Endereço" - interests: "Interesses" - CAD_softwares_mastered: "CAD Softwares mastered" - name: "Nome" - step_N: "Passo {INDEX}" - themes: "Temas" - tags: "Tags" - technical_specifications: "Especificações técnicas" - online_payment: "Pagamento Online" - type: "Tipo" - partner: "Parceiro" - standard: "Padrão" - year: "Ano" - month: "Mês" - subscription_price: "Preço da assinatura" - model: "Modelo" - from_date: "De" # context: date. eg: "from 01/01 to 01/05" - from_time: "De" # context: time. eg. "from 18:00 to 21:00" - to_date: "até" # context: date. eg: "from 01/01 to 01/05" - to_time: "até" # context: time. eg. "from 18:00 to 21:00" - or: "ou" - and: "e" - change_my_data: "Alterar meus dados" - sync_my_profile: "Sincronizar meu perfil" - once_your_data_are_up_to_date_: "Uma vez que seus dados estão atualizados," - _click_on_the_synchronization_button_opposite_: "clique no botão de sincronização" - _disconnect_then_reconnect_: "disconecte e se conecte novamente" - _for_your_changes_to_take_effect: "para que suas alterações tenham efeitos." - add_a_project: "Adicionar projeto" - illustration: "Ilustração" - add_an_illustration: "Adicionar ilustração." - book: "Agendar" - description_is_required: "Descrição é obrigatório." - name_is_required: "Nome é obrigatório." - all_themes: "Todos temas" - filter: 'Filtro' - confirm_payment_of_html: "{ROLE, select, admin{Pagamento pelo site} other{Pagamento}}: {AMOUNT}" # (context: confirm my payment of $20.00) - export_is_running_you_ll_be_notified_when_its_ready: "Exportação em andamento. Você será notificado quando terminar." - share_on_facebook: "Compartilhar no Facebook" - share_on_twitter: "Compartilhar no Twitter" - incomplete_profile: "Perfil incompleto" - unlimited: "Ilimitado" - payment_card_error: "A problem occurred with your payment card:" # translation_missing - online_payment_disabled: "El pago en línea no está disponible. Póngase en contacto directamente con la recepción de Fablab." - unexpected_error_occurred: "Um erro inesperado ocorreu" - messages: you_will_lose_any_unsaved_modification_if_you_quit_this_page: "Você irá perder todas as modificações não salvas se sair desta página" you_will_lose_any_unsaved_modification_if_you_reload_this_page: "Você irá perder todas as modificações não salvas se recarregar desta página" + payment_card_error: "A problem has occurred with your credit card:" user: # user edition form + man: "Man" + woman: "Woman" add_an_avatar: "Adicionar avatar" pseudonym: "Apelido" + pseudonym_is_required: "Pseudonym is required." + first_name: "Your first name" + first_name_is_required: "First name is required." + surname: "Your last name" + surname_is_required: "Last name is required." + email_address: "Email address" email_address_is_required: "E-mail é obrigatório." change_password: "Alterar senha" new_password: "Nova senha" + password_is_required: "Password is required." + password_is_too_short: "Password is too short (at least 8 characters)" confirmation_of_new_password: "Confirmação da nova senha" confirmation_of_password_is_required: "A confirmação da senha é obrigatória." confirmation_of_password_is_too_short: "A confirmação da senha é muito curta (mínimo 8 caracteres)." @@ -125,42 +51,65 @@ pt: date_of_birth_is_required: "Data de nascimento é obrigatório." website: "Website" job: "Ocupação" + interests: "Interests" + CAD_softwares_mastered: "CAD Softwares mastered" + birthday: "Date of birth" + birthday_is_required: "Date of birth is required." + address: "Address" + phone_number: "Phone number" + phone_number_is_required: "Phone number is required." + i_authorize_Fablab_users_registered_on_the_site_to_contact_me: "I authorize FabLab users, registered on the site, to contact me" + i_accept_to_receive_information_from_the_fablab: "I accept to receive information from the FabLab" + used_for_statistics: "This data will be used for statistical purposes" + used_for_invoicing: "This data will be used for billing purposes" + used_for_reservation: "This data will be used in case of change on one of your bookings" + used_for_profile: "This data will only be displayed on your profile" project: # project edition form + name: "Name" + name_is_required: "Name is required." illustration: "Ilustração" add_an_illustration: "Adicionar ilustração" CAD_file: "Arquivo do CAD" allowed_extensions: "Extensões permitidas:" add_a_new_file: "Adicionar novo arquivo" + description: "Description" + description_is_required: "Description is required." steps: "Passos" + step_N: "Step {INDEX}" step_title: "Passo Título" add_a_picture: "Adicionar imagem" change_the_picture: "Alterar imagem" delete_the_step: "Deletar este passo" + confirmation_required: "Confirmation required" do_you_really_want_to_delete_this_step: "Você realmente deseja deletar este passo?" add_a_new_step: "Adicionar novo passo" publish_your_project: "Publicar seu projeto" + or: "or" employed_materials: "Materiais utilizados" employed_machines: "Máquinas utilizadas" + collaborators: "Collaborators" creative_commons_licences: "Licença Creative Commons" + themes: "Themes" + tags: "Tags" + save_as_draft: "Save as draft" machine: # machine edition form - machine_form: - name: "Nome" - name_is_required: "Nome é obrigatório." - illustration: "Ilustração" - add_an_illustration: "Adicionar ilustração" - description: "Descrição" - description_is_required: "Especificações técnica é obrigatório." - technical_specifications: "Especificações técnicas" - technical_specifications_are_required: "Especificações técnicas são obrigatórias." - attached_files_pdf: "Arquivos anexos (pdf)" - attach_a_file: "Anexar arquivo" - add_an_attachment: "Adicionar anexo" - disable_machine: "Desativar máquina" - validate_your_machine: "Validar sua máquina" + name: "Nome" + name_is_required: "Nome é obrigatório." + illustration: "Ilustração" + add_an_illustration: "Adicionar ilustração" + description: "Descrição" + description_is_required: "Especificações técnica é obrigatório." + technical_specifications: "Especificações técnicas" + technical_specifications_are_required: "Especificações técnicas são obrigatórias." + attached_files_pdf: "Arquivos anexos (pdf)" + attach_a_file: "Anexar arquivo" + add_an_attachment: "Adicionar anexo" + disable_machine: "Desativar máquina" + validate_your_machine: "Validar sua máquina" plan_subscribe: # frame to select a plan to subscribe @@ -171,14 +120,15 @@ pt: # admin: choose a member to interact with select_a_member: "Selecionar um membro" start_typing: "Escrevendo..." - please_select_a_member_first: "Por favor, primeiramente selecione um membro" stripe: # stripe payment modal + online_payment: "Online payment" i_have_read_and_accept_: "Eu li e aceito" _the_general_terms_and_conditions: "os termos e condições." credit_amount_for_pay_reservation: "{amount} {currency} a ser pago para confirmar sua inscrição" client_credit_amount_for_pay_reservation: "{amount} {currency} a ser pago para confirmar a inscrição do cliente" + confirm_payment_of_: "Pay: {AMOUNT}" valid_reservation_modal: # dialog of on site payment for reservations @@ -187,9 +137,12 @@ pt: event: # event edition form + title: "Title" title_is_required: "Título é obrigatório." matching_visual: "Correspondência visual" choose_a_picture: "Escolha uma imagem" + description: "Description" + description_is_required: "Description is required." attachments: "Anexos" add_a_new_file: "Adicionar um novo arquivo" event_type: "Tipo de evento" @@ -210,69 +163,80 @@ pt: plan: # subscription plan edition form - plan_form: - general_information: "Informação geral" - name: "Nome" - name_is_required: "Nome é obrigatório." - name_length_must_be_less_than_24_characters: "O nome deve conter no máximo 24 caracteres." - type: "Tipo" - type_is_required: "Tipo é obrigatório." - group: "Grupo" - transversal_all_groups: "Transversal (todos os grupos)" - group_is_required: "Grupo é obrigatório." - number_of_periods: "Número de períodos" - number_of_periods_is_required: "Número de períodos é obrigatório." - period: "Período" - year: "Ano" - month: "Mês" - week: "Semana" - period_is_required: "Período é obrigatório." - subscription_price: "Preço de inscrição" - price_is_required: "Preço é obrigatório." - visual_prominence_of_the_subscription: "Proeminência visual da assinatura" - on_the_subscriptions_page_the_most_prominent_subscriptions_will_be_placed_at_the_top_of_the_list: "Na página de inscrições a inscrição mais relevante aparecerá no topo da lista." - an_evelated_number_means_a_higher_prominence: "Um número elevado significa uma maior relevância." - rolling_subscription: "Assinatura contínua?" - a_rolling_subscription_will_begin_the_day_of_the_first_training: "A assinatura contínua começarrá no primeiro dia de treinamento." - otherwise_it_will_begin_as_soon_as_it_is_bought: "Caso contrário, elecomeçará assim que for comprado." - information_sheet: "Folha de informação" - attach_an_information_sheet: "Anexar folha de informação" - notified_partner: "Parceiro notificado" - new_user: "Novo usuário ..." - as_part_of_a_partner_subscription_some_notifications_may_be_sent_to_this_user: "Como parte da inscrição do parceiro, algumas notificações podem ser enviadas para este usuário." - new_partner: "Novo parceiro" - email_address_is_required: "Email é obrigatório." - disabled: "Disable subscrição" - disable_plan_will_not_unsubscribe_users: "Aviso: desativar a assinatura não desautorizará os usuários que atualmente possuem esta assinatura ativa." + general_information: "Informação geral" + name: "Nome" + name_is_required: "Nome é obrigatório." + name_length_must_be_less_than_24_characters: "O nome deve conter no máximo 24 caracteres." + type: "Tipo" + partner: "Partner" + standard: "Standard" + type_is_required: "Tipo é obrigatório." + group: "Grupo" + transversal_all_groups: "Transversal (todos os grupos)" + group_is_required: "Grupo é obrigatório." + number_of_periods: "Número de períodos" + number_of_periods_is_required: "Número de períodos é obrigatório." + period: "Período" + year: "Ano" + month: "Mês" + week: "Semana" + period_is_required: "Período é obrigatório." + subscription_price: "Preço de inscrição" + price_is_required: "Preço é obrigatório." + visual_prominence_of_the_subscription: "Proeminência visual da assinatura" + on_the_subscriptions_page_the_most_prominent_subscriptions_will_be_placed_at_the_top_of_the_list: "Na página de inscrições a inscrição mais relevante aparecerá no topo da lista." + an_evelated_number_means_a_higher_prominence: "Um número elevado significa uma maior relevância." + rolling_subscription: "Assinatura contínua?" + a_rolling_subscription_will_begin_the_day_of_the_first_training: "A assinatura contínua começarrá no primeiro dia de treinamento." + otherwise_it_will_begin_as_soon_as_it_is_bought: "Caso contrário, elecomeçará assim que for comprado." + information_sheet: "Folha de informação" + attach_an_information_sheet: "Anexar folha de informação" + notified_partner: "Parceiro notificado" + new_user: "Novo usuário ..." + as_part_of_a_partner_subscription_some_notifications_may_be_sent_to_this_user: "Como parte da inscrição do parceiro, algumas notificações podem ser enviadas para este usuário." + new_partner: "Novo parceiro" + first_name: "First name" + first_name_is_required: "First name is required." + surname: "Last name" + surname_is_required: "Last name is required." + email_address: "Email address" + email_address_is_required: "Email é obrigatório." + disabled: "Disable subscrição" + disable_plan_will_not_unsubscribe_users: "Aviso: desativar a assinatura não desautorizará os usuários que atualmente possuem esta assinatura ativa." trainings: # training edition form - trainings_form: - name: "Nome" - name_is_required: "Nome é obrigatório." - illustration: "Ilustração" - add_an_illustration: "Adicionar ilustração" - description: "Descrição" - description_is_required: "Descrição é obrigatório." - add_a_new_training: "Adicionar um novo treinamento" - validate_your_training: "Validar seu treinamento" - associated_machines: "Máquinas associadas" - number_of_tickets: "Número de vagas" - public_page: "Mostrar na lista de treinamentos" - disable_training: "Desativar treinamento" + name: "Nome" + name_is_required: "Nome é obrigatório." + illustration: "Ilustração" + add_an_illustration: "Adicionar ilustração" + description: "Descrição" + description_is_required: "Descrição é obrigatório." + add_a_new_training: "Adicionar um novo treinamento" + validate_your_training: "Validar seu treinamento" + associated_machines: "Máquinas associadas" + number_of_tickets: "Número de vagas" + public_page: "Mostrar na lista de treinamentos" + disable_training: "Desativar treinamento" user_admin: # partial form to edit/create an user (admin view) + user: "User" + incomplete_profile: "Incomplete profile" user_profile: "Perfil de usuário" warning_incomplete_user_profile_probably_imported_from_sso: "Atenção: Esse perfil de usuário está incompleto. As \"single sign-on\" (SSO) authentication is currently enabled, it may probably be an imported but non merged account. Do not modify it unless you know what your doing." group: "Grupo" group_is_required: "Grupo é obrigatório" trainings: "Treinamentos" + tags: "Tags" authentication: # partial form to edit/create an authentication provider (SSO) + name: "Nome" provider_name_is_required: "Nome da provider é obrigatório." authentication_type: "Tipo de autenticação" + local_database: "Local database" + o_auth2: "OAuth 2.0" authentication_type_is_required: "Tipo de autenticação é obrigatório." data_mapping: "Mapeando dados" expected_data_type: "Esperado tipo de dado" @@ -298,6 +262,7 @@ pt: oauth2_client_secret_is_required: "OAuth 2.0 client secret is required." define_the_fields_mapping: "Define the fields mapping" add_a_match: "Add a match" + model: "Model" field: "Linhas" api_endpoint_url: "API endpoint URL" api_type: "API tipo" @@ -325,8 +290,7 @@ pt: public_profile: # user public profile - last_activity_: "Última atividade" - _on_: "em" + last_activity_html: "Última atividade
    em {DATE}" to_come: "vir" approved: "aprovado" projects: "Projetos" @@ -334,6 +298,11 @@ pt: author: "Autor" collaborator: "Colaboradores" private_profile: "Perfil privado" + interests: "Interests" + CAD_softwares_mastered: "CAD softwares mastered" + email_address: "Email address" + trainings: "Trainings" + no_trainings: "No trainings" wallet: # wallet @@ -341,6 +310,7 @@ pt: your_wallet_amount: 'Seus créditos disponíveis' wallet_amount: 'Crédito disponível' no_transactions_for_now: 'Sem transações' + date: "Date" operation: 'Operação' operator: 'Operador' amount: 'Montante' @@ -373,6 +343,8 @@ pt: coupon: # promotional coupon (creation/edition form) + name: "Nome" + name_is_required: "Name is required." code: "Código" code_is_required: "Código é obrigatório." code_must_be_composed_of_capital_letters_digits_and_or_dashes: "O código deve ser composto de letras maiúsculas, dígitos e / ou traços." @@ -409,62 +381,60 @@ pt: space: # form to create/edit a space - space: - name: "Nome" - name_is_required: "Nome é obrigatório." - illustration: "Ilustração" - add_an_illustration: "Adicionar ilustração" - description: "Descrição" - description_is_required: "Descrição é obrigatório." - characteristics: "Características" - characteristics_are_required: "Características são obrigatórias." - attached_files_pdf: "Arquivos anexos (pdf)" - attach_a_file: "Anexar arquivo" - add_an_attachment: "Adicionar um anexo" - default_places: "Tickets máximo padrão" - default_places_is_required: "Tickets máximo padrão é obrigatório." - disable_space: "Desativar espaço" + name: "Nome" + name_is_required: "Nome é obrigatório." + illustration: "Ilustração" + add_an_illustration: "Adicionar ilustração" + description: "Descrição" + description_is_required: "Descrição é obrigatório." + characteristics: "Características" + characteristics_are_required: "Características são obrigatórias." + attached_files_pdf: "Arquivos anexos (pdf)" + attach_a_file: "Anexar arquivo" + add_an_attachment: "Adicionar um anexo" + default_places: "Tickets máximo padrão" + default_places_is_required: "Tickets máximo padrão é obrigatório." + disable_space: "Desativar espaço" cart: # module de panier d'achat de réservations - cart: - summary: "Sumário" - select_one_or_more_slots_in_the_calendar: "Selecionar um {SINGLE, select, true{slot} other{ou mais slots}} no calendário" - you_ve_just_selected_the_slot: "Você selecionou apenas o slot:" - datetime_to_time: "{START_DATETIME} até {END_TIME}" # eg: Thursday, September 4 1986 8:30 PM to 10:00 PM - cost_of_TYPE: "Custo de {TYPE, select, Machine{máquina hora} Training{o treinamento} other{o elemento}}" - offer_this_slot: "Oferecer este slot" - confirm_this_slot: "Confirmar este slot" - remove_this_slot: "Remover este slot" - to_benefit_from_attractive_prices: "Para se beneficiar de preços atractivos" - view_our_subscriptions: "Ver suas inscrições" - or: "ou" - you_ve_just_selected_a_: "Você selecionou apenas" - _subscription: "inscrição" - cost_of_the_subscription: "Custo da inscrição" - confirm_and_pay: "Confirmar e pagar" - you_have_settled_the_following_TYPE: "Você liquidou o seguinte {TYPE, select, Machine{slots de máquina} Training{training} other{elements}}:" - you_have_settled_a_: "Você tem liquidado:" - total_: "TOTAL :" - thank_you_your_payment_has_been_successfully_registered: "Obrigado. Seu pagamento foi registrado com sucesso !" - your_invoice_will_be_available_soon_from_your_: "Sua fatura estará disponível em breve" - dashboard: "Dashboard" - i_want_to_change_the_following_reservation: "Eu quero mudar a seguinte reserva:" - cancel_my_modification: "Cancelar minha modificação" - select_a_new_slot_in_the_calendar: "Selecionar um novo slot no calendário" - cancel_my_selection: "Cancelar minha seleção" - tags_of_the_original_slot: "Tags do slot original:" - tags_of_the_destination_slot: "Tags do slot de destino:" - confirm_my_modification: "Confirmar minha modificação" - your_booking_slot_was_successfully_moved_from_: "Seu slot de reserva foi movido com sucesso para" - to_date: "até" # context: date. eg: "from 01/01 to 01/05" - please_select_a_member_first: "Por favor selecione o membro primeiramente" - unable_to_change_the_reservation: "Não permitido alterar esta reserva" - confirmation_required: "Confirmação é obrigatória" - do_you_really_want_to_cancel_this_reservation: "Você realmente quer cancelar essa reserva?" - reservation_was_cancelled_successfully: "Reserva a foi cancelada com sucesso." - cancellation_failed: "Cancelamento falhou." - confirm_payment_of_html: "{ROLE, select, admin{Pagamento pelo site} other{Pagar}}: {AMOUNT}" # (context: confirm my payment of $20.00) - a_problem_occurred_during_the_payment_process_please_try_again_later: "Um problema ocorreu durante o processo de pagamento. Por favor tente novamente mais tarde." - none: "Vazio" - online_payment_disabled: "O pagamento online não está disponível. Entre em contato diretamente com a recepção do Fablab." + summary: "Sumário" + select_one_or_more_slots_in_the_calendar: "Selecionar um {SINGLE, select, true{slot} other{ou mais slots}} no calendário" + you_ve_just_selected_the_slot: "Você selecionou apenas o slot:" + datetime_to_time: "{START_DATETIME} até {END_TIME}" # eg: Thursday, September 4 1986 8:30 PM to 10:00 PM + cost_of_TYPE: "Custo de {TYPE, select, Machine{máquina hora} Training{o treinamento} other{o elemento}}" + offer_this_slot: "Oferecer este slot" + confirm_this_slot: "Confirmar este slot" + remove_this_slot: "Remover este slot" + to_benefit_from_attractive_prices: "Para se beneficiar de preços atractivos" + view_our_subscriptions: "Ver suas inscrições" + or: "ou" + you_ve_just_selected_a_: "Você selecionou apenas" + _subscription: "inscrição" + cost_of_the_subscription: "Custo da inscrição" + confirm_and_pay: "Confirmar e pagar" + you_have_settled_the_following_TYPE: "Você liquidou o seguinte {TYPE, select, Machine{slots de máquina} Training{training} other{elements}}:" + you_have_settled_a_: "Você tem liquidado:" + total_: "TOTAL :" + thank_you_your_payment_has_been_successfully_registered: "Obrigado. Seu pagamento foi registrado com sucesso !" + your_invoice_will_be_available_soon_from_your_: "Sua fatura estará disponível em breve" + dashboard: "Dashboard" + i_want_to_change_the_following_reservation: "Eu quero mudar a seguinte reserva:" + cancel_my_modification: "Cancelar minha modificação" + select_a_new_slot_in_the_calendar: "Selecionar um novo slot no calendário" + cancel_my_selection: "Cancelar minha seleção" + tags_of_the_original_slot: "Tags do slot original:" + tags_of_the_destination_slot: "Tags do slot de destino:" + confirm_my_modification: "Confirmar minha modificação" + your_booking_slot_was_successfully_moved_from_: "Seu slot de reserva foi movido com sucesso para" + to_date: "até" # context: date. eg: "from 01/01 to 01/05" + please_select_a_member_first: "Por favor selecione o membro primeiramente" + unable_to_change_the_reservation: "Não permitido alterar esta reserva" + confirmation_required: "Confirmação é obrigatória" + do_you_really_want_to_cancel_this_reservation: "Você realmente quer cancelar essa reserva?" + reservation_was_cancelled_successfully: "Reserva a foi cancelada com sucesso." + cancellation_failed: "Cancelamento falhou." + confirm_payment_of_html: "{ROLE, select, admin{Pagamento pelo site} other{Pagar}}: {AMOUNT}" # (context: confirm my payment of $20.00) + a_problem_occurred_during_the_payment_process_please_try_again_later: "Um problema ocorreu durante o processo de pagamento. Por favor tente novamente mais tarde." + none: "Vazio" + online_payment_disabled: "O pagamento online não está disponível. Entre em contato diretamente com a recepção do Fablab." From c67de56405c19ace820e8aa06c45b0cb6d6dedba Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 18 Dec 2019 15:23:52 +0100 Subject: [PATCH 084/135] remove missing translation tags - useless with a TMS --- config/locales/app.admin.es.yml | 448 +++++++++++++++---------------- config/locales/app.admin.pt.yml | 380 +++++++++++++------------- config/locales/app.logged.es.yml | 20 +- config/locales/app.logged.pt.yml | 20 +- config/locales/app.public.es.yml | 68 ++--- config/locales/app.public.pt.yml | 28 +- config/locales/app.shared.es.yml | 16 +- config/locales/es.yml | 34 +-- config/locales/mails.es.yml | 18 +- config/locales/mails.pt.yml | 14 +- config/locales/pt.yml | 34 +-- 11 files changed, 540 insertions(+), 540 deletions(-) diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 050fba55c..4a831888b 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -44,25 +44,25 @@ es: adjust_the_opening_hours: "Ajustar el horario de apertura" to_time: "to" # context: hora. ej. "de 18:00 a 21:00" restrict_this_slot_with_labels_optional: "Restringir esta ranura con etiquetas (opcional)" - recurrence: "Recurrence" # translation_missing - enabled: "Enabled" # translation_missing - period: "Period" # translation_missing - week: "Week" # translation_missing - month: "Month" # translation_missing - number_of_periods: "Number of periods" # translation_missing - end_date: "End date" # translation_missing - summary: "Summary" # translation_missing - select_period: "Please select a period for the recurrence" # translation_missing - select_nb_period: "Please select a number of periods for the recurrence" # translation_missing - select_end_date: "Please select the date of the last occurrence" # translation_missing - about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}:" # translation_missing - reservable: "Reservable(s):" # translation_missing + recurrence: "Recurrence" + enabled: "Enabled" + period: "Period" + week: "Week" + month: "Month" + number_of_periods: "Number of periods" + end_date: "End date" + summary: "Summary" + select_period: "Please select a period for the recurrence" + select_nb_period: "Please select a number of periods for the recurrence" + select_end_date: "Please select the date of the last occurrence" + about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}:" + reservable: "Reservable(s):" labels: "Etiqueta(s):" none: "Ninguna" slot_successfully_deleted: "La ranura {START} - {END} se ha eliminado correctamente" - slots_deleted: "The slot of {START}, and {COUNT, plural, =1{one other} other{{COUNT} others}}}, have been deleted" # translation_missing + slots_deleted: "The slot of {START}, and {COUNT, plural, =1{one other} other{{COUNT} others}}}, have been deleted" unable_to_delete_the_slot: "No se puede eliminar la ranura {START} - {END}, probablemente porque ya está reservada por un miembror" - slots_not_deleted: "On {TOTAL} slots, {COUNT, plural, =1{one was not deleted} other{{COUNT} were not deleted}}. Some reservations may exist on {COUNT, plural, =1{it} other{them}}." # translation_missing + slots_not_deleted: "On {TOTAL} slots, {COUNT, plural, =1{one was not deleted} other{{COUNT} were not deleted}}. Some reservations may exist on {COUNT, plural, =1{it} other{them}}." you_should_select_at_least_a_machine: "Debe seleccionar al menos una máquina en esta ranura." export_is_running_you_ll_be_notified_when_its_ready: "La exportación se está ejecutando. Se le notificará cuando esté listo." actions: "Acciones" @@ -76,38 +76,38 @@ es: unlocking_failed: "Ocurrió un error. El desbloqueo de la ranura ha fallado" reservations_locked: "La reserva está bloqueada" unlockable_because_reservations: "No se puede bloquear la reserva en esta ranura porque existen algunas reservas no canceladas." - delete_slot: "Delete this slot" # translation_missing - do_you_really_want_to_delete_this_slot: "Do you really want to delete this slot?" # translation_missing - delete_recurring_slot: "You're about to delete a recurring slot. What do you want to do?"# translation_missing - delete_this_slot: "Only this slot" # translation_missing - delete_this_and_next: "This slot and the following" # translation_missing - delete_all: "All slots" # translation_missing - event_in_the_past: "Unable to create a slot in the past." # translation_missing - edit_event: "Edit the event" # translation_missing - view_reservations: "Ver reservas" # translation_missing + delete_slot: "Delete this slot" + do_you_really_want_to_delete_this_slot: "Do you really want to delete this slot?" + delete_recurring_slot: "You're about to delete a recurring slot. What do you want to do?" + delete_this_slot: "Only this slot" + delete_this_and_next: "This slot and the following" + delete_all: "All slots" + event_in_the_past: "Unable to create a slot in the past." + edit_event: "Edit the event" + view_reservations: "Ver reservas" legend: "leyenda" and: "y" icalendar: - icalendar_import: "iCalendar import" # translation_missing - intro: "Fab-manager allows to automatically import calendar events, at RFC 5545 iCalendar format, from external URL. These URL are synchronized every nights and the events are shown in the public calendar." # translation_missing - new_import: "New ICS import" # translation_missing - color: "Colour" # translation_missing - text_color: "Text colour" # translation_missing - url: "URL" # translation_missing - name: "Name" # translation_missing - example: "Example" # translation_missing - display: "Display" # translation_missing - hide_text: "Hide the text" # translation_missing - hidden: "Hidden" # translation_missing - shown: "Shown" # translation_missing - create_error: "Unable to create iCalendar import. Please try again later" # translation_missing - delete_failed: "Unable to delete the iCalendar import. Please try again later" # translation_missing - refresh: "Updating..." # translation_missing - sync_failed: "Unable to synchronize the URL. Please try again later" # translation_missing - confirmation_required: "Confirmation required" # translation_missing - confirm_delete_import: "Do you really want to delete this iCalendar import?" # translation_missing - delete_success: "iCalendar import successfully deleted" # translation_missing + icalendar_import: "iCalendar import" + intro: "Fab-manager allows to automatically import calendar events, at RFC 5545 iCalendar format, from external URL. These URL are synchronized every nights and the events are shown in the public calendar." + new_import: "New ICS import" + color: "Colour" + text_color: "Text colour" + url: "URL" + name: "Name" + example: "Example" + display: "Display" + hide_text: "Hide the text" + hidden: "Hidden" + shown: "Shown" + create_error: "Unable to create iCalendar import. Please try again later" + delete_failed: "Unable to delete the iCalendar import. Please try again later" + refresh: "Updating..." + sync_failed: "Unable to synchronize the URL. Please try again later" + confirmation_required: "Confirmation required" + confirm_delete_import: "Do you really want to delete this iCalendar import?" + delete_success: "iCalendar import successfully deleted" project_elements: # management of the projects' components @@ -126,10 +126,10 @@ es: # track and monitor the trainings trainings_monitoring: "Trainings monitoring" trainings: "Trainings" - add_a_new_training: "Add a new training" # translation_missing + add_a_new_training: "Add a new training" name: "Nombre" - associated_machines: "Associated machines" # translation_missing - number_of_tickets: "Number of tickets" # translation_missing + associated_machines: "Associated machines" + number_of_tickets: "Number of tickets" select_a_training: "Select a training" training: "Training" date: "Date" @@ -151,13 +151,13 @@ es: unable_to_delete_the_training_because_some_users_already_booked_it: "No se puede eliminar el entrenamiento porque algunos usuarios ya lo han reservado." confirmation_required: "Confirmation required" do_you_really_want_to_delete_this_training: "¿De verdad quieres eliminar este entrenamiento?" - status_enabled: "Enabled" # translation_missing - status_disabled: "Disabled" # translation_missing - status_all: "All" # translation_missing + status_enabled: "Enabled" + status_disabled: "Disabled" + status_all: "All" trainings_new: # create a new training - add_a_new_training: "Add a new training" # translation_missing + add_a_new_training: "Add a new training" beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Tenga cuidado, al crear una formación, sus precios de reserva se inicializan en cero." dont_forget_to_change_them_before_creating_slots_for_this_training: "No olvides cambiarlos antes de crear espacios para esta formación." @@ -171,18 +171,18 @@ es: passed_events: "Eventos pasados" events_to_come: "Eventos por venir" events_to_come_asc: "Events to come | chronological order" - on_DATE: "on {DATE}" # translation_missing - from_DATE: "Desde {DATE}" # translation_missing - from_TIME: "Desde {TIME}" # translation_missing + on_DATE: "on {DATE}" + from_DATE: "Desde {DATE}" + from_TIME: "Desde {TIME}" to_date: "to" # context: date. eg: "from 01/01 to 01/05" to_time: "to" # context: time. eg. "from 18:00 to 21:00" title: "Title" dates: "Dates" - booking: "Booking" # translation_missing - sold_out: "Sold out" # translation_missing - cancelled: "Cancelled" # translation_missing - free_entry: "Free entry" # translation_missing - free_admission: "Free admission" # translation_missing + booking: "Booking" + sold_out: "Sold out" + cancelled: "Cancelled" + free_entry: "Free entry" + free_admission: "Free admission" view_reservations: "Ver reservas" load_the_next_events: "Load the next events..." categories: "Categorías" @@ -259,7 +259,7 @@ es: group: "Grupo" prominence: "Prominencia" price: "Precio" - machine_hours: "Machine slots" # translation_missing + machine_hours: "Machine slots" these_prices_match_machine_hours_rates_: "Estos precios se ajustan a la tarifas de máquina por {DURATION} minutas" _without_subscriptions: "Sin suscripciones" machines: "Máquinas" @@ -268,7 +268,7 @@ es: related_trainings: "Formación relacionada" add_a_machine_credit: "Agregar un crédito de máquina" machine: "Máquina" - hours: "Slots of {DURATION} minutes" # translation_missing + hours: "Slots of {DURATION} minutes" related_subscriptions: "Suscripciónes relacionada" please_specify_a_number: "Por favor, especifique un número." none: "Nada" # nota gramatical: concordancia con "formación". @@ -280,7 +280,7 @@ es: error_a_credit_linking_this_machine_with_that_subscription_already_exists: "Error: un crédito que vincula esta máquina con esa suscripción ya existe." changes_have_been_successfully_saved: "Los cambios se han guardado correctamented." credit_was_successfully_saved: "El crédito se ha guardado correctamente." - error_creating_credit: "Unable to create credit, an error occurred" # translation_missing + error_creating_credit: "Unable to create credit, an error occurred" do_you_really_want_to_delete_this_subscription_plan: "¿Realmente desea eliminar este plan de suscripción?" subscription_plan_was_successfully_deleted: "Plan de suscripción eliminado correctamente." unable_to_delete_the_specified_subscription_an_error_occurred: "No se pudo eliminar la suscripción especificada, se produjo un error.." @@ -290,12 +290,12 @@ es: nb_of_usages: "Número de usos" status: "Estado" add_a_new_coupon: "Añadir un nuevo cupón" - display_more_coupons: "Display the next coupons" # translation_missing + display_more_coupons: "Display the next coupons" disabled: "Desactivado" expired: "Expirado" sold_out: "Agotado" active: "Activo" - all: "Display all" # translation_missing + all: "Display all" confirmation_required: "Confirmación requerida" do_you_really_want_to_delete_this_coupon: "¿Desea realmente eliminar este cupón?" coupon_was_successfully_deleted: "El cupón se eliminó correctamente." @@ -318,9 +318,9 @@ es: add_a_space_credit: "Añadir un crédito de espacio" space: "Espacio" error_a_credit_linking_this_space_with_that_subscription_already_exists: "Error: un crédito que vincula este espacio con esa suscripción ya existe." - status_enabled: "Enabled" # translation_missing - status_disabled: "Disabled" # translation_missing - status_all: "All" # translation_missing + status_enabled: "Enabled" + status_disabled: "Disabled" + status_all: "All" coupons_new: # ajouter un code promotionnel @@ -346,7 +346,7 @@ es: copy_prices_from: "Copia los precios desde" machines: "Máquinas" machine: "Máquina" - hourly_rate: "Tarifa por slot" # translation_missing + hourly_rate: "Tarifa por slot" spaces: "Espacios" space: "Espacio" unable_to_save_subscription_changes_please_try_again: "No se pueden guardar los cambios de suscripción. Por favor, inténtelo de nuevo." @@ -467,7 +467,7 @@ es: an_error_occurred_while_activating_the_invoicing_code: "Se ha producido un error al activar el código de facturación." order_number_successfully_saved: "Número de pedido guardado correctamente." an_error_occurred_while_saving_the_order_number: "Se ha producido un error al guardar el número de orden." - VAT_rate_successfully_saved: "VAT rate successfully saved." # translation_missing + VAT_rate_successfully_saved: "VAT rate successfully saved." an_error_occurred_while_saving_the_VAT_rate: "La tasa de IVA se ha guardado correctamente." VAT_successfully_activated: "IVA activado correctamente." VAT_successfully_disabled: "IVA desactivado correctamente." @@ -479,96 +479,96 @@ es: logo_successfully_saved: "Logo guardado correctamente." an_error_occurred_while_saving_the_logo: "Se ha producido un error al guardar el logotipo.." online_payment: "Pago online" - close_accounting_period: "Close an accounting period" # translation_missing - close_from_date: "Close from" # translation_missing - start_date_is_required: "Start date is required" # translation_missing - close_until_date: "Close until" # translation_missing - end_date_is_required: "End date is required" # translation_missing - previous_closings: "Previous closings" # translation_missing - start_date: "From" # translation_missing - end_date: "To" # translation_missing - closed_at: "Closed at" # translation_missing - closed_by: "By" # translation_missing - period_total: "Period total" # translation_missing - perpetual_total: "Perpetual total" # translation_missing + close_accounting_period: "Close an accounting period" + close_from_date: "Close from" + start_date_is_required: "Start date is required" + close_until_date: "Close until" + end_date_is_required: "End date is required" + previous_closings: "Previous closings" + start_date: "From" + end_date: "To" + closed_at: "Closed at" + closed_by: "By" + period_total: "Period total" + perpetual_total: "Perpetual total" integrity: "Verificación de integridad" - confirmation_required: "Confirmation required" # translation_missing - confirm_close_START_END: "Do you really want to close the accounting period between {START} and {END}? Any subsequent changes will be impossible." # translation_missing - period_must_match_fiscal_year: "A closing must occur at the end of a minimum annual period, or per financial year when it is not calendar-based." # translation_missing - this_may_take_a_while: "This operation will take some time to complete." # translation_missing - period_START_END_closed_success: "The accounting period from {START} to {END} has been successfully closed. Archive generation is running, you'll be notified when it's done." # translation_missing - failed_to_close_period: "An error occurred, unable to close the accounting period" # translation_missing - no_periods: "No closings for now" # translation_missing - accounting_codes: "Accounting codes" # translation_missing - accounting_journal_code: "Journal code" # translation_missing - general_journal_code: "Journal code" # translation_missing - accounting_card_client_code: "Card clients code" # translation_missing - card_client_code: "Accounting code for clients who paid by card" # translation_missing - accounting_card_client_label: "Card clients label" # translation_missing - card_client_label: "Account label for clients who paid by card" # translation_missing - accounting_wallet_client_code: "Wallet clients code" # translation_missing - wallet_client_code: "Accounting code for clients who paid by virtual wallet" # translation_missing - accounting_wallet_client_label: "Wallet clients label" # translation_missing - wallet_client_label: "Account label for clients who paid by virtual wallet" # translation_missing - accounting_other_client_code: "Other means client code" # translation_missing - other_client_code: "Accounting code for clients who paid using another payment means" # translation_missing - accounting_other_client_label: "Other means client label" # translation_missing - other_client_label: "Accounting label for clients who paid using another payment means" # translation_missing - accounting_wallet_code: "Wallet code" # translation_missing - general_wallet_code: "Accounting code for wallet credit" # translation_missing - accounting_wallet_label: "Wallet label" # translation_missing - general_wallet_label: "Account label for wallet credit" # translation_missing - accounting_vat_code: "VAT code" # translation_missing - general_vat_code: "Accounting code for VAT" # translation_missing - accounting_vat_label: "VAT label" # translation_missing - general_vat_label: "VAT account label" # translation_missing - accounting_subscription_code: "Subscriptions code" # translation_missing - general_subscription_code: "Accounting code for all subscriptions" # translation_missing - accounting_subscription_label: "Subscriptions label" # translation_missing - general_subscription_label: "Account label for all subscriptions" # translation_missing - accounting_Machine_code: "Machines code" # translation_missing - general_machine_code: "Accounting code for all machines" # translation_missing - accounting_Machine_label: "Machine label" # translation_missing - general_machine_label: "Account label for all machines" # translation_missing - accounting_Training_code: "Trainings code" # translation_missing - general_training_code: "Accounting code for all trainings" # translation_missing - accounting_Training_label: "Trainings label" # translation_missing - general_training_label: "Account label for all trainings" # translation_missing - accounting_Event_code: "Events code" # translation_missing - general_event_code: "Accounting code for all events" # translation_missing - accounting_Event_label: "Events label" # translation_missing - general_event_label: "Account label for all events" # translation_missing - accounting_Space_code: "Space code" # translation_missing - general_space_code: "Accounting code for all spaces" # translation_missing - accounting_Space_label: "Spaces label" # translation_missing - general_space_label: "Account label for all spaces" # translation_missing - codes_customization_success: "Customization of accounting codes successfully saved." # translation_missing - export_accounting_data: "Export accounting data" # translation_missing - export_to: "Export to the accounting software" # translation_missing + confirmation_required: "Confirmation required" + confirm_close_START_END: "Do you really want to close the accounting period between {START} and {END}? Any subsequent changes will be impossible." + period_must_match_fiscal_year: "A closing must occur at the end of a minimum annual period, or per financial year when it is not calendar-based." + this_may_take_a_while: "This operation will take some time to complete." + period_START_END_closed_success: "The accounting period from {START} to {END} has been successfully closed. Archive generation is running, you'll be notified when it's done." + failed_to_close_period: "An error occurred, unable to close the accounting period" + no_periods: "No closings for now" + accounting_codes: "Accounting codes" + accounting_journal_code: "Journal code" + general_journal_code: "Journal code" + accounting_card_client_code: "Card clients code" + card_client_code: "Accounting code for clients who paid by card" + accounting_card_client_label: "Card clients label" + card_client_label: "Account label for clients who paid by card" + accounting_wallet_client_code: "Wallet clients code" + wallet_client_code: "Accounting code for clients who paid by virtual wallet" + accounting_wallet_client_label: "Wallet clients label" + wallet_client_label: "Account label for clients who paid by virtual wallet" + accounting_other_client_code: "Other means client code" + other_client_code: "Accounting code for clients who paid using another payment means" + accounting_other_client_label: "Other means client label" + other_client_label: "Accounting label for clients who paid using another payment means" + accounting_wallet_code: "Wallet code" + general_wallet_code: "Accounting code for wallet credit" + accounting_wallet_label: "Wallet label" + general_wallet_label: "Account label for wallet credit" + accounting_vat_code: "VAT code" + general_vat_code: "Accounting code for VAT" + accounting_vat_label: "VAT label" + general_vat_label: "VAT account label" + accounting_subscription_code: "Subscriptions code" + general_subscription_code: "Accounting code for all subscriptions" + accounting_subscription_label: "Subscriptions label" + general_subscription_label: "Account label for all subscriptions" + accounting_Machine_code: "Machines code" + general_machine_code: "Accounting code for all machines" + accounting_Machine_label: "Machine label" + general_machine_label: "Account label for all machines" + accounting_Training_code: "Trainings code" + general_training_code: "Accounting code for all trainings" + accounting_Training_label: "Trainings label" + general_training_label: "Account label for all trainings" + accounting_Event_code: "Events code" + general_event_code: "Accounting code for all events" + accounting_Event_label: "Events label" + general_event_label: "Account label for all events" + accounting_Space_code: "Space code" + general_space_code: "Accounting code for all spaces" + accounting_Space_label: "Spaces label" + general_space_label: "Account label for all spaces" + codes_customization_success: "Customization of accounting codes successfully saved." + export_accounting_data: "Export accounting data" + export_to: "Export to the accounting software" export_is_running: "Exportando, será notificado cuando esté listo." - acd: "ACD" # translation_missing - export_form_date: "Export from" # translation_missing - export_to_date: "Export until" # translation_missing - format: "File format" # translation_missing - encoding: "Encoding" # translation_missing - separator: "Separator" # translation_missing - dateFormat: "Date format" # translation_missing - labelMaxLength: "Label maximum length" # translation_missing - decimalSeparator: "Decimal separator" # translation_missing - exportInvoicesAtZero: "Export invoices equal to 0" # translation_missing - columns: "Columns" # translation_missing - exportColumns: # translation_missing - journal_code: "Journal code" # translation_missing - date: "Entry date" # translation_missing - account_code: "Account code" # translation_missing - account_label: "Account label" # translation_missing - piece: "Document" # translation_missing - line_label: "Entry label" # translation_missing - debit_origin: "Origin debit" # translation_missing - credit_origin: "Origin credit" # translation_missing - debit_euro: "Euro debit" # translation_missing - credit_euro: "Euro credit" # translation_missing - lettering: "Lettering" # translation_missing + acd: "ACD" + export_form_date: "Export from" + export_to_date: "Export until" + format: "File format" + encoding: "Encoding" + separator: "Separator" + dateFormat: "Date format" + labelMaxLength: "Label maximum length" + decimalSeparator: "Decimal separator" + exportInvoicesAtZero: "Export invoices equal to 0" + columns: "Columns" + exportColumns: + journal_code: "Journal code" + date: "Entry date" + account_code: "Account code" + account_label: "Account label" + piece: "Document" + line_label: "Entry label" + debit_origin: "Origin debit" + credit_origin: "Origin credit" + debit_euro: "Euro debit" + credit_euro: "Euro credit" + lettering: "Lettering" members: # management of users, labels, groups, and so on @@ -631,20 +631,20 @@ es: group_form: add_a_group: "Añadir un grupo" group_name: "Nombre del grupo" - disable: "Disable" # translation_missing - enable: "Enable" # translation_missing - changes_successfully_saved: "Changes successfully saved." # translation_missing - an_error_occurred_while_saving_changes: "An error occurred when saving changes." # translation_missing + disable: "Disable" + enable: "Enable" + changes_successfully_saved: "Changes successfully saved." + an_error_occurred_while_saving_changes: "An error occurred when saving changes." new_group_successfully_saved: "Nuevo grupo guardado correctamente." an_error_occurred_when_saving_the_new_group: "Se ha producido un error al guardar el nuevo grupo." group_successfully_deleted: "Grupo eliminado correctamente." unable_to_delete_group_because_some_users_and_or_groups_are_still_linked_to_it: "No se puede eliminar el grupo porque algunos usuarios y / o grupos todavía están vinculados a él." - group_successfully_enabled_disabled: "Group successfully {STATUS, select, true{disabled} other{enabled}}." # translation_missing - unable_to_enable_disable_group: "Unable to {STATUS, select, true{disable} other{enable}} group." # translation_missing - unable_to_disable_group_with_users: "Unable to disable group because it still contains {USERS} active {USERS, plural, =1{user} other{users}}." # translation_missing - status_enabled: "Enabled" # translation_missing - status_disabled: "Disabled" # translation_missing - status_all: "All" # translation_missing + group_successfully_enabled_disabled: "Group successfully {STATUS, select, true{disabled} other{enabled}}." + unable_to_enable_disable_group: "Unable to {STATUS, select, true{disable} other{enable}} group." + unable_to_disable_group_with_users: "Unable to disable group because it still contains {USERS} active {USERS, plural, =1{user} other{users}}." + status_enabled: "Enabled" + status_disabled: "Disabled" + status_all: "All" members_new: # add a member @@ -653,41 +653,41 @@ es: members_import: # members bulk import - import_members: "Import members" # translation_missing - info: "You can upload a CSV file to create new members or update existing ones. Your file must user the identifiers below to specify the group, the trainings and the tags of the members." # translation_missing - required_fields: "Your file must contain, at least, the following information for each user to create: email, name, first name and group. If the password is empty, it will be generated. On updates, the empty fields will be kept as is." # translation_missing - about_example: "Please refer to the provided example file to generate a correct CSV file. Be careful to use Unicode UTF-8 encoding." # translation_missing - groups: "Groups" # translation_missing - group_name: "Group name" # translation_missing - group_identifier: "Identifier to use" # translation_missing - trainings: "Trainings" # translation_missing - training_name: "Training name" # translation_missing - training_identifier: "Identifier to use" # translation_missing - plans: "Plans" # translation_missing - plan_name: "Plan name" # translation_missing - plan_identifier: "Identifier to use" # translation_missing - tags: "Tags" # translation_missing - tag_name: "Tag name" # translation_missing - tag_identifier: "Identifier to use" # translation_missing - download_example: "Download the exemple file" # translation_missing - select_file: "Choose a file" # translation_missing - import: "Import" # translation_missing - update_field: "Reference field for users to update" # translation_missing - update_on_id: "ID" # translation_missing - update_on_username: "Username" # translation_missing - update_on_email: "Email address" # translation_missing + import_members: "Import members" + info: "You can upload a CSV file to create new members or update existing ones. Your file must user the identifiers below to specify the group, the trainings and the tags of the members." + required_fields: "Your file must contain, at least, the following information for each user to create: email, name, first name and group. If the password is empty, it will be generated. On updates, the empty fields will be kept as is." + about_example: "Please refer to the provided example file to generate a correct CSV file. Be careful to use Unicode UTF-8 encoding." + groups: "Groups" + group_name: "Group name" + group_identifier: "Identifier to use" + trainings: "Trainings" + training_name: "Training name" + training_identifier: "Identifier to use" + plans: "Plans" + plan_name: "Plan name" + plan_identifier: "Identifier to use" + tags: "Tags" + tag_name: "Tag name" + tag_identifier: "Identifier to use" + download_example: "Download the exemple file" + select_file: "Choose a file" + import: "Import" + update_field: "Reference field for users to update" + update_on_id: "ID" + update_on_username: "Username" + update_on_email: "Email address" members_import_result: # import results - import_results: "Import results" # translation_missing - import_details: "Import #{ID}, of {DATE}, initiated by {USER}" # translation_missing - results: "Results" # translation_missing - pending: "Pending..." # translation_missing - status_create: "Creating a new user" # translation_missing - status_update: "Updating user {ID}" # translation_missing - success: "Success" # translation_missing - failed: "Failed" # translation_missing - error_details: "Error's details:" # translation_missing + import_results: "Import results" + import_details: "Import #{ID}, of {DATE}, initiated by {USER}" + results: "Results" + pending: "Pending..." + status_create: "Creating a new user" + status_update: "Updating user {ID}" + success: "Success" + failed: "Failed" + error_details: "Error's details:" members_edit: # edit a member @@ -707,8 +707,8 @@ es: events: "Eventos" next_events: "Próximos eventos" no_upcoming_events: "No hay próximos eventos" - NUMBER_full_price_tickets_reserved: "{NUMBER, plural, =0{} one{1 full price ticket reserved} other{{NUMBER} full price tickets reserved}}" # translation_missing - NUMBER_NAME_tickets_reserved: "{NUMBER, plural, =0{} one{1 {NAME} ticket reserved} other{{NUMBER} {NAME} tickets reserved}}" # translation_missing + NUMBER_full_price_tickets_reserved: "{NUMBER, plural, =0{} one{1 full price ticket reserved} other{{NUMBER} full price tickets reserved}}" + NUMBER_NAME_tickets_reserved: "{NUMBER, plural, =0{} one{1 {NAME} ticket reserved} other{{NUMBER} {NAME} tickets reserved}}" passed_events: "Eventos pasados" no_passed_events: "No passed events" invoices: "Facturas" @@ -723,7 +723,7 @@ es: credits_will_remain_unchanged: "El saldo de créditos gratuitos (entrenamiento / máquinas / espacios) del usuario permanecerá sin cambios." you_intentionally_decide_to_extend_the_user_s_subscription_by_charging_him_again_for_his_current_subscription: "Usted intencionalmente decide extender la suscripción del usuario al cobrarle de nuevo por su suscripción actual." credits_will_be_reset: "Se restablecerá el saldo de créditos gratuitos (entrenamiento / máquinas / espacios) del usuario, se perderán los créditos no utilizados." - until_expiration_date: "Until (expiration date):" # translation_missing + until_expiration_date: "Until (expiration date):" you_successfully_changed_the_expiration_date_of_the_user_s_subscription: "Ha cambiado correctamente la fecha de caducidad de la suscripción del usuario" a_problem_occurred_while_saving_the_date: "Se ha producido un problema al guardar la fecha." new_subscription: "Nueva suscripción" @@ -855,8 +855,8 @@ es: customize_information_messages: "Personalizar mensajes de información" message_of_the_machine_booking_page: "Mensaje de la página de reserva de la máquina:" type_the_message_content: "Escriba el contenido del mensaje" - warning_message_of_the_training_booking_page: "Warning message of the training booking page:" # translation_missing - information_message_of_the_training_reservation_page: "Information message of the training reservation page:" # translation_missing + warning_message_of_the_training_booking_page: "Warning message of the training booking page:" + information_message_of_the_training_reservation_page: "Information message of the training reservation page:" message_of_the_subscriptions_page: "Mensaje de advertencia de la página de reserva de formación:" message_of_the_events_page: "Mensaje de la página de eventos:" message_of_the_spaces_page: "Mensaje de la página de espacios:" @@ -883,7 +883,7 @@ es: news_of_the_home_page: "Noticias de la página principal:" type_your_news_here: "Escriba sus noticias aquí" leave_it_empty_to_not_bring_up_any_news_on_the_home_page: "Déjelo vacío para no abrir ninguna noticia en la página principal" - twitter_stream: "Twitter Stream:" # translation_missing + twitter_stream: "Twitter Stream:" name_of_the_twitter_account: "Nombre de la cuenta de Twitter" title_of_the_about_page: "Título de la página Acerca de" shift_enter_to_force_carriage_return: "MAYÚS + ENTRAR para forzar el retorno de carro" @@ -919,13 +919,13 @@ es: main_color: "Color principal" secondary_color: "color secundario" home_blogpost: "Resumen de la página de inicio" - twitter_name: "Twitter feed name" # translation_missing + twitter_name: "Twitter feed name" about_title: "Título de la página \"Acerca de\"" about_body: "Contenido de la página \"Acerca de\"" about_contacts: "Página contactos\"Acerca de\"" - privacy_draft: "privacy policy draft" # translation_missing - privacy_body: "privacy policy" # translation_missing - privacy_dpo: "data protection officer address" # translation_missing + privacy_draft: "privacy policy draft" + privacy_body: "privacy policy" + privacy_dpo: "data protection officer address" booking_window_start: "hora de apertura" booking_window_end: "hora de cierre" booking_move_enable: "Activar cambio de reserva" @@ -952,14 +952,14 @@ es: updated_at: "Fecha de actualización" privacy: title: "Política de privacidad" - input_the_dpo: "Input the contact of the Data Protection Officer" # translation_missing - current_policy: "Current policy" # translation_missing - draft_from_USER_DATE: "Draft, saved by {USER}, on {DATE}" # translation_missing - save_or_publish: "Save or publish?" # translation_missing - save_or_publish_body: "Do you want to publish a new version of the privacy policy or save it as a draft?" # translation_missing - publish_will_notify: "Publish a new version will send a notification to every users." # translation_missing - publish: "Publish" # translation_missing - users_notified: "Platform users will be notified of the update." # translation_missing + input_the_dpo: "Input the contact of the Data Protection Officer" + current_policy: "Current policy" + draft_from_USER_DATE: "Draft, saved by {USER}, on {DATE}" + save_or_publish: "Save or publish?" + save_or_publish_body: "Do you want to publish a new version of the privacy policy or save it as a draft?" + publish_will_notify: "Publish a new version will send a notification to every users." + publish: "Publish" + users_notified: "Platform users will be notified of the update." open_api_clients: add_new_client: "Crear un nuevo cliente de API" @@ -988,17 +988,17 @@ es: space_edit: # modify an exiting space - edit_the_space_NAME: "Edit the space: {NAME}" # translation_missing + edit_the_space_NAME: "Edit the space: {NAME}" validate_the_changes: "Validar los cambios" manage_abuses: # process and delete abuses reports abuses_list: "Lista de informes" no_reports: "No informes por ahora" - published_by: "published by" # translation_missing - at_date: "on" # translation_missing - has_reported: "made the following report:" # translation_missing - confirmation_required: "Confirm the processing of the report" # translation_missing - report_will_be_destroyed: "Once the report has been processed, it will be deleted. This can't be undone, continue?" # translation_missing - report_removed: "The report has been deleted" # translation_missing - failed_to_remove: "An error occurred, unable to delete the report" # translation_missing + published_by: "published by" + at_date: "on" + has_reported: "made the following report:" + confirmation_required: "Confirm the processing of the report" + report_will_be_destroyed: "Once the report has been processed, it will be deleted. This can't be undone, continue?" + report_removed: "The report has been deleted" + failed_to_remove: "An error occurred, unable to delete the report" diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index c6c402bd1..372b5c604 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -44,25 +44,25 @@ pt: adjust_the_opening_hours: "Ajustar o horário de funcionamento" to_time: "ás" # context: time. eg. "from 18:00 to 21:00" restrict_this_slot_with_labels_optional: "Restrinja este slot com etiquetas (opcional)" - recurrence: "Recurrence" # translation_missing - enabled: "Enabled" # translation_missing - period: "Period" # translation_missing - week: "Week" # translation_missing - month: "Month" # translation_missing - number_of_periods: "Number of periods" # translation_missing - end_date: "End date" # translation_missing - summary: "Summary" # translation_missing - select_period: "Please select a period for the recurrence" # translation_missing - select_nb_period: "Please select a number of periods for the recurrence" # translation_missing - select_end_date: "Please select the date of the last occurrence" # translation_missing - about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}:" # translation_missing - reservable: "Reservable(s) :" # translation_missing + recurrence: "Recurrence" + enabled: "Enabled" + period: "Period" + week: "Week" + month: "Month" + number_of_periods: "Number of periods" + end_date: "End date" + summary: "Summary" + select_period: "Please select a period for the recurrence" + select_nb_period: "Please select a number of periods for the recurrence" + select_end_date: "Please select the date of the last occurrence" + about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}:" + reservable: "Reservable(s) :" labels: "Etiqueta(s):" none: "Nenhuma" slot_successfully_deleted: "O slot {START} - {END} foi deletado com sucesso" - slots_deleted: "The slot of {START}, and {COUNT, plural, =1{one other} other{{COUNT} others}}}, have been deleted" # translation_missing + slots_deleted: "The slot of {START}, and {COUNT, plural, =1{one other} other{{COUNT} others}}}, have been deleted" unable_to_delete_the_slot: "Não é possível deletar o slot {START} - {END}, provavelmente porque já foi reservado por um membro" - slots_not_deleted: "On {TOTAL} slots, {COUNT, plural, =1{one was not deleted} other{{COUNT} were not deleted}}. Some reservations may exist on {COUNT, plural, =1{it} other{them}}." # translation_missing + slots_not_deleted: "On {TOTAL} slots, {COUNT, plural, =1{one was not deleted} other{{COUNT} were not deleted}}. Some reservations may exist on {COUNT, plural, =1{it} other{them}}." you_should_select_at_least_a_machine: "Você deveria selecionar a última máquina neste slot." export_is_running_you_ll_be_notified_when_its_ready: "A Exportação está em andamento. Você será notificado quando terminar." actions: "Ações" @@ -78,36 +78,36 @@ pt: unlockable_because_reservations: "Não é possível bloquear a reserva neste slot porque existem algumas reservas não cancelados nele." delete_slot: "Exclua o slot" do_you_really_want_to_delete_this_slot: "Você realmente quer excluir esse slot?" - delete_recurring_slot: "You're about to delete a recurring slot. What do you want to do?"# translation_missing - delete_this_slot: "Only this slot" # translation_missing - delete_this_and_next: "This slot and the following" # translation_missing - delete_all: "All slots" # translation_missing - event_in_the_past: "Unable to create a slot in the past." # translation_missing - edit_event: "Edit the event" # translation_missing - view_reservations: "Ver reservas" # translation_missing + delete_recurring_slot: "You're about to delete a recurring slot. What do you want to do?" + delete_this_slot: "Only this slot" + delete_this_and_next: "This slot and the following" + delete_all: "All slots" + event_in_the_past: "Unable to create a slot in the past." + edit_event: "Edit the event" + view_reservations: "Ver reservas" legend: "legenda" and: "and" icalendar: - icalendar_import: "iCalendar import" # translation_missing - intro: "Fab-manager allows to automatically import calendar events, at RFC 5545 iCalendar format, from external URL. These URL are synchronized every nights and the events are shown in the public calendar." # translation_missing - new_import: "New ICS import" # translation_missing - color: "Colour" # translation_missing - text_color: "Text colour" # translation_missing - url: "URL" # translation_missing - name: "Name" # translation_missing - example: "Example" # translation_missing - display: "Display" # translation_missing - hide_text: "Hide the text" # translation_missing - hidden: "Hidden" # translation_missing - shown: "Shown" # translation_missing - create_error: "Unable to create iCalendar import. Please try again later" # translation_missing - delete_failed: "Unable to delete the iCalendar import. Please try again later" # translation_missing - refresh: "Updating..." # translation_missing - sync_failed: "Unable to synchronize the URL. Please try again later" # translation_missing - confirmation_required: "Confirmation required" # translation_missing - confirm_delete_import: "Do you really want to delete this iCalendar import?" # translation_missing - delete_success: "iCalendar import successfully deleted" # translation_missing + icalendar_import: "iCalendar import" + intro: "Fab-manager allows to automatically import calendar events, at RFC 5545 iCalendar format, from external URL. These URL are synchronized every nights and the events are shown in the public calendar." + new_import: "New ICS import" + color: "Colour" + text_color: "Text colour" + url: "URL" + name: "Name" + example: "Example" + display: "Display" + hide_text: "Hide the text" + hidden: "Hidden" + shown: "Shown" + create_error: "Unable to create iCalendar import. Please try again later" + delete_failed: "Unable to delete the iCalendar import. Please try again later" + refresh: "Updating..." + sync_failed: "Unable to synchronize the URL. Please try again later" + confirmation_required: "Confirmation required" + confirm_delete_import: "Do you really want to delete this iCalendar import?" + delete_success: "iCalendar import successfully deleted" project_elements: # management of the projects' components @@ -140,7 +140,7 @@ pt: training_validation: "Validação de treinamentos" training_of_the_DATE_TIME_html : "Training of the {DATE} - {TIME}" you_can_validate_the_training_of_the_following_members: "Você pode validar um treinamento dos seguintes membros:" - deleted_user: "Deleted user" # translation_missing + deleted_user: "Deleted user" no_reservation: "Sem reservas" validate_the_trainings: "Validação de treinamentos" edition_of_the_description_tooltip: "Edição da descrição tooltip" @@ -259,7 +259,7 @@ pt: group: "Grupo" prominence: "Relevância" price: "Preço" - machine_hours: "Machine slots" # translation_missing + machine_hours: "Machine slots" these_prices_match_machine_hours_rates_: "Estes preços correspondem às {DURATION} minutos de trabalho" _without_subscriptions: "sem assinaturas" machines: "Máquinas" @@ -268,7 +268,7 @@ pt: related_trainings: "Treinamentos relacionados" add_a_machine_credit: "Adicionar crédito de máquina" machine: "Máquina" - hours: "Slots of {DURATION} minutes" # translation_missing + hours: "Slots of {DURATION} minutes" related_subscriptions: "Assinaturas relacionadas" please_specify_a_number: "Por favor especifique um número." none: "Vazio" # grammar note: concordance with "training". @@ -290,12 +290,12 @@ pt: nb_of_usages: "Número de usos" status: "Status" add_a_new_coupon: "Adicionar novo cupom" - display_more_coupons: "Display the next coupons" # translation_missing + display_more_coupons: "Display the next coupons" disabled: "Desabilitado" expired: "Expirado" sold_out: "Esgotado" active: "Ativo" - all: "Display all" # translation_missing + all: "Display all" confirmation_required: "Confirmação obrigatória" do_you_really_want_to_delete_this_coupon: "Você realmente deseja deletar este cupom?" coupon_was_successfully_deleted: "O cupom foi deletado com sucesso." @@ -346,7 +346,7 @@ pt: copy_prices_from: "Copiar preços de" machines: "Máquinas" machine: "Máquina" - hourly_rate: "Price by slot" # translation_missing + hourly_rate: "Price by slot" spaces: "Espaços" space: "Espaço" unable_to_save_subscription_changes_please_try_again: "Impossível salvar mudanças da assinatura. Por favor tente novamente." @@ -437,10 +437,10 @@ pt: VAT: "VAT" enable_VAT: "Ativar VAT" VAT_rate: "VAT taxa" - VAT_history: "VAT rates history" #translation_missing - changed_at: "Changed at" #translation_missing - changed_by: "By" #translation_missing - deleted_user: "Deleted user" #translation_missing + VAT_history: "VAT rates history" + changed_at: "Changed at" + changed_by: "By" + deleted_user: "Deleted user" refund_invoice_successfully_created: "Restituição de fatura criada com sucesso." create_a_refund_on_this_invoice: "Criar restituição de fatura" creation_date_for_the_refund: "Criação de data de restituição" @@ -479,96 +479,96 @@ pt: logo_successfully_saved: "Logo salvo com sucesso." an_error_occurred_while_saving_the_logo: "Um erro ocorreu ao salvar o logo." online_payment: "Pagamento Online" - close_accounting_period: "Close an accounting period" # translation_missing - close_from_date: "Close from" # translation_missing - start_date_is_required: "Start date is required" # translation_missing - close_until_date: "Close until" # translation_missing - end_date_is_required: "End date is required" # translation_missing - previous_closings: "Previous closings" # translation_missing - start_date: "From" # translation_missing - end_date: "To" # translation_missing - closed_at: "Closed at" # translation_missing - closed_by: "By" # translation_missing - period_total: "Period total" # translation_missing - perpetual_total: "Perpetual total" # translation_missing + close_accounting_period: "Close an accounting period" + close_from_date: "Close from" + start_date_is_required: "Start date is required" + close_until_date: "Close until" + end_date_is_required: "End date is required" + previous_closings: "Previous closings" + start_date: "From" + end_date: "To" + closed_at: "Closed at" + closed_by: "By" + period_total: "Period total" + perpetual_total: "Perpetual total" integrity: "Verificação de integridade" - confirmation_required: "Confirmation required" # translation_missing - confirm_close_START_END: "Do you really want to close the accounting period between {START} and {END}? Any subsequent changes will be impossible" # translation_missing - period_must_match_fiscal_year: "A closing must occur at the end of a minimum annual period, or per financial year when it is not calendar-based." # translation_missing - this_may_take_a_while: "This operation will take some time to complete." # translation_missing - period_START_END_closed_success: "The accounting period from {START} to {END} has been successfully closed. Archive generation is running, you'll be notified when it's done." # translation_missing - failed_to_close_period: "An error occurred, unable to close the accounting period" # translation_missing - no_periods: "No closings for now" # translation_missing - accounting_codes: "Accounting codes" # translation_missing - accounting_journal_code: "Journal code" # translation_missing - general_journal_code: "Journal code" # translation_missing - accounting_card_client_code: "Card clients code" # translation_missing - card_client_code: "Accounting code for clients who paid by card" # translation_missing - accounting_card_client_label: "Card clients label" # translation_missing - card_client_label: "Account label for clients who paid by card" # translation_missing - accounting_wallet_client_code: "Wallet clients code" # translation_missing - wallet_client_code: "Accounting code for clients who paid by virtual wallet" # translation_missing - accounting_wallet_client_label: "Wallet clients label" # translation_missing - wallet_client_label: "Account label for clients who paid by virtual wallet" # translation_missing - accounting_other_client_code: "Other payment client code" # translation_missing - other_client_code: "Accounting code for clients who paid using another payment means" # translation_missing - accounting_other_client_label: "Other payment client label" # translation_missing - other_client_label: "Accounting label for clients who paid using another payment means" # translation_missing - accounting_wallet_code: "Wallet code" # translation_missing - general_wallet_code: "Accounting code for wallet credit" # translation_missing - accounting_wallet_label: "Wallet label" # translation_missing - general_wallet_label: "Account label for wallet credit" # translation_missing - accounting_vat_code: "VAT code" # translation_missing - general_vat_code: "Accounting code for VAT" # translation_missing - accounting_vat_label: "VAT label" # translation_missing - general_vat_label: "VAT account label" # translation_missing - accounting_subscription_code: "Subscriptions code" # translation_missing - general_subscription_code: "Accounting code for all subscriptions" # translation_missing - accounting_subscription_label: "Subscriptions label" # translation_missing - general_subscription_label: "Account label for all subscriptions" # translation_missing - accounting_Machine_code: "Machines code" # translation_missing - general_machine_code: "Accounting code for all machines" # translation_missing - accounting_Machine_label: "Machine label" # translation_missing - general_machine_label: "Account label for all machines" # translation_missing - accounting_Training_code: "Trainings code" # translation_missing - general_training_code: "Accounting code for all trainings" # translation_missing - accounting_Training_label: "Trainings label" # translation_missing - general_training_label: "Account label for all trainings" # translation_missing - accounting_Event_code: "Events code" # translation_missing - general_event_code: "Accounting code for all events" # translation_missing - accounting_Event_label: "Events label" # translation_missing - general_event_label: "Account label for all events" # translation_missing - accounting_Space_code: "Space code" # translation_missing - general_space_code: "Accounting code for all spaces" # translation_missing - accounting_Space_label: "Spaces label" # translation_missing - general_space_label: "Account label for all spaces" # translation_missing - codes_customization_success: "Customization of accounting codes successfully saved." # translation_missing - export_accounting_data: "Export accounting data" # translation_missing - export_to: "Export to the accounting software" # translation_missing + confirmation_required: "Confirmation required" + confirm_close_START_END: "Do you really want to close the accounting period between {START} and {END}? Any subsequent changes will be impossible" + period_must_match_fiscal_year: "A closing must occur at the end of a minimum annual period, or per financial year when it is not calendar-based." + this_may_take_a_while: "This operation will take some time to complete." + period_START_END_closed_success: "The accounting period from {START} to {END} has been successfully closed. Archive generation is running, you'll be notified when it's done." + failed_to_close_period: "An error occurred, unable to close the accounting period" + no_periods: "No closings for now" + accounting_codes: "Accounting codes" + accounting_journal_code: "Journal code" + general_journal_code: "Journal code" + accounting_card_client_code: "Card clients code" + card_client_code: "Accounting code for clients who paid by card" + accounting_card_client_label: "Card clients label" + card_client_label: "Account label for clients who paid by card" + accounting_wallet_client_code: "Wallet clients code" + wallet_client_code: "Accounting code for clients who paid by virtual wallet" + accounting_wallet_client_label: "Wallet clients label" + wallet_client_label: "Account label for clients who paid by virtual wallet" + accounting_other_client_code: "Other payment client code" + other_client_code: "Accounting code for clients who paid using another payment means" + accounting_other_client_label: "Other payment client label" + other_client_label: "Accounting label for clients who paid using another payment means" + accounting_wallet_code: "Wallet code" + general_wallet_code: "Accounting code for wallet credit" + accounting_wallet_label: "Wallet label" + general_wallet_label: "Account label for wallet credit" + accounting_vat_code: "VAT code" + general_vat_code: "Accounting code for VAT" + accounting_vat_label: "VAT label" + general_vat_label: "VAT account label" + accounting_subscription_code: "Subscriptions code" + general_subscription_code: "Accounting code for all subscriptions" + accounting_subscription_label: "Subscriptions label" + general_subscription_label: "Account label for all subscriptions" + accounting_Machine_code: "Machines code" + general_machine_code: "Accounting code for all machines" + accounting_Machine_label: "Machine label" + general_machine_label: "Account label for all machines" + accounting_Training_code: "Trainings code" + general_training_code: "Accounting code for all trainings" + accounting_Training_label: "Trainings label" + general_training_label: "Account label for all trainings" + accounting_Event_code: "Events code" + general_event_code: "Accounting code for all events" + accounting_Event_label: "Events label" + general_event_label: "Account label for all events" + accounting_Space_code: "Space code" + general_space_code: "Accounting code for all spaces" + accounting_Space_label: "Spaces label" + general_space_label: "Account label for all spaces" + codes_customization_success: "Customization of accounting codes successfully saved." + export_accounting_data: "Export accounting data" + export_to: "Export to the accounting software" export_is_running: "A Exportação está em andamento. Você será notificado quando terminar." - acd: "ACD" # translation_missing - export_form_date: "Export from" # translation_missing - export_to_date: "Export until" # translation_missing - format: "File format" # translation_missing - encoding: "Encoding" # translation_missing - separator: "Separator" # translation_missing - dateFormat: "Date format" # translation_missing - labelMaxLength: "Label maximum length" # translation_missing - decimalSeparator: "Decimal separator" # translation_missing - exportInvoicesAtZero: "Export invoices equal to 0" # translation_missing - columns: "Columns" # translation_missing - exportColumns: # translation_missing - journal_code: "Journal code" # translation_missing - date: "Entry date" # translation_missing - account_code: "Account code" # translation_missing - account_label: "Account label" # translation_missing - piece: "Document" # translation_missing - line_label: "Entry label" # translation_missing - debit_origin: "Origin debit" # translation_missing - credit_origin: "Origin credit" # translation_missing - debit_euro: "Euro debit" # translation_missing - credit_euro: "Euro credit" # translation_missing - lettering: "Lettering" # translation_missing + acd: "ACD" + export_form_date: "Export from" + export_to_date: "Export until" + format: "File format" + encoding: "Encoding" + separator: "Separator" + dateFormat: "Date format" + labelMaxLength: "Label maximum length" + decimalSeparator: "Decimal separator" + exportInvoicesAtZero: "Export invoices equal to 0" + columns: "Columns" + exportColumns: + journal_code: "Journal code" + date: "Entry date" + account_code: "Account code" + account_label: "Account label" + piece: "Document" + line_label: "Entry label" + debit_origin: "Origin debit" + credit_origin: "Origin credit" + debit_euro: "Euro debit" + credit_euro: "Euro credit" + lettering: "Lettering" members: # management of users, labels, groups, and so on @@ -654,41 +654,41 @@ pt: members_import: # members bulk import - import_members: "Import members" # translation_missing - info: "You can upload a CSV file to create new members or update existing ones. Your file must user the identifiers below to specify the group, the trainings and the tags of the members." # translation_missing - required_fields: "Your file must contain, at least, the following information for each user to create: email, name, first name and group. If the password is empty, it will be generated. On updates, the empty fields will be kept as is." # translation_missing - about_example: "Please refer to the provided example file to generate a correct CSV file. Be careful to use Unicode UTF-8 encoding." # translation_missing - groups: "Groups" # translation_missing - group_name: "Group name" # translation_missing - group_identifier: "Identifier to use" # translation_missing - trainings: "Trainings" # translation_missing - training_name: "Training name" # translation_missing - training_identifier: "Identifier to use" # translation_missing - plans: "Plans" # translation_missing - plan_name: "Plan name" # translation_missing - plan_identifier: "Identifier to use" # translation_missing - tags: "Tags" # translation_missing - tag_name: "Tag name" # translation_missing - tag_identifier: "Identifier to use" # translation_missing - download_example: "Download the exemple file" # translation_missing - select_file: "Choose a file" # translation_missing - import: "Import" # translation_missing - update_field: "Reference field for users to update" # translation_missing - update_on_id: "ID" # translation_missing - update_on_username: "Username" # translation_missing - update_on_email: "Email address" # translation_missing + import_members: "Import members" + info: "You can upload a CSV file to create new members or update existing ones. Your file must user the identifiers below to specify the group, the trainings and the tags of the members." + required_fields: "Your file must contain, at least, the following information for each user to create: email, name, first name and group. If the password is empty, it will be generated. On updates, the empty fields will be kept as is." + about_example: "Please refer to the provided example file to generate a correct CSV file. Be careful to use Unicode UTF-8 encoding." + groups: "Groups" + group_name: "Group name" + group_identifier: "Identifier to use" + trainings: "Trainings" + training_name: "Training name" + training_identifier: "Identifier to use" + plans: "Plans" + plan_name: "Plan name" + plan_identifier: "Identifier to use" + tags: "Tags" + tag_name: "Tag name" + tag_identifier: "Identifier to use" + download_example: "Download the exemple file" + select_file: "Choose a file" + import: "Import" + update_field: "Reference field for users to update" + update_on_id: "ID" + update_on_username: "Username" + update_on_email: "Email address" members_import_result: # import results - import_results: "Import results" # translation_missing - import_details: "Import #{ID}, of {DATE}, initiated by {USER}" # translation_missing - results: "Results" # translation_missing - pending: "Pending..." # translation_missing - status_create: "Creating a new user" # translation_missing - status_update: "Updating user {ID}" # translation_missing - success: "Success" # translation_missing - failed: "Failed" # translation_missing - error_details: "Error's details:" # translation_missing + import_results: "Import results" + import_details: "Import #{ID}, of {DATE}, initiated by {USER}" + results: "Results" + pending: "Pending..." + status_create: "Creating a new user" + status_update: "Updating user {ID}" + success: "Success" + failed: "Failed" + error_details: "Error's details:" members_edit: # edit a member @@ -812,7 +812,7 @@ pt: export_all_statistics: "Exportar todas estatísticas" export_the_current_search_results: "Exportar resultados encontrados" export: "Exportar" - deleted_user: "Deleted user" # translation_missing + deleted_user: "Deleted user" man: "Man" woman: "Woman" export_is_running_you_ll_be_notified_when_its_ready: "Export is running. You'll be notified when it's ready." @@ -924,9 +924,9 @@ pt: about_title: "\"Sobre\" título da página" about_body: "\"Sobre\" conteúdo da página" about_contacts: "\"Sobre\" página de contatos" - privacy_draft: "privacy policy draft" # translation_missing - privacy_body: "privacy policy" # translation_missing - privacy_dpo: "data protection officer address" # translation_missing + privacy_draft: "privacy policy draft" + privacy_body: "privacy policy" + privacy_dpo: "data protection officer address" booking_window_start: "Horário de abertura" booking_window_end: "Horário de fechamento" booking_move_enable: "Mover reserva habilitado" @@ -953,14 +953,14 @@ pt: updated_at: "TODO" privacy: title: "Política de privacidade" - input_the_dpo: "Input the contact of the Data Protection Officer" # translation_missing - current_policy: "Current policy" # translation_missing - draft_from_USER_DATE: "Draft, saved by {USER}, on {DATE}" # translation_missing - save_or_publish: "Save or publish?" # translation_missing - save_or_publish_body: "Do you want to publish a new version of the privacy policy or save it as a draft?" # translation_missing - publish_will_notify: "Publish a new version will send a notification to every users." # translation_missing - publish: "Publish" # translation_missing - users_notified: "Platform users will be notified of the update." # translation_missing + input_the_dpo: "Input the contact of the Data Protection Officer" + current_policy: "Current policy" + draft_from_USER_DATE: "Draft, saved by {USER}, on {DATE}" + save_or_publish: "Save or publish?" + save_or_publish_body: "Do you want to publish a new version of the privacy policy or save it as a draft?" + publish_will_notify: "Publish a new version will send a notification to every users." + publish: "Publish" + users_notified: "Platform users will be notified of the update." open_api_clients: add_new_client: "Criar novo cliente de API" @@ -996,10 +996,10 @@ pt: # process and delete abuses reports abuses_list: "Lista de relatórios" no_reports: "Não há relatos de agora" - published_by: "published by" # translation_missing - at_date: "on" # translation_missing - has_reported: "made the following report:" # translation_missing - confirmation_required: "Confirm the processing of the report" # translation_missing - report_will_be_destroyed: "Once the report has been processed, it will be deleted. This can't be undone, continue?" # translation_missing - report_removed: "The report has been deleted" # translation_missing - failed_to_remove: "An error occurred, unable to delete the report" # translation_missing + published_by: "published by" + at_date: "on" + has_reported: "made the following report:" + confirmation_required: "Confirm the processing of the report" + report_will_be_destroyed: "Once the report has been processed, it will be deleted. This can't be undone, continue?" + report_removed: "The report has been deleted" + failed_to_remove: "An error occurred, unable to delete the report" diff --git a/config/locales/app.logged.es.yml b/config/locales/app.logged.es.yml index 9918982c2..17c2cc837 100644 --- a/config/locales/app.logged.es.yml +++ b/config/locales/app.logged.es.yml @@ -74,12 +74,12 @@ es: no_further_access_to_projects: "Your published projects will be anonymized and you won't get any further ability to edit them." # missing translation your_user_account_has_been_successfully_deleted_goodbye: "Su cuenta ha sido eliminada con éxito. Adiós" an_error_occured_preventing_your_account_from_being_deleted: "Un error inesperado impidió que su cuenta fuese eliminada." - used_for_statistics: "This data will be used for statistical purposes" # translation missing - used_for_invoicing: "This data will be used for billing purposes" # translation missing - used_for_reservation: "This data will be used in case of change on one of your bookings" # translation missing - used_for_profile: "This data will only be displayed on your profile" # translation missing - used_for_pricing_stats: "This data will be used to determine the prices to which you are entitled, and for statistical purposes" # translation missing - public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing + used_for_statistics: "This data will be used for statistical purposes" + used_for_invoicing: "This data will be used for billing purposes" + used_for_reservation: "This data will be used in case of change on one of your bookings" + used_for_profile: "This data will only be displayed on your profile" + used_for_pricing_stats: "This data will be used to determine the prices to which you are entitled, and for statistical purposes" + public_profile: "You will have a public profile and other users will be able to associate you in their projects" trainings: "Cursos" no_trainings: "Sin cursos" subscription: "Suscripción" @@ -159,10 +159,10 @@ es: i_reserve: "reservo" i_shift: "reemplazo" i_change: "cambio" - do_you_really_want_to_cancel_this_reservation: "Do you really want to cancel this reservation?" # translation missing - reservation_was_cancelled_successfully: "Reservation was cancelled successfully." # translation missing - cancellation_failed: "Cancellation failed." # translation missing - a_problem_occured_during_the_payment_process_please_try_again_later: "A problem occurred during the payment process. Please try again later." # translation missing + do_you_really_want_to_cancel_this_reservation: "Do you really want to cancel this reservation?" + reservation_was_cancelled_successfully: "Reservation was cancelled successfully." + cancellation_failed: "Cancellation failed." + a_problem_occured_during_the_payment_process_please_try_again_later: "A problem occurred during the payment process. Please try again later." trainings_reserve: # book a training diff --git a/config/locales/app.logged.pt.yml b/config/locales/app.logged.pt.yml index 6ea5dec9a..846d60583 100755 --- a/config/locales/app.logged.pt.yml +++ b/config/locales/app.logged.pt.yml @@ -74,12 +74,12 @@ pt: no_further_access_to_projects: "Your published projects will be anonymized and you won't get any further ability to edit them." # missing translation your_user_account_has_been_successfully_deleted_goodbye: "Sua conta de usuário foi excluída com êxito. Até mais." an_error_occured_preventing_your_account_from_being_deleted: "Ocorreu um erro, impedindo que sua conta fosse excluída." - used_for_statistics: "This data will be used for statistical purposes" # translation missing - used_for_invoicing: "This data will be used for billing purposes" # translation missing - used_for_reservation: "This data will be used in case of change on one of your bookings" # translation missing - used_for_profile: "This data will only be displayed on your profile" # translation missing - used_for_pricing_stats: "This data will be used to determine the prices to which you are entitled, and for statistical purposes" # translation missing - public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing + used_for_statistics: "This data will be used for statistical purposes" + used_for_invoicing: "This data will be used for billing purposes" + used_for_reservation: "This data will be used in case of change on one of your bookings" + used_for_profile: "This data will only be displayed on your profile" + used_for_pricing_stats: "This data will be used to determine the prices to which you are entitled, and for statistical purposes" + public_profile: "You will have a public profile and other users will be able to associate you in their projects" trainings: "Treinamentos" no_trainings: "Sem treinamentos" subscription: "Assinatura" @@ -159,10 +159,10 @@ pt: i_reserve: "Eu reservo" i_shift: "Eu mudo" i_change: "Eu altero" - do_you_really_want_to_cancel_this_reservation: "Do you really want to cancel this reservation?" # translation missing - reservation_was_cancelled_successfully: "Reservation was cancelled successfully." # translation missing - cancellation_failed: "Cancellation failed." # translation missing - a_problem_occured_during_the_payment_process_please_try_again_later: "A problem occurred during the payment process. Please try again later." # translation missing + do_you_really_want_to_cancel_this_reservation: "Do you really want to cancel this reservation?" + reservation_was_cancelled_successfully: "Reservation was cancelled successfully." + cancellation_failed: "Cancellation failed." + a_problem_occured_during_the_payment_process_please_try_again_later: "A problem occurred during the payment process. Please try again later." trainings_reserve: # book a training diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml index d478b3e7c..98cb6a533 100644 --- a/config/locales/app.public.es.yml +++ b/config/locales/app.public.es.yml @@ -91,13 +91,13 @@ es: i_accept_to_receive_information_from_the_fablab: "Acepto recibir información del FabLab" i_ve_read_and_i_accept_: "He leido y acepto" _the_fablab_policy: "la política de FabLab" - field_required: "Field required" # translation missing - unexpected_error_occurred: "An unexpected error occurred. Please try again later." # translation missing - used_for_statistics: "This data will be used for statistical purposes" # translation missing - used_for_invoicing: "This data will be used for billing purposes" # translation missing - used_for_reservation: "This data will be used in case of change on one of your bookings" # translation missing - used_for_profile: "This data will only be displayed on your profile" # translation missing - public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing + field_required: "Field required" + unexpected_error_occurred: "An unexpected error occurred. Please try again later." + used_for_statistics: "This data will be used for statistical purposes" + used_for_invoicing: "This data will be used for billing purposes" + used_for_reservation: "This data will be used in case of change on one of your bookings" + used_for_profile: "This data will only be displayed on your profile" + public_profile: "You will have a public profile and other users will be able to associate you in their projects" # password modification modal change_your_password: "Cambiar contraseña" @@ -154,7 +154,7 @@ es: free_admission: "Admisión gratuita" full_price: "Precio final" event_full: "Evento lleno" - still_available: "Available place(s)" #translation_missing + still_available: "Available place(s)" projects_list: # projects gallery @@ -183,7 +183,7 @@ es: step_N: "Step {INDEX}" share_on_facebook: "Share on Facebook" share_on_twitter: "Share on Twitter" - deleted_user: "Deleted user" #translation_missing + deleted_user: "Deleted user" posted_on_: "Subido el" CAD_file_to_download: "{COUNT, plural, =0{No CAD files} =1{CAD file to download} other{CAD files to download}}" machines_and_materials: "Machines and materials" @@ -209,11 +209,11 @@ es: # list of machines the_fablab_s_machines: "Las máquinas del FabLab" add_a_machine: "Añadir una máquina" - book: "Book" #translation_missing + book: "Book" _or_the_: " o el " - status_enabled: "Enabled" #translation_missing - status_disabled: "Disabled" #translation_missing - status_all: "All" #translation_missing + status_enabled: "Enabled" + status_disabled: "Disabled" + status_all: "All" machines_show: # details of a machine @@ -275,15 +275,15 @@ es: the_fablab_s_events: "Los eventos del FabLab" all_categories: "Todas las categorías" for_all: "Para todo" - sold_out: "Sold Out" #translation_missing - cancelled: "Cancelled" #translation_missing - free_admission: "Free admission" #translation_missing - still_available: "available place(s)" #translation_missing + sold_out: "Sold Out" + cancelled: "Cancelled" + free_admission: "Free admission" + still_available: "available place(s)" free_entry: "Free entry" add_an_event: "Add an event" load_the_next_events: "Load the next events..." full_price_: "Full price:" - to_date: "to" # context: date. eg: "from 01/01 to 01/05" #translation_missing + to_date: "to" # context: date. eg: "from 01/01 to 01/05" events_show: # details and booking of an event @@ -301,14 +301,14 @@ es: tickets_still_availables: "Entradas disponibles:" sold_out: "Entradas vendidas." free_entry: "Entrada gratuita" - cancelled: "Cancelled" #translation_missing + cancelled: "Cancelled" ticket: "{NUMBER, plural, one{ticket} other{tickets}}" make_a_gift_of_this_reservation: "Regalar esta reserva" thank_you_your_payment_has_been_successfully_registered: "Tank you. Your payment has been successfully registered!" you_can_find_your_reservation_s_details_on_your_: "Puede encontrar los detalles de su reserva en" dashboard: "dashboard" you_booked_DATE: "You booked ({DATE}):" - canceled_reservation_SEATS: "Reservation canceled ({SEATS} seats)" #translation_missing + canceled_reservation_SEATS: "Reservation canceled ({SEATS} seats)" book: "Reservar" confirm_and_pay: "Confirm and pay" confirm_payment_of_html: "{ROLE, select, admin{Cash} other{Pay}}: {AMOUNT}" # (contexte : validate a payment of $20,00) @@ -316,17 +316,17 @@ es: please_select_a_member_first: "Please select a member first" change_the_reservation: "Cambiar la reserva" you_can_shift_this_reservation_on_the_following_slots: "Puede cambiar la reserva en los siguientes campos:" - confirmation_required: "Confirmation required" #translation_missing - do_you_really_want_to_delete_this_event: "Do you really want to delete this event?" #translation_missing - event_successfully_deleted: "Event successfully deleted" #translation_missing - unable_to_delete_the_event_because_some_users_alredy_booked_it: "Unable to delete this event, it may have been already reserved by some users." #translation_missing - cancel_the_reservation: "Cancel the reservation" #translation_missing - do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." #translation_missing + confirmation_required: "Confirmation required" + do_you_really_want_to_delete_this_event: "Do you really want to delete this event?" + event_successfully_deleted: "Event successfully deleted" + unable_to_delete_the_event_because_some_users_alredy_booked_it: "Unable to delete this event, it may have been already reserved by some users." + cancel_the_reservation: "Cancel the reservation" + do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." reservation_was_successfully_cancelled: "Reservation was successfully cancelled" - cancellation_failed: "Cancellation failed." #translation_missing - event_is_over: "The event is over" #translation_missing - thanks_for_coming: "Thanks for coming!" #translation_missing - view_event_list: "View events to come" #translation_missing + cancellation_failed: "Cancellation failed." + event_is_over: "The event is over" + thanks_for_coming: "Thanks for coming!" + view_event_list: "View events to come" share_on_facebook: "Share on Facebook" share_on_twitter: "Share on Twitter" @@ -345,10 +345,10 @@ es: # list of spaces the_spaces: "Espacios" add_a_space: "Añadir espacios" - status_enabled: "Enabled" #translation_missing - status_disabled: "Disabled" #translation_missing - status_all: "All" #translation_missing - book: "Book" #translation_missing + status_enabled: "Enabled" + status_disabled: "Disabled" + status_all: "All" + book: "Book" space_show: # display the details of a space diff --git a/config/locales/app.public.pt.yml b/config/locales/app.public.pt.yml index 19d91af4d..f1c02b0e7 100755 --- a/config/locales/app.public.pt.yml +++ b/config/locales/app.public.pt.yml @@ -91,13 +91,13 @@ pt: i_accept_to_receive_information_from_the_fablab: "Eu aceito receber informações do FabLab" i_ve_read_and_i_accept_: "Eu li e aceito" _the_fablab_policy: "a política do FabLab" - field_required: "Field required" # translation missing - unexpected_error_occurred: "An unexpected error occurred. Please try again later." # translation missing - used_for_statistics: "This data will be used for statistical purposes" # translation missing - used_for_invoicing: "This data will be used for billing purposes" # translation missing - used_for_reservation: "This data will be used in case of change on one of your bookings" # translation missing - used_for_profile: "This data will only be displayed on your profile" # translation missing - public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing + field_required: "Field required" + unexpected_error_occurred: "An unexpected error occurred. Please try again later." + used_for_statistics: "This data will be used for statistical purposes" + used_for_invoicing: "This data will be used for billing purposes" + used_for_reservation: "This data will be used in case of change on one of your bookings" + used_for_profile: "This data will only be displayed on your profile" + public_profile: "You will have a public profile and other users will be able to associate you in their projects" # password modification modal change_your_password: "Mudar sua senha" @@ -183,7 +183,7 @@ pt: step_N: "Step {INDEX}" share_on_facebook: "Share on Facebook" share_on_twitter: "Share on Twitter" - deleted_user: "Deleted user" #translation_missing + deleted_user: "Deleted user" posted_on_: "Criado em" CAD_file_to_download: "{COUNT, plural, =0{No CAD files} =1{CAD file to download} other{CAD files to download}}" machines_and_materials: "Machines and materials" @@ -308,7 +308,7 @@ pt: you_can_find_your_reservation_s_details_on_your_: "Você pode encontrar detalhes da sua reserva em seu" dashboard: "dashboard" you_booked_DATE: "Sua reserva ({DATE}):" - canceled_reservation_SEATS: "Reservation canceled ({SEATS} seats)" #translation_missing + canceled_reservation_SEATS: "Reservation canceled ({SEATS} seats)" book: "Reservar" confirm_and_pay: "Confirm and pay" confirm_payment_of_html: "{ROLE, select, admin{Cash} other{Pay}}: {AMOUNT}" # (contexte : validate a payment of $20,00) @@ -320,13 +320,13 @@ pt: do_you_really_want_to_delete_this_event: "Vocêrealmente deseja remover este evento?" event_successfully_deleted: "Evento excluído com sucesso" unable_to_delete_the_event_because_some_users_alredy_booked_it: "Não foi possível excluir este evento, já pode ter sido reservado por alguns usuários." - cancel_the_reservation: "Cancel the reservation" #translation_missing - do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." #translation_missing + cancel_the_reservation: "Cancel the reservation" + do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." reservation_was_successfully_cancelled: "Reservation was successfully cancelled" cancellation_failed: "Cancellation failed." #translation_missin - event_is_over: "The event is over" #translation_missing - thanks_for_coming: "Thanks for coming!" #translation_missing - view_event_list: "View events to come" #translation_missing + event_is_over: "The event is over" + thanks_for_coming: "Thanks for coming!" + view_event_list: "View events to come" share_on_facebook: "Share on Facebook" share_on_twitter: "Share on Twitter" diff --git a/config/locales/app.shared.es.yml b/config/locales/app.shared.es.yml index 313fdd942..dea5a37a7 100644 --- a/config/locales/app.shared.es.yml +++ b/config/locales/app.shared.es.yml @@ -108,7 +108,7 @@ es: attached_files_pdf: "archivos anclados (pdf)" attach_a_file: "adjuntar archivo" add_an_attachment: "añadir archivo adjunto" - disable_machine: "Disable machine" #translation_missing + disable_machine: "Disable machine" validate_your_machine: "Validar su máquina" plan_subscribe: @@ -201,8 +201,8 @@ es: surname_is_required: "Last name is required." email_address: "Email address" email_address_is_required: "Se requiere un mail." - disabled: "Disable subscription" #translation_missing - disable_plan_will_not_unsubscribe_users: "Beware: disabling this plan won't unsubscribe users having active subscriptions with it." #translation_missing + disabled: "Disable subscription" + disable_plan_will_not_unsubscribe_users: "Beware: disabling this plan won't unsubscribe users having active subscriptions with it." trainings: # training edition form @@ -217,7 +217,7 @@ es: associated_machines: "Máquinas asociadas" number_of_tickets: "Número de entradas" public_page: "Hacer curso público" - disable_training: "Disable the training" #translation_missing + disable_training: "Disable the training" user_admin: # partial form to edit/create an user (admin view) @@ -367,8 +367,8 @@ es: coupon_input: # coupon (input zone for users) - i_have_a_coupon: "I have a coupon!" #translation_missing - code_: "Code:" #translation_missing + i_have_a_coupon: "I have a coupon!" + code_: "Code:" the_coupon_has_been_applied_you_get_PERCENT_discount: "Se ha aplicado el cupón {PERCENT}% de descuento." the_coupon_has_been_applied_you_get_AMOUNT_CURRENCY: "Se ha aplicado el cupón. Recibirá un descuento de {AMOUNT} {CURRENCY}." unable_to_apply_the_coupon_because_disabled: "No se ha podido canjear el cupón: código inhabilitado." @@ -394,7 +394,7 @@ es: add_an_attachment: "Añadir adjunto" default_places: "Máximo de entradas predeterminado" default_places_is_required: "Se requiere un máximo de entradas predeterminado." - disable_space: "Disable space" #translation_missing + disable_space: "Disable space" cart: # module de panier d'achat de réservations @@ -413,7 +413,7 @@ es: _subscription: "suscripción" cost_of_the_subscription: "Coste de la suscripción" confirm_and_pay: "Confirmar y pagar" - you_have_settled_the_following_TYPE: "Acaba de seleccionar {TYPE, select, Machine{machine slots} Training{training} other{elements}}:" #translation_missing + you_have_settled_the_following_TYPE: "Acaba de seleccionar {TYPE, select, Machine{machine slots} Training{training} other{elements}}:" you_have_settled_a_: "Ha establecido una" total_: "TOTAL :" thank_you_your_payment_has_been_successfully_registered: "Gracias. Su pago se ha registrado con éxito." diff --git a/config/locales/es.yml b/config/locales/es.yml index 05aefa471..33290d9c8 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -127,24 +127,24 @@ es: and: 'y' accounting_export: - journal_code: "Journal code" # translation_missing - date: "Entry date" # translation_missing - account_code: "Account code" # translation_missing - account_label: "Account label" # translation_missing - piece: "Document" # translation_missing - line_label: "Entry label" # translation_missing - debit_origin: "Origin debit" # translation_missing - credit_origin: "Origin credit" # translation_missing - debit_euro: "Euro debit" # translation_missing - credit_euro: "Euro credit" # translation_missing - lettering: "Lettering" # translation_missing + journal_code: "Journal code" + date: "Entry date" + account_code: "Account code" + account_label: "Account label" + piece: "Document" + line_label: "Entry label" + debit_origin: "Origin debit" + credit_origin: "Origin credit" + debit_euro: "Euro debit" + credit_euro: "Euro credit" + lettering: "Lettering" VAT: 'IVA' - subscription: "subscr." # translation_missing - Machine_reservation: "machine reserv." # translation_missing - Training_reservation: "training reserv." # translation_missing - Event_reservation: "event reserv." # translation_missing - Space_reservation: "space reserv." # translation_missing - wallet: "wallet" # translation_missing + subscription: "subscr." + Machine_reservation: "machine reserv." + Training_reservation: "training reserv." + Event_reservation: "event reserv." + Space_reservation: "space reserv." + wallet: "wallet" trainings: # training availabilities diff --git a/config/locales/mails.es.yml b/config/locales/mails.es.yml index 4e3e70175..2a7007e83 100644 --- a/config/locales/mails.es.yml +++ b/config/locales/mails.es.yml @@ -229,7 +229,7 @@ es: subject: "Una cuenta importada ha completado su perfil" body: account_completed: "Una cuenta de usuario importada previamente %{PROVIDER} ha completado su perfil:" - imported_account_completed: "An user account previously imported through %{PROVIDER} has just completed his/her profile data:" # translation missing + imported_account_completed: "An user account previously imported through %{PROVIDER} has just completed his/her profile data:" provider_id: "su ID de proveedor es:" notify_admin_abuse_reported: @@ -243,7 +243,7 @@ es: visit_management_interface: "Refer to the Reporting Management Interface for more information." # missing translation notify_user_wallet_is_credited: - subject: "Your wallet has been credited" # translation missing + subject: "Your wallet has been credited" body: wallet_credit_html: "Se han ingresado %{AMOUNT} por el administrador." @@ -259,7 +259,7 @@ es: statistics_global: "de todas las estadísticas" statistics_account: "de las estadísticas de registro" statistics_event: "de estadísticas sobre eventos" - statistics_machine: "de estadísticas sobre slots de máquina" # translation missing + statistics_machine: "de estadísticas sobre slots de máquina" statistics_project: "de estadísticas sobre proyectos" statistics_subscription: "de estadísticas de suscripción" statistics_training: "de estadísticas sobre entrenamientos" @@ -275,7 +275,7 @@ es: xlsx: "Excel" csv: "CSV" - notify_admin_import_complete: #translation_missing + notify_admin_import_complete: subject: "Import completed" body: you_made_an_import: "You have initiated an import %{CATEGORY}" @@ -289,17 +289,17 @@ es: enjoy_a_discount_of_AMOUNT_with_code_CODE: "Disfruta de un descuento de %{AMOUNT} en toda la web con el código %{CODE}." this_coupon_is_valid_USAGE_times_until_DATE_for_all_your_purchases: "Este cupón es válido {USAGE, plural, =1{just once} other{many times}}: para todas tus compras {TYPE, select, amount_off{at least equal to the amount of the coupon} other{}}, desde ahora {DATE, select, NO-DATE{and without time limit} other{and until {DATE}}}." - notify_admin_free_disk_space: #translation_missing + notify_admin_free_disk_space: subject: "Low disk space" body: "Warning: available disk space on the server hosting fab-manager is less than %{THRESHOLD} MiB. This can affect its operation and prevent saving some data. Currently, %{AVAILABLE} MiB of free disk space remains available on the mount point." - notify_admin_close_period_reminder: #translation_missing + notify_admin_close_period_reminder: subject: "Remind to close your accounting periods" body: warning_last_closed_period_over_1_year: "Please remind to periodically close your accounting periods. Last closed period ended at %{LAST_END}." warning_no_closed_periods: "Please remind to periodically close your accounting periods. You have to close periods from %{FIRST_DATE}." - notify_admin_archive_complete: #translation_missing + notify_admin_archive_complete: subject: "Archiving completed" body: archive_complete: "You have closed the accounting period from %{START} to %{END}. Archiving of data is now complete." @@ -307,13 +307,13 @@ es: here: "here." save_on_secured: "Remember that you must save this archive on a secured external support, which may be requested by the tax authorities during a check." - notify_privacy_policy_changed: #translation_missing + notify_privacy_policy_changed: subject: "Privacy policy updated" body: content_html: "

    We wish to inform you that we have just updated our privacy policy.

    We may change our privacy policy regularly. In accordance with the regulations, you will receive a notification for each update.

    By accessing or using our services after the privacy policy update, we will consider that you agree its terms, updates included.

    " link_to_policy: "Cliquez ici pour consultez la politique de confidentialité." - notify_admin_refund_created: #translation_missing + notify_admin_refund_created: subject: "A refund has been generated" body: refund_created: "A refund of %{AMOUNT} has been generated on invoice %{INVOICE} of user %{USER}" diff --git a/config/locales/mails.pt.yml b/config/locales/mails.pt.yml index 32cbee51a..a7247b1e7 100755 --- a/config/locales/mails.pt.yml +++ b/config/locales/mails.pt.yml @@ -259,7 +259,7 @@ pt: statistics_global: "de todas as estatísticas" statistics_account: "das estatísticas de registro" statistics_event: "das estatísticas sobre eventos" - statistics_machine: "das estatísticas de slot máquina" #translation_missing + statistics_machine: "das estatísticas de slot máquina" statistics_project: "das estatísticas de projetos" statistics_subscription: "das estatísticas de assinaturas" statistics_training: "das estatísticas de treinamento" @@ -275,7 +275,7 @@ pt: xlsx: "Excel" csv: "CSV" - notify_admin_import_complete: #translation_missing + notify_admin_import_complete: subject: "Import completed" body: you_made_an_import: "You have initiated an import %{CATEGORY}" @@ -289,17 +289,17 @@ pt: enjoy_a_discount_of_AMOUNT_with_code_CODE: "Desfrute de um desconto de %{AMOUNT} em todo o site com o código %{CODE}." this_coupon_is_valid_USAGE_times_until_DATE_for_all_your_purchases: "Esse cupom é válido {USAGE, plural, =1{uma vez} other{vérias vezes}}: para todas as suas compras {TYPE, select, amount_off{pelo menos igual ao montante do cupom} other{}}, from now {DATE, select, NO-DATE{e sem limite de tempo} other{até {DATE}}}." - notify_admin_free_disk_space: #translation_missing + notify_admin_free_disk_space: subject: "Low disk space" body: "Warning: available disk space on the server hosting fab-manager is less than %{THRESHOLD} MiB. This can affect its operation and prevent saving some data. Currently, %{AVAILABLE} MiB of free disk space remains available on the mount point." - notify_admin_close_period_reminder: #translation_missing + notify_admin_close_period_reminder: subject: "Remind to close your accounting periods" body: warning_last_closed_period_over_1_year: "Please remind to periodically close your accounting periods. Last closed period ended at %{LAST_END}." warning_no_closed_periods: "Please remind to periodically close your accounting periods. You have to close periods from %{FIRST_DATE}." - notify_admin_archive_complete: #translation_missing + notify_admin_archive_complete: subject: "Archiving completed" body: archive_complete: "You have closed the accounting period from %{START} to %{END}. Archiving of data is now complete." @@ -307,13 +307,13 @@ pt: here: "here." save_on_secured: "Remember that you must save this archive on a secured external support, which may be requested by the tax authorities during a check." - notify_privacy_policy_changed: #translation_missing + notify_privacy_policy_changed: subject: "Privacy policy updated" body: content_html: "

    We wish to inform you that we have just updated our privacy policy.

    We may change our privacy policy regularly. In accordance with the regulations, you will receive a notification for each update.

    By accessing or using our services after the privacy policy update, we will consider that you agree its terms, updates included.

    " link_to_policy: "Cliquez ici pour consultez la politique de confidentialité." - notify_admin_refund_created: #translation_missing + notify_admin_refund_created: subject: "A refund has been generated" body: refund_created: "A refund of %{AMOUNT} has been generated on invoice %{INVOICE} of user %{USER}" diff --git a/config/locales/pt.yml b/config/locales/pt.yml index b6ece70a6..c208ef348 100755 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -127,24 +127,24 @@ pt: and: 'e' accounting_export: - journal_code: "Journal code" # translation_missing - date: "Entry date" # translation_missing - account_code: "Account code" # translation_missing - account_label: "Account label" # translation_missing - piece: "Document" # translation_missing - line_label: "Entry label" # translation_missing - debit_origin: "Origin debit" # translation_missing - credit_origin: "Origin credit" # translation_missing - debit_euro: "Euro debit" # translation_missing - credit_euro: "Euro credit" # translation_missing - lettering: "Lettering" # translation_missing + journal_code: "Journal code" + date: "Entry date" + account_code: "Account code" + account_label: "Account label" + piece: "Document" + line_label: "Entry label" + debit_origin: "Origin debit" + credit_origin: "Origin credit" + debit_euro: "Euro debit" + credit_euro: "Euro credit" + lettering: "Lettering" VAT: 'IVA' - subscription: "subscr." # translation_missing - Machine_reservation: "machine reserv." # translation_missing - Training_reservation: "training reserv." # translation_missing - Event_reservation: "event reserv." # translation_missing - Space_reservation: "space reserv." # translation_missing - wallet: "wallet" # translation_missing + subscription: "subscr." + Machine_reservation: "machine reserv." + Training_reservation: "training reserv." + Event_reservation: "event reserv." + Space_reservation: "space reserv." + wallet: "wallet" trainings: # training availabilities From f651f540d70f0fb28ddcb83ed5d70cc15b7123c7 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 18 Dec 2019 15:57:13 +0100 Subject: [PATCH 085/135] fixes environment documentation --- CHANGELOG.md | 3 ++- doc/environment.md | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b43023b19..06ce7162d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,8 @@ - Added freeCAD files as default allowed extensions - Rake task to sync local users with Stripe - Unified translations syntax to use ICU MessageFormat -- Updated and refactored README +- Refactored front-end translations keys with unified paths +- Updated and refactored README and documentations - Fix a bug: unable to remove the picture from a training - Fix a bug: no alerts on errors during admin creation - Fix a bug: replaces all Time.now by DateTime.current to prevent time zones issues [Taiga#134] diff --git a/doc/environment.md b/doc/environment.md index 23d962d94..2c435a529 100644 --- a/doc/environment.md +++ b/doc/environment.md @@ -325,7 +325,7 @@ Configure the first day of the week in your locale zone (generally monday or sun D3_DATE_FORMAT Date format for dates displayed in statistics charts. -See [D3 Wiki](https://github.com/mbostock/d3/wiki/Time-Formatting#format) for available formats. +See [D3 Wiki](https://github.com/d3/d3-time-format/blob/v2.2.2/README.md#locale_format) for available formats. UIB_DATE_FORMAT From bcd0e6833d0af8587384a55e022c0bf14952662b Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 18 Dec 2019 16:50:16 +0100 Subject: [PATCH 086/135] integrate crowdin in-context translation code --- app/views/application/index.html.erb | 7 + config/locales/ach.yml | 409 +++++++++++ config/locales/app.admin.ach.yml | 975 +++++++++++++++++++++++++++ config/locales/app.logged.ach.yml | 183 +++++ config/locales/app.public.ach.yml | 334 +++++++++ config/locales/app.shared.ach.yml | 417 ++++++++++++ config/locales/devise.ach.yml | 63 ++ config/locales/mails.ach.yml | 277 ++++++++ config/locales/rails.ach.yml | 205 ++++++ config/secrets.yml | 1 + doc/environment.md | 6 + 11 files changed, 2877 insertions(+) create mode 100644 config/locales/ach.yml create mode 100644 config/locales/app.admin.ach.yml create mode 100644 config/locales/app.logged.ach.yml create mode 100644 config/locales/app.public.ach.yml create mode 100644 config/locales/app.shared.ach.yml create mode 100644 config/locales/devise.ach.yml create mode 100644 config/locales/mails.ach.yml create mode 100644 config/locales/rails.ach.yml diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb index b8885143e..9084e0b41 100644 --- a/app/views/application/index.html.erb +++ b/app/views/application/index.html.erb @@ -12,6 +12,13 @@ + <% if Rails.env.staging? && Rails.application.secrets.enable_in_context_translation == 'true' %> + + + <% end %> From f05547e46ecfdd8524a5f0ed2a485b9dde3517b2 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 23 Dec 2019 11:29:02 +0100 Subject: [PATCH 091/135] change ach pluralization location --- app/views/application/index.html.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb index 2aacaafac..554df8b70 100644 --- a/app/views/application/index.html.erb +++ b/app/views/application/index.html.erb @@ -14,7 +14,6 @@ <% if Rails.env.staging? && Rails.application.secrets.enable_in_context_translation == 'true' %> @@ -127,7 +126,9 @@ - +<% if Rails.env.staging? && Rails.application.secrets.enable_in_context_translation == 'true' %> + +<% end %> <% if Rails.application.assets.find_asset "moment/locale/#{Rails.application.secrets.moment_locale}.js" %> From 3412d9e35c4dcb6fc4376d8b307e96f444c530d5 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 23 Dec 2019 13:49:46 +0100 Subject: [PATCH 092/135] fix checking enable_in_context_translation --- app/views/application/index.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb index 554df8b70..58b936944 100644 --- a/app/views/application/index.html.erb +++ b/app/views/application/index.html.erb @@ -12,7 +12,7 @@ - <% if Rails.env.staging? && Rails.application.secrets.enable_in_context_translation == 'true' %> + <% if Rails.env.staging? && Rails.application.secrets.enable_in_context_translation %> -<% if Rails.env.staging? && Rails.application.secrets.enable_in_context_translation == 'true' %> +<% if Rails.env.staging? && Rails.application.secrets.enable_in_context_translation %> <% end %> From b65c76beb3f47bf28e08341a1d73dfec7dbda7d8 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 23 Dec 2019 15:18:18 +0100 Subject: [PATCH 093/135] fix datetime parsing formats for ach locale --- config/locales/ach.yml | 4 ++-- config/locales/rails.ach.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/locales/ach.yml b/config/locales/ach.yml index d8ec5fa94..6a335e902 100644 --- a/config/locales/ach.yml +++ b/config/locales/ach.yml @@ -12,8 +12,8 @@ ach: other: 'crwdns3161:5%{count}crwdne3161:5' time: formats: - #See http://apidock.com/ruby/DateTime/strftime for a list of available directives - hour_minute: "crwdns3163:0%I:%Mcrwdnd3163:0%pcrwdne3163:0" + # See http://apidock.com/ruby/DateTime/strftime for a list of available directives + hour_minute: "%I:%M %p" errors: messages: #CarrierWave diff --git a/config/locales/rails.ach.yml b/config/locales/rails.ach.yml index ebbd2611c..893188b05 100644 --- a/config/locales/rails.ach.yml +++ b/config/locales/rails.ach.yml @@ -31,9 +31,9 @@ ach: - crwdns4265:0crwdne4265:0 - crwdns4267:0crwdne4267:0 formats: - default: "crwdns4269:0%Y-%m-%dcrwdne4269:0" - long: "crwdns4271:0%Bcrwdnd4271:0%dcrwdnd4271:0%Ycrwdne4271:0" - short: "crwdns4273:0%bcrwdnd4273:0%dcrwdne4273:0" + default: "%Y-%m-%d" + long: "%B %d, %Y" + short: "%b %d" month_names: - - crwdns4275:0crwdne4275:0 @@ -49,9 +49,9 @@ ach: - crwdns4295:0crwdne4295:0 - crwdns4297:0crwdne4297:0 order: - - crwdns4299:0crwdne4299:0 - - crwdns4301:0crwdne4301:0 - - crwdns4303:0crwdne4303:0 + - :year + - :month + - :day datetime: distance_in_words: about_x_hours: From 2083cb6c3d01a1ac98adac730c6bff874c075e5f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 23 Dec 2019 15:31:18 +0100 Subject: [PATCH 094/135] documented in-context translation --- doc/translation_readme.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/translation_readme.md b/doc/translation_readme.md index f817d6860..50723288b 100644 --- a/doc/translation_readme.md +++ b/doc/translation_readme.md @@ -22,6 +22,12 @@ We use [Crowdin](https://www.crowdin.com), a translation management system (TMS) You can access it at [translate.fab-manager.com](https://translate.fab-manager.com) and start translating to one of the already configured languages. If you want to translate Fab-Manager to a new language, just send us an email to [contact@fab-manager.com](mailto:contact@fab-manager.com) and we'll add this new language to the TMS. +### Using In-Context translation +To translate the front-end application (angularJS client), and the notifications, you can use [Crowdin In-Context](https://crowdin.com/page/in-context-localization). +This allows you to use Fab-Manager as normally, but with the addition of small "edit" icons on the top-left corner of each text blocs. +Clicking on this "edit" icon will open the Crowdin translation interface and you'll be able to translate or modify existing translations directly. +You can access it at [in-context.translate.fab-manager.com](https://in-context.translate.fab-manager.com/). + ### From the files If you don't wan't want to use the TMS, you can write translations with in the source files. From 9756953836a770291c953a1e35586e682a4236f9 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 23 Dec 2019 15:32:33 +0100 Subject: [PATCH 095/135] updated table of contents --- doc/translation_readme.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/translation_readme.md b/doc/translation_readme.md index 50723288b..16b85d761 100644 --- a/doc/translation_readme.md +++ b/doc/translation_readme.md @@ -6,9 +6,10 @@ This document will explain you what you need to know to contribute to the transl 1. [Translation](#translation)
    1.1. [Using a TMS](#using-a-tms)
    -1.2. [From the files](#from-the-files)
    -1.2.1 [Front-end translations](#i18n-translation-front)
    -1.2.2 [Back-end translations](#i18n-translation-back) +1.2. [Using In-Context translation](#using-in-context-translation)
    +1.3. [From the files](#from-the-files)
    +1.3.1 [Front-end translations](#i18n-translation-front)
    +1.3.2 [Back-end translations](#i18n-translation-back) 2. [Configuration](#configuration)
    2.1. [Settings](#settings)
    2.2. [Applying changes](#applying-changes) @@ -22,6 +23,7 @@ We use [Crowdin](https://www.crowdin.com), a translation management system (TMS) You can access it at [translate.fab-manager.com](https://translate.fab-manager.com) and start translating to one of the already configured languages. If you want to translate Fab-Manager to a new language, just send us an email to [contact@fab-manager.com](mailto:contact@fab-manager.com) and we'll add this new language to the TMS. + ### Using In-Context translation To translate the front-end application (angularJS client), and the notifications, you can use [Crowdin In-Context](https://crowdin.com/page/in-context-localization). This allows you to use Fab-Manager as normally, but with the addition of small "edit" icons on the top-left corner of each text blocs. From 1b5014e7a68122d249793fed174a97ad7a18683c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 23 Dec 2019 16:02:33 +0100 Subject: [PATCH 096/135] fix datetime parsing formats for ach locale --- config/locales/rails.ach.yml | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/config/locales/rails.ach.yml b/config/locales/rails.ach.yml index 893188b05..86a98c56b 100644 --- a/config/locales/rails.ach.yml +++ b/config/locales/rails.ach.yml @@ -146,36 +146,36 @@ ach: number: currency: format: - delimiter: "crwdns4407:0crwdne4407:0" - format: "crwdns4409:0%ucrwdnd4409:0%ncrwdne4409:0" - precision: 0 - separator: "crwdns4413:0crwdne4413:0" + delimiter: "," + format: "%u%n" + precision: 2 + separator: "." significant: false strip_insignificant_zeros: false - unit: "crwdns4415:0crwdne4415:0" + unit: "$" format: - delimiter: "crwdns4417:0crwdne4417:0" - precision: 0 - separator: "crwdns4421:0crwdne4421:0" + delimiter: "," + precision: 3 + separator: "." significant: false strip_insignificant_zeros: false human: decimal_units: - format: "crwdns4423:0%ncrwdnd4423:0%ucrwdne4423:0" + format: "%n %u" units: billion: crwdns4425:0crwdne4425:0 million: crwdns4427:0crwdne4427:0 quadrillion: crwdns4429:0crwdne4429:0 thousand: crwdns4431:0crwdne4431:0 trillion: crwdns4433:0crwdne4433:0 - unit: 'crwdns4435:0crwdne4435:0' + unit: '' format: - delimiter: 'crwdns4437:0crwdne4437:0' - precision: 0 + delimiter: '' + precision: 3 significant: true strip_insignificant_zeros: true storage_units: - format: "crwdns4441:0%ncrwdnd4441:0%ucrwdne4441:0" + format: "%n %u" units: byte: one: crwdns4443:1crwdne4443:1 @@ -186,20 +186,20 @@ ach: tb: crwdns4451:0crwdne4451:0 percentage: format: - delimiter: 'crwdns4453:0crwdne4453:0' - format: "crwdns4455:0%ncrwdne4455:0" + delimiter: '' + format: "%n%" precision: format: - delimiter: 'crwdns4457:0crwdne4457:0' + delimiter: '' support: array: last_word_connector: "crwdns4459:0crwdne4459:0" two_words_connector: "crwdns4461:0crwdne4461:0" words_connector: "crwdns4463:0crwdne4463:0" time: - am: crwdns4465:0crwdne4465:0 + am: am formats: - default: "crwdns4467:0%acrwdnd4467:0%dcrwdnd4467:0%bcrwdnd4467:0%Ycrwdnd4467:0%H:%M:%Scrwdnd4467:0%zcrwdne4467:0" - long: "crwdns4469:0%Bcrwdnd4469:0%dcrwdnd4469:0%Ycrwdnd4469:0%H:%Mcrwdne4469:0" - short: "crwdns4471:0%dcrwdnd4471:0%bcrwdnd4471:0%H:%Mcrwdne4471:0" - pm: crwdns4473:0crwdne4473:0 + default: "%a, %d %b %Y %H:%M:%S %z" + long: "%B %d, %Y %H:%M" + short: "%d %b %H:%M" + pm: pm \ No newline at end of file From 7c3f7c754e2a6f4c2122e1fc9f6f26626908bdd5 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 24 Dec 2019 09:49:01 +0100 Subject: [PATCH 097/135] fix staging assets compressor config --- config/environments/staging.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/config/environments/staging.rb b/config/environments/staging.rb index a18e94bee..65d152210 100644 --- a/config/environments/staging.rb +++ b/config/environments/staging.rb @@ -29,9 +29,7 @@ Rails.application.configure do # Disable Rails's static asset server (Apache or nginx will already do this). config.serve_static_files = false - # Compress JavaScripts and CSS. - config.assets.js_compressor = :uglifier - # if you want disable variable name mangling and enable ES6 support + # Compress JavaScripts and CSS. We disable variable name mangling and enable ES6 support config.assets.js_compressor = Uglifier.new(mangle: false, harmony: true) # config.assets.css_compressor = :sass From d0ace9e972ee55f92ff5ebd58435046f2ed9e0d7 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 24 Dec 2019 10:07:06 +0100 Subject: [PATCH 098/135] allowed FreeCAD mime-type by default --- config/application.yml.default | 2 +- docker/env.example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/application.yml.default b/config/application.yml.default index 8327dc659..fcbd6bee2 100644 --- a/config/application.yml.default +++ b/config/application.yml.default @@ -92,7 +92,7 @@ DISK_SPACE_MB_ALERT: '100' SUPERADMIN_EMAIL: 'admin@sleede.com' ALLOWED_EXTENSIONS: pdf ai eps cad math svg stl dxf dwg obj step iges igs 3dm 3dmf doc docx png ino scad fcad skp sldprt sldasm slddrw slddrt tex latex ps fcstd fcstd1 -ALLOWED_MIME_TYPES: application/pdf application/postscript application/illustrator image/x-eps image/svg+xml application/sla application/dxf application/acad application/dwg application/octet-stream application/step application/iges model/iges x-world/x-3dmf application/vnd.openxmlformats-officedocument.wordprocessingml.document image/png text/x-arduino text/plain application/scad application/vnd.sketchup.skp application/x-koan application/vnd-koan koan/x-skm application/vnd.koan application/x-tex application/x-latex +ALLOWED_MIME_TYPES: application/pdf application/postscript application/illustrator image/x-eps image/svg+xml application/sla application/dxf application/acad application/dwg application/octet-stream application/step application/iges model/iges x-world/x-3dmf application/vnd.openxmlformats-officedocument.wordprocessingml.document image/png text/x-arduino text/plain application/scad application/vnd.sketchup.skp application/x-koan application/vnd-koan koan/x-skm application/vnd.koan application/x-tex application/x-latex application/x-extension-fcstd # 5242880 = 5 megabytes MAX_IMPORT_SIZE: '5242880' diff --git a/docker/env.example b/docker/env.example index 0717f6fed..858c8233f 100644 --- a/docker/env.example +++ b/docker/env.example @@ -77,7 +77,7 @@ SUPERADMIN_EMAIL='admin@sleede.com' ALLOWED_EXTENSIONS=pdf ai eps cad math svg stl dxf dwg obj step iges igs 3dm 3dmf doc docx png ino scad fcad skp sldprt sldasm slddrw slddrt tex latex ps fcstd fcstd1 -ALLOWED_MIME_TYPES=application/pdf application/postscript application/illustrator image/x-eps image/svg+xml application/sla application/dxf application/acad application/dwg application/octet-stream application/step application/iges model/iges x-world/x-3dmf application/ application/vnd.openxmlformats-officedocument.wordprocessingml.document image/png text/x-arduino text/plain application/scad application/vnd.sketchup.skp application/x-koan application/vnd-koan koan/x-skm application/vnd.koan application/x-tex application/x-latex +ALLOWED_MIME_TYPES=application/pdf application/postscript application/illustrator image/x-eps image/svg+xml application/sla application/dxf application/acad application/dwg application/octet-stream application/step application/iges model/iges x-world/x-3dmf application/ application/vnd.openxmlformats-officedocument.wordprocessingml.document image/png text/x-arduino text/plain application/scad application/vnd.sketchup.skp application/x-koan application/vnd-koan koan/x-skm application/vnd.koan application/x-tex application/x-latex application/x-extension-fcstd # 5242880 = 5 megabytes MAX_IMPORT_SIZE = '5242880' From d8724516b4161a9c264fe7d4f31f024530f85cc2 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 24 Dec 2019 10:49:51 +0100 Subject: [PATCH 099/135] fix: no logs in staging --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index ec596ad88..0e887b74c 100644 --- a/Gemfile +++ b/Gemfile @@ -61,7 +61,7 @@ group :test do gem 'webmock' end -group :production do +group :production, :staging do gem 'rails_12factor' end From d4f7ff3603b9a95f6fa18d3b2cfe20ac1cbfba48 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 24 Dec 2019 11:47:31 +0100 Subject: [PATCH 100/135] fixes comments syntax for crowdin compat --- config/locales/app.admin.en.yml | 14 +++++++------- config/locales/app.admin.es.yml | 14 +++++++------- config/locales/app.admin.fr.yml | 14 +++++++------- config/locales/app.admin.pt.yml | 14 +++++++------- config/locales/app.public.en.yml | 6 +++--- config/locales/app.public.es.yml | 6 +++--- config/locales/app.public.fr.yml | 6 +++--- config/locales/app.public.pt.yml | 6 +++--- config/locales/app.shared.en.yml | 4 ++-- config/locales/app.shared.es.yml | 2 +- config/locales/app.shared.fr.yml | 2 +- config/locales/app.shared.pt.yml | 2 +- 12 files changed, 45 insertions(+), 45 deletions(-) diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 9e3e7eed8..d66bacae3 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -42,7 +42,7 @@ en: select_some_machines: "Select some machines" number_of_tickets: "Number of tickets: " adjust_the_opening_hours: "Adjust the opening hours" - to_time: "to" # context: time. eg. "from 18:00 to 21:00" + to_time: "to" # context: time. eg. 'from 18:00 to 21:00' restrict_this_slot_with_labels_optional: "Restrict this slot with labels (optional)" recurrence: "Recurrence" enabled: "Enabled" @@ -174,8 +174,8 @@ en: on_DATE: "on {DATE}" from_DATE: "from {DATE}" from_TIME: "from {TIME}" - to_date: "to" # context: date. eg: "from 01/01 to 01/05" - to_time: "to" # context: time. eg. "from 18:00 to 21:00" + to_date: "to" # context: date. eg: 'from 01/01 to 01/05' + to_time: "to" # context: time. eg. 'from 18:00 to 21:00' title: "Title" dates: "Dates" booking: "Booking" @@ -790,8 +790,8 @@ en: criterion: "Criterion:" value: "Value:" exclude: "Exclude" - from_date: "From" # context: date. eg: "from 01/01 to 01/05" - to_date: "to" # context: date. eg: "from 01/01 to 01/05" + from_date: "From" # context: date. eg: 'from 01/01 to 01/05' + to_date: "to" # context: date. eg: 'from 01/01 to 01/05' entries: "Entries:" revenue_: "Revenue:" average_age: "Average age:" @@ -823,8 +823,8 @@ en: data: "Data" day: "Day" week: "Week" - from_date: "From" # context: date. eg: "from 01/01 to 01/05" - to_date: "to" # context: date. eg: "from 01/01 to 01/05" + from_date: "From" # context: date. eg: 'from 01/01 to 01/05' + to_date: "to" # context: date. eg: 'from 01/01 to 01/05' month: "Month" start: "Start:" end: "End:" diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 4a831888b..76f315b79 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -42,7 +42,7 @@ es: select_some_machines: "Seleccione algunas máquinas" number_of_tickets: "Número de tickets: " adjust_the_opening_hours: "Ajustar el horario de apertura" - to_time: "to" # context: hora. ej. "de 18:00 a 21:00" + to_time: "to" # context: hora. ej. 'de 18:00 a 21:00' restrict_this_slot_with_labels_optional: "Restringir esta ranura con etiquetas (opcional)" recurrence: "Recurrence" enabled: "Enabled" @@ -174,8 +174,8 @@ es: on_DATE: "on {DATE}" from_DATE: "Desde {DATE}" from_TIME: "Desde {TIME}" - to_date: "to" # context: date. eg: "from 01/01 to 01/05" - to_time: "to" # context: time. eg. "from 18:00 to 21:00" + to_date: "to" # context: date. eg: 'from 01/01 to 01/05' + to_time: "to" # context: time. eg. 'from 18:00 to 21:00' title: "Title" dates: "Dates" booking: "Booking" @@ -789,8 +789,8 @@ es: criterion: "Criterio:" value: "Valor:" exclude: "Excluir" - from_date: "From" # context: date. eg: "from 01/01 to 01/05" - to_date: "to" # context: date. eg: "from 01/01 to 01/05" + from_date: "From" # context: date. eg: 'from 01/01 to 01/05' + to_date: "to" # context: date. eg: 'from 01/01 to 01/05' entries: "Entradas:" revenue_: "Ingresos:" average_age: "Edad media:" @@ -822,8 +822,8 @@ es: data: "Datos" day: "Dia" week: "Semana" - from_date: "From" # context: date. eg: "from 01/01 to 01/05" - to_date: "to" # context: date. eg: "from 01/01 to 01/05" + from_date: "From" # context: date. eg: 'from 01/01 to 01/05' + to_date: "to" # context: date. eg: 'from 01/01 to 01/05' month: "Month" start: "Inicio:" end: "Final:" diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 47646a36f..18d5e74bd 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -42,7 +42,7 @@ fr: select_some_machines: "Sélectionnez des machines" number_of_tickets: "Nombre de places : " adjust_the_opening_hours: "Ajuster l'horaire" - to_time: "à" # context: time. eg. "from 18:00 to 21:00" + to_time: "à" # context: time. eg. 'from 18:00 to 21:00' restrict_this_slot_with_labels_optional: "Restreindre ce créneau avec des étiquettes (optionnel)" recurrence: "Récurrence" enabled: "Activée" @@ -174,8 +174,8 @@ fr: on_DATE: "le {DATE}" from_DATE: "du {DATE}" from_TIME: "de {TIME}" - to_date: "au" # context: date. eg: "from 01/01 to 01/05" - to_time: "à" # context: time. eg. "from 18:00 to 21:00" + to_date: "au" # context: date. eg: 'from 01/01 to 01/05' + to_time: "à" # context: time. eg. 'from 18:00 to 21:00' title: "Titre" dates: "Dates" booking: "Réservations" @@ -790,8 +790,8 @@ fr: criterion: "Critère :" value: "Valeur :" exclude: "Exclure" - from_date: "Du" # context: date. eg: "from 01/01 to 01/05" - to_date: "au" # context: date. eg: "from 01/01 to 01/05" + from_date: "Du" # context: date. eg: 'from 01/01 to 01/05' + to_date: "au" # context: date. eg: 'from 01/01 to 01/05' entries: "Entrées :" revenue_: "Chiffre d'affaires :" average_age: "Âge moyen :" @@ -823,8 +823,8 @@ fr: data: "Données" day: "Jour" week: "Semaine" - from_date: "Du" # context: date. eg: "from 01/01 to 01/05" - to_date: "au" # context: date. eg: "from 01/01 to 01/05" + from_date: "Du" # context: date. eg: 'from 01/01 to 01/05' + to_date: "au" # context: date. eg: 'from 01/01 to 01/05' month: "Mois" start: "Début :" end: "Fin :" diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 372b5c604..34a804f4d 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -42,7 +42,7 @@ pt: select_some_machines: "Selecionar algumas máquinas" number_of_tickets: "Número de vagas: " adjust_the_opening_hours: "Ajustar o horário de funcionamento" - to_time: "ás" # context: time. eg. "from 18:00 to 21:00" + to_time: "ás" # context: time. eg. 'from 18:00 to 21:00' restrict_this_slot_with_labels_optional: "Restrinja este slot com etiquetas (opcional)" recurrence: "Recurrence" enabled: "Enabled" @@ -174,8 +174,8 @@ pt: on_DATE: "No {DATE}" from_DATE: "Em {DATE}" from_TIME: "Ás {TIME}" - to_date: "to" # context: date. eg: "from 01/01 to 01/05" - to_time: "to" # context: time. eg. "from 18:00 to 21:00" + to_date: "to" # context: date. eg: 'from 01/01 to 01/05' + to_time: "to" # context: time. eg. 'from 18:00 to 21:00' title: "Title" dates: "Dates" booking: "Reserva" @@ -790,8 +790,8 @@ pt: criterion: "Critério:" value: "Valor:" exclude: "Excluir" - from_date: "From" # context: date. eg: "from 01/01 to 01/05" - to_date: "to" # context: date. eg: "from 01/01 to 01/05" + from_date: "From" # context: date. eg: 'from 01/01 to 01/05' + to_date: "to" # context: date. eg: 'from 01/01 to 01/05' entries: "Entradas:" revenue_: "Receita:" average_age: "Idade média:" @@ -823,8 +823,8 @@ pt: data: "Dado" day: "Dia" week: "Semana" - from_date: "From" # context: date. eg: "from 01/01 to 01/05" - to_date: "to" # context: date. eg: "from 01/01 to 01/05" + from_date: "From" # context: date. eg: 'from 01/01 to 01/05' + to_date: "to" # context: date. eg: 'from 01/01 to 01/05' month: "Month" start: "Início:" end: "Fim:" diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml index 5fd8df09f..d7b3ec7b6 100644 --- a/config/locales/app.public.en.yml +++ b/config/locales/app.public.en.yml @@ -283,7 +283,7 @@ en: add_an_event: "Add an event" load_the_next_events: "Load the next events..." full_price_: "Full price:" - to_date: "to" # context: date. eg: "from 01/01 to 01/05" + to_date: "to" # context: date. eg: 'from 01/01 to 01/05' events_show: # details and booking of an event @@ -295,8 +295,8 @@ en: ending: "Ending:" opening_hours: "Opening hours:" all_day: "All day" - from_time: "From" # context: time. eg. "from 18:00 to 21:00" - to_time: "to" # context: time. eg. "from 18:00 to 21:00" + from_time: "From" # context: time. eg. 'from 18:00 to 21:00' + to_time: "to" # context: time. eg. 'from 18:00 to 21:00' full_price_: "Full price:" tickets_still_availables: "Tickets still available:" sold_out: "Sold out." diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml index 98cb6a533..129a03c39 100644 --- a/config/locales/app.public.es.yml +++ b/config/locales/app.public.es.yml @@ -283,7 +283,7 @@ es: add_an_event: "Add an event" load_the_next_events: "Load the next events..." full_price_: "Full price:" - to_date: "to" # context: date. eg: "from 01/01 to 01/05" + to_date: "to" # context: date. eg: 'from 01/01 to 01/05' events_show: # details and booking of an event @@ -295,8 +295,8 @@ es: ending: "Termina:" opening_hours: "Hora de apertura:" all_day: "All day" - from_time: "From" # context: time. eg. "from 18:00 to 21:00" - to_time: "to" # context: time. eg. "from 18:00 to 21:00" + from_time: "From" # context: time. eg. 'from 18:00 to 21:00' + to_time: "to" # context: time. eg. 'from 18:00 to 21:00' full_price_: "Full price:" tickets_still_availables: "Entradas disponibles:" sold_out: "Entradas vendidas." diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index 5108d984a..82a43d4f7 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -283,7 +283,7 @@ fr: add_an_event: "Ajouter un évènement" load_the_next_events: "Charger les évènements suivants..." full_price_: "Plein tarif :" - to_date: "au" # context: date. eg: "from 01/01 to 01/05" + to_date: "au" # context: date. eg: 'from 01/01 to 01/05' events_show: # détails d'un événement et réservation @@ -295,8 +295,8 @@ fr: ending: "Fin :" opening_hours: "Horaires :" all_day: "Toute la journée" - from_time: "De" # context: time. eg. "from 18:00 to 21:00" - to_time: "à" # context: time. eg. "from 18:00 to 21:00" + from_time: "De" # context: time. eg. 'from 18:00 to 21:00' + to_time: "à" # context: time. eg. 'from 18:00 to 21:00' full_price_: "Plein tarif :" tickets_still_availables: "Places encore disponibles :" sold_out: "Événement complet" diff --git a/config/locales/app.public.pt.yml b/config/locales/app.public.pt.yml index f1c02b0e7..b79aaf1dc 100755 --- a/config/locales/app.public.pt.yml +++ b/config/locales/app.public.pt.yml @@ -283,7 +283,7 @@ pt: add_an_event: "Add an event" load_the_next_events: "Load the next events..." full_price_: "Full price:" - to_date: "to" # context: date. eg: "from 01/01 to 01/05" + to_date: "to" # context: date. eg: 'from 01/01 to 01/05' events_show: # details and booking of an event @@ -295,8 +295,8 @@ pt: ending: "Término:" opening_hours: "Abre ás:" all_day: "All day" - from_time: "From" # context: time. eg. "from 18:00 to 21:00" - to_time: "to" # context: time. eg. "from 18:00 to 21:00" + from_time: "From" # context: time. eg. 'from 18:00 to 21:00' + to_time: "to" # context: time. eg. 'from 18:00 to 21:00' full_price_: "Full price:" tickets_still_availables: "Tickets ainda disponíveis:" sold_out: "Esgotado." diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index 265fd8602..a9c14c9f3 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -427,8 +427,8 @@ en: tags_of_the_destination_slot: "Tags of the destination slot:" confirm_my_modification: "Confirm my modification" your_booking_slot_was_successfully_moved_from_: "Your booking slot was successfully moved from" - to_date: "to" # context: date. eg: "from 01/01 to 01/05" - please_select_a_member_first: "Please select a member first" + to_date: "to" # context: date. eg: 'from 01/01 to 01/05' + please_select_a_member_first: 'Please select a member first' unable_to_change_the_reservation: "Unable to change the reservation" confirmation_required: "Confirmation required" do_you_really_want_to_cancel_this_reservation: "Do you really want to cancel this reservation?" diff --git a/config/locales/app.shared.es.yml b/config/locales/app.shared.es.yml index dea5a37a7..8cf32e350 100644 --- a/config/locales/app.shared.es.yml +++ b/config/locales/app.shared.es.yml @@ -427,7 +427,7 @@ es: tags_of_the_destination_slot: "Etiquetas del espacio final:" confirm_my_modification: "Confirmar modificación" your_booking_slot_was_successfully_moved_from_: "Tu reserva de espacio ha sido reemplazada con éxito" - to_date: "a" # context: date. eg: "from 01/01 to 01/05" + to_date: "a" # context: date. eg: 'from 01/01 to 01/05' please_select_a_member_first: "Por favor, selecciona un miembro de la lista" unable_to_change_the_reservation: "Imposible cambiar reserva" confirmation_required: "Confirmación requerida" diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 020f99302..4689e7cd5 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -427,7 +427,7 @@ fr: tags_of_the_destination_slot: "Étiquettes du créneau de destination :" confirm_my_modification: "Valider ma modification" your_booking_slot_was_successfully_moved_from_: "Votre créneau de réservation a bien été déplacé du" - to_date: "au" # context: date. eg: "from 01/01 to 01/05" + to_date: "au" # context: date. eg: 'from 01/01 to 01/05' please_select_a_member_first: "Veuillez tout d'abord sélectionner un membre" unable_to_change_the_reservation: "Impossible de modifier la réservation" confirmation_required: "Confirmation requise" diff --git a/config/locales/app.shared.pt.yml b/config/locales/app.shared.pt.yml index 7c51aeeb5..0c0fbff49 100755 --- a/config/locales/app.shared.pt.yml +++ b/config/locales/app.shared.pt.yml @@ -427,7 +427,7 @@ pt: tags_of_the_destination_slot: "Tags do slot de destino:" confirm_my_modification: "Confirmar minha modificação" your_booking_slot_was_successfully_moved_from_: "Seu slot de reserva foi movido com sucesso para" - to_date: "até" # context: date. eg: "from 01/01 to 01/05" + to_date: "até" # context: date. eg: 'from 01/01 to 01/05' please_select_a_member_first: "Por favor selecione o membro primeiramente" unable_to_change_the_reservation: "Não permitido alterar esta reserva" confirmation_required: "Confirmação é obrigatória" From 8a7b10e746d85e46915cd75cfc80daef7b2e34aa Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 24 Dec 2019 12:10:06 +0100 Subject: [PATCH 101/135] updated crowdin pseudo-language for in-context translation --- config/locales/app.admin.ach.yml | 14 +++++++------- config/locales/app.public.ach.yml | 6 +++--- config/locales/app.shared.ach.yml | 4 ++-- config/locales/rails.ach.yml | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config/locales/app.admin.ach.yml b/config/locales/app.admin.ach.yml index 1a48d6c07..8d342edd1 100644 --- a/config/locales/app.admin.ach.yml +++ b/config/locales/app.admin.ach.yml @@ -40,7 +40,7 @@ ach: select_some_machines: "crwdns6759:0crwdne6759:0" number_of_tickets: "crwdns6761:0crwdne6761:0" adjust_the_opening_hours: "crwdns6763:0crwdne6763:0" - to_time: "crwdns6765:0crwdne6765:0" + to_time: crwdns10109:0crwdne10109:0 restrict_this_slot_with_labels_optional: "crwdns6767:0crwdne6767:0" recurrence: "crwdns6769:0crwdne6769:0" enabled: "crwdns6771:0crwdne6771:0" @@ -167,8 +167,8 @@ ach: on_DATE: "crwdns6995:0{DATE}crwdne6995:0" from_DATE: "crwdns6997:0{DATE}crwdne6997:0" from_TIME: "crwdns6999:0{TIME}crwdne6999:0" - to_date: "crwdns7001:0crwdne7001:0" - to_time: "crwdns7003:0crwdne7003:0" + to_date: crwdns10111:0crwdne10111:0 + to_time: crwdns10113:0crwdne10113:0 title: "crwdns7005:0crwdne7005:0" dates: "crwdns7007:0crwdne7007:0" booking: "crwdns7009:0crwdne7009:0" @@ -766,8 +766,8 @@ ach: criterion: "crwdns8111:0crwdne8111:0" value: "crwdns8113:0crwdne8113:0" exclude: "crwdns8115:0crwdne8115:0" - from_date: "crwdns8117:0crwdne8117:0" - to_date: "crwdns8119:0crwdne8119:0" + from_date: crwdns10115:0crwdne10115:0 + to_date: crwdns10117:0crwdne10117:0 entries: "crwdns8121:0crwdne8121:0" revenue_: "crwdns8123:0crwdne8123:0" average_age: "crwdns8125:0crwdne8125:0" @@ -798,8 +798,8 @@ ach: data: "crwdns8171:0crwdne8171:0" day: "crwdns8173:0crwdne8173:0" week: "crwdns8175:0crwdne8175:0" - from_date: "crwdns8177:0crwdne8177:0" - to_date: "crwdns8179:0crwdne8179:0" + from_date: crwdns10119:0crwdne10119:0 + to_date: crwdns10121:0crwdne10121:0 month: "crwdns8181:0crwdne8181:0" start: "crwdns8183:0crwdne8183:0" end: "crwdns8185:0crwdne8185:0" diff --git a/config/locales/app.public.ach.yml b/config/locales/app.public.ach.yml index c7de748d5..8482fc08f 100644 --- a/config/locales/app.public.ach.yml +++ b/config/locales/app.public.ach.yml @@ -259,7 +259,7 @@ ach: add_an_event: "crwdns9239:0crwdne9239:0" load_the_next_events: "crwdns9241:0crwdne9241:0" full_price_: "crwdns9243:0crwdne9243:0" - to_date: "crwdns9245:0crwdne9245:0" + to_date: crwdns10123:0crwdne10123:0 events_show: #details and booking of an event event_description: "crwdns9247:0crwdne9247:0" @@ -270,8 +270,8 @@ ach: ending: "crwdns9257:0crwdne9257:0" opening_hours: "crwdns9259:0crwdne9259:0" all_day: "crwdns9261:0crwdne9261:0" - from_time: "crwdns9263:0crwdne9263:0" - to_time: "crwdns9265:0crwdne9265:0" + from_time: crwdns10125:0crwdne10125:0 + to_time: crwdns10127:0crwdne10127:0 full_price_: "crwdns9267:0crwdne9267:0" tickets_still_availables: "crwdns9269:0crwdne9269:0" sold_out: "crwdns9271:0crwdne9271:0" diff --git a/config/locales/app.shared.ach.yml b/config/locales/app.shared.ach.yml index 83cf9506c..21501bde1 100644 --- a/config/locales/app.shared.ach.yml +++ b/config/locales/app.shared.ach.yml @@ -404,8 +404,8 @@ ach: tags_of_the_destination_slot: "crwdns10081:0crwdne10081:0" confirm_my_modification: "crwdns10083:0crwdne10083:0" your_booking_slot_was_successfully_moved_from_: "crwdns10085:0crwdne10085:0" - to_date: "crwdns10087:0crwdne10087:0" - please_select_a_member_first: "crwdns10089:0crwdne10089:0" + to_date: crwdns10129:0crwdne10129:0 + please_select_a_member_first: 'crwdns10089:0crwdne10089:0' unable_to_change_the_reservation: "crwdns10091:0crwdne10091:0" confirmation_required: "crwdns10093:0crwdne10093:0" do_you_really_want_to_cancel_this_reservation: "crwdns10095:0crwdne10095:0" diff --git a/config/locales/rails.ach.yml b/config/locales/rails.ach.yml index 86a98c56b..59db18b20 100644 --- a/config/locales/rails.ach.yml +++ b/config/locales/rails.ach.yml @@ -202,4 +202,4 @@ ach: default: "%a, %d %b %Y %H:%M:%S %z" long: "%B %d, %Y %H:%M" short: "%d %b %H:%M" - pm: pm \ No newline at end of file + pm: pm From b34d31fea4ca61e13b0a42ee9a6629b4cfbe89b8 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 24 Dec 2019 15:19:29 +0100 Subject: [PATCH 102/135] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06ce7162d..4b14670e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ - Fix a bug: unable to remove the picture from a training - Fix a bug: no alerts on errors during admin creation - Fix a bug: replaces all Time.now by DateTime.current to prevent time zones issues [Taiga#134] +- Fix a bug: logs are not printed in staging environment - Fix a security issue: updated loofah to fix [CVE-2019-15587](https://github.com/advisories/GHSA-c3gv-9cxf-6f57) - Fix a security issue: updated angular to 1.7.9 to fix [CVE-2019-10768](https://github.com/advisories/GHSA-89mq-4x47-5v83) - Fix a security issue: updated puma to 3.12.2 to fix [GHSA-7xx3-m584-x994](https://github.com/advisories/GHSA-7xx3-m584-x994) From 47cf32e67ca313abdde987a158dc343fc941e499 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 24 Dec 2019 15:27:42 +0100 Subject: [PATCH 103/135] moved setup files to separate folder --- {docker => setup}/docker-compose.yml | 0 {docker => setup}/elasticsearch.yml | 0 {docker => setup}/env.example | 0 {docker => setup}/log4j2.properties | 0 {docker => setup}/nginx.conf.example | 0 {docker => setup}/nginx_with_ssl.conf.example | 0 {docker => setup}/setup.sh | 0 {docker => setup}/supervisor.conf | 0 {docker => setup}/webroot.ini.example | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename {docker => setup}/docker-compose.yml (100%) rename {docker => setup}/elasticsearch.yml (100%) rename {docker => setup}/env.example (100%) rename {docker => setup}/log4j2.properties (100%) rename {docker => setup}/nginx.conf.example (100%) rename {docker => setup}/nginx_with_ssl.conf.example (100%) rename {docker => setup}/setup.sh (100%) rename {docker => setup}/supervisor.conf (100%) rename {docker => setup}/webroot.ini.example (100%) diff --git a/docker/docker-compose.yml b/setup/docker-compose.yml similarity index 100% rename from docker/docker-compose.yml rename to setup/docker-compose.yml diff --git a/docker/elasticsearch.yml b/setup/elasticsearch.yml similarity index 100% rename from docker/elasticsearch.yml rename to setup/elasticsearch.yml diff --git a/docker/env.example b/setup/env.example similarity index 100% rename from docker/env.example rename to setup/env.example diff --git a/docker/log4j2.properties b/setup/log4j2.properties similarity index 100% rename from docker/log4j2.properties rename to setup/log4j2.properties diff --git a/docker/nginx.conf.example b/setup/nginx.conf.example similarity index 100% rename from docker/nginx.conf.example rename to setup/nginx.conf.example diff --git a/docker/nginx_with_ssl.conf.example b/setup/nginx_with_ssl.conf.example similarity index 100% rename from docker/nginx_with_ssl.conf.example rename to setup/nginx_with_ssl.conf.example diff --git a/docker/setup.sh b/setup/setup.sh similarity index 100% rename from docker/setup.sh rename to setup/setup.sh diff --git a/docker/supervisor.conf b/setup/supervisor.conf similarity index 100% rename from docker/supervisor.conf rename to setup/supervisor.conf diff --git a/docker/webroot.ini.example b/setup/webroot.ini.example similarity index 100% rename from docker/webroot.ini.example rename to setup/webroot.ini.example From 4fb72cfd744df622f142cfe5ff0690d275c27b1b Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 24 Dec 2019 16:19:44 +0100 Subject: [PATCH 104/135] update setup script and instructions --- doc/docker-compose_readme.md | 49 +++++++++++++++++------------------- setup/setup.sh | 25 ++++++++++++------ 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/doc/docker-compose_readme.md b/doc/docker-compose_readme.md index 8b833fdea..15e8acf5b 100644 --- a/doc/docker-compose_readme.md +++ b/doc/docker-compose_readme.md @@ -100,13 +100,11 @@ You can run the following script as root to easily perform all these operations: \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/setup.sh | bash -s "/my/custom/path" ``` -### Setup folders and env file +### Setup env file -Create the config folder, copy the environnement variables configuration file and edit it: +Configure the environnement variables file: ```bash -mkdir -p /apps/fabmanager/config cd /apps/fabmanager -cp example/env.example config/env vi config/env # or use your favorite text editor instead of vi (nano, ne...) ``` @@ -116,14 +114,8 @@ Please refer to the [environment configuration documentation](environment.md) fo ### Setup nginx configuration -Create the nginx folder, copy the example configuration file and edit it: +Edit the nginx configuration file: ```bash -mkdir -p /apps/fabmanager/config/nginx -# whether you want you fab-manager to use SSL encryption or not, you should copy one of the following file -### with SSL ### -cp example/nginx_with_ssl.conf.example config/nginx/fabmanager.conf -### OR without SSL ### -cp example/nginx.conf.example config/nginx/fabmanager.conf vi config/nginx/fabmanager.conf # or use your favorite text editor instead of vi (nano, ne...) @@ -131,16 +123,14 @@ vi config/nginx/fabmanager.conf Customize the following values: * Replace **MAIN_DOMAIN** (example: fab-manager.com). -* Replace **URL_WITH_PROTOCOL_HTTPS** (example: https://www.fab-manager.com). -* Replace **ANOTHER_URL_1**, **ANOTHER_URL_2** (example: .fab-manager.fr) ### SSL certificate with LetsEncrypt **FOLLOW THOSE INSTRUCTIONS ONLY IF YOU WANT TO USE SSL**. -If you have chosen the SSL configuration at the previous point, you must follow these instructions to make it work. +If you want to host you Fab-manager instance through SSL (which is highly recommended), you must follow the following instructions. -Let's Encrypt is a new Certificate Authority that is free, automated, and open. +Let's Encrypt is a Certificate Authority that is free, automated, and open. Let’s Encrypt certificates expire after 90 days, so automation of renewing your certificates is important. Here is the setup for a systemd timer and service to renew the certificates and reboot the app Docker container: @@ -151,13 +141,8 @@ cd /apps/fabmanager/config/nginx/ssl openssl dhparam -out dhparam.pem 4096 ``` -Copy the initial configuration file and customize it +Customize the let's encrypt configuration file ```bash -cd /apps/fabmanager/ -mkdir -p letsencrypt/config/ -mkdir -p letsencrypt/etc/webrootauth - -cp example/webroot.ini.example /apps/fabmanager/letsencrypt/config/webroot.ini vi letsencrypt/config/webroot.ini # or use your favorite text editor instead of vi (nano, ne...) ``` @@ -173,8 +158,8 @@ Requires=docker.service [Service] Type=oneshot -ExecStart=/usr/bin/docker run --rm --name letsencrypt -v "/apps/fabmanager/log:/var/log/letsencrypt" -v "/apps/fabmanager/letsencrypt/etc:/etc/letsencrypt" -v "/apps/fabmanager/letsencrypt/config:/letsencrypt-config" quay.io/letsencrypt/letsencrypt:latest -c "/letsencrypt-config/webroot.ini" certonly -ExecStartPost=-/usr/bin/docker restart fabmanager_nginx_1 +ExecStart=/usr/bin/docker run --rm --name certbot_fabmanager -v "/apps/fabmanager/letsencrypt:/etc/letsencrypt" certbot/certbot:latest -c "/etc/letsencrypt/config/webroot.ini" certonly +ExecStartPost=-/usr/bin/docker restart fabmanager_nginx_1 ``` Create file (with sudo) /etc/systemd/system/letsencrypt.timer and paste the following configuration into it: @@ -245,7 +230,7 @@ docker-compose run --rm -e ADMIN_EMAIL=xxx -e ADMIN_PASSWORD=xxx fabmanager bund `docker-compose up -d` -### Generate SSL certificate by Let's encrypt +### Generate SSL certificate by Let's encrypt **Important: app must be run on http before starting letsencrypt** @@ -254,8 +239,19 @@ Start letsencrypt service : sudo systemctl start letsencrypt.service ``` -If the certificate was successfully generated then update the nginx configuration file and activate the ssl port and certificate +If the certificate was successfully generated, you must update the nginx configuration to activate the ssl port and certificate. editing the file `/apps/fabmanager/config/nginx/fabmanager.conf`. +```bash +mv /apps/fabmanager/config/nginx/fabmanager.conf /apps/fabmanager/config/nginx/fabmanager.conf.nossl +cp /apps/fabmanager/config/nginx/fabmanager.conf.ssl /apps/fabmanager/config/nginx/fabmanager.conf +vi /apps/fabmanager/config/nginx/fabmanager.conf +# or use your favorite text editor instead of vi (nano, ne...) +``` + +Customize the following values: +* Replace **MAIN_DOMAIN** (example: fab-manager.com). +* Replace **URL_WITH_PROTOCOL_HTTPS** (example: https://www.fab-manager.com). +* Replace **ANOTHER_URL_1**, **ANOTHER_URL_2** (example: .fab-manager.fr) Remove your app container and run your app to apply the changes running the following commands: ```bash @@ -263,7 +259,7 @@ docker-compose down docker-compose up -d ``` -Finally, if everything is ok, start letsencrypt timer to update the certificate every 1st of the month : +Finally, if everything is ok, start let's encrypt timer to update the certificate every 1st of the month : ```bash sudo systemctl enable letsencrypt.timer @@ -274,6 +270,7 @@ sudo systemctl list-timers ## Docker utils with docker-compose +Below, you'll find a collection of useful commands to control your instance with docker-compose ### Restart app diff --git a/setup/setup.sh b/setup/setup.sh index 3350c550a..da69dd938 100644 --- a/setup/setup.sh +++ b/setup/setup.sh @@ -4,25 +4,34 @@ prepare_config() { FABMANAGER_PATH=${1:-/apps/fabmanager} - mkdir -p "$FABMANAGER_PATH/example" + mkdir -p "$FABMANAGER_PATH/config/nginx/ssl" + mkdir -p "$FABMANAGER_PATH/letsencrypt/config" + mkdir -p "$FABMANAGER_PATH/letsencrypt/etc/webrootauth" mkdir -p "$FABMANAGER_PATH/elasticsearch/config" # fab-manager environment variables - \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/env.example > "$FABMANAGER_PATH/example/env.example" + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/env.example > "$FABMANAGER_PATH/config/env" # nginx configuration - \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/nginx_with_ssl.conf.example > "$FABMANAGER_PATH/example/nginx_with_ssl.conf.example" - \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/nginx.conf.example > "$FABMANAGER_PATH/example/nginx.conf.example" + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/nginx_with_ssl.conf.example > "$FABMANAGER_PATH/config/nginx/fabmanager.conf.ssl" + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/nginx.conf.example > "$FABMANAGER_PATH/config/nginx/fabmanager.conf" # let's encrypt configuration - \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/webroot.ini.example > "$FABMANAGER_PATH/example/webroot.ini.example" + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/webroot.ini.example > "$FABMANAGER_PATH/letsencrypt/config/webroot.ini" # ElasticSearch configuration files - \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/elasticsearch.yml > "$FABMANAGER_PATH/elasticsearch/config/elasticsearch.yml" - \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/log4j2.properties > "$FABMANAGER_PATH/elasticsearch/config/log4j2.properties" + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/elasticsearch.yml > "$FABMANAGER_PATH/elasticsearch/config/elasticsearch.yml" + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/log4j2.properties > "$FABMANAGER_PATH/elasticsearch/config/log4j2.properties" # docker-compose - \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/docker-compose.yml > "$FABMANAGER_PATH/docker-compose.yml" + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/docker-compose.yml > "$FABMANAGER_PATH/docker-compose.yml" } +function trap_ctrlc() +{ + echo "Ctrl^C, exiting..." + exit 2 +} + +trap "trap_ctrlc" 2 # SIGINT prepare_config "$@" From 5b83fadcf918835c58b09f9ac48cc3f05c8ae8f0 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 24 Dec 2019 16:20:16 +0100 Subject: [PATCH 105/135] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b14670e7..38833f712 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ - Unified translations syntax to use ICU MessageFormat - Refactored front-end translations keys with unified paths - Updated and refactored README and documentations +- Updated setup script and instructions - Fix a bug: unable to remove the picture from a training - Fix a bug: no alerts on errors during admin creation - Fix a bug: replaces all Time.now by DateTime.current to prevent time zones issues [Taiga#134] From 9cc090e4bcafec4f462121c3cf3f86ca4a19acc0 Mon Sep 17 00:00:00 2001 From: Nicolas Florentin Date: Mon, 30 Dec 2019 13:48:40 +0100 Subject: [PATCH 106/135] typo --- app/assets/templates/shared/signalAbuseModal.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/templates/shared/signalAbuseModal.html.erb b/app/assets/templates/shared/signalAbuseModal.html.erb index 8026f6537..86d029f9f 100644 --- a/app/assets/templates/shared/signalAbuseModal.html.erb +++ b/app/assets/templates/shared/signalAbuseModal.html.erb @@ -3,7 +3,7 @@

    {{ 'app.public.projects_show.report_an_abuse' }}

    -
    +
    From 4be8dd68928e03b3f22a83ee1e6d9c4e6edbeb0b Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 30 Dec 2019 14:46:58 +0100 Subject: [PATCH 107/135] New translations app.public.en.yml (Spanish) --- config/locales/app.public.es.yml | 100 +++++++++++-------------------- 1 file changed, 36 insertions(+), 64 deletions(-) diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml index 129a03c39..40aa21a92 100644 --- a/config/locales/app.public.es.yml +++ b/config/locales/app.public.es.yml @@ -2,18 +2,16 @@ es: app: public: common: - # header and "about" page + #header and "about" page about_the_fablab: "Sobre {GENDER, select, male{el} female{la} neutral{} other{las}} {NAME}" return: "Volver" - - # cookies + #cookies cookies: about_cookies: "Este sitio web utiliza cookies para medir la audiencia." learn_more: "Aprende más" accept: "Aceptar cookies" - decline: "Rehusar" - - # dashboard sections + decline: "Rechazar" + #dashboard sections dashboard: "Panel" my_profile: "My Perfil" my_settings: "Mis ajustes" @@ -22,18 +20,15 @@ es: my_events: "Mis eventos" my_invoices: "Mis facturas" my_wallet: "Mi cartera" - - # login/logout + #login/logout sign_out: "Salir" sign_up: "Registrarse" sign_in: "Entrar" - - # left menu + #left menu notifications: "Notificaciones" admin: "Administrador" reduce_panel: "Reducir panel" - - # left menu (public) + #left menu (public) home: "Menú principal" reserve_a_machine: "Reservar una máquina" trainings_registrations: "Registro de cursos" @@ -42,8 +37,7 @@ es: projects_gallery: "Galería de proyectos" subscriptions: "Suscripciones" public_calendar: "Calendario" - - # left menu (admin) + #left menu (admin) trainings_monitoring: "Monitorización de cursos" manage_the_calendar: "Gestionar calendario" manage_the_users: "Gestionar usuarios" @@ -56,8 +50,7 @@ es: statistics: "Estadísticas" customization: "Customización" open_api_clients: "Clientes OpenAPI" - - # account creation modal + #account creation modal create_your_account: "Crear su cuenta" man: "Hombre" woman: "Mujer" @@ -98,53 +91,44 @@ es: used_for_reservation: "This data will be used in case of change on one of your bookings" used_for_profile: "This data will only be displayed on your profile" public_profile: "You will have a public profile and other users will be able to associate you in their projects" - - # password modification modal + #password modification modal change_your_password: "Cambiar contraseña" your_new_password: "Nueva contraseña" your_password_was_successfully_changed: "Su contraseña ha sido cambiada con éxito." - - # connection modal + #connection modal connection: "Conexión" password_forgotten: "¿Ha olvidado su contraseña?" not_registered_to_the_fablab: "¿No está registrado en el fatlab aún?" create_an_account: "Crear una cuenta" wrong_email_or_password: "E-mail o contraseña incorrecta." caps_lock_is_on: "Las mayusculas están activadas." - - # forgotten password modal + #forgotten password modal your_email_address_is_unknown: "Se desconoce su email." you_will_receive_in_a_moment_an_email_with_instructions_to_reset_your_password: "En un momento recibirá las instrucciones para restablecer su contraseña en su mail." - - # Fab-manager's version + #Fab-manager's version version: "Version:" - - # Notifications + #Notifications and_NUMBER_other_notifications: "y {NUMBER, plural, =0{no other notifications} =1{one other notification} otras{{NUMBER} other notifications}}..." - about: - # about page + #about page read_the_fablab_policy: "Leer la politica del FabLab" read_the_fablab_s_general_terms_and_conditions: "Leer los terminos y condiciones del FabLab" your_fablab_s_contacts: "Sus contactos del FabLab" privacy_policy: "Política de privacidad" - privacy: - # 'privacy policy' page + #'privacy policy' page title: "Política de privacidad" dpo: "Oficial de protección de datos" last_update: "Última actualización," - home: - # home page + #home page latest_documented_projects: "Los últimos proyectos documentados" follow_us: "Siguenos" latest_tweets: "Los últimos tweets" latest_registered_members: "Miembros más recientes" create_an_account: "Crear una cuenta" discover_members: "Descubrir miembros" - - # next events summary on the home page + #next events summary on the home page fablab_s_next_events: "Próximos eventos del FabLab" every_events: "Todos los eventos" from_date_to_date: "Desde {START} hasta {END}" @@ -155,9 +139,8 @@ es: full_price: "Precio final" event_full: "Evento lleno" still_available: "Available place(s)" - projects_list: - # projects gallery + #projects gallery the_fablab_projects: "Los proyectos del FabLab" add_a_project: "Añadir un proyecto" search_over_the_whole_network: "Buscar en toda la red de FabLab" @@ -174,9 +157,8 @@ es: all_materials: "Todo el material" load_next_projects: "Cargar más proyectos" rough_draft: "Borrador" - projects_show: - # details of a projet + #details of a projet rough_draft: "Draft" project_description: "Descripción de proyecto" by_name: "Por {NAME}" @@ -204,9 +186,8 @@ es: message_is_required: "El mensaje es obligatorio." report: "Reportar" do_you_really_want_to_delete_this_project: "¿Está seguro de querer eliminar este proyecto?" - machines_list: - # list of machines + #list of machines the_fablab_s_machines: "Las máquinas del FabLab" add_a_machine: "Añadir una máquina" book: "Book" @@ -214,9 +195,8 @@ es: status_enabled: "Enabled" status_disabled: "Disabled" status_all: "All" - machines_show: - # details of a machine + #details of a machine book_this_machine: "Alquilar máquina" technical_specifications: "Technical specifications" files_to_download: "Archivos a descargar" @@ -226,22 +206,19 @@ es: do_you_really_want_to_delete_this_machine: "¿Está seguro de querer eliminar esta máquina?" unauthorized_operation: "Unauthorized operation" the_machine_cant_be_deleted_because_it_is_already_reserved_by_some_users: "La máquina no puede borrarse porque está siendo usada o ha sido reservada por algún usuario." - trainings_list: - # list of trainings + #list of trainings book: "Book" the_trainings: "Lista de cursos" - training_show: - # details of a training + #details of a training book_this_training: "reservar plaza en este curso" do_you_really_want_to_delete_this_training: "Está seguro de querer eliminar este curso?" unauthorized_operation: "Operación no autorizada" confirmation_required: "Confirmation required" the_training_cant_be_deleted_because_it_is_already_reserved_by_some_users: "El curso no puede borrarse porque ya ha sido reservado por algún usuario." - plans: - # summary of the subscriptions + #summary of the subscriptions subcriptions: "Suscripciones" i_choose_that_plan: "Elijo este plan" i_subscribe_online: "Suscribirme online" @@ -267,11 +244,10 @@ es: an_error_occured_during_the_payment_process_please_try_again_later: "Ha ocurrido un error mientras se procesaba el pago. Intentelo en unos minutos." subscription_confirmation: "Confirmar suscripción" here_is_the_NAME_subscription_summary: "Resumen de la suscrpición de {NAME}:" - confirm_payment_of_html: "{ROLE, select, admin{Cash} other{Pay}}: {AMOUNT}" # (contexte : validate a payment of $20,00) + confirm_payment_of_html: "{ROLE, select, admin{Cash} other{Pay}}: {AMOUNT}" #(contexte : validate a payment of $20,00) online_payment_disabled: "Payment by credit card is not available. Please contact the Fablab's reception directly." - events_list: - # Fablab's events list + #Fablab's events list the_fablab_s_events: "Los eventos del FabLab" all_categories: "Todas las categorías" for_all: "Para todo" @@ -283,10 +259,9 @@ es: add_an_event: "Add an event" load_the_next_events: "Load the next events..." full_price_: "Full price:" - to_date: "to" # context: date. eg: 'from 01/01 to 01/05' - + to_date: '"to"' events_show: - # details and booking of an event + #details and booking of an event event_description: "Descripción del evento" downloadable_documents: "Archivos descargables" information_and_booking: "Información y reservas" @@ -295,8 +270,8 @@ es: ending: "Termina:" opening_hours: "Hora de apertura:" all_day: "All day" - from_time: "From" # context: time. eg. 'from 18:00 to 21:00' - to_time: "to" # context: time. eg. 'from 18:00 to 21:00' + from_time: '"From"' + to_time: '"to"' full_price_: "Full price:" tickets_still_availables: "Entradas disponibles:" sold_out: "Entradas vendidas." @@ -311,13 +286,13 @@ es: canceled_reservation_SEATS: "Reservation canceled ({SEATS} seats)" book: "Reservar" confirm_and_pay: "Confirm and pay" - confirm_payment_of_html: "{ROLE, select, admin{Cash} other{Pay}}: {AMOUNT}" # (contexte : validate a payment of $20,00) + confirm_payment_of_html: "{ROLE, select, admin{Cash} other{Pay}}: {AMOUNT}" #(contexte : validate a payment of $20,00) online_payment_disabled: "Payment by credit card is not available. Please contact the Fablab's reception directly." please_select_a_member_first: "Please select a member first" change_the_reservation: "Cambiar la reserva" you_can_shift_this_reservation_on_the_following_slots: "Puede cambiar la reserva en los siguientes campos:" confirmation_required: "Confirmation required" - do_you_really_want_to_delete_this_event: "Do you really want to delete this event?" + do_you_really_want_to_delete_this_event: "Do you really want to delete this event?" event_successfully_deleted: "Event successfully deleted" unable_to_delete_the_event_because_some_users_alredy_booked_it: "Unable to delete this event, it may have been already reserved by some users." cancel_the_reservation: "Cancel the reservation" @@ -329,9 +304,8 @@ es: view_event_list: "View events to come" share_on_facebook: "Share on Facebook" share_on_twitter: "Share on Twitter" - calendar: - # public calendar + #public calendar calendar: "Calendario" show_unavailables: "Mostrar campos inválidos" filter_calendar: "Filtrar calendario" @@ -340,18 +314,16 @@ es: spaces: "Espacios" events: "Eventos" externals: "Otros calendarios" - spaces_list: - # list of spaces + #list of spaces the_spaces: "Espacios" add_a_space: "Añadir espacios" status_enabled: "Enabled" status_disabled: "Disabled" status_all: "All" book: "Book" - space_show: - # display the details of a space + #display the details of a space book_this_space: "Reservar este espacio" unauthorized_operation: "Operación no autorizada" confirmation_required: "Confirmación requerida" From 1af9d1a7f2db413673d665919a6698b2502c945c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 30 Dec 2019 14:58:03 +0100 Subject: [PATCH 108/135] New translations app.public.en.yml (Spanish) --- config/locales/app.public.es.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml index 40aa21a92..deca5cc97 100644 --- a/config/locales/app.public.es.yml +++ b/config/locales/app.public.es.yml @@ -8,7 +8,7 @@ es: #cookies cookies: about_cookies: "Este sitio web utiliza cookies para medir la audiencia." - learn_more: "Aprende más" + learn_more: "Saber más" accept: "Aceptar cookies" decline: "Rechazar" #dashboard sections @@ -190,11 +190,11 @@ es: #list of machines the_fablab_s_machines: "Las máquinas del FabLab" add_a_machine: "Añadir una máquina" - book: "Book" + book: "Reservar" _or_the_: " o el " - status_enabled: "Enabled" - status_disabled: "Disabled" - status_all: "All" + status_enabled: "Activas" + status_disabled: "No activas" + status_all: "Todas" machines_show: #details of a machine book_this_machine: "Alquilar máquina" @@ -208,7 +208,7 @@ es: the_machine_cant_be_deleted_because_it_is_already_reserved_by_some_users: "La máquina no puede borrarse porque está siendo usada o ha sido reservada por algún usuario." trainings_list: #list of trainings - book: "Book" + book: "Reservar" the_trainings: "Lista de cursos" training_show: #details of a training @@ -257,7 +257,7 @@ es: still_available: "available place(s)" free_entry: "Free entry" add_an_event: "Add an event" - load_the_next_events: "Load the next events..." + load_the_next_events: "Cargar los próximos eventos..." full_price_: "Full price:" to_date: '"to"' events_show: @@ -318,10 +318,10 @@ es: #list of spaces the_spaces: "Espacios" add_a_space: "Añadir espacios" - status_enabled: "Enabled" - status_disabled: "Disabled" - status_all: "All" - book: "Book" + status_enabled: "Activos" + status_disabled: "No activos" + status_all: "Todos" + book: "Reservar" space_show: #display the details of a space book_this_space: "Reservar este espacio" From c6575de1e5a2887a45cf1116c0661b4c37125c62 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 30 Dec 2019 15:18:19 +0100 Subject: [PATCH 109/135] New translations app.admin.en.yml (Spanish) --- config/locales/app.admin.es.yml | 125 ++++++++++++-------------------- 1 file changed, 48 insertions(+), 77 deletions(-) diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 76f315b79..f3a91b3a4 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -2,17 +2,15 @@ es: app: admin: machines_new: - # add a new machine + #add a new machine declare_a_new_machine: "Declara una nueva máquina" watch_out_when_creating_a_new_machine_its_prices_are_initialized_at_0_for_all_subscriptions: "Cuidado al crear una nueva máquina, los precios están inicializados a 0 para todas las subscripciones." consider_changing_them_before_creating_any_reservation_slot: "Considera cambiarlos antes de crear cualquier ranura de reserva." - machines_edit: - # machine edition + #machine edition machine_edit: "Editar una máquina" - calendar: - # manage the trainings & machines slots + #manage the trainings & machines slots calendar_management: "Administración de calendario" trainings: "Formación" machines: "Máquinas" @@ -33,7 +31,7 @@ es: the_machine_was_successfully_removed_from_the_slot: "La máquina se eliminó correctamente de la ranura." deletion_failed: "Fallo al borrar." DATE_slot: "{DATE} espacio:" - what_kind_of_slot_do_you_want_to_create: "¿Qué tipo de ranura desea crear??" + what_kind_of_slot_do_you_want_to_create: "¿Qué tipo de horario desea crear?" training: "Formación" machine: "Máquina" space: "Espacio" @@ -42,8 +40,8 @@ es: select_some_machines: "Seleccione algunas máquinas" number_of_tickets: "Número de tickets: " adjust_the_opening_hours: "Ajustar el horario de apertura" - to_time: "to" # context: hora. ej. 'de 18:00 a 21:00' - restrict_this_slot_with_labels_optional: "Restringir esta ranura con etiquetas (opcional)" + to_time: a + restrict_this_slot_with_labels_optional: "Restringir este horario con etiquetas (opcional)" recurrence: "Recurrence" enabled: "Enabled" period: "Period" @@ -77,7 +75,7 @@ es: reservations_locked: "La reserva está bloqueada" unlockable_because_reservations: "No se puede bloquear la reserva en esta ranura porque existen algunas reservas no canceladas." delete_slot: "Delete this slot" - do_you_really_want_to_delete_this_slot: "Do you really want to delete this slot?" + do_you_really_want_to_delete_this_slot: "¿Está seguro de querer remover este horario?" delete_recurring_slot: "You're about to delete a recurring slot. What do you want to do?" delete_this_slot: "Only this slot" delete_this_and_next: "This slot and the following" @@ -87,7 +85,6 @@ es: view_reservations: "Ver reservas" legend: "leyenda" and: "y" - icalendar: icalendar_import: "iCalendar import" intro: "Fab-manager allows to automatically import calendar events, at RFC 5545 iCalendar format, from external URL. These URL are synchronized every nights and the events are shown in the public calendar." @@ -108,9 +105,8 @@ es: confirmation_required: "Confirmation required" confirm_delete_import: "Do you really want to delete this iCalendar import?" delete_success: "iCalendar import successfully deleted" - project_elements: - # management of the projects' components + #management of the projects' components name: "Name" projects_elements_management: "Gestión de elementos de proyectos" materials: "Materials" @@ -121,9 +117,8 @@ es: description: "Description" add_a_new_licence: "Agregar una nueva licencia" manage_abuses: "Administrar informes" - trainings: - # track and monitor the trainings + #track and monitor the trainings trainings_monitoring: "Trainings monitoring" trainings: "Trainings" add_a_new_training: "Add a new training" @@ -138,7 +133,7 @@ es: NUMBER_reservation: "{NUMBER} {NUMBER, plural, one{reservation} other{reservations}}" none: "Nada" training_validation: "Validación de la formación" - training_of_the_DATE_TIME_html : "Training of the {DATE} - {TIME}" + training_of_the_DATE_TIME_html: "Training of the {DATE} - {TIME}" you_can_validate_the_training_of_the_following_members: "Puede validar la formación de los siguientes miembros:" deleted_user: "Usario eliminado" no_reservation: "Sin reserva" @@ -154,15 +149,13 @@ es: status_enabled: "Enabled" status_disabled: "Disabled" status_all: "All" - trainings_new: - # create a new training + #create a new training add_a_new_training: "Add a new training" beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Tenga cuidado, al crear una formación, sus precios de reserva se inicializan en cero." dont_forget_to_change_them_before_creating_slots_for_this_training: "No olvides cambiarlos antes de crear espacios para esta formación." - events: - # events tracking and management + #events tracking and management events_monitoring: "Monitoreo de eventos" manage_filters: "Administrar filtros" fablab_events: "Eventos de Fablab" @@ -174,8 +167,8 @@ es: on_DATE: "on {DATE}" from_DATE: "Desde {DATE}" from_TIME: "Desde {TIME}" - to_date: "to" # context: date. eg: 'from 01/01 to 01/05' - to_time: "to" # context: time. eg. 'from 18:00 to 21:00' + to_date: '"to"' + to_time: '"to"' title: "Title" dates: "Dates" booking: "Booking" @@ -215,22 +208,19 @@ es: do_you_really_want_to_delete_this_price_category: "¿Desea realmente eliminar esta categoría de precios?" price_category_successfully_deleted: "Categoría de precio eliminada correctamente." price_category_deletion_failed: "Error al eliminar la categoría de precio." - events_new: - # add a new event + #add a new event add_an_event: "Add an event" none: "Nada" every_days: "Todos los dias" every_week: "Cada semana" every_month: "Cada mes" every_year: "Cada año" - events_edit: - # edit an existing event + #edit an existing event edit_the_event: "Editar el evento" - event_reservations: - # event reservations list + #event reservations list the_reservations: "Reservas :" user: "User" payment_date: "Fecha de pago" @@ -240,9 +230,8 @@ es: no_reservations_for_now: "No hay reservas por ahora." back_to_monitoring: "Volver a monitorizar" canceled: "cancelada" - pricing: - # subscriptions, prices, credits and coupons management + #subscriptions, prices, credits and coupons management pricing_management: "Gestión de precios" subscriptions: "Suscripciones" trainings: "Formaciones" @@ -271,7 +260,7 @@ es: hours: "Slots of {DURATION} minutes" related_subscriptions: "Suscripciónes relacionada" please_specify_a_number: "Por favor, especifique un número." - none: "Nada" # nota gramatical: concordancia con "formación". + none: '"Nada"' an_error_occurred_while_saving_the_number_of_credits: "Se ha producido un error al guardar el número de créditos." an_error_occurred_while_deleting_credit_with_the_TRAINING: "Se ha producido un error al eliminar el crédito con la {TRAINING}." an_error_occurred_unable_to_find_the_credit_to_revoke: "Se ha producido un error: no se puede encontrar el crédito a revocar." @@ -321,26 +310,23 @@ es: status_enabled: "Enabled" status_disabled: "Disabled" status_all: "All" - coupons_new: - # ajouter un code promotionnel + #ajouter un code promotionnel add_a_coupon: "Añadir un cupón" unable_to_create_the_coupon_check_code_already_used: "No se puede crear el cupón. Compruebe que el código no esté ya utilizado" - coupons_edit: - # mettre à jour un code promotionnel + #mettre à jour un code promotionnel coupon: "Coupon:" unable_to_update_the_coupon_an_error_occurred: "No se puede actualizar el cupón: se ha producido un error." - plans: new: - # add a subscription plan on the platform + #add a subscription plan on the platform add_a_subscription_plan: "Agregar un plan de suscripción" unable_to_create_the_subscription_please_try_again: "No se puede crear el plan de suscripción. Por favor, inténtelo de nuevo." successfully_created_subscriptions_dont_forget_to_redefine_prices: "Suscripción(es) creada correctamente. No olvide redefinir los precios." unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "No se puede guardar este usuario. Compruebe que no hay un usuario ya definido con el mismo nombre." edit: - # edit a subscription plan / machine slot prices + #edit a subscription plan / machine slots prices subscription_plan: "Plan de suscripción:" prices: "Precios" copy_prices_from: "Copia los precios desde" @@ -351,11 +337,10 @@ es: space: "Espacio" unable_to_save_subscription_changes_please_try_again: "No se pueden guardar los cambios de suscripción. Por favor, inténtelo de nuevo." subscription_successfully_changed: "Suscripción cambiada correctamente." - invoices: - # list of all invoices & invoicing parameters + #list of all invoices & invoicing parameters invoices: "Facturas" - accounting_periods: "Accounting periods" # missing translation + accounting_periods: "Accounting periods" invoices_list: "Lista de facturas" filter_invoices: "Filtrar facturas" invoice_num_: "Factura #:" @@ -371,7 +356,7 @@ es: display_more_invoices: "Mostrar más facturas..." no_invoices_for_now: "Sin facturas por ahora." invoicing_settings: "Configuración de facturación" - warning_invoices_disabled: "Warning : invoices are not enabled. No invoices will be generated by Fab-manager. Nevertheless, you must correctly fill the information below, especially VAT." # missing translation + warning_invoices_disabled: "Warning : invoices are not enabled. No invoices will be generated by Fab-manager. Nevertheless, you must correctly fill the information below, especially VAT." change_logo: "Cambio de logotipo" john_smith: "John Smith" john_smith_at_example_com: "jean.smith@example.com" @@ -451,7 +436,7 @@ es: description: "Descripción" description_optional: "Descripción (opcional):" will_appear_on_the_refund_invoice: "Aparecerá en la factura de reembolso." - none: "Nada" # grammar note: concordancia con "medio de pago"" + none: "Nada\" # grammar note: concordancia con \"medio de pago\"" by_cash: "En efectivo" by_cheque: "Mediante cheque" by_transfer: "Por transferencia" @@ -569,9 +554,8 @@ es: debit_euro: "Euro debit" credit_euro: "Euro credit" lettering: "Lettering" - members: - # management of users, labels, groups, and so on + #management of users, labels, groups, and so on users_management: "Gestión de usuarios" members: "Miembros" subscriptions: "Subscriptions" @@ -591,6 +575,7 @@ es: groups: "Grupos" tags: "Tags" authentication: "Autenticación" + confirmation_required: "Confirmation required" confirm_delete_member: "¿Desea realmente eliminar este usario? Esto no se puede deshacer." member_successfully_deleted: "Usario eliminado correctamente." unable_to_delete_the_member: "No se puede eliminar el usario." @@ -645,14 +630,12 @@ es: status_enabled: "Enabled" status_disabled: "Disabled" status_all: "All" - members_new: - # add a member + #add a member add_a_member: "Agregar un miembro" user_is_an_organization: "El usuario es una organización" - members_import: - # members bulk import + #members bulk import import_members: "Import members" info: "You can upload a CSV file to create new members or update existing ones. Your file must user the identifiers below to specify the group, the trainings and the tags of the members." required_fields: "Your file must contain, at least, the following information for each user to create: email, name, first name and group. If the password is empty, it will be generated. On updates, the empty fields will be kept as is." @@ -676,9 +659,8 @@ es: update_on_id: "ID" update_on_username: "Username" update_on_email: "Email address" - members_import_result: - # import results + #import results import_results: "Import results" import_details: "Import #{ID}, of {DATE}, initiated by {USER}" results: "Results" @@ -688,9 +670,8 @@ es: success: "Success" failed: "Failed" error_details: "Error's details:" - members_edit: - # edit a member + #edit a member subscription: "Subscription" duration: "Duración:" expires_at: "Caduca en:" @@ -732,9 +713,8 @@ es: a_problem_occurred_while_taking_the_subscription: "Se ha producido un problema al realizar la suscripción." wallet: "Wallet" to_credit: 'Credit' - admins_new: - # add a new administrator to the platform + #add a new administrator to the platform add_an_administrator: "Agregar un administrador" administrator_successfully_created_he_will_receive_his_connection_directives_by_email: "administrador creado correctamente. {GENDER, select, female{She} other{He}} receive {GENDER, select, female{her} other{his}} directivas de conexión por e-mail." failed_to_create_admin: "No se puede crear el administrador :" @@ -751,9 +731,8 @@ es: birth_date: "Date of birth" address: "Address" phone_number: "Phone number" - authentication_new: - # add a new authentication provider (SSO) + #add a new authentication provider (SSO) local_database: "Base de datos local" o_auth2: "OAuth 2.0" add_a_new_authentication_provider: "Agregar un nuevo proveedor de autenticación" @@ -766,21 +745,19 @@ es: do_you_really_want_to_continue: "¿De verdad quieres continuar?" unsecured_oauth2_provider_successfully_added: "Proveedor de OAuth 2.0 no seguro, se ha agregado correctamente." oauth2_provider_successfully_added: "OAuth 2.0 proveedor agregado correctamente." - authentication_edit: - # edit an authentication provider (SSO) + #edit an authentication provider (SSO) provider: "Proveedor :" it_is_required_to_set_the_matching_between_User.uid_and_the_API_to_add_this_provider: "Es necesario establecer la coincidencia entre User.uid y la API para agregar este proveedor" provider_successfully_updated: "Proveedor actualizado correctamente" an_error_occurred_unable_to_update_the_provider: "Se ha producido un error: no se puede actualizar el proveedor." - statistics: - # statistics tables + #statistics tables statistics: "Statistics" evolution: "Evolución" age_filter: "Filtro de edad" - from_age: "Desde" # contexto: edad. por ejemplo: de 8 a 40 años - to_age: "a" # contexto: edad. por ejemplo: de 8 a 40 años + from_age: "Desde" #context: age. eg: from 8 to 40 years old + to_age: "a" #context: age. eg: from 8 to 40 years old _years_old: "años" start: "Principio:" end: "Final:" @@ -789,8 +766,8 @@ es: criterion: "Criterio:" value: "Valor:" exclude: "Excluir" - from_date: "From" # context: date. eg: 'from 01/01 to 01/05' - to_date: "to" # context: date. eg: 'from 01/01 to 01/05' + from_date: '"From"' + to_date: '"to"' entries: "Entradas:" revenue_: "Ingresos:" average_age: "Edad media:" @@ -815,15 +792,14 @@ es: man: "Man" woman: "Woman" export_is_running_you_ll_be_notified_when_its_ready: "Export is running. You'll be notified when it's ready." - stats_graphs: - # statistics graphs + #statistics graphs statistics: "Statistics" data: "Datos" day: "Dia" week: "Semana" - from_date: "From" # context: date. eg: 'from 01/01 to 01/05' - to_date: "to" # context: date. eg: 'from 01/01 to 01/05' + from_date: '"From"' + to_date: '"to"' month: "Month" start: "Inicio:" end: "Final:" @@ -835,9 +811,8 @@ es: week_of_START_to_END: "Semana del {START} a {END}" no_data_for_this_period: "No hay datos para este periodo" date: "Date" - settings: - # global application parameters and customization + #global application parameters and customization title: "Título" customize_the_application: "Personalizar la aplicación" general: "General" @@ -960,7 +935,6 @@ es: publish_will_notify: "Publish a new version will send a notification to every users." publish: "Publish" users_notified: "Platform users will be notified of the update." - open_api_clients: add_new_client: "Crear un nuevo cliente de API" api_documentation: "Documentation API" @@ -978,21 +952,18 @@ es: client_successfully_updated: "Cliente actualizado correctamente." client_successfully_deleted: "Cliente borrado correctamente." access_successfully_revoked: "Acceso revocado correctamente." - space_new: - # create a new space + #create a new space add_a_new_space: "Añadir un espacio nuevo" watch_out_when_creating_a_new_space_its_prices_are_initialized_at_0_for_all_subscriptions: "¡Cuidado! Al crear un nuevo espacio, sus precios se inicializan en 0 para todas las suscripciones." consider_changing_its_prices_before_creating_any_reservation_slot: "Considere cambiar sus precios antes de crear cualquier espacio de reserva." add_this_space: "Añadir este espacio" - space_edit: - # modify an exiting space + #modify an exiting space edit_the_space_NAME: "Edit the space: {NAME}" validate_the_changes: "Validar los cambios" - manage_abuses: - # process and delete abuses reports + #process and delete abuses reports abuses_list: "Lista de informes" no_reports: "No informes por ahora" published_by: "published by" From f161c1ff246ad0d5ab90675ae175aac8913be8f6 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 30 Dec 2019 15:18:21 +0100 Subject: [PATCH 110/135] New translations app.public.en.yml (Spanish) --- config/locales/app.public.es.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml index deca5cc97..11d4ea0b1 100644 --- a/config/locales/app.public.es.yml +++ b/config/locales/app.public.es.yml @@ -23,7 +23,7 @@ es: #login/logout sign_out: "Salir" sign_up: "Registrarse" - sign_in: "Entrar" + sign_in: "Ingresar" #left menu notifications: "Notificaciones" admin: "Administrador" @@ -98,7 +98,7 @@ es: #connection modal connection: "Conexión" password_forgotten: "¿Ha olvidado su contraseña?" - not_registered_to_the_fablab: "¿No está registrado en el fatlab aún?" + not_registered_to_the_fablab: "¿No está registrado en el fablab todavía?" create_an_account: "Crear una cuenta" wrong_email_or_password: "E-mail o contraseña incorrecta." caps_lock_is_on: "Las mayusculas están activadas." From 3b7c97340957e18d3874f80bc9617aad83bf0b78 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 30 Dec 2019 15:37:10 +0100 Subject: [PATCH 111/135] New translations app.admin.en.yml (Spanish) --- config/locales/app.admin.es.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index f3a91b3a4..12806fa01 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -42,18 +42,18 @@ es: adjust_the_opening_hours: "Ajustar el horario de apertura" to_time: a restrict_this_slot_with_labels_optional: "Restringir este horario con etiquetas (opcional)" - recurrence: "Recurrence" - enabled: "Enabled" - period: "Period" - week: "Week" - month: "Month" - number_of_periods: "Number of periods" - end_date: "End date" - summary: "Summary" + recurrence: "Recurrencia" + enabled: "Activa" + period: "Período" + week: "Semana" + month: "Mes" + number_of_periods: "Numéro de períodos" + end_date: "Fecha de fin" + summary: "Resumen" select_period: "Please select a period for the recurrence" select_nb_period: "Please select a number of periods for the recurrence" select_end_date: "Please select the date of the last occurrence" - about_to_create: "You are about to create the following {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}:" + about_to_create: "Está a punto de crear los horarios siguientes: {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}:" reservable: "Reservable(s):" labels: "Etiqueta(s):" none: "Ninguna" @@ -820,18 +820,18 @@ es: fablab_name: "Nombre del FabLab " title_concordance: "Concordancia de título" male: "Masculino." - female: "Hembra." + female: "Mujer." neutral: "Neutral" eg: "ej:" - about: "Sobre" + about: "Acerca de" male_preposition: "el" female_preposition: "la" neutral_preposition: "" customize_information_messages: "Personalizar mensajes de información" message_of_the_machine_booking_page: "Mensaje de la página de reserva de la máquina:" type_the_message_content: "Escriba el contenido del mensaje" - warning_message_of_the_training_booking_page: "Warning message of the training booking page:" - information_message_of_the_training_reservation_page: "Information message of the training reservation page:" + warning_message_of_the_training_booking_page: "Mensaje de advertencia de la pagina de reservación de las formaciones:" + information_message_of_the_training_reservation_page: "Mensaje de información en la página de reservación de las formaciones:" message_of_the_subscriptions_page: "Mensaje de advertencia de la página de reserva de formación:" message_of_the_events_page: "Mensaje de la página de eventos:" message_of_the_spaces_page: "Mensaje de la página de espacios:" @@ -846,7 +846,7 @@ es: logo_white_background: "Logo (fondo blanco)" change_the_logo: "Cambiar el logotipo" logo_black_background: "Logo (fondo negro)" - favicon: "Favicon" + favicon: "Favicón" change_the_favicon: "Cambiar el favicon" main_colour: "Color principal:" primary: "Primario" @@ -928,8 +928,8 @@ es: privacy: title: "Política de privacidad" input_the_dpo: "Input the contact of the Data Protection Officer" - current_policy: "Current policy" - draft_from_USER_DATE: "Draft, saved by {USER}, on {DATE}" + current_policy: "Política de privacidad" + draft_from_USER_DATE: "Borrador, guardado por {USER}, el {DATE}" save_or_publish: "Save or publish?" save_or_publish_body: "Do you want to publish a new version of the privacy policy or save it as a draft?" publish_will_notify: "Publish a new version will send a notification to every users." From a766a60535bccd1e50f53bf181f1617cabad75c1 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 30 Dec 2019 15:37:12 +0100 Subject: [PATCH 112/135] New translations app.shared.en.yml (Spanish) --- config/locales/app.shared.es.yml | 77 +++++++++++--------------------- 1 file changed, 27 insertions(+), 50 deletions(-) diff --git a/config/locales/app.shared.es.yml b/config/locales/app.shared.es.yml index 8cf32e350..9037f6403 100644 --- a/config/locales/app.shared.es.yml +++ b/config/locales/app.shared.es.yml @@ -2,7 +2,7 @@ es: app: shared: buttons: - # translations of common buttons + #translations of common buttons confirm_changes: "Confirmar cambios" consult: "Consultar" edit: "Editar" @@ -18,14 +18,12 @@ es: "yes": "Sí" "no": "No" apply: "Aplicar" - messages: you_will_lose_any_unsaved_modification_if_you_quit_this_page: "Si cierra la página se perderán todas las modificaciones que no se hayan guardado" you_will_lose_any_unsaved_modification_if_you_reload_this_page: "Si recarga la página se perderán todas las modificaciones que no se hayan guardado" payment_card_error: "A problem has occurred with your credit card:" - user: - # user edition form + #user edition form man: "Man" woman: "Woman" add_an_avatar: "Añadir un avatar" @@ -64,9 +62,8 @@ es: used_for_invoicing: "This data will be used for billing purposes" used_for_reservation: "This data will be used in case of change on one of your bookings" used_for_profile: "This data will only be displayed on your profile" - project: - # project edition form + #project edition form name: "Name" name_is_required: "Name is required." illustration: "Ilustración" @@ -94,9 +91,8 @@ es: themes: "Themes" tags: "Tags" save_as_draft: "Save as draft" - machine: - # machine edition form + #machine edition form name: "Nombre" name_is_required: "Se requiere un nombre." illustration: "Ilustración" @@ -110,33 +106,28 @@ es: add_an_attachment: "añadir archivo adjunto" disable_machine: "Disable machine" validate_your_machine: "Validar su máquina" - plan_subscribe: - # frame to select a plan to subscribe + #frame to select a plan to subscribe subscribe_online: "suscribirse online" do_not_subscribe: "no suscribe" - member_select: - # admin: choose a member to interact with + #admin: choose a member to interact with select_a_member: "Selecciona un miembro" start_typing: "Empezar a escribir..." - stripe: - # stripe payment modal + #stripe payment modal online_payment: "Online payment" i_have_read_and_accept_: "He leido y acepto" _the_general_terms_and_conditions: "Los términos y condiciones." credit_amount_for_pay_reservation: "{amount} {currency} falta por pagar para efectuar su reserva" client_credit_amount_for_pay_reservation: "{amount} {currency} falta por pagar para efectuar la reserva del cliente" confirm_payment_of_: "Pay: {AMOUNT}" - valid_reservation_modal: - # dialog of on site payment for reservations + #dialog of on site payment for reservations booking_confirmation: "Confirmar reserva" here_is_the_summary_of_the_slots_to_book_for_the_current_user: "Resumen de los espacios reservados por el usuario actual:" - event: - # event edition form + #event edition form title: "Title" title_is_required: "Se requiere un título." matching_visual: "Coincidencia visual" @@ -160,9 +151,8 @@ es: tickets_available: "Entradas disponibles" event_theme: "Tema del evento" age_range: "Rango de edades" - plan: - # subscription plan edition form + #subscription plan edition form general_information: "Información general" name: "Nombre" name_is_required: "Se requiere un nombre." @@ -203,9 +193,8 @@ es: email_address_is_required: "Se requiere un mail." disabled: "Disable subscription" disable_plan_will_not_unsubscribe_users: "Beware: disabling this plan won't unsubscribe users having active subscriptions with it." - trainings: - # training edition form + #training edition form name: "Nombre" name_is_required: "Se requiere un nombre." illustration: "Ilustración" @@ -218,9 +207,8 @@ es: number_of_tickets: "Número de entradas" public_page: "Hacer curso público" disable_training: "Disable the training" - user_admin: - # partial form to edit/create an user (admin view) + #partial form to edit/create an user (admin view) user: "User" incomplete_profile: "Incomplete profile" user_profile: "Profil utilisateur" @@ -229,9 +217,8 @@ es: group_is_required: "Se requiere un grupo" trainings: "Cursos" tags: "Tags" - authentication: - # partial form to edit/create an authentication provider (SSO) + #partial form to edit/create an authentication provider (SSO) name: "Nombre" provider_name_is_required: "Se requiere el nombre del proveedor." authentication_type: "Tipo de autenticación" @@ -242,9 +229,8 @@ es: expected_data_type: "Tipo de datos esperado" input_format: "Formato de entrada" mappings: "Mapeos" - oauth2: - # edition/creation form of an OAuth2 authentication provider + #edition/creation form of an OAuth2 authentication provider common_url: "URL común" common_url_is_required: "se requiere una URL común." provided_url_is_not_a_valid_url: "La URL cedida no es válida." @@ -267,29 +253,25 @@ es: api_endpoint_url: "API final de URL" api_type: "Tipo de API" api_fields: "Campos de API" - confirm_modify_slot_modal: - # machine/training slot modification modal + #machine/training slot modification modal change_the_slot: "Cambiar la ranura" do_you_want_to_change_your_booking_slot_initially_planned_at: "Desea cambiar su reserva efectuada inicialmente el:" do_you_want_to_change_NAME_s_booking_slot_initially_planned_at: "Desea cambiar la reserva de {NAME} , efectuada inicialmente el:" cancel_this_reservation: "Cancelar reserva" i_want_to_change_date: "Quiero cambiar la fecha" - request_training_modal: - # modal introducing that a training is requested before booking a machine + #modal introducing that a training is requested before booking a machine to_book_the_MACHINE_you_must_have_completed_the_TRAINING: "Para reservar \"{MACHINE}\" debes haber completado el curso: {TRAINING}." register_for_the_training: "Apuntarse al curso" i_dont_want_to_register_now: "No quiero apuntarme aún" - training_reservation_modal: - # modal introducing that a user must wait for his training being validated before booking a machine + #modal introducing that a user must wait for his training being validated before booking a machine machine_reservation: "Reserva de máquina" you_must_wait_for_your_training_is_being_validated_by_the_fablab_team_to_book_this_machine: "Debes esperar a que el Fablab valide tu curso para reservar la máquina." your_training_will_occur_: "Tu curso será realizado" - public_profile: - # user public profile + #user public profile last_activity_html: "Last activity
    on {DATE}" to_come: "por llegar" approved: "aprobada" @@ -303,9 +285,8 @@ es: email_address: "Email address" trainings: "Trainings" no_trainings: "No trainings" - wallet: - # wallet + #wallet wallet: 'Cartera' your_wallet_amount: 'Su dinero disponible' wallet_amount: 'Cantidad disponible' @@ -340,9 +321,8 @@ es: debit_reservation_machine: "Débito por reserva de máquina" debit_reservation_event: "Débito por reserva de evento" warning_uneditable_credit: "ADVERTENCIA: una vez validada la reserva no podrá modificarse el pago." - coupon: - # promotional coupon (creation/edition form) + #promotional coupon (creation/edition form) name: "Nombre" name_is_required: "Name is required." code: "Código" @@ -364,9 +344,8 @@ es: max_usages: "Usos máximos permitidos" max_usages_must_be_equal_or_greater_than_0: "El número de usos máximos permitidos debe ser mayor que 0." enabled: "Activo" - coupon_input: - # coupon (input zone for users) + #coupon (input zone for users) i_have_a_coupon: "I have a coupon!" code_: "Code:" the_coupon_has_been_applied_you_get_PERCENT_discount: "Se ha aplicado el cupón {PERCENT}% de descuento." @@ -378,9 +357,8 @@ es: unable_to_apply_the_coupon_because_amount_exceeded: "No se puede aplicar el cupón: el descuento excede el monto total de esta compra." unable_to_apply_the_coupon_because_undefined: "No se puede aplicar el cupón: se ha producido un error inesperado, póngase en contacto con el gerente del Fablab." unable_to_apply_the_coupon_because_rejected: "Este código no existe." - space: - # form to create/edit a space + #form to create/edit a space name: "Nombre" name_is_required: "Se requiere un nombre." illustration: "Ilustración" @@ -395,13 +373,12 @@ es: default_places: "Máximo de entradas predeterminado" default_places_is_required: "Se requiere un máximo de entradas predeterminado." disable_space: "Disable space" - cart: - # module de panier d'achat de réservations + #module de panier d'achat de réservations summary: "Resumen" select_one_or_more_slots_in_the_calendar: "Selecciona uno {SINGLE, select, true{slot} other{or more slots}} en el calendario" you_ve_just_selected_the_slot: "Acaba de seleccionar el espacio :" - datetime_to_time: "{START_DATETIME} hasta {END_TIME}" # eg: Thursday, September 4 1986 8:30 PM to 10:00 PM + datetime_to_time: "{START_DATETIME} hasta {END_TIME}" #eg: Thursday, September 4 1986 8:30 PM to 10:00 PM cost_of_TYPE: "Coste de {TYPE, select, Machine{a machine hour} Training{the training} other{the element}}" offer_this_slot: "Ofertar este espacio" confirm_this_slot: "Confirmar este espacio" @@ -427,14 +404,14 @@ es: tags_of_the_destination_slot: "Etiquetas del espacio final:" confirm_my_modification: "Confirmar modificación" your_booking_slot_was_successfully_moved_from_: "Tu reserva de espacio ha sido reemplazada con éxito" - to_date: "a" # context: date. eg: 'from 01/01 to 01/05' - please_select_a_member_first: "Por favor, selecciona un miembro de la lista" + to_date: '"a"' + please_select_a_member_first: 'Por favor, selecciona un miembro de la lista' unable_to_change_the_reservation: "Imposible cambiar reserva" confirmation_required: "Confirmación requerida" do_you_really_want_to_cancel_this_reservation: "¿Está seguro de querer cancelar la reserva?" reservation_was_cancelled_successfully: "La reserva se ha cancelado con éxito." cancellation_failed: "Cancelación fallida." - confirm_payment_of_html: "{ROLE, select, admin{Payment on site} other{Pay}}: {AMOUNT}" # (context: confirm my payment of $20.00) + confirm_payment_of_html: "{ROLE, select, admin{Payment on site} other{Pay}}: {AMOUNT}" #(context: confirm my payment of $20.00) a_problem_occurred_during_the_payment_process_please_try_again_later: "A problem occurred during the payment process. Please try again later." none: "Ninguno" online_payment_disabled: "El pago en línea no está disponible. Póngase en contacto directamente con la recepción de Fablab." From bfb5174efa7f564365f9a366379eb9e966dccae3 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 30 Dec 2019 15:48:53 +0100 Subject: [PATCH 113/135] New translations app.admin.en.yml (Spanish) --- config/locales/app.admin.es.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 12806fa01..897856fe0 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -819,9 +819,9 @@ es: fablab_title: "Título del FabLab" fablab_name: "Nombre del FabLab " title_concordance: "Concordancia de título" - male: "Masculino." + male: "Hombre." female: "Mujer." - neutral: "Neutral" + neutral: "Neutral." eg: "ej:" about: "Acerca de" male_preposition: "el" @@ -909,7 +909,7 @@ es: booking_cancel_delay: "Cancelar demora de reserva" reminder_enable: "Recordatorio de reserva" reminder_delay: "demora antes de enviar el recordatorio" - default_value_is_24_hours: "Si el campo es dejado vacio: 24 horas." + default_value_is_24_hours: "Si el campo está vacío: 24 horas." visibility_yearly: "máxima visibilidad para suscriptores anuales" visibility_others: "máxima visibilidad para otros miembros" confidentiality: "Confidencialidad" From aaa63e3e413444ffc6def8af4370c35ad96e1a13 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 30 Dec 2019 15:48:55 +0100 Subject: [PATCH 114/135] New translations app.public.en.yml (Spanish) --- config/locales/app.public.es.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml index 11d4ea0b1..61c4006b3 100644 --- a/config/locales/app.public.es.yml +++ b/config/locales/app.public.es.yml @@ -3,7 +3,7 @@ es: public: common: #header and "about" page - about_the_fablab: "Sobre {GENDER, select, male{el} female{la} neutral{} other{las}} {NAME}" + about_the_fablab: "Acerca de {GENDER, select, male{el} female{la} neutral{} other{las}} {NAME}" return: "Volver" #cookies cookies: From 8917085025237cafc6c8396ac40c49d5b4585cb8 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 30 Dec 2019 16:02:48 +0100 Subject: [PATCH 115/135] New translations rails.en.yml (Spanish) --- config/locales/rails.es.yml | 112 ++++++++++++++++++------------------ 1 file changed, 57 insertions(+), 55 deletions(-) diff --git a/config/locales/rails.es.yml b/config/locales/rails.es.yml index d88a38231..9739bdbb7 100644 --- a/config/locales/rails.es.yml +++ b/config/locales/rails.es.yml @@ -1,57 +1,57 @@ es: date: abbr_day_names: - - dom - - lun - - mar - - mié - - jue - - vie - - sáb + - dom + - lun + - mar + - mié + - jue + - vie + - sáb abbr_month_names: - - - - ene - - feb - - mar - - abr - - may - - jun - - jul - - ago - - sep - - oct - - nov - - dic + - + - ene + - feb + - mar + - abr + - may + - jun + - jul + - ago + - sep + - oct + - nov + - dic day_names: - - domingo - - lunes - - martes - - miércoles - - jueves - - viernes - - sábado + - domingo + - lunes + - martes + - miércoles + - jueves + - viernes + - sábado formats: default: "%-d/%-m/%Y" long: "%-d de %B de %Y" short: "%-d de %b" month_names: - - - - enero - - febrero - - marzo - - abril - - mayo - - junio - - julio - - agosto - - septiembre - - octubre - - noviembre - - diciembre + - + - enero + - febrero + - marzo + - abril + - mayo + - junio + - julio + - agosto + - septiembre + - octubre + - noviembre + - diciembre order: - - :day - - :month - - :year + - :day + - :month + - :year datetime: distance_in_words: about_x_hours: @@ -106,14 +106,14 @@ es: equal_to: debe ser igual a %{count} even: debe ser par exclusion: está reservado - greater_than: debe ser mayor que %{count} - greater_than_or_equal_to: debe ser mayor que o igual a %{count} + greater_than: debe ser mayor a %{count} + greater_than_or_equal_to: debe ser mayor o igual a %{count} inclusion: no está incluido en la lista invalid: no es válido - less_than: debe ser menor que %{count} - less_than_or_equal_to: debe ser menor que o igual a %{count} + less_than: debe ser menor a %{count} + less_than_or_equal_to: debe ser menor o igual a %{count} not_a_number: no es un número - not_an_integer: debe ser un entero + not_an_integer: debe ser un número entero odd: debe ser impar record_invalid: 'La validación falló: %{errors}' restrict_dependent_destroy: @@ -121,20 +121,21 @@ es: many: No se puede eliminar el registro porque existen %{record} dependientes taken: ya está en uso too_long: - one: "es demasiado largo (1 carácter máximo)" - other: "es demasiado largo (%{count} caracteres máximo)" + one: es demasiado largo (1 carácter máximo) + other: es demasiado largo (%{count} caracteres máximo) too_short: - one: "es demasiado corto (1 carácter mínimo)" - other: "es demasiado corto (%{count} caracteres mínimo)" + one: es demasiado corto (1 carácter mínimo) + other: es demasiado corto (%{count} caracteres mínimo) wrong_length: - one: "no tiene la longitud correcta (1 carácter exactos)" - other: "no tiene la longitud correcta (%{count} caracteres exactos)" + one: no tiene la longitud correcta (1 carácter exactos) + other: no tiene la longitud correcta (%{count} caracteres exactos) other_than: debe ser distinto de %{count} + wrong_content_type: "este tipo de archivo adjunto no está permitido" template: body: 'Se encontraron problemas con los siguientes campos:' header: one: No se pudo guardar este/a %{model} porque se encontró 1 error - other: No se pudo guardar este/a %{model} porque se encontraron %{count} errores + other: "No se pudo guardar este/a %{model} porque se encontraron %{count} errores" helpers: select: prompt: Por favor seleccione @@ -186,6 +187,7 @@ es: percentage: format: delimiter: '' + format: "%n%" precision: format: delimiter: '' From 392c125d448fd42b0bb80eecaadf243089760775 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 30 Dec 2019 16:08:19 +0100 Subject: [PATCH 116/135] New translations rails.en.yml (Spanish) --- config/locales/rails.es.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/locales/rails.es.yml b/config/locales/rails.es.yml index 9739bdbb7..db1937f52 100644 --- a/config/locales/rails.es.yml +++ b/config/locales/rails.es.yml @@ -117,8 +117,8 @@ es: odd: debe ser impar record_invalid: 'La validación falló: %{errors}' restrict_dependent_destroy: - one: No se puede eliminar el registro porque existe un %{record} dependiente - many: No se puede eliminar el registro porque existen %{record} dependientes + one: No se puede borrar el registro porque existe un %{record} dependiente + many: No se puede borrar el registro porque existen %{record} dependientes taken: ya está en uso too_long: one: es demasiado largo (1 carácter máximo) @@ -127,7 +127,7 @@ es: one: es demasiado corto (1 carácter mínimo) other: es demasiado corto (%{count} caracteres mínimo) wrong_length: - one: no tiene la longitud correcta (1 carácter exactos) + one: no tiene la longitud correcta (1 carácter) other: no tiene la longitud correcta (%{count} caracteres exactos) other_than: debe ser distinto de %{count} wrong_content_type: "este tipo de archivo adjunto no está permitido" From 1324fbc025b18cd6df53c826487099ce70b31e47 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 30 Dec 2019 16:18:12 +0100 Subject: [PATCH 117/135] New translations rails.en.yml (Spanish) --- config/locales/rails.es.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/locales/rails.es.yml b/config/locales/rails.es.yml index db1937f52..7f2e26a71 100644 --- a/config/locales/rails.es.yml +++ b/config/locales/rails.es.yml @@ -99,9 +99,9 @@ es: format: "%{attribute} %{message}" messages: accepted: debe ser aceptado - blank: no puede estar en blanco - present: debe estar en blanco - confirmation: no coincide + blank: no puede ser vacío + present: debe ser vacío + confirmation: no coincide con %{attribute} empty: no puede estar vacío equal_to: debe ser igual a %{count} even: debe ser par @@ -128,11 +128,11 @@ es: other: es demasiado corto (%{count} caracteres mínimo) wrong_length: one: no tiene la longitud correcta (1 carácter) - other: no tiene la longitud correcta (%{count} caracteres exactos) + other: no tiene la longitud correcta (%{count} caracteres) other_than: debe ser distinto de %{count} wrong_content_type: "este tipo de archivo adjunto no está permitido" template: - body: 'Se encontraron problemas con los siguientes campos:' + body: 'Se encontraron errores con los siguientes campos:' header: one: No se pudo guardar este/a %{model} porque se encontró 1 error other: "No se pudo guardar este/a %{model} porque se encontraron %{count} errores" From aec3a575290ac09ec133caddda55696d6ca5972c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 30 Dec 2019 17:34:15 +0100 Subject: [PATCH 118/135] [ongoing] setup script --- doc/docker-compose_readme.md | 165 +++-------------------- doc/environment.md | 1 - setup/letsencrypt.service | 8 ++ setup/letsencrypt.timer | 11 ++ setup/nginx_with_ssl.conf.example | 6 +- setup/setup.sh | 215 ++++++++++++++++++++++++++++-- setup/webroot.ini.example | 7 +- 7 files changed, 247 insertions(+), 166 deletions(-) create mode 100644 setup/letsencrypt.service create mode 100644 setup/letsencrypt.timer diff --git a/doc/docker-compose_readme.md b/doc/docker-compose_readme.md index 15e8acf5b..e0dc617e0 100644 --- a/doc/docker-compose_readme.md +++ b/doc/docker-compose_readme.md @@ -9,15 +9,10 @@ You will need to be root through the rest of the setup. ##### Table of contents 1. [Preliminary steps](#preliminary-steps)
    -1.1. Setup the server
    -1.2. Setup the domain name
    -1.3. Connect through SSH
    -1.4. Prepare the server
    -1.5. Retrieve the initial configuration files
    -1.6. Setup folders and env file
    -1.7. Setup nginx configuration
    -1.8. SSL certificate with LetsEncrypt
    -1.9. Requirements +1.1. [Setup the server](#setup-the-server)
    +1.2. [Setup the domain name](#setup-the-domain-name)
    +1.3. [Connect through SSH](#connect-through-ssh)
    +1.4. [Prepare the server](#prepare-the-server)
    2. [Install Fab-manager](#install-fabmanager)
    2.1. Add docker-compose.yml file
    2.2. pull images
    @@ -54,8 +49,8 @@ You will need at least 2GB of addressable memory (RAM + swap) to install and use We recommend 4 GB RAM for larger communities. On DigitalOcean, create a Droplet with One-click apps **"Docker on Ubuntu 16.04 LTS"**. -This way, Docker and Docker-compose are preinstalled. -Choose a datacenter and set the hostname as your domain name. +This way, Docker and Docker-compose are pre-installed. +Choose a datacenter and set your domain name as the hostname. With other providers, choose a [supported operating system](../README.md#software-stack) and install docker on it: - [Debian](https://docs.docker.com/engine/installation/linux/docker-ce/debian/) @@ -63,6 +58,7 @@ With other providers, choose a [supported operating system](../README.md#softwar Then install [Docker Compose](https://docs.docker.com/compose/install/) + ### Setup the domain name There are many domain name registrars on the internet, you may choose one that fit your needs. @@ -72,11 +68,13 @@ You can find an exhaustive list [on the ICANN website](https://www.icann.org/reg 2. Replace the IP address of the domain with the IP address of your VPS (This is a DNS record type A) 3. **Do not** try to access your domain name right away, DNS are not aware of the change yet so **WAIT** and be patient. + ### Connect through SSH You can already connect to the server with this command: `ssh root@server-ip`. When DNS propagation will be done, you will be able to connect to the server with `ssh root@your-domain-name`. + ### Prepare the server Before installing fab-manager, we recommend you to: @@ -91,144 +89,23 @@ You can run the following script as root to easily perform all these operations: \curl -sSL prepare-vps.sleede.com | bash ``` - -### Retrieve the initial configuration files - -```bash -\curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/setup.sh | bash -# OR, if you don't want to install fab-manager in /apps/fabmanager, use: -\curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/setup.sh | bash -s "/my/custom/path" -``` - -### Setup env file - -Configure the environnement variables file: -```bash -cd /apps/fabmanager -vi config/env -# or use your favorite text editor instead of vi (nano, ne...) -``` -You need to carefully configure each variable before starting fab-manager. -Please refer to the [environment configuration documentation](environment.md) for explanations about those variables. - - -### Setup nginx configuration - -Edit the nginx configuration file: -```bash - -vi config/nginx/fabmanager.conf -# or use your favorite text editor instead of vi (nano, ne...) -``` - -Customize the following values: -* Replace **MAIN_DOMAIN** (example: fab-manager.com). - -### SSL certificate with LetsEncrypt - -**FOLLOW THOSE INSTRUCTIONS ONLY IF YOU WANT TO USE SSL**. - -If you want to host you Fab-manager instance through SSL (which is highly recommended), you must follow the following instructions. - -Let's Encrypt is a Certificate Authority that is free, automated, and open. -Let’s Encrypt certificates expire after 90 days, so automation of renewing your certificates is important. -Here is the setup for a systemd timer and service to renew the certificates and reboot the app Docker container: - -Generate the dhparam.pem file -```bash -mkdir -p /apps/fabmanager/config/nginx/ssl -cd /apps/fabmanager/config/nginx/ssl -openssl dhparam -out dhparam.pem 4096 -``` - -Customize the let's encrypt configuration file -```bash -vi letsencrypt/config/webroot.ini -# or use your favorite text editor instead of vi (nano, ne...) -``` - -Run `docker pull quay.io/letsencrypt/letsencrypt:latest` - -Create file (with sudo) /etc/systemd/system/letsencrypt.service and paste the following configuration into it: - -```systemd -[Unit] -Description=letsencrypt cert update oneshot -Requires=docker.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/docker run --rm --name certbot_fabmanager -v "/apps/fabmanager/letsencrypt:/etc/letsencrypt" certbot/certbot:latest -c "/etc/letsencrypt/config/webroot.ini" certonly -ExecStartPost=-/usr/bin/docker restart fabmanager_nginx_1 -``` - -Create file (with sudo) /etc/systemd/system/letsencrypt.timer and paste the following configuration into it: -```systemd -[Unit] -Description=letsencrypt oneshot timer -Requires=docker.service - -[Timer] -OnCalendar=*-*-1 06:00:00 -Persistent=true -Unit=letsencrypt.service - -[Install] -WantedBy=timers.target -``` - -That's all for the moment. Keep on with the installation, we'll complete that part after deployment in the [Generate SSL certificate by Let's encrypt](#generate-ssl-cert-letsencrypt). - -### Requirements - - -Verify that Docker and Docker-composer are installed : -(This is normally the case if you used a pre-configured image.) - -```bash -docker info -docker-compose -v -``` - -Otherwise, follow the instructions provided in the section [Setup the server](#setup-the-server) to install. - ## Install Fabmanager -### Add docker-compose.yml file +### Setup script -You should already have a `docker-compose.yml` file in your app folder `/apps/fabmanager`. -Otherwise, see the section [Retrieve the initial configuration files](#retrieve-config-files) to get it. - -The docker-compose commands must be launched from the folder `/apps/fabmanager`. - -### pull images +Run the following command to retrieve the initial configuration files. +This script will also guide you through the installation process by checking the requirements and asking you some configuration elements. ```bash -docker-compose pull +\curl -sSL setup.fab-manager.com | bash ``` -### setup database - +**OR**, if you don't want to install fab-manager in `/apps/fabmanager`, use the following instead: ```bash -docker-compose run --rm fabmanager bundle exec rake db:create # create the database -docker-compose run --rm fabmanager bundle exec rake db:migrate # run all the migrations -# replace xxx with your default admin email/password -docker-compose run --rm -e ADMIN_EMAIL=xxx -e ADMIN_PASSWORD=xxx fabmanager bundle exec rake db:seed # seed the database +\curl -sSL setup.fab-manager.com | bash -s "/my/custom/path" ``` -### build assets - -`docker-compose run --rm fabmanager bundle exec rake assets:precompile` - -### prepare Elasticsearch (search engine) - -`docker-compose run --rm fabmanager bundle exec rake fablab:es:build_stats` - -### start all services - -`docker-compose up -d` - ### Generate SSL certificate by Let's encrypt @@ -240,20 +117,12 @@ sudo systemctl start letsencrypt.service ``` If the certificate was successfully generated, you must update the nginx configuration to activate the ssl port and certificate. -editing the file `/apps/fabmanager/config/nginx/fabmanager.conf`. ```bash mv /apps/fabmanager/config/nginx/fabmanager.conf /apps/fabmanager/config/nginx/fabmanager.conf.nossl -cp /apps/fabmanager/config/nginx/fabmanager.conf.ssl /apps/fabmanager/config/nginx/fabmanager.conf -vi /apps/fabmanager/config/nginx/fabmanager.conf -# or use your favorite text editor instead of vi (nano, ne...) +mv /apps/fabmanager/config/nginx/fabmanager.conf.ssl /apps/fabmanager/config/nginx/fabmanager.conf ``` -Customize the following values: -* Replace **MAIN_DOMAIN** (example: fab-manager.com). -* Replace **URL_WITH_PROTOCOL_HTTPS** (example: https://www.fab-manager.com). -* Replace **ANOTHER_URL_1**, **ANOTHER_URL_2** (example: .fab-manager.fr) - -Remove your app container and run your app to apply the changes running the following commands: +Remove your app container and run your app again to apply the changes running the following commands: ```bash docker-compose down docker-compose up -d diff --git a/doc/environment.md b/doc/environment.md index 0b4fd81b7..736f49d69 100644 --- a/doc/environment.md +++ b/doc/environment.md @@ -30,7 +30,6 @@ When using docker-compose, you should provide the name of the service in your [d POSTGRES_PASSWORD Password for the PostgreSQL user, as specified in `database.yml` (default: `postgres`). -Please see [Setup the FabManager database in PostgreSQL](../README.md#setup-fabmanager-in-postgresql) for information on how to create a user and set his password. This value is only used when deploying in production, otherwise this is configured in [config/database.yml](../config/database.yml.default). When using docker-compose, the default configuration (with `postgres` user) does not uses any password as it is confined in the docker container. diff --git a/setup/letsencrypt.service b/setup/letsencrypt.service new file mode 100644 index 000000000..f601166fd --- /dev/null +++ b/setup/letsencrypt.service @@ -0,0 +1,8 @@ +[Unit] +Description=letsencrypt cert update oneshot +Requires=docker.service + +[Service] +Type=oneshot +ExecStart=/usr/bin/docker run --rm --name certbot_fabmanager -v "/apps/fabmanager/letsencrypt:/etc/letsencrypt" certbot/certbot:latest -c "/etc/letsencrypt/config/webroot.ini" certonly +ExecStartPost=-/usr/bin/docker restart fabmanager_nginx_1 diff --git a/setup/letsencrypt.timer b/setup/letsencrypt.timer new file mode 100644 index 000000000..d5b754707 --- /dev/null +++ b/setup/letsencrypt.timer @@ -0,0 +1,11 @@ +[Unit] +Description=letsencrypt oneshot timer +Requires=docker.service + +[Timer] +OnCalendar=*-*-1 06:00:00 +Persistent=true +Unit=letsencrypt.service + +[Install] +WantedBy=timers.target diff --git a/setup/nginx_with_ssl.conf.example b/setup/nginx_with_ssl.conf.example index 4ac583b3a..79be4cc2a 100644 --- a/setup/nginx_with_ssl.conf.example +++ b/setup/nginx_with_ssl.conf.example @@ -8,8 +8,8 @@ server { root /usr/src/app/public; ssl on; ## with your ssl certificate - #ssl_certificate /etc/nginx/conf.d/ssl/MAIN_DOMAIN.crt; - #ssl_certificate_key /etc/nginx/conf.d/ssl/MAIN_DOMAIN.deprotected.key; + # ssl_certificate /etc/nginx/conf.d/ssl/MAIN_DOMAIN.crt; + # ssl_certificate_key /etc/nginx/conf.d/ssl/MAIN_DOMAIN.deprotected.key; ## ## with letsencrypt certificate (free) ssl_certificate_key /etc/letsencrypt/live/MAIN_DOMAIN/privkey.pem; @@ -79,6 +79,6 @@ server { server { listen 80; - server_name MAIN_DOMAIN ANOTHER_DOMAIN_1 ANOTHER_DOMAIN_2; + server_name MAIN_DOMAIN ANOTHER_DOMAIN_1; rewrite ^ URL_WITH_PROTOCOL_HTTPS$request_uri? permanent; } diff --git a/setup/setup.sh b/setup/setup.sh index da69dd938..bdc47ef9e 100644 --- a/setup/setup.sh +++ b/setup/setup.sh @@ -1,23 +1,95 @@ #!/bin/bash -prepare_config() +DOMAINS=() + +system_requirements() +{ + if [ "$(whoami)" = "root" ]; then + echo "It is not recommended to run this script as root. As a normal user, elevation will be prompted if needed." + read -rp "Continue anyway? (Y/n) " confirm " EMAIL ' domain "$FABMANAGER_PATH/config/env" # nginx configuration - \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/nginx_with_ssl.conf.example > "$FABMANAGER_PATH/config/nginx/fabmanager.conf.ssl" - \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/nginx.conf.example > "$FABMANAGER_PATH/config/nginx/fabmanager.conf" + if [ "$NGINX" = "y" ]; then + mkdir -p "$FABMANAGER_PATH/config/nginx" + + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/nginx_with_ssl.conf.example > "$FABMANAGER_PATH/config/nginx/fabmanager.conf.ssl" + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/nginx.conf.example > "$FABMANAGER_PATH/config/nginx/fabmanager.conf" + fi # let's encrypt configuration - \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/webroot.ini.example > "$FABMANAGER_PATH/letsencrypt/config/webroot.ini" + if [ "$LETSENCRYPT" = "y" ]; then + mkdir -p "$FABMANAGER_PATH/letsencrypt/config" + mkdir -p "$FABMANAGER_PATH/letsencrypt/systemd" + mkdir -p "$FABMANAGER_PATH/letsencrypt/etc/webrootauth" + + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/webroot.ini.example > "$FABMANAGER_PATH/letsencrypt/config/webroot.ini" + # temp systemd files + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/letsencrypt.service > "$FABMANAGER_PATH/letsencrypt/systemd/letsencrypt.service" + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/letsencrypt.timer > "$FABMANAGER_PATH/letsencrypt/systemd/letsencrypt.timer" + fi # ElasticSearch configuration files \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/elasticsearch.yml > "$FABMANAGER_PATH/elasticsearch/config/elasticsearch.yml" @@ -27,11 +99,136 @@ prepare_config() \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/docker-compose.yml > "$FABMANAGER_PATH/docker-compose.yml" } +prepare_nginx() +{ + if [ "$NGINX" != "n" ]; then + sed -i.bak "s/MAIN_DOMAIN/${MAIN_DOMAIN[0]}/g" "$FABMANAGER_PATH/config/nginx/fabmanager.conf" + sed -i.bak "s/MAIN_DOMAIN/${MAIN_DOMAIN[0]}/g" "$FABMANAGER_PATH/config/nginx/fabmanager.conf.ssl" + sed -i.bak "s/ANOTHER_DOMAIN_1/$OTHER_DOMAINS/g" "$FABMANAGER_PATH/config/nginx/fabmanager.conf.ssl" + sed -i.bak "s/URL_WITH_PROTOCOL_HTTPS/https://${MAIN_DOMAIN[0]}/g" "$FABMANAGER_PATH/config/nginx/fabmanager.conf.ssl" + fi +} + +prepare_letsencrypt() +{ + mkdir -p "$FABMANAGER_PATH/config/nginx/ssl" + echo "Now, we will generate a Diffie-Hellman (DH) 4096 bits encryption key, to encrypt connections. This will take a moment, please wait..." + openssl dhparam -out "$FABMANAGER_PATH/config/nginx/ssl/dhparam.pem" 4096 + sed -i.bak "s/REPLACE_WITH_YOUR@EMAIL.COM/$EMAIL/g" "$FABMANAGER_PATH/letsencrypt/config/webroot.ini" + sed -i.bak "s/MAIN_DOMAIN/${MAIN_DOMAIN[0]}/g" "$FABMANAGER_PATH/letsencrypt/config/webroot.ini" + sed -i.bak "s/ANOTHER_DOMAIN_1/$OTHER_DOMAINS/g" "$FABMANAGER_PATH/letsencrypt/config/webroot.ini" + docker pull certbot/certbot:latest + sed -i.bak "s:/apps/fabmanager:$FABMANAGER_PATH:g" "$FABMANAGER_PATH/letsencrypt/systemd/letsencrypt.service" + sudo cp "$FABMANAGER_PATH/letsencrypt/systemd/letsencrypt.service" /etc/systemd/system/letsencrypt.service + sudo cp "$FABMANAGER_PATH/letsencrypt/systemd/letsencrypt.timer" /etc/systemd/system/letsencrypt.timer +} + +prepare_docker() +{ + cd "$FABMANAGER_PATH" && docker-compose pull +} + +get_md_anchor() +{ + local md_file="$1" + local anchor="$2" + + local section + section=$(echo "$md_file" | sed -n "/ " value " password " confirmation " EMAIL Date: Tue, 31 Dec 2019 08:14:05 +0100 Subject: [PATCH 119/135] New translations en.yml (Spanish) --- config/locales/es.yml | 145 +++++++++++++++++++++--------------------- 1 file changed, 73 insertions(+), 72 deletions(-) diff --git a/config/locales/es.yml b/config/locales/es.yml index 33290d9c8..744e32dfc 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1,7 +1,6 @@ es: - duration: - # subscription plan duration + #subscription plan duration year: one: 'un año' other: '%{count} años' @@ -11,15 +10,13 @@ es: week: one: 'una semana' other: '%{count} semanas' - time: formats: - # See http://apidock.com/ruby/DateTime/strftime for a list of available directives + #See http://apidock.com/ruby/DateTime/strftime for a list of available directives hour_minute: "%I:%M %p" - - errors: &errors - messages: &errors_messages - # CarrierWave + errors: + messages: + #CarrierWave carrierwave_processing_error: "fallo al procesar" carrierwave_integrity_error: "es un tipo de archivo no permitido" carrierwave_download_error: "no pudo ser descargado" @@ -36,45 +33,62 @@ es: cannot_be_blank_at_same_time: "no puede estar vacío cuando %{field} también está vacío" cannot_be_in_the_past: "no puede estar en el pasado" cannot_be_before_previous_value: "No puede estar antes del valor anterior." - cannot_overlap: "can't overlap an existing accounting period" # missing translation - cannot_encompass: "can't encompass an existing accounting period" # missing translation - in_closed_period: "can't be within a closed accounting period" # missing translation - invalid_footprint: "invoice's checksum is invalid" # missing translation - end_before_start: "The end date can't be before the start date. Pick a date after %{START}" # missing translation - invalid_duration: "The allowed duration must be between 1 day and 1 year. Your period is %{DAYS} days long." # missing translation - must_be_in_the_past: "The period must be strictly prior to today's date." # missing translation - + cannot_overlap: "no se puede solapar con un período contable existente" + cannot_encompass: "no puede abarcar un período contable existente" + in_closed_period: "no puede estar dentro de un período de contabilidad cerrado" + invalid_footprint: "la suma de comprobación de factura no es válida" + end_before_start: "La fecha de fin no puede ser anterior a la fecha de inicio. Elija una fecha posterior a %{START}" + invalid_duration: "La duración permitida es de 1 día a 1 año. Su período es %{DAYS} días de largo." + must_be_in_the_past: "El período debe ser estrictamente anterior a la fecha de hoy." activemodel: errors: - <<: *errors - + messages: + carrierwave_processing_error: fallo al procesar + carrierwave_integrity_error: es un tipo de archivo no permitido + carrierwave_download_error: no pudo ser descargado + extension_white_list_error: 'no le está permitido subir archivos de extensión %{extension} , tipos permitidos: %{allowed_types}' + extension_black_list_error: 'no le está permitido subir archivos de extensión %{extension} , tipos prohibidos: %{prohibited_types}' + rmagick_processing_error: 'error al manipular con rmagick, ¿Está seguro de que el archivo es una imagen? Error original: %{e}' + mime_types_processing_error: 'error al procesar archivo MIME::Types, puede ser que el contenido no sea válido. Error original: %{e}' + mini_magick_processing_error: 'Error al editar con MiniMagick, ¿Está seguro de que el archivo es una imagen? Error original: %{e}' + wrong_size: Tamaño erroneo (should be %{file_size}) + size_too_small: es demasiado pequeño (should be at least %{file_size}) + size_too_big: es demasiado grande (should be at most %{file_size}) + export_not_found: La exportación solicitada no se encontró. Probablemente se eliminó, por favor, genere una nueva exportación. + percentage_out_of_range: El porcentaje debe estar incluido entre 0 y 100 + cannot_be_blank_at_same_time: no puede estar vacío cuando %{field} también está vacío + cannot_be_in_the_past: no puede estar en el pasado + cannot_be_before_previous_value: No puede estar antes del valor anterior. + cannot_overlap: can't overlap an existing accounting period + cannot_encompass: can't encompass an existing accounting period + in_closed_period: can't be within a closed accounting period + invalid_footprint: invoice's checksum is invalid + end_before_start: The end date can't be before the start date. Pick a date after %{START} + invalid_duration: The allowed duration must be between 1 day and 1 year. Your period is %{DAYS} days long. + must_be_in_the_past: The period must be strictly prior to today's date. apipie: api_documentation: "Documentación API" - omniauth: - # error messages when importing an account from a SSO + #error messages when importing an account from a SSO email_already_linked_to_another_account_please_input_your_authentication_code: "E-mail \"%{OLD_MAIL}\"ya está vinculado a otra cuenta, ingrese su código de autenticación." your_username_is_already_linked_to_another_account_unable_to_update_it: "Su nombre de usuario (%{USERNAME}) ." your_email_address_is_already_linked_to_another_account_unable_to_update_it: "Your e-mail address (%{EMAIL}) ya está vinculado a otra cuenta, no se puede actualizar." this_account_is_already_linked_to_an_user_of_the_platform: "Esta %{NAME} cuenta ya está vinculada a un usuario de la plataforma ." - availabilities: - # availability slots in the calendar + #availability slots in the calendar not_available: "No disponible" i_ve_reserved: "He reservado" length_must_be_slot_multiple: "Debe ser al menos %{MIN} minutos después de la fecha de inicio" must_be_associated_with_at_least_1_machine: "debe estar asociado con al menos 1 máquina" - members: - # members management + #members management unable_to_change_the_group_while_a_subscription_is_running: "No se puede cambiar el grupo mientras se está ejecutando una suscripción." please_input_the_authentication_code_sent_to_the_address: "Ingrese el código de autenticación enviado a la dirección de correo electrónico %{EMAIL}" your_authentication_code_is_not_valid: "Su código de autenticación no es válido." current_authentication_method_no_code: "El método de autenticación actual no requiere ningún código de migración" requested_account_does_not_exists: "La cuenta solicitada no existe" - invoices: - # PDF invoices generation + #PDF invoices generation refund_invoice_reference: "Referencia de devolución de factura: %{REF}" invoice_reference: "Referencia de factura: %{REF}" code: "Código: %{CODE}" @@ -102,7 +116,7 @@ es: one: "un %{NAME} entrada" other: "%{count} %{NAME} entradas" reservation_other: "Reserva (other)" - coupon_CODE_discount_of_DISCOUNT: "Cupón {CODE}: descuento de {DISCOUNT}{TYPE, select, percent_off{%} other{}}" # messageFormat interpolation + coupon_CODE_discount_of_DISCOUNT: "Cupón {CODE}: descuento de {DISCOUNT}{TYPE, select, percent_off{%} other{}}" #messageFormat interpolation total_including_all_taxes: "total impuestos incluidos" including_VAT_RATE: "Incluyendo IVA %{RATE}%" including_total_excluding_taxes: "Excluyendo IVA" @@ -113,19 +127,18 @@ es: by_cheque: "por cheque" by_transfer: "por transferencia" by_cash: "en efectivo" - no_refund: "sin devolución" by_wallet: "por cartera" + no_refund: "sin devolución" settlement_by_debit_card: "Efectuado con tarjeta de débito" settlement_done_at_the_reception: "Efectuado en recepción" settlement_by_wallet: "Efectuado con cartera" on_DATE_at_TIME: "el %{DATE} a las %{TIME}," for_an_amount_of_AMOUNT: "Por una cantidad de %{AMOUNT}" - on_DATE_from_START_to_END: "El %{DATE} desde %{START} hasta %{END}" # eg: on feb. 7 Desde 7AM hasta 9AM - from_STARTDATE_to_ENDDATE_from_STARTTIME_to_ENDTIME: "Desde %{STARTDATE} hasta %{ENDDATE}, desde %{STARTTIME} hasta %{ENDTIME}" # eg: Desde feb. 7 hasta feb. 10, Desde 6PM hasta 10PM + on_DATE_from_START_to_END: "El %{DATE} desde %{START} hasta %{END}" #eg: on feb. 7 from 7AM to 9AM + from_STARTDATE_to_ENDDATE_from_STARTTIME_to_ENDTIME: "Desde %{STARTDATE} hasta %{ENDDATE}, desde %{STARTTIME} hasta %{ENDTIME}" #eg: from feb. 7 to feb. 10, from 6PM to 10PM subscription_of_NAME_for_DURATION_starting_from_DATE: "Suscripción %{NAME} por %{DURATION} empezando Desde %{DATE}" subscription_of_NAME_extended_starting_from_STARTDATE_until_ENDDATE: "Subscripción de %{NAME} extendida (Free days) empezando desde %{STARTDATE} hasta %{ENDDATE}" and: 'y' - accounting_export: journal_code: "Journal code" date: "Entry date" @@ -145,22 +158,19 @@ es: Event_reservation: "event reserv." Space_reservation: "space reserv." wallet: "wallet" - trainings: - # training availabilities + #training availabilities i_ve_reserved: "he reservado" completed: "Lleno" - events: - # error messages when updating an event + #error messages when updating an event error_deleting_reserved_price: "No se puede eliminar el precio solicitado porque está asociado con algunas reservas." other_error: "Se ha producido un error inesperado al actualizar el evento." - # event duration + #event duration from_STARTDATE_to_ENDDATE: "Del %{STARTDATE} al %{ENDDATE}," from_STARTTIME_to_ENDTIME: "de %{STARTTIME} a %{ENDTIME}" - export_members: - # members list export to EXCEL format + #members list export to EXCEL format members: "Miembros" id: "ID" surname: "Apellidos" @@ -191,9 +201,8 @@ es: man: "hombre" woman: "mujer" without_subscriptions: "Sin suscripciones" - export_reservations: - # machines/trainings/events reservations list to EXCEL format + #machines/trainings/events reservations list to EXCEL format reservations: "Reservas" customer_id: "Identificación del cliente" customer: "Cliente" @@ -205,9 +214,8 @@ es: payment_method: "Método de pago" local_payment: "Pago en recepción" online_payment: "Pago online" - export_subscriptions: - # subscriptions list export to EXCEL format + #subscriptions list export to EXCEL format subscriptions: "Suscripciones" id: "ID" customer: "Cliente" @@ -220,9 +228,8 @@ es: payment_method: "Método de pago" local_payment: "Pago en recepción" online_payment: "Pago online" - export_availabilities: - # reservation slots export, by type, to EXCEL format + #reservation slots export, by type, to EXCEL format machines: "Máquinas" trainings: "Cursos" spaces: "Espacios" @@ -236,11 +243,9 @@ es: event: "Evento" reservations: "Reservas" available_seats: "Asientos disponibles" - - api: notifications: - # internal app notifications + #internal app notifications deleted_user: "Usuario eliminado" notify_admin_abuse_reported: an_abuse_was_reported_on_TYPE_ID_NAME_html: "Un abuso ha sido reportado %{TYPE} %{ID}: %{NAME}." @@ -257,15 +262,15 @@ es: notify_admin_subscription_canceled: USER_s_subscription_has_been_cancelled: "La suscripción de %{USER}ha sido cancelada." notify_admin_subscription_extended: - subscription_PLAN_of_the_member_USER_has_been_extended_FREE_until_DATE_html: "La suscripción {PLAN} de {USER} se ha extendido {FREE, select, true{for free} other{}} hasta {DATE}." # messageFormat interpolation + subscription_PLAN_of_the_member_USER_has_been_extended_FREE_until_DATE_html: "La suscripción {PLAN} de {USER} se ha extendido {FREE, select, true{for free} other{}} hasta {DATE}." #messageFormat interpolation notify_admin_subscription_is_expired: USER_s_subscription_has_expired: "%La suscripción de {USER} ha expirado." notify_admin_subscription_will_expire_in_7_days: USER_s_subscription_will_expire_in_7_days: "La suscripción de %{USER} expirará en 7 días." notify_admin_user_group_changed: - user_NAME_changed_his_group_html: "El usuario {NAME} ha cambiado {GENDER, select, true{his} other{her}} el grupo." # messageFormat interpolation + user_NAME_changed_his_group_html: "El usuario {NAME} ha cambiado {GENDER, select, true{his} other{her}} el grupo." #messageFormat interpolation notify_admin_user_merged: - user_NAME_has_merged_his_account_with_the_one_imported_from_PROVIDER_UID_html: "El usuario {NAME} se ha fusionado {GENDER, select, true{his} other{her}} con la cuenta importada desde {PROVIDER} ({UID})." # messageFormat interpolation + user_NAME_has_merged_his_account_with_the_one_imported_from_PROVIDER_UID_html: "El usuario {NAME} se ha fusionado {GENDER, select, true{his} other{her}} con la cuenta importada desde {PROVIDER} ({UID})." #messageFormat interpolation notify_admin_when_project_published: project_NAME_has_been_published_html: "Project %{NAME} has been published." notify_admin_when_user_is_created: @@ -287,7 +292,7 @@ es: notify_member_subscription_canceled: your_subscription_PLAN_was_successfully_cancelled_html: "Su suscripción %{PLAN} se ha cancelado exitosamente." notify_member_subscription_extended: - your_subscription_PLAN_has_been_extended_FREE_until_DATE_html: "Su suscripción {PLAN} se ha extendido {FREE, select, true{for free} other{}} hasta {DATE}." # messageFormat interpolation + your_subscription_PLAN_has_been_extended_FREE_until_DATE_html: "Su suscripción {PLAN} se ha extendido {FREE, select, true{for free} other{}} hasta {DATE}." #messageFormat interpolation notify_member_subscription_is_expired: your_subscription_has_expired: "Su suscripción ha expirado." notify_member_subscription_will_expire_in_7_days: @@ -322,7 +327,7 @@ es: statistics_global: "de todas las estadísticas" statistics_account: "de las estadísticas de registro" statistics_event: "de estadísticas sobre eventos" - statistics_machine: "de estadísticas sobre slots de máquina" # missing translation + statistics_machine: "de estadísticas sobre slots de máquina" statistics_project: "de estadísticas sobre proyectos" statistics_subscription: "de estadísticas de suscripción" statistics_training: "de estadísticas de cursos" @@ -335,29 +340,28 @@ es: is_over: "se ha acabado." download_here: "Descargar aquí" notify_admin_import_complete: - import_over: "%{CATEGORY} import is over. " # missing translation - members: "Members" # missing translation - view_results: "View results." # missing translation + import_over: "%{CATEGORY} import is over. " + members: "Members" + view_results: "View results." notify_member_about_coupon: enjoy_a_discount_of_PERCENT_with_code_CODE: "Disfruta de un descuento de %{PERCENT}% con el código %{CODE}" enjoy_a_discount_of_AMOUNT_with_code_CODE: "Disfruta de un descuento de %{AMOUNT} con el código %{CODE}" notify_admin_free_disk_space: - warning_free_disk_space: "Warning: the server's available disk space is now %{AVAILABLE} MiB" # missing translation + warning_free_disk_space: "Warning: the server's available disk space is now %{AVAILABLE} MiB" notify_admin_close_period_reminder: - warning_last_closed_period_over_1_year: "Please remind to periodically close your accounting periods. Last closed period ended at %{LAST_END}" # missing translation - warning_no_closed_periods: "Please remind to periodically close your accounting periods. You have to close periods from %{FIRST_DATE}" # missing translation - notify_admin_archive_complete: # missing translation - archive_complete: "Data archiving from %{START} to %{END} is done. click here to download. Remember to save it on an external secured media." # missing translation + warning_last_closed_period_over_1_year: "Please remind to periodically close your accounting periods. Last closed period ended at %{LAST_END}" + warning_no_closed_periods: "Please remind to periodically close your accounting periods. You have to close periods from %{FIRST_DATE}" + notify_admin_archive_complete: + archive_complete: "Data archiving from %{START} to %{END} is done. click here to download. Remember to save it on an external secured media." notify_privacy_policy_changed: - policy_updated: "Privacy policy updated." # missing translation - click_to_show: "Click here to consult" # missing translation + policy_updated: "Privacy policy updated." + click_to_show: "Click here to consult" notify_admin_refund_created: - refund_created: "A refund of %{AMOUNT} has been created for user %{USER}" # missing translation - + refund_created: "A refund of %{AMOUNT} has been created for user %{USER}" statistics: - # statistics tools for admins + #statistics tools for admins subscriptions: "Suscripciones" - machines_hours: "Machine slots" # missing translation + machines_hours: "Machine slots" spaces: "Espacios" trainings: "Cursos" events: "Eventos" @@ -381,9 +385,8 @@ es: revenue: "Ingresos" account_creation: "Creación de cuenta" project_publication: "Publicación de proyectos" - export: - # statistics exports to the excel file format + #statistics exports to the excel file format entries: "Entradas" revenue: "Ingresos" average_age: "Edad media" @@ -397,12 +400,10 @@ es: type: "Tipo" male: "Hombre" female: "Mujer" - price_category: - # initial price's category for events, created to replace the old "reduced amount" property + #initial price's category for events, created to replace the old "reduced amount" property reduced_fare: "Tarifa reducida" reduced_fare_if_you_are_under_25_student_or_unemployed: "Tarifa reducida si tienes menos de 25 años, eres estudiante o estás desempleado." - group: - # name of the user's group for administrators + #name of the user's group for administrators admins: 'Administradores' From 8ea5762f02675a1a4625a22ca456c832d414234a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 31 Dec 2019 09:00:17 +0100 Subject: [PATCH 120/135] New translations en.yml (Spanish) --- config/locales/es.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/config/locales/es.yml b/config/locales/es.yml index 744e32dfc..0bf19914e 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -59,13 +59,13 @@ es: cannot_be_blank_at_same_time: no puede estar vacío cuando %{field} también está vacío cannot_be_in_the_past: no puede estar en el pasado cannot_be_before_previous_value: No puede estar antes del valor anterior. - cannot_overlap: can't overlap an existing accounting period - cannot_encompass: can't encompass an existing accounting period - in_closed_period: can't be within a closed accounting period - invalid_footprint: invoice's checksum is invalid - end_before_start: The end date can't be before the start date. Pick a date after %{START} - invalid_duration: The allowed duration must be between 1 day and 1 year. Your period is %{DAYS} days long. - must_be_in_the_past: The period must be strictly prior to today's date. + cannot_overlap: no se puede solapar con un período contable existente + cannot_encompass: no puede abarcar un período contable existente + in_closed_period: no puede estar dentro de un período de contabilidad cerrado + invalid_footprint: la suma de comprobación de factura no es válida + end_before_start: La fecha de fin no puede ser anterior a la fecha de inicio. Elija una fecha posterior a %{START} + invalid_duration: La duración permitida es de 1 día a 1 año. Su período es %{DAYS} días de largo. + must_be_in_the_past: El período debe ser estrictamente anterior a la fecha de hoy. apipie: api_documentation: "Documentación API" omniauth: @@ -140,19 +140,19 @@ es: subscription_of_NAME_extended_starting_from_STARTDATE_until_ENDDATE: "Subscripción de %{NAME} extendida (Free days) empezando desde %{STARTDATE} hasta %{ENDDATE}" and: 'y' accounting_export: - journal_code: "Journal code" - date: "Entry date" - account_code: "Account code" - account_label: "Account label" - piece: "Document" - line_label: "Entry label" - debit_origin: "Origin debit" - credit_origin: "Origin credit" - debit_euro: "Euro debit" - credit_euro: "Euro credit" - lettering: "Lettering" + journal_code: "Código de registro" + date: "Fecha contable" + account_code: "Código de cuenta" + account_label: "Título de cuenta" + piece: "Documento" + line_label: "Título contable" + debit_origin: "Débito origen" + credit_origin: "Crédito origen" + debit_euro: "Débito euro" + credit_euro: "Crédito euro" + lettering: "Punteo" VAT: 'IVA' - subscription: "subscr." + subscription: "suscr." Machine_reservation: "machine reserv." Training_reservation: "training reserv." Event_reservation: "event reserv." From cb66584d3be032a8557ce2fd4709e369c383ec64 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 31 Dec 2019 09:07:31 +0100 Subject: [PATCH 121/135] New translations en.yml (Spanish) --- config/locales/es.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/config/locales/es.yml b/config/locales/es.yml index 0bf19914e..549c1025e 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -153,11 +153,11 @@ es: lettering: "Punteo" VAT: 'IVA' subscription: "suscr." - Machine_reservation: "machine reserv." - Training_reservation: "training reserv." - Event_reservation: "event reserv." - Space_reservation: "space reserv." - wallet: "wallet" + Machine_reservation: "reserv. máquina" + Training_reservation: "reserv. formación" + Event_reservation: "reserv. evento" + Space_reservation: "reserv. espacio" + wallet: "cartera" trainings: #training availabilities i_ve_reserved: "he reservado" @@ -175,7 +175,7 @@ es: id: "ID" surname: "Apellidos" first_name: "Nombre" - email: "E-mail" + email: "Correo electrónico" newsletter: "Hoja informativa" last_login: "Último acceso" gender: "Genero" @@ -206,7 +206,7 @@ es: reservations: "Reservas" customer_id: "Identificación del cliente" customer: "Cliente" - email: "E-mail" + email: "Correo electrónico" reservation_date: "fecha de reserva" reservation_type: "tipo de reserva" reservation_object: "objetivo de reserva" @@ -219,7 +219,7 @@ es: subscriptions: "Suscripciones" id: "ID" customer: "Cliente" - email: "E-mail" + email: "Correo electrónico" subscription: "Suscripción" period: "Periodo" start_date: "Fecha de comienzo" @@ -272,7 +272,7 @@ es: notify_admin_user_merged: user_NAME_has_merged_his_account_with_the_one_imported_from_PROVIDER_UID_html: "El usuario {NAME} se ha fusionado {GENDER, select, true{his} other{her}} con la cuenta importada desde {PROVIDER} ({UID})." #messageFormat interpolation notify_admin_when_project_published: - project_NAME_has_been_published_html: "Project %{NAME} has been published." + project_NAME_has_been_published_html: "Proyecto %{NAME} ha sido publicado." notify_admin_when_user_is_created: a_new_user_account_has_been_created_NAME_EMAIL_html: "Se ha creado una nueva cuenta: %{NAME} <%{EMAIL}>." notify_admin_when_user_is_imported: From 3448acc76417f751403306856d2336f7036fd43f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 31 Dec 2019 09:27:06 +0100 Subject: [PATCH 122/135] New translations en.yml (Spanish) --- config/locales/es.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/es.yml b/config/locales/es.yml index 549c1025e..3cce58e38 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -340,14 +340,14 @@ es: is_over: "se ha acabado." download_here: "Descargar aquí" notify_admin_import_complete: - import_over: "%{CATEGORY} import is over. " - members: "Members" - view_results: "View results." + import_over: "La importación de %{CATEGORY} esta terminada. " + members: "Usuarios" + view_results: "Ver resultados." notify_member_about_coupon: enjoy_a_discount_of_PERCENT_with_code_CODE: "Disfruta de un descuento de %{PERCENT}% con el código %{CODE}" enjoy_a_discount_of_AMOUNT_with_code_CODE: "Disfruta de un descuento de %{AMOUNT} con el código %{CODE}" notify_admin_free_disk_space: - warning_free_disk_space: "Warning: the server's available disk space is now %{AVAILABLE} MiB" + warning_free_disk_space: "Aviso: el espacio disponible en el disco es ahora de %{AVAILABLE} MiB" notify_admin_close_period_reminder: warning_last_closed_period_over_1_year: "Please remind to periodically close your accounting periods. Last closed period ended at %{LAST_END}" warning_no_closed_periods: "Please remind to periodically close your accounting periods. You have to close periods from %{FIRST_DATE}" From 7c8fdf6ffdbabc77d05a5a307e7321abc8e1fe9c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 31 Dec 2019 09:44:00 +0100 Subject: [PATCH 123/135] New translations en.yml (Spanish) --- config/locales/es.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/locales/es.yml b/config/locales/es.yml index 3cce58e38..01be067b5 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -349,15 +349,15 @@ es: notify_admin_free_disk_space: warning_free_disk_space: "Aviso: el espacio disponible en el disco es ahora de %{AVAILABLE} MiB" notify_admin_close_period_reminder: - warning_last_closed_period_over_1_year: "Please remind to periodically close your accounting periods. Last closed period ended at %{LAST_END}" - warning_no_closed_periods: "Please remind to periodically close your accounting periods. You have to close periods from %{FIRST_DATE}" + warning_last_closed_period_over_1_year: "Por favor, recuerda cerrar periódicamente tus periodos de contabilidad. El último período cerrado terminó el %{LAST_END}" + warning_no_closed_periods: "Por favor, recuerde cerrar periódicamente sus períodos contables. Tiene que cerrar los periodos del %{FIRST_DATE}" notify_admin_archive_complete: - archive_complete: "Data archiving from %{START} to %{END} is done. click here to download. Remember to save it on an external secured media." + archive_complete: "El archivado de datos de %{START} a %{END} se ha realizado. haga clic aquí para descargar. Recuerda guardarlo en un medio externo seguro." notify_privacy_policy_changed: - policy_updated: "Privacy policy updated." - click_to_show: "Click here to consult" + policy_updated: "Política de privacidad actualizada." + click_to_show: "Haga clic aquí para consultar" notify_admin_refund_created: - refund_created: "A refund of %{AMOUNT} has been created for user %{USER}" + refund_created: "Se ha creado un reembolso de %{AMOUNT} para el usuario %{USER}" statistics: #statistics tools for admins subscriptions: "Suscripciones" From ccac577916875378f0feeeb03706aaf40ef520b0 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 31 Dec 2019 10:11:16 +0100 Subject: [PATCH 124/135] setup script and updated setup documentation --- doc/docker-compose_readme.md | 141 +++++++++++++++-------------------- setup/setup.sh | 55 +++++++++++++- 2 files changed, 112 insertions(+), 84 deletions(-) diff --git a/doc/docker-compose_readme.md b/doc/docker-compose_readme.md index e0dc617e0..c6b350bcb 100644 --- a/doc/docker-compose_readme.md +++ b/doc/docker-compose_readme.md @@ -13,18 +13,12 @@ You will need to be root through the rest of the setup. 1.2. [Setup the domain name](#setup-the-domain-name)
    1.3. [Connect through SSH](#connect-through-ssh)
    1.4. [Prepare the server](#prepare-the-server)
    -2. [Install Fab-manager](#install-fabmanager)
    -2.1. Add docker-compose.yml file
    -2.2. pull images
    -2.3. setup database
    -2.4. build assets
    -2.5. prepare Elasticsearch (search engine)
    -2.6. start all services
    -2.7. Generate SSL certificate by Let's encrypt -4. [Docker utils](#docker-utils) -5. [Update Fab-manager](#update-fabmanager)
    -5.1. Steps
    -5.2. Good to know +2. [Install Fab-manager](#install-fab-manager)
    +3. [Docker utils](#docker-utils) +4. [Update Fab-manager](#update-fabmanager)
    +4.1. [Steps](#steps)
    +4.2. [Upgrade to the last version](#upgrade-to-the-last-version)
    +4.3. [Upgrade to a specific version](#upgrade-to-a-specific-version) ## Preliminary steps @@ -89,13 +83,11 @@ You can run the following script as root to easily perform all these operations: \curl -sSL prepare-vps.sleede.com | bash ``` - -## Install Fabmanager + +## Install Fab-Manager -### Setup script - -Run the following command to retrieve the initial configuration files. -This script will also guide you through the installation process by checking the requirements and asking you some configuration elements. +Run the following command to install Fab-Manager. +This script will guide you through the installation process by checking the requirements and asking you the configuration elements. ```bash \curl -sSL setup.fab-manager.com | bash @@ -106,82 +98,55 @@ This script will also guide you through the installation process by checking the \curl -sSL setup.fab-manager.com | bash -s "/my/custom/path" ``` - -### Generate SSL certificate by Let's encrypt + +## Docker utils +Below, you'll find a collection of useful commands to control your instance with docker-compose. +Before using any of these commands, you must first `cd` into the app directory. -**Important: app must be run on http before starting letsencrypt** - -Start letsencrypt service : +- Restart app ```bash -sudo systemctl start letsencrypt.service +docker-compose restart fabmanager ``` - -If the certificate was successfully generated, you must update the nginx configuration to activate the ssl port and certificate. +- Remove app ```bash -mv /apps/fabmanager/config/nginx/fabmanager.conf /apps/fabmanager/config/nginx/fabmanager.conf.nossl -mv /apps/fabmanager/config/nginx/fabmanager.conf.ssl /apps/fabmanager/config/nginx/fabmanager.conf +docker-compose down fabmanager ``` - -Remove your app container and run your app again to apply the changes running the following commands: +- Restart all containers +```bash +docker-compose restart +``` +- Remove all containers ```bash docker-compose down +``` +- Start all containers +```bash docker-compose up -d ``` - -Finally, if everything is ok, start let's encrypt timer to update the certificate every 1st of the month : - +- Open a bash in the app context ```bash -sudo systemctl enable letsencrypt.timer -sudo systemctl start letsencrypt.timer -# check status with -sudo systemctl list-timers +docker-compose run --rm fabmanager bash ``` - - -## Docker utils with docker-compose -Below, you'll find a collection of useful commands to control your instance with docker-compose - -### Restart app - -`docker-compose restart fabmanager` - -### Remove app - -`docker-compose down fabmanager` - -### Restart all containers - -`docker-compose restart` - -### Remove all containers - -`docker-compose down` - -### Start all containers - -`docker-compose up -d` - -### Open a bash in the app context - -`docker-compose run --rm fabmanager bash` - -### Show services status - -`docker-compose ps` - -### Restart nginx container - -`docker-compose restart nginx` - -### Example of command passing env variables - +- Show services status +```bash +docker-compose ps +``` +- Restart nginx container +```bash +docker-compose restart nginx + ``` +- Example of command passing env variables +```bash docker-compose run --rm -e ADMIN_EMAIL=xxx -e ADMIN_PASSWORD=xxx fabmanager bundle exec rake db:seed - +``` ## Update Fab-manager -*This procedure updates fabmanager to the most recent version by default.* +*This procedure updates Fab-Manager to the most recent version by default.* +> ⚠ If you are upgrading from a very outdated version, you must first upgrade to v2.8.3, then to v3.1.2 and finally to the last version + + ### Steps When a new version is available, follow this procedure to update fab-manager app in a production environment, using docker-compose. @@ -226,10 +191,22 @@ You can subscribe to [this atom feed](https://github.com/sleede/fab-manager/rele You can check that all containers are running with `docker ps`. -### Good to know + +### Upgrade to the last version -#### Is it possible to update several versions at the same time ? - -Yes, indeed. It's the default behaviour as `docker-compose pull` command will fetch the latest versions of the docker images. +It's the default behaviour as `docker-compose pull` command will fetch the latest versions of the docker images. Be sure to run all the specific commands listed in the [CHANGELOG](https://github.com/sleede/fab-manager/blob/master/CHANGELOG.md) between your actual and the new version in sequential order. (Example: to update from 2.4.0 to 2.4.3, you will run the specific commands for the 2.4.1, then for the 2.4.2 and then for the 2.4.3). + + +### Upgrade to a specific version + +Edit your [/apps/fabmanager/docker-compose.yml](../setup/docker-compose.yml#L4) file and change the following line: +```yaml +image: sleede/fab-manager +``` +For example, here we want to use the v3.1.2: +```yaml +image: sleede/fab-manager:release-v3.1.2 +``` +Then run the normal upgrade procedure. diff --git a/setup/setup.sh b/setup/setup.sh index bdc47ef9e..b28b592b2 100644 --- a/setup/setup.sh +++ b/setup/setup.sh @@ -2,6 +2,22 @@ DOMAINS=() +welcome_message() +{ + echo "============================================" + echo -e "\e[31m Fab-Manager's setup\e[0m" + echo "============================================" + echo "Thank you for installing Fab-Manager." + printf "This script will guide you through the installation process of Fab-Manager\n" + echo -e "Please report any \e[1mfeedback or improvement request\e[21m on https://feedback.fab-manager.com/" + echo -e "For \e[1mbug reports\e[21m, please open a new issue on https://github.com/sleede/fab-manager/issues" + echo -e "You can call for \e[1mcommunity assistance\e[21m on https://forum.fab-manager.com/" + printf "\nYou can interrupt this installation at any time by pressing Ctrl+C\n" + echo -e "If you do not feel confortable with this installation, you can \e[4msubscribe to our hosting plan\e[24m: contact@fab-manager.com" + read -rp "\n\nContinue? (Y/n) " confirm Date: Tue, 31 Dec 2019 11:02:37 +0100 Subject: [PATCH 125/135] New translations en.yml (Spanish) --- config/locales/es.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config/locales/es.yml b/config/locales/es.yml index 01be067b5..9c6043b75 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -70,10 +70,10 @@ es: api_documentation: "Documentación API" omniauth: #error messages when importing an account from a SSO - email_already_linked_to_another_account_please_input_your_authentication_code: "E-mail \"%{OLD_MAIL}\"ya está vinculado a otra cuenta, ingrese su código de autenticación." - your_username_is_already_linked_to_another_account_unable_to_update_it: "Su nombre de usuario (%{USERNAME}) ." - your_email_address_is_already_linked_to_another_account_unable_to_update_it: "Your e-mail address (%{EMAIL}) ya está vinculado a otra cuenta, no se puede actualizar." - this_account_is_already_linked_to_an_user_of_the_platform: "Esta %{NAME} cuenta ya está vinculada a un usuario de la plataforma ." + email_already_linked_to_another_account_please_input_your_authentication_code: "El correo electrónico \"%{OLD_MAIL}\" ya está ligado a otra cuenta, ingrese su código de autenticación." + your_username_is_already_linked_to_another_account_unable_to_update_it: "Su nombre de usuario (%{USERNAME}) ya está ligado a otra cuenta, no se puede actualizar." + your_email_address_is_already_linked_to_another_account_unable_to_update_it: "Your e-mail address (%{EMAIL}) ya está ligado a otra cuenta, no se puede actualizar." + this_account_is_already_linked_to_an_user_of_the_platform: "Esta cuenta %{NAME} ya está ligada a un usuario de la plataforma." availabilities: #availability slots in the calendar not_available: "No disponible" @@ -82,14 +82,14 @@ es: must_be_associated_with_at_least_1_machine: "debe estar asociado con al menos 1 máquina" members: #members management - unable_to_change_the_group_while_a_subscription_is_running: "No se puede cambiar el grupo mientras se está ejecutando una suscripción." - please_input_the_authentication_code_sent_to_the_address: "Ingrese el código de autenticación enviado a la dirección de correo electrónico %{EMAIL}" + unable_to_change_the_group_while_a_subscription_is_running: "No se puede cambiar de grupo mientras haya una suscripción en curso" + please_input_the_authentication_code_sent_to_the_address: "Por favor Ingrese el código de autenticación enviado a la dirección de correo electrónico %{EMAIL}" your_authentication_code_is_not_valid: "Su código de autenticación no es válido." current_authentication_method_no_code: "El método de autenticación actual no requiere ningún código de migración" requested_account_does_not_exists: "La cuenta solicitada no existe" invoices: #PDF invoices generation - refund_invoice_reference: "Referencia de devolución de factura: %{REF}" + refund_invoice_reference: "Referencia de la factura de reembolso: %{REF}" invoice_reference: "Referencia de factura: %{REF}" code: "Código: %{CODE}" order_number: "Pedido #: %{NUMBER}" From 60e49a5593d7a43f2e74564f533388b14b2f7b7b Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 31 Dec 2019 11:21:34 +0100 Subject: [PATCH 126/135] fixes in setup script --- doc/docker-compose_readme.md | 2 +- setup/env.example | 6 +++--- setup/setup.sh | 29 ++++++++++++++++++----------- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/doc/docker-compose_readme.md b/doc/docker-compose_readme.md index c6b350bcb..a2255e479 100644 --- a/doc/docker-compose_readme.md +++ b/doc/docker-compose_readme.md @@ -47,7 +47,7 @@ This way, Docker and Docker-compose are pre-installed. Choose a datacenter and set your domain name as the hostname. With other providers, choose a [supported operating system](../README.md#software-stack) and install docker on it: -- [Debian](https://docs.docker.com/engine/installation/linux/docker-ce/debian/) +- [Debian](https://docs.docker.com/engine/installation/linux/docker-ce/debian/) - [Ubuntu](https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/) Then install [Docker Compose](https://docs.docker.com/compose/install/) diff --git a/setup/env.example b/setup/env.example index 858c8233f..7325c25a5 100644 --- a/setup/env.example +++ b/setup/env.example @@ -80,8 +80,8 @@ ALLOWED_EXTENSIONS=pdf ai eps cad math svg stl dxf dwg obj step iges igs 3dm 3dm ALLOWED_MIME_TYPES=application/pdf application/postscript application/illustrator image/x-eps image/svg+xml application/sla application/dxf application/acad application/dwg application/octet-stream application/step application/iges model/iges x-world/x-3dmf application/ application/vnd.openxmlformats-officedocument.wordprocessingml.document image/png text/x-arduino text/plain application/scad application/vnd.sketchup.skp application/x-koan application/vnd-koan koan/x-skm application/vnd.koan application/x-tex application/x-latex application/x-extension-fcstd # 5242880 = 5 megabytes -MAX_IMPORT_SIZE = '5242880' +MAX_IMPORT_SIZE='5242880' # 10485760 = 10 megabytes -MAX_IMAGE_SIZE=10485760 +MAX_IMAGE_SIZE='10485760' # 20971520 = 20 megabytes -MAX_CAO_SIZE = '20971520' +MAX_CAO_SIZE='20971520' diff --git a/setup/setup.sh b/setup/setup.sh index b28b592b2..f9f6a05b7 100644 --- a/setup/setup.sh +++ b/setup/setup.sh @@ -8,13 +8,13 @@ welcome_message() echo -e "\e[31m Fab-Manager's setup\e[0m" echo "============================================" echo "Thank you for installing Fab-Manager." - printf "This script will guide you through the installation process of Fab-Manager\n" + printf "This script will guide you through the installation process of Fab-Manager\n\n" echo -e "Please report any \e[1mfeedback or improvement request\e[21m on https://feedback.fab-manager.com/" echo -e "For \e[1mbug reports\e[21m, please open a new issue on https://github.com/sleede/fab-manager/issues" echo -e "You can call for \e[1mcommunity assistance\e[21m on https://forum.fab-manager.com/" printf "\nYou can interrupt this installation at any time by pressing Ctrl+C\n" - echo -e "If you do not feel confortable with this installation, you can \e[4msubscribe to our hosting plan\e[24m: contact@fab-manager.com" - read -rp "\n\nContinue? (Y/n) " confirm " EMAIL " EMAIL ' domain " value " password " confirmation Date: Tue, 31 Dec 2019 12:30:31 +0100 Subject: [PATCH 127/135] fix setup script --- doc/environment.md | 5 ++-- setup/env.example | 2 +- setup/setup.sh | 57 +++++++++++++++++++++++++++++++--------------- 3 files changed, 42 insertions(+), 22 deletions(-) diff --git a/doc/environment.md b/doc/environment.md index 736f49d69..392e70a52 100644 --- a/doc/environment.md +++ b/doc/environment.md @@ -348,13 +348,12 @@ See [Crowdin documentation](https://support.crowdin.com/in-context-localization/ Accordingly, `RAILS_LOCALE` and `APP_LOCALE` must be configured to `ach`. ## OpenLab settings - -This configuration is optional and can only work in production mode. -It allows you to display a shared projects gallery and to share your projects with other fablabs. OPENLAB_APP_ID, OPENLAB_APP_SECRET +This configuration is optional and can only work in production mode. +It allows you to display a shared projects gallery and to share your projects with other fablabs. Send an email to **contact@fab-manager.com** to get your OpenLab client's credentials. diff --git a/setup/env.example b/setup/env.example index 7325c25a5..6db0127c9 100644 --- a/setup/env.example +++ b/setup/env.example @@ -73,7 +73,7 @@ NAVINUM_API_PASSWORD= LOG_LEVEL=debug DISK_SPACE_MB_ALERT='100' -SUPERADMIN_EMAIL='admin@sleede.com' +SUPERADMIN_EMAIL= ALLOWED_EXTENSIONS=pdf ai eps cad math svg stl dxf dwg obj step iges igs 3dm 3dmf doc docx png ino scad fcad skp sldprt sldasm slddrw slddrt tex latex ps fcstd fcstd1 diff --git a/setup/setup.sh b/setup/setup.sh index f9f6a05b7..2b2544c15 100644 --- a/setup/setup.sh +++ b/setup/setup.sh @@ -49,17 +49,28 @@ system_requirements() done } +read_email() +{ + local email + read -rp "Please input a valid email address > " email " EMAIL ' domain " value " value " password " confirmation " password " confirmation " EMAIL Date: Tue, 31 Dec 2019 15:27:44 +0100 Subject: [PATCH 128/135] check for sudo even if root --- setup/setup.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/setup/setup.sh b/setup/setup.sh index 2b2544c15..66ef781e8 100644 --- a/setup/setup.sh +++ b/setup/setup.sh @@ -25,10 +25,6 @@ system_requirements() read -rp "Continue anyway? (Y/n) " confirm Date: Tue, 31 Dec 2019 17:55:41 +0100 Subject: [PATCH 129/135] fix some bugs in eetup script --- setup/setup.sh | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/setup/setup.sh b/setup/setup.sh index 66ef781e8..63bb3d906 100644 --- a/setup/setup.sh +++ b/setup/setup.sh @@ -96,7 +96,7 @@ prepare_files() { FABMANAGER_PATH=${1:-/apps/fabmanager} - sudo mkdir -p "$FABMANAGER_PATH" + sudo mkdir -p "$FABMANAGER_PATH/config" sudo chown -R "$(whoami)" "$FABMANAGER_PATH" mkdir -p "$FABMANAGER_PATH/elasticsearch/config" @@ -105,7 +105,7 @@ prepare_files() \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/env.example > "$FABMANAGER_PATH/config/env" # nginx configuration - if [ "$NGINX" = "y" ]; then + if [ "$NGINX" != "n" ]; then mkdir -p "$FABMANAGER_PATH/config/nginx" \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/nginx_with_ssl.conf.example > "$FABMANAGER_PATH/config/nginx/fabmanager.conf.ssl" @@ -113,7 +113,7 @@ prepare_files() fi # let's encrypt configuration - if [ "$LETSENCRYPT" = "y" ]; then + if [ "$LETSENCRYPT" != "n" ]; then mkdir -p "$FABMANAGER_PATH/letsencrypt/config" mkdir -p "$FABMANAGER_PATH/letsencrypt/systemd" mkdir -p "$FABMANAGER_PATH/letsencrypt/etc/webrootauth" @@ -142,15 +142,16 @@ prepare_nginx() fi } +function join_by { local IFS="$1"; shift; echo "$*"; } + prepare_letsencrypt() { - if [ "$LETSENCRYPT" = "y" ]; then + if [ "$LETSENCRYPT" != "n" ]; then mkdir -p "$FABMANAGER_PATH/config/nginx/ssl" echo "Now, we will generate a Diffie-Hellman (DH) 4096 bits encryption key, to encrypt connections. This will take a moment, please wait..." openssl dhparam -out "$FABMANAGER_PATH/config/nginx/ssl/dhparam.pem" 4096 sed -i.bak "s/REPLACE_WITH_YOUR@EMAIL.COM/$EMAIL/g" "$FABMANAGER_PATH/letsencrypt/config/webroot.ini" - sed -i.bak "s/MAIN_DOMAIN/${MAIN_DOMAIN[0]}/g" "$FABMANAGER_PATH/letsencrypt/config/webroot.ini" - sed -i.bak "s/ANOTHER_DOMAIN_1/$OTHER_DOMAINS/g" "$FABMANAGER_PATH/letsencrypt/config/webroot.ini" + sed -i.bak "s/MAIN_DOMAIN, ANOTHER_DOMAIN_1/$(join_by , "${DOMAINS[@]}")/g" "$FABMANAGER_PATH/letsencrypt/config/webroot.ini" echo "Now downloading and configuring the certificate signing bot..." docker pull certbot/certbot:latest sed -i.bak "s:/apps/fabmanager:$FABMANAGER_PATH:g" "$FABMANAGER_PATH/letsencrypt/systemd/letsencrypt.service" @@ -210,18 +211,18 @@ configure_env_file() done # we automatically generate the SECRET_KEY_BASE secret=$(cd "$FABMANAGER_PATH" && docker-compose run --rm fabmanager bundle exec rake secret) - sed -i.bak "s/SECRET_KEY_BASE=/SECRET_KEY_BASE=${secret:-2}/g" "$FABMANAGER_PATH/config/env" + sed -i.bak "s/SECRET_KEY_BASE=/SECRET_KEY_BASE=$secret/g" "$FABMANAGER_PATH/config/env" } read_password() { local password confirmation - echo "Please input a password for this administrator's account" + >&2 echo "Please input a password for this administrator's account" read -rsp " > " password &2 printf "\nConfirm the password\n" read -rsp " > " confirmation &2 printf "\nError: passwords mismatch\n" password=$(read_password) fi echo "$password" @@ -230,7 +231,7 @@ read_password() setup_assets_and_databases() { echo "We will now setup the database." - read -rp "Continue? (Y/n)" confirm Date: Fri, 3 Jan 2020 10:57:56 +0100 Subject: [PATCH 130/135] New translations en.yml (Spanish) --- config/locales/es.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/locales/es.yml b/config/locales/es.yml index 9c6043b75..6000a5967 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -17,10 +17,10 @@ es: errors: messages: #CarrierWave - carrierwave_processing_error: "fallo al procesar" + carrierwave_processing_error: "no se pudo procesar" carrierwave_integrity_error: "es un tipo de archivo no permitido" carrierwave_download_error: "no pudo ser descargado" - extension_white_list_error: "no le está permitido subir archivos de extensión %{extension} , tipos permitidos: %{allowed_types}" + extension_white_list_error: "No puede subir archivos con extensión %{extension}, tipos permitidos: %{allowed_types}" extension_black_list_error: "no le está permitido subir archivos de extensión %{extension} , tipos prohibidos: %{prohibited_types}" rmagick_processing_error: "error al manipular con rmagick, ¿Está seguro de que el archivo es una imagen? Error original: %{e}" mime_types_processing_error: "error al procesar archivo MIME::Types, puede ser que el contenido no sea válido. Error original: %{e}" @@ -393,7 +393,7 @@ es: total: "hasta tal punto" date: "Fecha" user: "Usuario" - email: "Email" + email: "Correo electrónico" phone: "Teléfono" gender: "Genero" age: "Edad" From e550fd6dbc7b462e61db4693e8367fd197a48c00 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 3 Jan 2020 11:11:53 +0100 Subject: [PATCH 131/135] New translations en.yml (Spanish) --- config/locales/es.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/config/locales/es.yml b/config/locales/es.yml index 6000a5967..62b114f6c 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -21,18 +21,18 @@ es: carrierwave_integrity_error: "es un tipo de archivo no permitido" carrierwave_download_error: "no pudo ser descargado" extension_white_list_error: "No puede subir archivos con extensión %{extension}, tipos permitidos: %{allowed_types}" - extension_black_list_error: "no le está permitido subir archivos de extensión %{extension} , tipos prohibidos: %{prohibited_types}" - rmagick_processing_error: "error al manipular con rmagick, ¿Está seguro de que el archivo es una imagen? Error original: %{e}" - mime_types_processing_error: "error al procesar archivo MIME::Types, puede ser que el contenido no sea válido. Error original: %{e}" + extension_black_list_error: "No puede subir archivos con extensión %{extension}, tipos prohibidos: %{prohibited_types}" + rmagick_processing_error: "Error al manipular con rmagick, ¿Está seguro de que el archivo es una imagen? Error original: %{e}" + mime_types_processing_error: "Error al procesar archivo con MIME::Types, puede ser que el contenido no sea válido. Error original: %{e}" mini_magick_processing_error: "Error al editar con MiniMagick, ¿Está seguro de que el archivo es una imagen? Error original: %{e}" - wrong_size: "Tamaño erroneo (should be %{file_size})" - size_too_small: "es demasiado pequeño (should be at least %{file_size})" - size_too_big: "es demasiado grande (should be at most %{file_size})" - export_not_found: "La exportación solicitada no se encontró. Probablemente se eliminó, por favor, genere una nueva exportación." + wrong_size: "es de tamaño incorrecto (debería ser de %{file_size})" + size_too_small: "es demasiado pequeño (debería ser de minimo %{file_size})" + size_too_big: "es demasiado grande (deberia ser de maximo %{file_size})" + export_not_found: "La exportación solicitada no se encontró. Probablemente fue borrada, por favor, genere una nueva exportación." percentage_out_of_range: "El porcentaje debe estar incluido entre 0 y 100" cannot_be_blank_at_same_time: "no puede estar vacío cuando %{field} también está vacío" cannot_be_in_the_past: "no puede estar en el pasado" - cannot_be_before_previous_value: "No puede estar antes del valor anterior." + cannot_be_before_previous_value: "no puede estar antes del valor anterior" cannot_overlap: "no se puede solapar con un período contable existente" cannot_encompass: "no puede abarcar un período contable existente" in_closed_period: "no puede estar dentro de un período de contabilidad cerrado" @@ -43,22 +43,22 @@ es: activemodel: errors: messages: - carrierwave_processing_error: fallo al procesar + carrierwave_processing_error: falló al procesar carrierwave_integrity_error: es un tipo de archivo no permitido carrierwave_download_error: no pudo ser descargado - extension_white_list_error: 'no le está permitido subir archivos de extensión %{extension} , tipos permitidos: %{allowed_types}' - extension_black_list_error: 'no le está permitido subir archivos de extensión %{extension} , tipos prohibidos: %{prohibited_types}' - rmagick_processing_error: 'error al manipular con rmagick, ¿Está seguro de que el archivo es una imagen? Error original: %{e}' - mime_types_processing_error: 'error al procesar archivo MIME::Types, puede ser que el contenido no sea válido. Error original: %{e}' + extension_white_list_error: 'No puede subir archivos de extensión %{extension}, tipos permitidos: %{allowed_types}' + extension_black_list_error: 'No puede subir archivos de extensión %{extension}, tipos prohibidos: %{prohibited_types}' + rmagick_processing_error: 'Error al manipular con rmagick, ¿Está seguro de que el archivo es una imagen? Error original: %{e}' + mime_types_processing_error: 'Error al procesar archivo con MIME::Types, puede ser que el contenido no sea válido. Error original: %{e}' mini_magick_processing_error: 'Error al editar con MiniMagick, ¿Está seguro de que el archivo es una imagen? Error original: %{e}' - wrong_size: Tamaño erroneo (should be %{file_size}) - size_too_small: es demasiado pequeño (should be at least %{file_size}) - size_too_big: es demasiado grande (should be at most %{file_size}) - export_not_found: La exportación solicitada no se encontró. Probablemente se eliminó, por favor, genere una nueva exportación. + wrong_size: es de tamaño incorrecto (debería ser de %{file_size}) + size_too_small: es demasiado pequeño (debería ser de minimo %{file_size}) + size_too_big: es demasiado grande (debería ser de maximo %{file_size}) + export_not_found: La exportación solicitada no se encontró. Probablemente fue borrada, por favor, genere una nueva exportación. percentage_out_of_range: El porcentaje debe estar incluido entre 0 y 100 cannot_be_blank_at_same_time: no puede estar vacío cuando %{field} también está vacío cannot_be_in_the_past: no puede estar en el pasado - cannot_be_before_previous_value: No puede estar antes del valor anterior. + cannot_be_before_previous_value: no puede estar antes del valor anterior cannot_overlap: no se puede solapar con un período contable existente cannot_encompass: no puede abarcar un período contable existente in_closed_period: no puede estar dentro de un período de contabilidad cerrado From 034b5d5707d81234420c0ba746cb76a5877a44d4 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 3 Jan 2020 11:19:14 +0100 Subject: [PATCH 132/135] New translations en.yml (Spanish) --- config/locales/es.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/config/locales/es.yml b/config/locales/es.yml index 62b114f6c..fae1508ec 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -123,21 +123,21 @@ es: including_amount_payed_on_ordering: "Incluyendo cantidad pagada en el pedido" total_amount: "Precio total" refund_on_DATE: "Reembolso en %{DATE}" - by_stripe_online_payment: "por pago online" + by_stripe_online_payment: "por Stripe (pago online)" by_cheque: "por cheque" by_transfer: "por transferencia" by_cash: "en efectivo" by_wallet: "por cartera" - no_refund: "sin devolución" - settlement_by_debit_card: "Efectuado con tarjeta de débito" - settlement_done_at_the_reception: "Efectuado en recepción" - settlement_by_wallet: "Efectuado con cartera" + no_refund: "Sin devolución" + settlement_by_debit_card: "Liquidación por tarjeta de débito" + settlement_done_at_the_reception: "Liquidación realizada en la recepción" + settlement_by_wallet: "Liquidación con cartera" on_DATE_at_TIME: "el %{DATE} a las %{TIME}," - for_an_amount_of_AMOUNT: "Por una cantidad de %{AMOUNT}" + for_an_amount_of_AMOUNT: "por una cantidad de %{AMOUNT}" on_DATE_from_START_to_END: "El %{DATE} desde %{START} hasta %{END}" #eg: on feb. 7 from 7AM to 9AM from_STARTDATE_to_ENDDATE_from_STARTTIME_to_ENDTIME: "Desde %{STARTDATE} hasta %{ENDDATE}, desde %{STARTTIME} hasta %{ENDTIME}" #eg: from feb. 7 to feb. 10, from 6PM to 10PM - subscription_of_NAME_for_DURATION_starting_from_DATE: "Suscripción %{NAME} por %{DURATION} empezando Desde %{DATE}" - subscription_of_NAME_extended_starting_from_STARTDATE_until_ENDDATE: "Subscripción de %{NAME} extendida (Free days) empezando desde %{STARTDATE} hasta %{ENDDATE}" + subscription_of_NAME_for_DURATION_starting_from_DATE: "Suscripción %{NAME} por %{DURATION} empezando desde %{DATE}" + subscription_of_NAME_extended_starting_from_STARTDATE_until_ENDDATE: "Subscripción de %{NAME} extendida (días gratuitos) empezando desde %{STARTDATE} hasta %{ENDDATE}" and: 'y' accounting_export: journal_code: "Código de registro" @@ -160,7 +160,7 @@ es: wallet: "cartera" trainings: #training availabilities - i_ve_reserved: "he reservado" + i_ve_reserved: "Reservé" completed: "Lleno" events: #error messages when updating an event From 3eec4f25bbca54cb40221ce368fa3921888f47ae Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 3 Jan 2020 11:38:14 +0100 Subject: [PATCH 133/135] New translations en.yml (Spanish) --- config/locales/es.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config/locales/es.yml b/config/locales/es.yml index fae1508ec..a577f14df 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -173,11 +173,11 @@ es: #members list export to EXCEL format members: "Miembros" id: "ID" - surname: "Apellidos" + surname: "Apellido" first_name: "Nombre" email: "Correo electrónico" - newsletter: "Hoja informativa" - last_login: "Último acceso" + newsletter: "Boletín informativo" + last_login: "Última conexión" gender: "Genero" age: "Edad" address: "Dirección" @@ -227,18 +227,18 @@ es: amount: "Cantidad" payment_method: "Método de pago" local_payment: "Pago en recepción" - online_payment: "Pago online" + online_payment: "Pago en línea" export_availabilities: #reservation slots export, by type, to EXCEL format machines: "Máquinas" - trainings: "Cursos" + trainings: "Formaciones" spaces: "Espacios" events: "Eventos" day_of_week: "Día de la semana" date: "Fecha" - slot: "Espacio" + slot: "Horario" machine: "Máquina" - training: "Curso" + training: "Formación" space: "Espacio" event: "Evento" reservations: "Reservas" @@ -250,7 +250,7 @@ es: notify_admin_abuse_reported: an_abuse_was_reported_on_TYPE_ID_NAME_html: "Un abuso ha sido reportado %{TYPE} %{ID}: %{NAME}." notify_admin_member_create_reservation: - a_RESERVABLE_reservation_was_made_by_USER_html: "una %{RESERVABLE} reserva fue hecha por %{USER}." + a_RESERVABLE_reservation_was_made_by_USER_html: "Una reserva de %{RESERVABLE} fue hecha por %{USER}." notify_admin_profile_complete: account_imported_from_PROVIDER_UID_has_completed_its_information_html: "Cuenta importada desde %{PROVIDER} (%{UID}) ha completado su información." notify_admin_slot_is_canceled: From 01844d002275044e5d4132ff46a429d755b23d05 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 6 Jan 2020 16:44:18 +0100 Subject: [PATCH 134/135] fix setup script --- setup/letsencrypt.service | 2 +- setup/setup.sh | 68 ++++++++++++++++++++++++++------------- setup/webroot.ini.example | 1 + 3 files changed, 48 insertions(+), 23 deletions(-) mode change 100644 => 100755 setup/setup.sh diff --git a/setup/letsencrypt.service b/setup/letsencrypt.service index f601166fd..28db3b6b0 100644 --- a/setup/letsencrypt.service +++ b/setup/letsencrypt.service @@ -4,5 +4,5 @@ Requires=docker.service [Service] Type=oneshot -ExecStart=/usr/bin/docker run --rm --name certbot_fabmanager -v "/apps/fabmanager/letsencrypt:/etc/letsencrypt" certbot/certbot:latest -c "/etc/letsencrypt/config/webroot.ini" certonly +ExecStart=/usr/bin/docker run --rm --name certbot_fabmanager -v "/apps/fabmanager/letsencrypt/etc:/etc/letsencrypt" certbot/certbot:latest -c "/etc/letsencrypt/config/webroot.ini" certonly ExecStartPost=-/usr/bin/docker restart fabmanager_nginx_1 diff --git a/setup/setup.sh b/setup/setup.sh old mode 100644 new mode 100755 index 63bb3d906..0e522f574 --- a/setup/setup.sh +++ b/setup/setup.sh @@ -4,9 +4,15 @@ DOMAINS=() welcome_message() { - echo "============================================" - echo -e "\e[31m Fab-Manager's setup\e[0m" - echo "============================================" + clear + echo "#======================================================================#" + echo -e "#\e[31m ____ __ ____ _ _ __ __ _ __ ___ ____ ____ \e[0m#" + echo -e "#\e[31m ( __)/ _\ ( _ \ ___ ( \/ ) / _\ ( ( \ / _\ / __)( __)( _ \\ \e[0m#" + echo -e "#\e[31m ) _)/ \ ) _ ((___)/ \/ \/ \/ // \( (_ \ ) _) ) / \e[0m#" + echo -e "#\e[31m (__) \_/\_/(____/ \_)(_/\_/\_/\_)__)\_/\_/ \___/(____)(__\_) \e[0m#" + echo "# #" + echo "#======================================================================#" + printf "\n Welcome to Fab-Manager's setup assistant\n\n\n" echo "Thank you for installing Fab-Manager." printf "This script will guide you through the installation process of Fab-Manager\n\n" echo -e "Please report any \e[1mfeedback or improvement request\e[21m on https://feedback.fab-manager.com/" @@ -27,10 +33,11 @@ system_requirements() else local _groups=("sudo" "docker") for _group in "${_groups[@]}"; do + echo -e "detecting group $_group for current user..." if ! groups | grep "$_group"; then echo "Please add your current user to the $_group group." echo "You can run the following as root: \"usermod -aG $_group $(whoami)\", then logout and login again" - echo "current user is misconfigured, exiting..." && exit 1 + echo -e "\e[91m[ ❌ ] current user is misconfigured, exiting...\e[39m" && exit 1 fi done fi @@ -40,9 +47,10 @@ system_requirements() if ! command -v "$_command" then echo "Please install $_command before running this script." - echo "$_command was not found, exiting..." && exit 1 + echo -e "\e[91m[ ❌ ] $_command was not found, exiting...\e[39m" && exit 1 fi done + printf "\e[92m[ ✔ ] All requirements successfully checked.\e[39m \n\n" } read_email() @@ -58,18 +66,18 @@ read_email() config() { - echo 'We recommand nginx to serve the application over the network (internet). You can use your own solution or let this script install and configure nginx for Fab-Manager.' + echo 'We recommend nginx to serve the application over the network (internet). You can use your own solution or let this script install and configure nginx for Fab-Manager.' read -rp 'Do you want install nginx? (Y/n) ' NGINX "$FABMANAGER_PATH/letsencrypt/config/webroot.ini" + \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/webroot.ini.example > "$FABMANAGER_PATH/letsencrypt/etc/config/webroot.ini" # temp systemd files \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/letsencrypt.service > "$FABMANAGER_PATH/letsencrypt/systemd/letsencrypt.service" \curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/letsencrypt.timer > "$FABMANAGER_PATH/letsencrypt/systemd/letsencrypt.timer" @@ -147,11 +155,13 @@ function join_by { local IFS="$1"; shift; echo "$*"; } prepare_letsencrypt() { if [ "$LETSENCRYPT" != "n" ]; then - mkdir -p "$FABMANAGER_PATH/config/nginx/ssl" - echo "Now, we will generate a Diffie-Hellman (DH) 4096 bits encryption key, to encrypt connections. This will take a moment, please wait..." - openssl dhparam -out "$FABMANAGER_PATH/config/nginx/ssl/dhparam.pem" 4096 - sed -i.bak "s/REPLACE_WITH_YOUR@EMAIL.COM/$EMAIL/g" "$FABMANAGER_PATH/letsencrypt/config/webroot.ini" - sed -i.bak "s/MAIN_DOMAIN, ANOTHER_DOMAIN_1/$(join_by , "${DOMAINS[@]}")/g" "$FABMANAGER_PATH/letsencrypt/config/webroot.ini" + if ! openssl dhparam -in "$FABMANAGER_PATH/config/nginx/ssl/dhparam.pem"; then + mkdir -p "$FABMANAGER_PATH/config/nginx/ssl" + printf "\n\nNow, we will generate a Diffie-Hellman (DH) 4096 bits encryption key, to encrypt connections. This will take a moment, please wait...\n" + openssl dhparam -out "$FABMANAGER_PATH/config/nginx/ssl/dhparam.pem" 4096 + fi + sed -i.bak "s/REPLACE_WITH_YOUR@EMAIL.COM/$EMAIL/g" "$FABMANAGER_PATH/letsencrypt/etc/config/webroot.ini" + sed -i.bak "s/MAIN_DOMAIN, ANOTHER_DOMAIN_1/$(join_by , "${DOMAINS[@]}")/g" "$FABMANAGER_PATH/letsencrypt/etc/config/webroot.ini" echo "Now downloading and configuring the certificate signing bot..." docker pull certbot/certbot:latest sed -i.bak "s:/apps/fabmanager:$FABMANAGER_PATH:g" "$FABMANAGER_PATH/letsencrypt/systemd/letsencrypt.service" @@ -163,6 +173,17 @@ prepare_letsencrypt() prepare_docker() { + if [ "$(docker ps | wc -l)" -gt 1 ]; then + printf "\n\nIf you have previously interrupted the installer, it is recommended to stop any existing docker container before continuing.\n" + echo "Here's a list of all existing containers:" + docker ps -a + read -rp "Force remove all containers? (y/N) " confirm Date: Tue, 25 Feb 2020 01:57:36 +0000 Subject: [PATCH 135/135] Bump nokogiri from 1.10.4 to 1.10.8 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.4 to 1.10.8. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.4...v1.10.8) Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0c1c06a6b..524c2b060 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -153,7 +153,7 @@ GEM execjs (2.7.0) faker (1.4.3) i18n (~> 0.5) - faraday (0.17) + faraday (0.17.0) multipart-post (>= 1.2, < 3) ffi (1.9.24) figaro (1.1.0) @@ -240,7 +240,7 @@ GEM multi_xml (0.6.0) multipart-post (2.1.1) naught (1.1.0) - nokogiri (1.10.4) + nokogiri (1.10.8) mini_portile2 (~> 2.4.0) notify_with (0.0.2) jbuilder (~> 2.0)