From bfa29938e6dab3cabdac5d436515e8706985f745 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 30 Mar 2021 09:12:23 +0200 Subject: [PATCH 01/18] New translations app.admin.en.yml (German) --- config/locales/app.admin.de.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/locales/app.admin.de.yml b/config/locales/app.admin.de.yml index 0132ae6e6..6522a2b55 100644 --- a/config/locales/app.admin.de.yml +++ b/config/locales/app.admin.de.yml @@ -73,10 +73,13 @@ de: labels: "Label(s):" none: "Keine" slot_successfully_deleted: "Der Slot {START} - {END} wurde erfolgreich gelöscht" - slots_deleted: "Der Slot beginnend mit {START}, und {COUNT, plural, =1{one other} ein weiterer Slot{{COUNT} weitere Slots}}} wurden gelöscht" + slots_deleted: "The slot of {START}, and {COUNT, plural, =1{one other} other{{COUNT} others}}, have been deleted" unable_to_delete_the_slot: "Konnte den Slot {START} - {END} nicht löschen, wahrscheinlich weil er bereits von einem Mitglied reserviert ist" slots_not_deleted: "Von {TOTAL} Slots {COUNT, plural, one {} =1{wurde einer wurde nicht gelöscht} other{wurden {COUNT} nicht gelöscht}}. Möglicherweise {COUNT, plural, =1{ist er} other{sind sie}} bereits reserviert." you_should_select_at_least_a_machine: "Sie sollten mindestens eine Maschine auf diesem Slot auswählen." + inconsistent_times: "Error: the end of the availability is before its beginning." + min_one_slot: "The availability must be split in one slot at least." + min_slot_duration: "You must specify a valid duration for the slots." export_is_running_you_ll_be_notified_when_its_ready: "Export wird ausgeführt. Sie werden nach Fertigstellung benachrichtigt." actions: "Aktionen" block_reservations: "Reservierungen blockieren" From f38ad1a99bba907e7598ba17323afe213c76bce5 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 30 Mar 2021 09:12:26 +0200 Subject: [PATCH 02/18] New translations app.admin.en.yml (Zulu) --- config/locales/app.admin.zu.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/locales/app.admin.zu.yml b/config/locales/app.admin.zu.yml index 756f1189c..eaf2deb82 100644 --- a/config/locales/app.admin.zu.yml +++ b/config/locales/app.admin.zu.yml @@ -73,10 +73,13 @@ zu: labels: "crwdns6795:0crwdne6795:0" none: "crwdns6797:0crwdne6797:0" slot_successfully_deleted: "crwdns6799:0{START}crwdnd6799:0{END}crwdne6799:0" - slots_deleted: "crwdns6801:0{START}crwdnd6801:0{one other}crwdnd6801:0{COUNT}crwdne6801:0" + slots_deleted: "crwdns21456:0START={START}crwdnd21456:0COUNT={COUNT}crwdnd21456:0COUNT={COUNT}crwdne21456:0" unable_to_delete_the_slot: "crwdns6803:0{START}crwdnd6803:0{END}crwdne6803:0" slots_not_deleted: "crwdns6805:0TOTAL={TOTAL}crwdnd6805:0COUNT={COUNT}crwdnd6805:0COUNT={COUNT}crwdnd6805:0COUNT={COUNT}crwdne6805:0" you_should_select_at_least_a_machine: "crwdns6807:0crwdne6807:0" + inconsistent_times: "crwdns21458:0crwdne21458:0" + min_one_slot: "crwdns21460:0crwdne21460:0" + min_slot_duration: "crwdns21462:0crwdne21462:0" export_is_running_you_ll_be_notified_when_its_ready: "crwdns6809:0crwdne6809:0" actions: "crwdns6811:0crwdne6811:0" block_reservations: "crwdns6813:0crwdne6813:0" From ff656c3ed245a8966d6f8d62da44fe2defbbf661 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 30 Mar 2021 09:12:30 +0200 Subject: [PATCH 03/18] New translations app.admin.en.yml (Portuguese) --- config/locales/app.admin.pt.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index aa3646739..ffe300914 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -73,10 +73,13 @@ pt: labels: "Etiqueta(s):" none: "Nenhuma" slot_successfully_deleted: "O slot {START} - {END} foi deletado com sucesso" - slots_deleted: "O slot de {START}, e {COUNT, plural, =1{one other} other{{COUNT} outros}}}, foram excluídos" + 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: "Em {TOTAL} slots, {COUNT, plural, one {} =1{um não foi deletado} other{{COUNT} não foram deletados}}. Talvez existam algumas reservas {COUNT, plural, =1{nela} other{nelas}}." you_should_select_at_least_a_machine: "Você deveria selecionar a última máquina neste slot." + inconsistent_times: "Error: the end of the availability is before its beginning." + min_one_slot: "The availability must be split in one slot at least." + min_slot_duration: "You must specify a valid duration for the slots." 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" From d7607c8694a0e3f0b97783e7846828e784cb8d22 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 30 Mar 2021 09:12:36 +0200 Subject: [PATCH 04/18] New translations app.admin.en.yml (French) --- config/locales/app.admin.fr.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 91dfedde8..fec8c898b 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -73,13 +73,13 @@ fr: labels: "Étiquette(s) :" none: "Aucune" slot_successfully_deleted: "Le créneau {START} - {END} a bien été supprimé" - 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" + slots_deleted: "The slot of {START}, and {COUNT, plural, =1{one other} other{{COUNT} others}}, have been deleted" 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" 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}}." you_should_select_at_least_a_machine: "Vous devriez sélectionner au moins une machine pour ce créneau." - inconsistent_times: "Erreur : la fin de la plage de disponibilité est avant son début." - min_one_slot: "La plage de disponibilité doit être scindée en au moins un créneau." - min_slot_duration: "Vous devez indiquer une durée valide pour les créneaux." + inconsistent_times: "Error: the end of the availability is before its beginning." + min_one_slot: "The availability must be split in one slot at least." + min_slot_duration: "You must specify a valid duration for the slots." 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" block_reservations: "Bloquer les réservations" From 9943f7910ebedee94dfb11746842e930cb0ae4b8 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 30 Mar 2021 09:12:40 +0200 Subject: [PATCH 05/18] New translations app.admin.en.yml (Spanish) --- config/locales/app.admin.es.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 438da9e14..ae94887bc 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -73,10 +73,13 @@ es: 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" + 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}}." you_should_select_at_least_a_machine: "Debe seleccionar al menos una máquina en esta ranura." + inconsistent_times: "Error: the end of the availability is before its beginning." + min_one_slot: "The availability must be split in one slot at least." + min_slot_duration: "You must specify a valid duration for the slots." 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" From 1e974f3b1bfa11a499c7814d2c6e963fc3a0511d Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 31 Mar 2021 14:45:35 +0200 Subject: [PATCH 06/18] New translations app.admin.en.yml (Portuguese) --- config/locales/app.admin.pt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index ffe300914..019abc2d5 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -73,7 +73,7 @@ pt: 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" + slots_deleted: "O slot de {START}, e {COUNT, plural, =1{one other} other{{COUNT} outros}}, foram excluídos" 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: "Em {TOTAL} slots, {COUNT, plural, one {} =1{um não foi deletado} other{{COUNT} não foram deletados}}. Talvez existam algumas reservas {COUNT, plural, =1{nela} other{nelas}}." you_should_select_at_least_a_machine: "Você deveria selecionar a última máquina neste slot." From fb7e128ae46dc53e50c6048b21d0aa6ec59bfcf2 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 31 Mar 2021 14:45:54 +0200 Subject: [PATCH 07/18] New translations app.admin.en.yml (French) --- config/locales/app.admin.fr.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index fec8c898b..91dfedde8 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -73,13 +73,13 @@ fr: labels: "Étiquette(s) :" none: "Aucune" slot_successfully_deleted: "Le créneau {START} - {END} a bien été supprimé" - slots_deleted: "The slot of {START}, and {COUNT, plural, =1{one other} other{{COUNT} others}}, have been deleted" + 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" 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" 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}}." you_should_select_at_least_a_machine: "Vous devriez sélectionner au moins une machine pour ce créneau." - inconsistent_times: "Error: the end of the availability is before its beginning." - min_one_slot: "The availability must be split in one slot at least." - min_slot_duration: "You must specify a valid duration for the slots." + inconsistent_times: "Erreur : la fin de la plage de disponibilité est avant son début." + min_one_slot: "La plage de disponibilité doit être scindée en au moins un créneau." + min_slot_duration: "Vous devez indiquer une durée valide pour les créneaux." 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" block_reservations: "Bloquer les réservations" From 0970844c3511434aeacd30c61dcf7cc3d99782f8 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 31 Mar 2021 14:46:04 +0200 Subject: [PATCH 08/18] New translations app.admin.en.yml (German) --- config/locales/app.admin.de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.admin.de.yml b/config/locales/app.admin.de.yml index 6522a2b55..e5ae3fcb4 100644 --- a/config/locales/app.admin.de.yml +++ b/config/locales/app.admin.de.yml @@ -73,7 +73,7 @@ de: labels: "Label(s):" none: "Keine" slot_successfully_deleted: "Der Slot {START} - {END} wurde erfolgreich gelöscht" - slots_deleted: "The slot of {START}, and {COUNT, plural, =1{one other} other{{COUNT} others}}, have been deleted" + slots_deleted: "Der Slot beginnend mit {START}, und {COUNT, plural, =1{ein weiterer Slot} other{{COUNT} weitere Slots}} wurden gelöscht" unable_to_delete_the_slot: "Konnte den Slot {START} - {END} nicht löschen, wahrscheinlich weil er bereits von einem Mitglied reserviert ist" slots_not_deleted: "Von {TOTAL} Slots {COUNT, plural, one {} =1{wurde einer wurde nicht gelöscht} other{wurden {COUNT} nicht gelöscht}}. Möglicherweise {COUNT, plural, =1{ist er} other{sind sie}} bereits reserviert." you_should_select_at_least_a_machine: "Sie sollten mindestens eine Maschine auf diesem Slot auswählen." From 7cc8b891bfd6d2ff4d8835db53a5e2c7d3f7f29c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Apr 2021 07:43:47 +0000 Subject: [PATCH 09/18] Bump y18n from 4.0.0 to 4.0.1 Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/yargs/y18n/releases) - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/y18n/commits) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index fdfd131d3..0e4afe6a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9620,9 +9620,9 @@ xtend@^4.0.0, xtend@~4.0.1: integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== y18n@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" - integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== + version "4.0.1" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" + integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== yallist@^2.1.2: version "2.1.2" From cc639e2e5671f17823e1d6add934f603748cf869 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Apr 2021 10:37:52 +0200 Subject: [PATCH 10/18] typo --- setup/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/setup.sh b/setup/setup.sh index 093e062af..feed68431 100755 --- a/setup/setup.sh +++ b/setup/setup.sh @@ -350,7 +350,7 @@ setup_assets_and_databases() printf "\n\nWe will now create the default administrator of Fab-manager.\n" read_email PASSWORD=$(read_password) - printf "\nOK. We will fulfill the database now...\n" + printf "\nOK. We will fill the database now...\n" cd "$FABMANAGER_PATH" && docker-compose run --rm -e ADMIN_EMAIL="$EMAIL" -e ADMIN_PASSWORD="$PASSWORD" "$SERVICE" bundle exec rake db:seed # seed the database # now build the assets From 30aa047807e560a977fb63ec27c1314a46012ba3 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Apr 2021 15:28:42 +0200 Subject: [PATCH 11/18] New translations app.admin.en.yml (German) --- config/locales/app.admin.de.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/locales/app.admin.de.yml b/config/locales/app.admin.de.yml index e5ae3fcb4..4aed7ace2 100644 --- a/config/locales/app.admin.de.yml +++ b/config/locales/app.admin.de.yml @@ -77,7 +77,7 @@ de: unable_to_delete_the_slot: "Konnte den Slot {START} - {END} nicht löschen, wahrscheinlich weil er bereits von einem Mitglied reserviert ist" slots_not_deleted: "Von {TOTAL} Slots {COUNT, plural, one {} =1{wurde einer wurde nicht gelöscht} other{wurden {COUNT} nicht gelöscht}}. Möglicherweise {COUNT, plural, =1{ist er} other{sind sie}} bereits reserviert." you_should_select_at_least_a_machine: "Sie sollten mindestens eine Maschine auf diesem Slot auswählen." - inconsistent_times: "Error: the end of the availability is before its beginning." + inconsistent_times: "Fehler: das Ende der Verfügbarkeit liegt vor dem Beginn." min_one_slot: "The availability must be split in one slot at least." min_slot_duration: "You must specify a valid duration for the slots." export_is_running_you_ll_be_notified_when_its_ready: "Export wird ausgeführt. Sie werden nach Fertigstellung benachrichtigt." @@ -646,7 +646,7 @@ de: payment_schedules: filter_schedules: "Filter schedules" no_payment_schedules: "No payment schedules to display" - load_more: "Load more" + load_more: "Mehr laden" document_filters: reference: "Reference" customer: "Customer" @@ -1076,7 +1076,7 @@ de: machines_sort_by: "Anzeigereihenfolge der Maschinen" fab_analytics: "Fab-Analytics" phone_required: "Telefonummer erforderlich" - address_required: "address required" + address_required: "Adresse erforderlich" tracking_id: "Tracking-ID" facebook_app_id: "Facebook App-ID" twitter_analytics: "Twitter Analytics-Konto" @@ -1113,9 +1113,9 @@ de: phone: "Telefon" phone_is_required: "Telefonummer erforderlich" phone_required_info: "Sie können festlegen, ob die Telefonnummer erforderlich sein soll, um einen neuen Benutzer auf Fab-Manager zu registrieren." - address: "Address" + address: "Adresse" address_required_info_html: "You can define if the address should be required to register a new user on Fab-manager.
Please note that, depending on your country, the regulations may requires addresses for the invoices to be valid." - address_is_required: "Address is required" + address_is_required: "Adresse ist erforderlich" captcha: "Captcha" captcha_info_html: "Sie können einen Schutz gegen Roboter einrichten, um zu verhindern, dass diese Accounts erstellen. Dieser Schutz verwendet Google reCAPTCHA. Melden Sie sich für ein API-Schlüsselpaar an, um reCaptcha zu verwenden." site_key: "Site-Schlüssel" From ea6626c7cf853f81c69da967f9fe31266c494d34 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Apr 2021 15:42:22 +0200 Subject: [PATCH 12/18] New translations app.admin.en.yml (German) --- config/locales/app.admin.de.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/config/locales/app.admin.de.yml b/config/locales/app.admin.de.yml index 4aed7ace2..bcc6a9bca 100644 --- a/config/locales/app.admin.de.yml +++ b/config/locales/app.admin.de.yml @@ -349,7 +349,7 @@ de: confirmation_required: "Bestätigung erforderlich" do_you_really_want_to_delete_this_coupon: "Möchten Sie diesen Gutschein wirklich löschen?" coupon_was_successfully_deleted: "Gutschein wurde erfolgreich gelöscht." - unable_to_delete_the_specified_coupon_already_in_use: "Unable to delete the specified coupon: it is already used with some invoices and/or some payment schedules." + unable_to_delete_the_specified_coupon_already_in_use: "Der angegebene Gutschein konnte nicht gelöscht werden: Er wird bereits bei einigen Rechnungen und/oder Zahlungsplänen verwendet." unable_to_delete_the_specified_coupon_an_unexpected_error_occurred: "Der angegebene Gutschein konnte nicht gelöscht werden: Ein unerwarteter Fehler ist aufgetreten." send_a_coupon: "Gutschein senden" coupon: "Gutschein" @@ -417,7 +417,7 @@ de: credit_note: "Gutschrift" display_more_invoices: "Weitere Rechnungen anzeigen..." no_invoices_for_now: "Momentan keine Rechnungen." - payment_schedules_list: "Payment schedules" + payment_schedules_list: "Zahlungspläne" invoicing_settings: "Rechnungs-Einstellungen" warning_invoices_disabled: "Warnung: Rechnungen sind nicht aktiviert. Es werden keine Rechnungen von Fab-Manager generiert. Trotzdem müssen Sie die unten angegebenen Informationen korrekt ausfüllen, insbesondere die Mehrwertsteuer." change_logo: "Logo ändern" @@ -444,7 +444,7 @@ de: important_notes: "Wichtige Hinweise" address_and_legal_information: "Adresse und rechtliche Informationen" invoice_reference: "Rechnungsbezug" - text: "text" + text: "Text" year: "Jahr" month: "Monat" day: "Tag" @@ -452,7 +452,7 @@ de: online_sales: "Online-Verkäufe" wallet: "Guthabenkonto" refund: "Erstattung" - payment_schedule: "Payment schedule" + payment_schedule: "Zahlungsplan" model: "Modell" documentation: "Dokumentation" 2_digits_year: "Jahr (zwei Ziffern, z.B. 75)" @@ -476,9 +476,9 @@ de: add_a_notice_regarding_refunds_only_if_the_invoice_is_concerned: "Fügen Sie nur dann eine Mitteilung zu Erstattungen hinzu, wenn die Rechnung betroffen ist." this_will_never_be_added_when_an_online_sales_notice_is_present: "Dies wird nie hinzugefügt, wenn eine Online-Verkaufsmitteilung vorhanden ist." eg_RA_will_add_A_to_the_refund_invoices: '(z.B. fügt R[/A] den Rückerstattungsrechnungen "/A" hinzu)' - add_a_notice_regarding_payment_schedule: "Add a notice regarding the payment schedules, only for concerned documents." - this_will_never_be_added_with_other_notices: "This will never be added when any other notice is present." - eg_SE_to_schedules: '(eg. S[/E] will add "/E" to the payment schedules)' + add_a_notice_regarding_payment_schedule: "Fügen Sie eine Mitteilung bezüglich der Zahlungspläne hinzu; nur für betreffende Dokumente." + this_will_never_be_added_with_other_notices: "Dies wird nie hinzugefügt, wenn eine andere Mitteilung vorhanden ist." + eg_SE_to_schedules: '(zB. fügt S[/E] "/E" zu den Zahlungsplänen hinzu)' code: "Code" enable_the_code: "Code aktivieren" enabled: "Aktiviert" @@ -644,13 +644,13 @@ de: currency_alert_html: "Warnung: Die Währung kann nicht mehr geändert werden, nachdem die erste Online-Zahlung eingegangen ist. Bitte nehmen Sie diese Einstellung sorgfältig vor, bevor Sie Fab-Manager für Mitglieder öffnen." stripe_currency: "Stripe-Währung" payment_schedules: - filter_schedules: "Filter schedules" - no_payment_schedules: "No payment schedules to display" + filter_schedules: "Pläne filtern" + no_payment_schedules: "Keine Zahlungspläne zum Anzeigen" load_more: "Mehr laden" document_filters: - reference: "Reference" - customer: "Customer" - date: "Date" + reference: "Referenz" + customer: "Kunde" + date: "Datum" #management of users, labels, groups, and so on members: users_management: "Benutzer-Verwaltung" From e626e1ef6ca8018ae8a5c0dfc0e8fc393e8c3d60 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 2 Apr 2021 10:22:20 +0200 Subject: [PATCH 13/18] updated changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38bd3dfa6..49c1dfdb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,12 @@ - Enforced validation on required input fields - Updated babeljs and its dependencies +- Updated german translations (thanks to [@Piapat](https://crowdin.com/profile/piapat)) - Fix a bug: the view is not refreshed when deleting a recurring slot - Fix a bug: unable to add a new authorized file type for project's CAD files - Fix a bug: unable to update a coupon - Fix a bug: create a training availability with calendar in month view result in wrong dates +- Fix a security issue: updated y18n to 4.0.1 to fix [CVE-2020-7774](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-7774) ## v4.7.6 2021 March 24 - Ability to disable the trainings module From 64316d028f37e8d4d4b85c27c85211eeb70b367c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 2 Apr 2021 10:30:06 +0200 Subject: [PATCH 14/18] Version 4.7.7 --- CHANGELOG.md | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49c1dfdb6..e788099ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Changelog Fab-manager +## v4.7.7 2021 April 02 - Enforced validation on required input fields - Updated babeljs and its dependencies - Updated german translations (thanks to [@Piapat](https://crowdin.com/profile/piapat)) diff --git a/package.json b/package.json index 81980e6eb..a74a5fa06 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fab-manager", - "version": "4.7.6", + "version": "4.7.7", "description": "Fab-manager 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 5a3d7be7ba9985099941daabd78f236d669ab84c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 2 Apr 2021 11:01:43 +0200 Subject: [PATCH 15/18] updated mimemagic --- Gemfile.lock | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ee8c4a8b3..1eb73dcbe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -201,7 +201,9 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2020.0512) - mimemagic (0.3.5) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_magick (4.10.1) mini_mime (1.0.2) mini_portile2 (2.5.0) From cd2cc91373b04ef9fe475fd476b34d4252089acc Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 2 Apr 2021 11:02:40 +0200 Subject: [PATCH 16/18] Version 4.7.8 --- CHANGELOG.md | 3 +++ package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e788099ea..5ef5db021 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog Fab-manager +## v4.7.8 2021 April 02 +- Updated mimemagic to 0.3.10 to fix [a build issue](https://github.com/mimemagicrb/mimemagic/issues/139) + ## v4.7.7 2021 April 02 - Enforced validation on required input fields - Updated babeljs and its dependencies diff --git a/package.json b/package.json index a74a5fa06..3085ea036 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fab-manager", - "version": "4.7.7", + "version": "4.7.8", "description": "Fab-manager 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 e06f3beeab1d43a811fc1e123070435ac8b3c833 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 6 Apr 2021 14:16:03 +0200 Subject: [PATCH 17/18] [bug] notification not sent notification sent to the project author when a collaborator has confirmed his participation --- CHANGELOG.md | 2 ++ app/models/project_user.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ef5db021..de92b2f45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog Fab-manager +- Fix a bug: the notification sent to the project author when a collaborator has confirmed his participation is not sent + ## v4.7.8 2021 April 02 - Updated mimemagic to 0.3.10 to fix [a build issue](https://github.com/mimemagicrb/mimemagic/issues/139) diff --git a/app/models/project_user.rb b/app/models/project_user.rb index 06ccab3c5..54b13f7de 100644 --- a/app/models/project_user.rb +++ b/app/models/project_user.rb @@ -29,7 +29,7 @@ class ProjectUser < ApplicationRecord def notify_project_author_when_collaborator_valid NotificationCenter.call type: 'notify_project_author_when_collaborator_valid', - receiver: project.author, + receiver: project.author.user, attached_object: self end end From 3483e1355c68abec3eb970e75f7b5a81f2f41959 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 6 Apr 2021 14:58:12 +0200 Subject: [PATCH 18/18] updated openlab + handle missing dev instance --- CHANGELOG.md | 2 ++ Gemfile.lock | 6 +++--- app/workers/openlab_worker.rb | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de92b2f45..dcaa7de37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog Fab-manager +- Updated dependency to OpenLab +- Prevent the worker from crashing if OpenLab is not reachable in dev - Fix a bug: the notification sent to the project author when a collaborator has confirmed his participation is not sent ## v4.7.8 2021 April 02 diff --git a/Gemfile.lock b/Gemfile.lock index 1eb73dcbe..088465d48 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -154,7 +154,7 @@ GEM hashery (2.1.2) hashie (4.1.0) htmlentities (4.3.4) - httparty (0.18.0) + httparty (0.18.1) mime-types (~> 3.0) multi_xml (>= 0.5.2) i18n (1.8.9) @@ -200,7 +200,7 @@ GEM method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) + mime-types-data (3.2021.0225) mimemagic (0.3.10) nokogiri (~> 1) rake @@ -241,7 +241,7 @@ GEM omniauth-rails_csrf_protection (0.1.2) actionpack (>= 4.2) omniauth (>= 1.3.1) - openlab_ruby (0.0.4) + openlab_ruby (0.0.5) httparty (~> 0.13) orm_adapter (0.5.0) parallel (1.19.1) diff --git a/app/workers/openlab_worker.rb b/app/workers/openlab_worker.rb index 2281b3acb..c14200236 100644 --- a/app/workers/openlab_worker.rb +++ b/app/workers/openlab_worker.rb @@ -28,5 +28,7 @@ class OpenlabWorker end logger.debug ['Openlab sync', 'RESPONSE ERROR', response.inspect] unless response.success? + rescue Errno::ECONNREFUSED => e + logger.warn "Unable to connect to OpenProject, maybe the dev instance is not running: #{e}" if Rails.env.development? end end