diff --git a/app/frontend/src/javascript/controllers/admin/calendar.js b/app/frontend/src/javascript/controllers/admin/calendar.js index eef4effdd8..c7e07d2eda 100644 --- a/app/frontend/src/javascript/controllers/admin/calendar.js +++ b/app/frontend/src/javascript/controllers/admin/calendar.js @@ -366,11 +366,11 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state /** * Return an enumerable meaninful string for the gender of the provider user * @param user {Object} Database user record - * @return {string} 'male' or 'female' + * @return {string} 'male', 'female' or "other" */ const getGender = function (user) { if (user.statistic_profile_attributes) { - if (user.statistic_profile_attributes.gender === 'true') { return 'male'; } else { return 'female'; } + if (user.statistic_profile_attributes.gender === 'male') { return 'male'; } else if (user.statistic_profile_attributes.gender === 'female') { return 'female'; } } else { return 'other'; } }; diff --git a/app/frontend/src/javascript/controllers/admin/members.js b/app/frontend/src/javascript/controllers/admin/members.js index 52c03bed6f..dc5323fb9d 100644 --- a/app/frontend/src/javascript/controllers/admin/members.js +++ b/app/frontend/src/javascript/controllers/admin/members.js @@ -1176,11 +1176,11 @@ Application.Controllers.controller('NewAdminController', ['$state', '$scope', 'A /** * Return an enumerable meaningful string for the gender of the provider user * @param user {Object} Database user record - * @return {string} 'male' or 'female' + * @return {string} 'male', 'female' or "other" */ return getGender = function (user) { if (user.statistic_profile_attributes) { - if (user.statistic_profile_attributes.gender) { return 'male'; } else { return 'female'; } + if (user.statistic_profile_attributes.gender === 'male') { return 'male'; } else if (user.statistic_profile_attributes.gender === 'female') { return 'female'; } } else { return 'other'; } }; } diff --git a/app/frontend/templates/shared/signupModal.html b/app/frontend/templates/shared/signupModal.html index 60ead06632..fe06292e5b 100644 --- a/app/frontend/templates/shared/signupModal.html +++ b/app/frontend/templates/shared/signupModal.html @@ -14,14 +14,26 @@

{{ 'app.public.common.create_your_account' }}

{{ 'app.public.common.man' | translate }} + + {{ 'app.public.common.gender_is_required'}} diff --git a/config/locales/app.admin.de.yml b/config/locales/app.admin.de.yml index 810a9613a3..69c15f4ff8 100644 --- a/config/locales/app.admin.de.yml +++ b/config/locales/app.admin.de.yml @@ -1098,6 +1098,7 @@ de: failed_to_create_admin: "Administrator konnte nicht erstellt werden:" man: "Männlich" woman: "Weiblich" + other: "Unbestimmt" pseudonym: "Pseudonym" pseudonym_is_required: "Pseudonym ist erforderlich." first_name: "Vorname" @@ -1116,6 +1117,7 @@ de: failed_to_create_manager: "Konnte den Manager nicht erstellen:" man: "Männlich" woman: "Weiblich" + other: "Unbestimmt" pseudonym: "Pseudonym" pseudonym_is_required: "Pseudonym ist erforderlich." first_name: "Vorname" @@ -1268,6 +1270,7 @@ de: deleted_user: "Gelöschter Nutzer" man: "Männlich" woman: "Weiblich" + other: "Unbestimmt" export_is_running_you_ll_be_notified_when_its_ready: "Export wird ausgeführt. Sie werden nach Fertigstellung benachrichtigt." create_plans_to_start: "Beginnen Sie mit dem Erstellen neuer Abonnement-Pläne." click_here: "Klicken Sie hier, um die erste zu erstellen." diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 72847b85e5..d7addcf167 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -1098,6 +1098,7 @@ en: failed_to_create_admin: "Unable to create the administrator:" man: "Man" woman: "Woman" + other: "Other" pseudonym: "Pseudonym" pseudonym_is_required: "Pseudonym is required." first_name: "First name" @@ -1116,6 +1117,7 @@ en: failed_to_create_manager: "Unable to create the manager:" man: "Man" woman: "Woman" + other: "Other" pseudonym: "Pseudonym" pseudonym_is_required: "Pseudonym is required." first_name: "First name" @@ -1268,6 +1270,7 @@ en: deleted_user: "Deleted user" man: "Man" woman: "Woman" + other: "Other" export_is_running_you_ll_be_notified_when_its_ready: "Export is running. You'll be notified when it's ready." create_plans_to_start: "Start by creating new subscription plans." click_here: "Click here to create your first one." diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 77b2de597e..66c38f9c81 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -1096,8 +1096,9 @@ es: add_an_administrator: "Agregar un administrador" administrator_successfully_created_he_will_receive_his_connection_directives_by_email: "Successful creation. Connection directives were sent to the new administrator by e-mail." failed_to_create_admin: "No se puede crear el administrador :" - man: "Man" - woman: "Woman" + man: "Hombre" + woman: "Mujer" + other: "Otro" pseudonym: "Pseudonym" pseudonym_is_required: "Pseudonym is required." first_name: "First name" @@ -1114,8 +1115,9 @@ es: add_a_manager: "Add a manager" manager_successfully_created: "Successful creation. Connection directives were sent to the new manager by e-mail." failed_to_create_manager: "Unable to create the manager:" - man: "Man" - woman: "Woman" + man: "Hombre" + woman: "Mujer" + other: "Otro" pseudonym: "Pseudonym" pseudonym_is_required: "Pseudonym is required." first_name: "First name" @@ -1266,8 +1268,9 @@ es: export_the_current_search_results: "Exportar los resultados de búsqueda actuales" export: "Exportar" deleted_user: "Usario eliminado" - man: "Man" - woman: "Woman" + man: "Hombre" + woman: "Mujer" + other: "Otro" export_is_running_you_ll_be_notified_when_its_ready: "Export is running. You'll be notified when it's ready." create_plans_to_start: "Start by creating new subscription plans." click_here: "Click here to create your first one." diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 75971a2db8..ffbf5fd11e 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -1098,6 +1098,7 @@ fr: failed_to_create_admin: "Impossible de créer l'administrateur :" man: "Homme" woman: "Femme" + other: "Autre" pseudonym: "Pseudonyme" pseudonym_is_required: "Le pseudonyme est requis." first_name: "Prénom" @@ -1116,6 +1117,7 @@ fr: failed_to_create_manager: "Impossible de créer le gestionnaire :" man: "Homme" woman: "Femme" + other: "Autre" pseudonym: "Pseudonyme" pseudonym_is_required: "Le pseudonyme est requis." first_name: "Prénom" @@ -1268,6 +1270,7 @@ fr: deleted_user: "Utilisateur supprimé" man: "Homme" woman: "Femme" + other: "Autre" export_is_running_you_ll_be_notified_when_its_ready: "L'export est en cours. Vous serez notifié lorsqu'il sera prêt." create_plans_to_start: "Pour commencer, créez de nouvelles formules d'abonnement." click_here: "Cliquez ici pour créer votre première formule." diff --git a/config/locales/app.admin.no.yml b/config/locales/app.admin.no.yml index 524bec6a18..d36218e9e4 100644 --- a/config/locales/app.admin.no.yml +++ b/config/locales/app.admin.no.yml @@ -1098,6 +1098,7 @@ failed_to_create_admin: "Kan ikke opprette administrator:" man: "Mann" woman: "Kvinne" + other: "Annet" pseudonym: "Pseudonym" pseudonym_is_required: "Kallenavn er nødvendig." first_name: "Fornavn" @@ -1116,6 +1117,7 @@ failed_to_create_manager: "Kan ikke opprette leder:" man: "Mann" woman: "Kvinne" + other: "Annet" pseudonym: "Pseudonym" pseudonym_is_required: "Kallenavn er nødvendig." first_name: "Fornavn" @@ -1268,6 +1270,7 @@ deleted_user: "Slettet bruker" man: "Mann" woman: "Kvinne" + other: "Annet" export_is_running_you_ll_be_notified_when_its_ready: "Eksport er startet. Du vil bli varslet når den er klar." create_plans_to_start: "Begynn med å opprette nye medlemskapsplaner." click_here: "Klikk her for å opprette din første." diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 356485bb89..5ecd09a00f 100644 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -1098,6 +1098,7 @@ pt: failed_to_create_admin: "Não é possível criar administrador:" man: "Homem" woman: "Mulher" + other: "Other" pseudonym: "Apelido" pseudonym_is_required: "Apelido é obrigatório." first_name: "Primeiro nome" @@ -1116,6 +1117,7 @@ pt: failed_to_create_manager: "Não foi possível criar o gerente:" man: "Homem" woman: "Mulher" + other: "Other" pseudonym: "Apelido" pseudonym_is_required: "Apelido é obrigatório." first_name: "Primeiro nome" @@ -1268,6 +1270,7 @@ pt: deleted_user: "Usuário deletado" man: "Homem" woman: "Mulher" + other: "Other" export_is_running_you_ll_be_notified_when_its_ready: "A exportação está em execução. Você será notificado quando estiver pronto." create_plans_to_start: "Comece criando novos planos de assinatura." click_here: "Clique aqui para criar o seu primeiro." diff --git a/config/locales/app.admin.zu.yml b/config/locales/app.admin.zu.yml index 2f075770b1..5f002f218b 100644 --- a/config/locales/app.admin.zu.yml +++ b/config/locales/app.admin.zu.yml @@ -1098,6 +1098,7 @@ zu: failed_to_create_admin: "crwdns25998:0crwdne25998:0" man: "crwdns26000:0crwdne26000:0" woman: "crwdns26002:0crwdne26002:0" + other: "Other" pseudonym: "crwdns26004:0crwdne26004:0" pseudonym_is_required: "crwdns26006:0crwdne26006:0" first_name: "crwdns26008:0crwdne26008:0" @@ -1116,6 +1117,7 @@ zu: failed_to_create_manager: "crwdns26030:0crwdne26030:0" man: "crwdns26032:0crwdne26032:0" woman: "crwdns26034:0crwdne26034:0" + other: "Other" pseudonym: "crwdns26036:0crwdne26036:0" pseudonym_is_required: "crwdns26038:0crwdne26038:0" first_name: "crwdns26040:0crwdne26040:0" @@ -1268,6 +1270,7 @@ zu: deleted_user: "crwdns26292:0crwdne26292:0" man: "crwdns26294:0crwdne26294:0" woman: "crwdns26296:0crwdne26296:0" + other: "Other" export_is_running_you_ll_be_notified_when_its_ready: "crwdns26298:0crwdne26298:0" create_plans_to_start: "crwdns26300:0crwdne26300:0" click_here: "crwdns26302:0crwdne26302:0" diff --git a/config/locales/app.public.de.yml b/config/locales/app.public.de.yml index 65a1110b83..2b8fd0cfe1 100644 --- a/config/locales/app.public.de.yml +++ b/config/locales/app.public.de.yml @@ -63,6 +63,7 @@ de: create_your_account: "Eigenen Account erstellen" man: "Männlich" woman: "Weiblich" + other: "Unbestimmt" gender_is_required: "Die Angabe des Geschlechts ist erforderlich." your_first_name: "Dein Vorname" first_name_is_required: "Der Vorname ist erforderlich." diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml index b3f2d1c2fd..a291f0f742 100644 --- a/config/locales/app.public.en.yml +++ b/config/locales/app.public.en.yml @@ -63,6 +63,7 @@ en: create_your_account: "Create your account" man: "Man" woman: "Woman" + other: "Other" gender_is_required: "Gender is required." your_first_name: "Your first name" first_name_is_required: "First name is required." diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml index e21ca15683..53f5e2c1b1 100644 --- a/config/locales/app.public.es.yml +++ b/config/locales/app.public.es.yml @@ -63,6 +63,7 @@ es: create_your_account: "Crear su cuenta" man: "Hombre" woman: "Mujer" + other: "Otro" gender_is_required: "El genero es obligatorio." your_first_name: "Su nombre" first_name_is_required: "El nombre es obligatorio." diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index c934e79905..b96b03fc3c 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -63,6 +63,7 @@ fr: create_your_account: "Créer votre compte" man: "Homme" woman: "Femme" + other: "Autre" gender_is_required: "Le genre est requis." your_first_name: "Votre prénom" first_name_is_required: "Le prénom est requis." diff --git a/config/locales/app.public.no.yml b/config/locales/app.public.no.yml index 064e6d4489..a2f1c6716e 100644 --- a/config/locales/app.public.no.yml +++ b/config/locales/app.public.no.yml @@ -63,6 +63,7 @@ create_your_account: "Opprett konto" man: "Mann" woman: "Kvinne" + other: "Annet" gender_is_required: "Kjønn er nødvendig." your_first_name: "Fornavn" first_name_is_required: "Fornavn er påkrevd." diff --git a/config/locales/app.public.zu.yml b/config/locales/app.public.zu.yml index a78ad4dcfd..f7e1950ffb 100644 --- a/config/locales/app.public.zu.yml +++ b/config/locales/app.public.zu.yml @@ -63,6 +63,7 @@ zu: create_your_account: "crwdns27878:0crwdne27878:0" man: "crwdns27880:0crwdne27880:0" woman: "crwdns27882:0crwdne27882:0" + other: "Other" gender_is_required: "crwdns27884:0crwdne27884:0" your_first_name: "crwdns27886:0crwdne27886:0" first_name_is_required: "crwdns27888:0crwdne27888:0" diff --git a/config/locales/app.shared.de.yml b/config/locales/app.shared.de.yml index c80bd85aa5..115efa9c46 100644 --- a/config/locales/app.shared.de.yml +++ b/config/locales/app.shared.de.yml @@ -102,6 +102,7 @@ de: gender_input: man: "Man" woman: "Woman" + other: "Unbestimmt" change_password: change_my_password: "Change my password" confirm_current: "Confirm your current password" diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index 8dbc6c09b2..1e2d70b33b 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -102,6 +102,7 @@ en: gender_input: man: "Man" woman: "Woman" + other: "Other" change_password: change_my_password: "Change my password" confirm_current: "Confirm your current password" diff --git a/config/locales/app.shared.es.yml b/config/locales/app.shared.es.yml index 5385f39d28..941bbbfb22 100644 --- a/config/locales/app.shared.es.yml +++ b/config/locales/app.shared.es.yml @@ -100,8 +100,9 @@ es: must_accept_terms: "You must accept the terms and conditions" save: "Save" gender_input: - man: "Man" - woman: "Woman" + man: "Hombre" + woman: "Mujer" + other: "Otro" change_password: change_my_password: "Change my password" confirm_current: "Confirm your current password" diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 37bcfda270..ca8666b49a 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -102,6 +102,7 @@ fr: gender_input: man: "Homme" woman: "Femme" + other: "Autre" change_password: change_my_password: "Changer mon mot de passe" confirm_current: "Confirmez votre mot de passe actuel" diff --git a/config/locales/app.shared.no.yml b/config/locales/app.shared.no.yml index 24c220a124..801772f705 100644 --- a/config/locales/app.shared.no.yml +++ b/config/locales/app.shared.no.yml @@ -102,6 +102,7 @@ gender_input: man: "Man" woman: "Woman" + other: "Annet" change_password: change_my_password: "Change my password" confirm_current: "Confirm your current password" diff --git a/config/locales/app.shared.pt.yml b/config/locales/app.shared.pt.yml index 1239a6b51d..1af9335216 100644 --- a/config/locales/app.shared.pt.yml +++ b/config/locales/app.shared.pt.yml @@ -102,6 +102,7 @@ pt: gender_input: man: "Homem" woman: "Mulher" + other: "Other" change_password: change_my_password: "Alterar a minha senha" confirm_current: "Confirme sua senha atual" diff --git a/config/locales/app.shared.zu.yml b/config/locales/app.shared.zu.yml index b5eea579a9..10585fe7af 100644 --- a/config/locales/app.shared.zu.yml +++ b/config/locales/app.shared.zu.yml @@ -102,6 +102,7 @@ zu: gender_input: man: "crwdns28704:0crwdne28704:0" woman: "crwdns28706:0crwdne28706:0" + other: "Other" change_password: change_my_password: "crwdns28708:0crwdne28708:0" confirm_current: "crwdns28710:0crwdne28710:0" diff --git a/config/locales/de.yml b/config/locales/de.yml index ce2d3a54d3..d51c13e45e 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -212,6 +212,7 @@ de: organization_address: "Adresse der Organisation" man: "Mann" woman: "Frau" + other: "Unbestimmt" without_subscriptions: "Ohne Abonnement" #machines/trainings/events reservations list to EXCEL format export_reservations: @@ -474,6 +475,7 @@ de: type: "Typ" male: "Männlich" female: "Weiblich" + other: "Unbestimmt" deleted_user: "Deleted user" #initial price's category for events, created to replace the old "reduced amount" property price_category: diff --git a/config/locales/en.yml b/config/locales/en.yml index 5dcc9c76f3..b58c437c68 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -474,6 +474,7 @@ en: type: "Type" male: "Man" female: "Woman" + other: "Other" deleted_user: "Deleted user" #initial price's category for events, created to replace the old "reduced amount" property price_category: diff --git a/config/locales/es.yml b/config/locales/es.yml index 2940a041ee..590fe137e5 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -212,6 +212,7 @@ es: organization_address: "Dirección de la organización" man: "Hombre" woman: "Mujer" + other: "Otro" without_subscriptions: "Sin suscripciones" #machines/trainings/events reservations list to EXCEL format export_reservations: @@ -474,6 +475,7 @@ es: type: "Tipo" male: "Hombre" female: "Mujer" + other: "Otro" deleted_user: "Deleted user" #initial price's category for events, created to replace the old "reduced amount" property price_category: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 99ad4c9c05..dc5056a484 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -212,6 +212,7 @@ fr: organization_address: "Adresse de la structure" man: "Homme" woman: "Femme" + other: "Autre" without_subscriptions: "Sans Abonnement" #machines/trainings/events reservations list to EXCEL format export_reservations: @@ -474,6 +475,7 @@ fr: type: "Type" male: "Homme" female: "Femme" + other: "Autre" deleted_user: "Utilisateur supprimé" #initial price's category for events, created to replace the old "reduced amount" property price_category: diff --git a/config/locales/no.yml b/config/locales/no.yml index 5c68b5f961..6197b2a835 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -212,6 +212,7 @@ organization_address: "Organisasjonens adresse" man: "Mann" woman: "Kvinne" + other: "Annet" without_subscriptions: "Uten abonnementer" #machines/trainings/events reservations list to EXCEL format export_reservations: @@ -474,6 +475,7 @@ type: "Type" male: "Mann" female: "Kvinne" + other: "Annet" deleted_user: "Deleted user" #initial price's category for events, created to replace the old "reduced amount" property price_category: diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 638ed419a9..f56698cb50 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -212,6 +212,7 @@ pt: organization_address: "Endereço da organização" man: "Homem" woman: "Mulher" + other: "Other" without_subscriptions: "Sem assinaturas" #machines/trainings/events reservations list to EXCEL format export_reservations: @@ -474,6 +475,7 @@ pt: type: "Tipo" male: "Homem" female: "Mulher" + other: "Other" deleted_user: "Deleted user" #initial price's category for events, created to replace the old "reduced amount" property price_category: diff --git a/config/locales/zu.yml b/config/locales/zu.yml index 44f522b4d6..cc1eb0b10a 100644 --- a/config/locales/zu.yml +++ b/config/locales/zu.yml @@ -212,6 +212,7 @@ zu: organization_address: "crwdns3477:0crwdne3477:0" man: "crwdns3479:0crwdne3479:0" woman: "crwdns3481:0crwdne3481:0" + other: "Other" without_subscriptions: "crwdns3483:0crwdne3483:0" #machines/trainings/events reservations list to EXCEL format export_reservations: @@ -474,6 +475,7 @@ zu: type: "crwdns3759:0crwdne3759:0" male: "crwdns3761:0crwdne3761:0" female: "crwdns3763:0crwdne3763:0" + other: "Other" deleted_user: "crwdns31747:0crwdne31747:0" #initial price's category for events, created to replace the old "reduced amount" property price_category: