diff --git a/source/data/localization/deu.loc.json b/source/data/localization/deu.loc.json index da97a21..a380e32 100644 --- a/source/data/localization/deu.loc.json +++ b/source/data/localization/deu.loc.json @@ -12,21 +12,12 @@ "domain.group.name.label": "Name", "domain.group.label.label": "Beschriftung", "domain.member.member": "Mitglied", - "domain.member.membership_number.label": "Mitgliedsnummer", "domain.member.name.label": "Name", "domain.member.label.label": "Beschriftung", - "domain.member.name_real_value.label": "Echter Name", - "domain.member.name_real_index.label": "Namens-Index", "domain.member.groups.label": "Gruppen", "domain.member.registered.label": "registriert", "domain.member.enabled.label": "aktiviert", "domain.member.email_address.label": "E-Mail-Adresse", - "domain.member.email_address_private.label": "private E-Mail-Adresse", - "domain.member.email_address_veiled.label": "pseudonymisierte E-Mail-Adresse", - "domain.member.email_address_nominal.label": "namentliche E-Mail-Adresse", - "domain.member.email_redirect_to_private_address.label": "eingehende E-Mails zu privater Adresse umleiten", - "domain.member.email_allow_sending.label": "Versenden von E-Mails erlauben", - "domain.member.name_login.label": "Anmeldename", "domain.member.password_set.label": "Passwort gesetzt", "domain.invitation.key.label": "Schlüssel", "domain.invitation.expiry.label": "Ablaufzeitpunkt", @@ -43,31 +34,6 @@ "page.member_list.title": "Mitglieder", "page.member_view.title": "Mitglied", "page.member_view.form.action.save": "Änderungen speichern", - "page.member_view.form.action.summon": "Zur Registrierung auffordern", - "page.member_view.misc.summoned": "Benachrichtigung verschickt", - "page.member_view.misc.test_info": "Im Produktiv-Szenario würde an dieser Stelle eine E-Mail an die hinterlegte private E-Mail-Adresse des Mitglieds versendet werden mit einem Willkommens-Gruß und dem Aufruf folgenden Link zu öffnen:\n\n{{url}}", - "page.member_register.title": "Registrieren", - "page.member_register.form.field.email_address.label": "Partei-E-Mail-Adresse einrichten", - "page.member_register.form.field.email_address.help": "Für Partei-Angelegenheiten möchten wir dir anbieten gesonderte E-Mail-Adressen zu verwenden.\n\nDeine namentliche E-Mail-Adresse würde lauten »{{email_address_nominal}}« und die pseudonymisierte »{{email_address_veiled}}«\n\nDie Partei-E-Mail-Adressen können zum Empfangen von E-Mails verwendet werden. Falls es nötig werden sollte, dass du auch E-Mails mit über die Partei-Adresse verschicken kannst, wende dich bitte an den/die Mitgliederbeauftragte:n!", - "page.member_register.form.field.email_address.option.none": "keine", - "page.member_register.form.field.email_address.option.only_veiled": "nur pseudonymisiert", - "page.member_register.form.field.email_address.option.both": "pseudonymisiert und namentlich", - "page.member_register.form.field.email_redirect.label": "eingehende E-Mails an private Adresse leiten", - "page.member_register.form.field.email_redirect.help": "", - "page.member_register.form.field.password_value.label": "Passwort", - "page.member_register.form.field.password_value.help": "das Passwort für die Anmeldung bei den Netz-Diensten.\n\nDu solltest dir merken oder geeignet abspeichern, was du hier einträgst.\n\nSolltest du dieses Passwort mal vergessen oder verlieren, hast du die Möglichkeit ein neues zu setzen.", - "page.member_register.form.field.password_confirmation.label": "Passwort wiederholen", - "page.member_register.form.field.password_confirmation.help": "", - "page.member_register.form.submit": "Abschicken", - "page.member_register.flaw.already_registered": "bereits registriert", - "page.member_register.flaw.password_mismatch": "die Passwörter stimmen nicht überein", - "page.member_register.flaw.password_too_short": "das Passwort muss mindestens {{minimum_length}} Zeichen haben", - "page.member_register.flaw.password_too_long": "das Passwort darf höchstens {{maximum_length}} Zeichen haben", - "page.member_register.flaw.password_lacks_letter": "das Passwort muss einen Buchstaben beinhalten", - "page.member_register.flaw.password_lacks_number": "das Passwort muss eine Zahl beinhalten", - "page.member_register.flaw.password_lacks_special_character": "das Passwort muss ein Sonderzeichen beinhalten", - "page.member_register.flaw.unhandled_error": "da ist etwas schief gelaufen :/", - "page.member_register.success": "Danke!", "page.password_change_init.title": "Passwort ändern", "page.password_change_init.info": "Falls dein Mitglieds-Konto zugeordnet werden kann, wird eine E-Mail mit weiteren Anweisungen an deine private Adresse geschickt.", "page.password_change_init.identifier": "Anmelde-Name oder private E-Mail-Adresse", @@ -96,6 +62,18 @@ "page.invitation_handle.title": "Einladung", "page.invitation_handle.message.invalid": "ungültig", "page.invitation_handle.message.successful": "erfolgreich", - "page.invitation_handle.form.action.submit": "annehmen" + "page.invitation_handle.form.action.submit": "annehmen", + "page.invitation_handle.form.field.password_value.label": "Passwort", + "page.invitation_handle.form.field.password_value.help": "das Passwort für die Anmeldung bei den Netz-Diensten.\n\nDu solltest dir merken oder geeignet abspeichern, was du hier einträgst.\n\nSolltest du dieses Passwort mal vergessen oder verlieren, hast du die Möglichkeit ein neues zu setzen.", + "page.invitation_handle.form.field.password_confirmation.label": "Passwort wiederholen", + "page.invitation_handle.form.field.password_confirmation.help": "", + "page.invitation_handle.flaw.already_registered": "bereits registriert", + "page.invitation_handle.flaw.password_mismatch": "die Passwörter stimmen nicht überein", + "page.invitation_handle.flaw.password_too_short": "das Passwort muss mindestens {{minimum_length}} Zeichen haben", + "page.invitation_handle.flaw.password_too_long": "das Passwort darf höchstens {{maximum_length}} Zeichen haben", + "page.invitation_handle.flaw.password_lacks_letter": "das Passwort muss einen Buchstaben beinhalten", + "page.invitation_handle.flaw.password_lacks_number": "das Passwort muss eine Zahl beinhalten", + "page.invitation_handle.flaw.password_lacks_special_character": "das Passwort muss ein Sonderzeichen beinhalten", + "page.invitation_handle.flaw.unhandled_error": "da ist etwas schief gelaufen :/" } } diff --git a/source/data/localization/eng.loc.json b/source/data/localization/eng.loc.json index fae0206..e9d8bb9 100644 --- a/source/data/localization/eng.loc.json +++ b/source/data/localization/eng.loc.json @@ -12,21 +12,12 @@ "domain.group.name.label": "name", "domain.group.label.label": "label", "domain.member.member": "member", - "domain.member.membership_number.label": "membership number", "domain.member.name.label": "name", "domain.member.label.label": "label", - "domain.member.name_real_value.label": "real name", - "domain.member.name_real_index.label": "name index", "domain.member.groups.label": "groups", "domain.member.registered.label": "registered", "domain.member.enabled.label": "enabled", "domain.member.email_address.label": "e-mail address", - "domain.member.email_address_private.label": "private e-mail address", - "domain.member.email_address_veiled.label": "veiled e-mail address", - "domain.member.email_address_nominal.label": "nominal e-mail address", - "domain.member.email_redirect_to_private_address.label": "redirect incoming e-mails to private address", - "domain.member.email_allow_sending.label": "allow sending e-mails", - "domain.member.name_login.label": "login name", "domain.member.password_set.label": "password set", "domain.invitation.key.label": "key", "domain.invitation.expiry.label": "expiration", @@ -43,31 +34,6 @@ "page.member_list.title": "Members", "page.member_view.title": "Member", "page.member_view.form.action.save": "save changes", - "page.member_view.form.action.summon": "urge for registration", - "page.member_view.misc.summoned": "notification sent", - "page.member_view.misc.test_info": "in a productive environment the system would now send an e-mail to the member's private address with a welcome note and a call to open the following link:\n\n{{url}}", - "page.member_register.title": "Register", - "page.member_register.form.field.email_address.label": "Set up party e-mail address", - "page.member_register.form.field.email_address.help": "We offer you to use a special e-mail address for any party concerns.\n\nYour namely e-mail address would be »{{email_address_nominal}}« and the veiled one »{{email_address_veiled}}«\n\nThe party e-mail address may be used for the reception of e-mails. In case it becomes necessary for you to submit e-mails via a party address, please get in contact with your membership authority!", - "page.member_register.form.field.email_address.option.none": "none", - "page.member_register.form.field.email_address.option.only_veiled": "only veiled", - "page.member_register.form.field.email_address.option.both": "both, veiled and namely", - "page.member_register.form.field.email_redirect.label": "redirect incoming e-mails to private address", - "page.member_register.form.field.email_redirect.help": "", - "page.member_register.form.field.password_value.label": "password", - "page.member_register.form.field.password_value.help": "the password for logging in to the online services\n\nYou should remember, denote or save properly, what you enter here.\n\nIn case you forget or lose the password some day, you can reset it.", - "page.member_register.form.field.password_confirmation.label": "confirm password", - "page.member_register.form.field.password_confirmation.help": "", - "page.member_register.form.submit": "submit", - "page.member_register.flaw.already_registered": "already registered", - "page.member_register.flaw.password_mismatch": "passwords do not match", - "page.member_register.flaw.password_too_short": "the password must have at least {{minimum_length}} characters", - "page.member_register.flaw.password_too_long": "the password must not have more than {{maximum_length}} characters", - "page.member_register.flaw.password_lacks_letter": "the password must contain a letter", - "page.member_register.flaw.password_lacks_number": "the password must contain a number", - "page.member_register.flaw.password_lacks_special_character": "the password must contain a special character", - "page.member_register.flaw.unhandled_error": "something went wrong :/", - "page.member_register.success": "Thanks!", "page.password_change_init.title": "Change Password", "page.password_change_init.info": "In case your member account can be found, an e-mail with further instructions will be sent to your private e-mail address.", "page.password_change_init.identifier": "Login name or private e-mail address", @@ -96,6 +62,18 @@ "page.invitation_handle.title": "invitation", "page.invitation_handle.message.invalid": "invalid", "page.invitation_handle.message.successful": "successful", - "page.invitation_handle.form.action.submit": "accept" + "page.invitation_handle.form.action.submit": "accept", + "page.invitation_handle.form.field.password_value.label": "password", + "page.invitation_handle.form.field.password_value.help": "the password for logging in to the online services\n\nYou should remember, denote or save properly, what you enter here.\n\nIn case you forget or lose the password some day, you can reset it.", + "page.invitation_handle.form.field.password_confirmation.label": "confirm password", + "page.invitation_handle.form.field.password_confirmation.help": "", + "page.invitation_handle.flaw.already_registered": "already registered", + "page.invitation_handle.flaw.password_mismatch": "passwords do not match", + "page.invitation_handle.flaw.password_too_short": "the password must have at least {{minimum_length}} characters", + "page.invitation_handle.flaw.password_too_long": "the password must not have more than {{maximum_length}} characters", + "page.invitation_handle.flaw.password_lacks_letter": "the password must contain a letter", + "page.invitation_handle.flaw.password_lacks_number": "the password must contain a number", + "page.invitation_handle.flaw.password_lacks_special_character": "the password must contain a special character", + "page.invitation_handle.flaw.unhandled_error": "something went wrong :/" } } diff --git a/source/pages/invitation_handle/logic.ts b/source/pages/invitation_handle/logic.ts index b423377..0a1dd9c 100644 --- a/source/pages/invitation_handle/logic.ts +++ b/source/pages/invitation_handle/logic.ts @@ -183,14 +183,15 @@ lib_plankton.zoo_page.register( "name": "password_value", "input": new lib_plankton.zoo_input.class_input_password( ), - "label": lib_plankton.translate.get("page.member_register.form.field.password_value.label"), - "help": lib_plankton.translate.get("page.member_register.form.field.password_value.help"), + "label": lib_plankton.translate.get("page.invitation_handle.form.field.password_value.label"), + "help": lib_plankton.translate.get("page.invitation_handle.form.field.password_value.help"), }, { "name": "password_confirmation", "input": new lib_plankton.zoo_input.class_input_password( ), - "label": lib_plankton.translate.get("page.member_register.form.field.password_confirmation.label"), + "label": lib_plankton.translate.get("page.invitation_handle.form.field.password_confirmation.label"), + // "help": lib_plankton.translate.get("page.invitation_handle.form.field.password_confirmation.help"), }, ] ), @@ -239,7 +240,7 @@ lib_plankton.zoo_page.register( "fill", flaws.map( flaw => lib_plankton.string.coin( - lib_plankton.translate.get("page.member_register.flaw." + flaw.incident), + lib_plankton.translate.get("page.invitation_handle.flaw." + flaw.incident), flaw.details ) ) @@ -250,7 +251,6 @@ lib_plankton.zoo_page.register( set_state( "done", [ - // lib_plankton.translate.get("page.member_register.success") lib_plankton.translate.get("page.invitation_handle.message.successful"), ] );