diff --git a/app/views/api/notifications/_notify_admin_slot_is_canceled.json.jbuilder b/app/views/api/notifications/_notify_admin_slot_is_canceled.json.jbuilder
index e90614b13..6063a19ef 100644
--- a/app/views/api/notifications/_notify_admin_slot_is_canceled.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_slot_is_canceled.json.jbuilder
@@ -1,5 +1,5 @@
json.title notification.notification_type
json.description t('.USER_s_reservation_on_the_DATE_was_cancelled_remember_to_generate_a_refund_invoice_if_applicable_html',
- USER: notification.attached_object.reservation.user.profile.full_name,
+ USER: notification.attached_object.reservation.user&.profile&.full_name,
DATE: I18n.l(notification.attached_object.start_at, format: :long))
json.url notification_url(notification, format: :json)
diff --git a/app/views/api/notifications/_notify_admin_subscription_canceled.json.jbuilder b/app/views/api/notifications/_notify_admin_subscription_canceled.json.jbuilder
index 85bafc10c..c4cdc21aa 100644
--- a/app/views/api/notifications/_notify_admin_subscription_canceled.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_subscription_canceled.json.jbuilder
@@ -1,4 +1,4 @@
json.title notification.notification_type
json.description t('.USER_s_subscription_has_been_cancelled',
- USER: notification.attached_object.user.profile.full_name)
+ USER: notification.attached_object.user&.profile&.full_name)
json.url notification_url(notification, format: :json)
diff --git a/app/views/api/notifications/_notify_admin_subscription_extended.json.jbuilder b/app/views/api/notifications/_notify_admin_subscription_extended.json.jbuilder
index 930d87cb8..f2dd3bf82 100644
--- a/app/views/api/notifications/_notify_admin_subscription_extended.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_subscription_extended.json.jbuilder
@@ -2,7 +2,7 @@ json.title notification.notification_type
json.description _t('.subscription_PLAN_of_the_member_USER_has_been_extended_FREE_until_DATE_html',
{
PLAN: notification.attached_object.plan.name,
- USER: notification.attached_object.user.profile.full_name,
+ USER: notification.attached_object.user&.profile&.full_name,
FREE: notification.get_meta_data(:free_days).to_s,
DATE: I18n.l(notification.attached_object.expired_at.to_date)
}) # messageFormat
diff --git a/app/views/api/notifications/_notify_admin_subscription_is_expired.json.jbuilder b/app/views/api/notifications/_notify_admin_subscription_is_expired.json.jbuilder
index 293cf4a91..eda72542f 100644
--- a/app/views/api/notifications/_notify_admin_subscription_is_expired.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_subscription_is_expired.json.jbuilder
@@ -1,4 +1,4 @@
json.title notification.notification_type
json.description t('.USER_s_subscription_has_expired',
- USER:notification.attached_object.user.profile.full_name)
+ USER:notification.attached_object.user&.profile&.full_name)
json.url notification_url(notification, format: :json)
diff --git a/app/views/api/notifications/_notify_admin_subscription_will_expire_in_7_days.json.jbuilder b/app/views/api/notifications/_notify_admin_subscription_will_expire_in_7_days.json.jbuilder
index 746f21055..f521f42f0 100644
--- a/app/views/api/notifications/_notify_admin_subscription_will_expire_in_7_days.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_subscription_will_expire_in_7_days.json.jbuilder
@@ -1,4 +1,4 @@
json.title notification.notification_type
json.description t('.USER_s_subscription_will_expire_in_7_days',
- USER: notification.attached_object.user.profile.full_name)
+ USER: notification.attached_object.user&.profile&.full_name)
json.url notification_url(notification, format: :json)
diff --git a/app/views/api/notifications/_notify_admin_user_group_changed.json.jbuilder b/app/views/api/notifications/_notify_admin_user_group_changed.json.jbuilder
index 30093c2c5..5400a1638 100644
--- a/app/views/api/notifications/_notify_admin_user_group_changed.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_user_group_changed.json.jbuilder
@@ -1,7 +1,7 @@
json.title notification.notification_type
json.description _t('.user_NAME_changed_his_group_html',
{
- NAME: notification.attached_object.profile.full_name,
- GENDER: bool_to_sym(notification.attached_object.statistic_profile.gender)
+ NAME: notification.attached_object&.profile&.full_name,
+ GENDER: bool_to_sym(notification.attached_object&.statistic_profile&.gender)
}) # messageFormat
json.url notification_url(notification, format: :json)
diff --git a/app/views/api/notifications/_notify_admin_user_merged.json.jbuilder b/app/views/api/notifications/_notify_admin_user_merged.json.jbuilder
index 9409ec4ec..8f713c460 100644
--- a/app/views/api/notifications/_notify_admin_user_merged.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_user_merged.json.jbuilder
@@ -1,9 +1,9 @@
json.title notification.notification_type
json.description _t('.user_NAME_has_merged_his_account_with_the_one_imported_from_PROVIDER_UID_html',
{
- NAME: notification.attached_object.profile.full_name,
- GENDER: bool_to_sym(notification.attached_object.statistic_profile.gender),
- PROVIDER: notification.attached_object.provider,
- UID: notification.attached_object.uid
+ NAME: notification.attached_object&.profile&.full_name,
+ GENDER: bool_to_sym(notification.attached_object&.statistic_profile&.gender),
+ PROVIDER: notification.attached_object&.provider,
+ UID: notification.attached_object&.uid
}) # messageFormat
json.url notification_url(notification, format: :json)
diff --git a/app/views/api/notifications/_notify_admin_user_wallet_is_credited.json.jbuilder b/app/views/api/notifications/_notify_admin_user_wallet_is_credited.json.jbuilder
index 6b692d542..f92efffae 100644
--- a/app/views/api/notifications/_notify_admin_user_wallet_is_credited.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_user_wallet_is_credited.json.jbuilder
@@ -2,6 +2,6 @@ json.title notification.notification_type
amount = notification.attached_object.amount
json.description t('.wallet_is_credited',
AMOUNT: number_to_currency(amount),
- USER: notification.attached_object.wallet.user.profile.full_name,
- ADMIN: notification.attached_object.user.profile.full_name)
+ USER: notification.attached_object.wallet.user&.profile&.full_name,
+ ADMIN: notification.attached_object.user&.profile&.full_name)
json.url notification_url(notification, format: :json)
diff --git a/app/views/api/notifications/_notify_admin_when_user_is_created.json.jbuilder b/app/views/api/notifications/_notify_admin_when_user_is_created.json.jbuilder
index caeeefbbf..e1779b52d 100644
--- a/app/views/api/notifications/_notify_admin_when_user_is_created.json.jbuilder
+++ b/app/views/api/notifications/_notify_admin_when_user_is_created.json.jbuilder
@@ -1,5 +1,5 @@
json.title notification.notification_type
json.description t('.a_new_user_account_has_been_created_NAME_EMAIL_html',
- NAME: notification.attached_object.profile.full_name,
- EMAIL: notification.attached_object.email)
+ NAME: notification.attached_object&.profile&.full_name,
+ EMAIL: notification.attached_object&.email)
json.url notification_url(notification, format: :json)
diff --git a/app/views/api/notifications/_notify_partner_subscribed_plan.json.jbuilder b/app/views/api/notifications/_notify_partner_subscribed_plan.json.jbuilder
index 90fadd561..a02aace6e 100644
--- a/app/views/api/notifications/_notify_partner_subscribed_plan.json.jbuilder
+++ b/app/views/api/notifications/_notify_partner_subscribed_plan.json.jbuilder
@@ -2,6 +2,6 @@ json.title notification.notification_type
json.description t('.subscription_partner_PLAN_has_been_subscribed_by_USER_html',
{
PLAN: notification.attached_object.plan.name,
- USER: notification.attached_object.user.profile.full_name
+ USER: notification.attached_object.user&.profile&.full_name
}) # messageFormat
json.url notification_url(notification, format: :json)
diff --git a/app/views/api/notifications/_notify_project_author_when_collaborator_valid.json.jbuilder b/app/views/api/notifications/_notify_project_author_when_collaborator_valid.json.jbuilder
index d5dc45864..11671526e 100644
--- a/app/views/api/notifications/_notify_project_author_when_collaborator_valid.json.jbuilder
+++ b/app/views/api/notifications/_notify_project_author_when_collaborator_valid.json.jbuilder
@@ -1,5 +1,5 @@
json.title notification.notification_type
json.description t('.USER_became_collaborator_of_your_project',
- USER: notification.attached_object.user.profile.full_name) +
+ USER: notification.attached_object.user&.profile&.full_name) +
" #{notification.attached_object.project.name}."
json.url notification_url(notification, format: :json)
diff --git a/config/locales/app.logged.en.yml b/config/locales/app.logged.en.yml
index 67776c1d8..38d95d077 100644
--- a/config/locales/app.logged.en.yml
+++ b/config/locales/app.logged.en.yml
@@ -55,6 +55,11 @@ en:
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"
+ public_profile: "You will have a public profile and other users will be able to associate you in their projects"
projects:
# dashboard: my projects
you_dont_have_any_projects: "You don't have any projects."
diff --git a/config/locales/app.logged.es.yml b/config/locales/app.logged.es.yml
index 439b7c82f..13de8affd 100644
--- a/config/locales/app.logged.es.yml
+++ b/config/locales/app.logged.es.yml
@@ -55,6 +55,11 @@ 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
+ public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing
projects:
# dashboard: my projects
you_dont_have_any_projects: "Aún no tiene proyectos."
diff --git a/config/locales/app.logged.fr.yml b/config/locales/app.logged.fr.yml
index c13a57805..e12f8896c 100644
--- a/config/locales/app.logged.fr.yml
+++ b/config/locales/app.logged.fr.yml
@@ -55,6 +55,11 @@ fr:
no_further_access_to_projects: "Vos projets publiés seront anonymisés et vous n'aurez plus de possibilité de les modifier."
your_user_account_has_been_successfully_deleted_goodbye: "Votre compte utilisateur a bien été supprimé. Au revoir."
an_error_occured_preventing_your_account_from_being_deleted: "Une erreur est survenue qui a empêché la suppression de votre compte."
+ used_for_statistics: "Cette donnée sera utilisée à des fins statistiques"
+ used_for_invoicing: "Cette donnée sera utilisée à des fins de facturation"
+ used_for_reservation: "Cette donnée sera utilisée en cas de changement sur une de vos réservations"
+ used_for_profile: "Cette donnée sera seulement affichée sur votre profil"
+ public_profile: "Vous aurez un profil public et les autres utilisateurs pourront vous associer à leurs projets"
projects:
# tableau de bord : mes projets
you_dont_have_any_projects: "Vous n'avez aucun projet."
diff --git a/config/locales/app.logged.pt.yml b/config/locales/app.logged.pt.yml
index edd9ddec9..8d46fcb69 100755
--- a/config/locales/app.logged.pt.yml
+++ b/config/locales/app.logged.pt.yml
@@ -55,6 +55,11 @@ 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
+ public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing
projects:
# dashboard: my projects
you_dont_have_any_projects: "Você não tem nenhum projeto."
diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml
index 764ae1366..ff8972ec5 100644
--- a/config/locales/app.public.en.yml
+++ b/config/locales/app.public.en.yml
@@ -87,6 +87,11 @@ en:
_the_fablab_policy: "the FabLab policy"
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: "Change your password"
diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml
index a8bba4339..c25e808ae 100644
--- a/config/locales/app.public.es.yml
+++ b/config/locales/app.public.es.yml
@@ -84,8 +84,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
+ 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: "Cambiar contraseña"
diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml
index 17beb74f9..a52a74e18 100644
--- a/config/locales/app.public.fr.yml
+++ b/config/locales/app.public.fr.yml
@@ -87,6 +87,11 @@ fr:
_the_fablab_policy: "la charte d'utilisation du Fab Lab"
field_required: "Champ requis"
unexpected_error_occurred: "Une erreur inattendue s'est produite. Veuillez réessayer ultérieurement."
+ used_for_statistics: "Cette donnée sera utilisée à des fins statistiques"
+ used_for_invoicing: "Cette donnée sera utilisée à des fins de facturation"
+ used_for_reservation: "Cette donnée sera utilisée en cas de changement sur une de vos réservations"
+ used_for_profile: "Cette donnée sera seulement affichée sur votre profil"
+ public_profile: "Vous aurez un profil public et les autres utilisateurs pourront vous associer à leurs projets"
# fenêtre de changement de mot de passe
change_your_password: "Modifier votre mot de passe"
diff --git a/config/locales/app.public.pt.yml b/config/locales/app.public.pt.yml
index 9550020ba..1bd82bf50 100755
--- a/config/locales/app.public.pt.yml
+++ b/config/locales/app.public.pt.yml
@@ -85,8 +85,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
+ 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"