From cf28bcc1fa113688e5c9768b82ad38b38d21a1ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 17 Jul 2017 11:30:24 +0200 Subject: [PATCH] Please cherry-pick: - duplicated files removed - renamed remaining the proper way as they are user-specific templates - maybe one day this need more (directory-based) separation to have smaller directories on server MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- src/java/templates/de/account_confirmed_1.vm | 10 ---- src/java/templates/de/registration_1.vm | 53 ------------------- .../de/resend_confirmation_link_1.vm | 21 -------- ...confirmed.vm => user_account_confirmed.vm} | 0 .../templates/de/user_password_change_1.vm | 13 ----- .../{registration.vm => user_registration.vm} | 0 ...nk.vm => user_resend_confirmation_link.vm} | 0 .../templates/en/user_account_confirmed_1.vm | 10 ---- .../templates/en/user_password_change_1.vm | 13 ----- src/java/templates/en/user_registration_1.vm | 53 ------------------- .../en/user_resend_confirmation_link_1.vm | 21 -------- 11 files changed, 194 deletions(-) delete mode 100644 src/java/templates/de/account_confirmed_1.vm delete mode 100644 src/java/templates/de/registration_1.vm delete mode 100644 src/java/templates/de/resend_confirmation_link_1.vm rename src/java/templates/de/{account_confirmed.vm => user_account_confirmed.vm} (100%) delete mode 100644 src/java/templates/de/user_password_change_1.vm rename src/java/templates/de/{registration.vm => user_registration.vm} (100%) rename src/java/templates/de/{resend_confirmation_link.vm => user_resend_confirmation_link.vm} (100%) delete mode 100644 src/java/templates/en/user_account_confirmed_1.vm delete mode 100644 src/java/templates/en/user_password_change_1.vm delete mode 100644 src/java/templates/en/user_registration_1.vm delete mode 100644 src/java/templates/en/user_resend_confirmation_link_1.vm diff --git a/src/java/templates/de/account_confirmed_1.vm b/src/java/templates/de/account_confirmed_1.vm deleted file mode 100644 index f56ac6c..0000000 --- a/src/java/templates/de/account_confirmed_1.vm +++ /dev/null @@ -1,10 +0,0 @@ -Hallo $contactPersonalTitle $contactFirstName $contactFamilyName, - -Sie hatten soeben ($userUpdated) Ihren Account bestätigt. Vielen Dank. - -Sie können sich mit Ihrem Benutzernamen $userName und Ihrem vergebenen Passwort im Mitgliedsbereich einloggen. - -Mit freundlichen Grüßen - -Kontaktmöglichkeit und Impressum: -$baseUrl/imprint.xhtml diff --git a/src/java/templates/de/registration_1.vm b/src/java/templates/de/registration_1.vm deleted file mode 100644 index c0e5baa..0000000 --- a/src/java/templates/de/registration_1.vm +++ /dev/null @@ -1,53 +0,0 @@ -Hallo $contactPersonalTitle $contactFirstName $contactFamilyName, - -Sie hatten sich eben ($userCreated) bei uns angemeldet. Sollten Sie dies nicht gewesen sein, so melden Sie sich bitter per Kontaktformular bei uns. - -Hier sind Ihre Daten: ---------------------- -Benuzter-Id: -$userId ---------------------- -Benutzername: -$userName ---------------------- -Anrede: -$contactPersonalTitle ---------------------- -Titel: -$contactTitle ---------------------- -Vorname: -$contactFirstName ---------------------- -Nachname: -$contactFamilyName ---------------------- -Straße + Hausnummer: -$contactStreet $contactHouseNumber ---------------------- -PLZ, Wohnort: -$contactZipCode $contactCity ---------------------- -Geburtsdatum: -$contactBirthday ---------------------- -Email-Adresse: -$contactEmailAddress ---------------------- - -Wenn Sie sich anmelden möchten, so müssen Sie Ihren Account bestätigen. Bitte klicken Sie oder kopieren Sie den unten stehenden Link in Ihren Browser: - -- - - - - - - - - - - - - - - - - - - - - -$baseUrl/guest/user/user_confirm_account.xhtml?confirmKey=$userConfirmKey -- - - - - - - - - - - - - - - - - - - - - - -Falls der Link nicht funktioniert, rufen Sie bitte folgenden auf und lassen sich einen neuen Link zuschicken: - -- - - - - - - - - - - - - - - - - - - - - -$baseUrl/guest/user/resend_link.xhtml -- - - - - - - - - - - - - - - - - - - - - - -Mit freundlichen Grüßen - -Kontaktmöglichkeit und Impressum: -$baseUrl/imprint.xhtml diff --git a/src/java/templates/de/resend_confirmation_link_1.vm b/src/java/templates/de/resend_confirmation_link_1.vm deleted file mode 100644 index 6782f02..0000000 --- a/src/java/templates/de/resend_confirmation_link_1.vm +++ /dev/null @@ -1,21 +0,0 @@ -Hallo $contactPersonalTitle $contactFirstName $contactFamilyName, - -Sie hatten soeben ($userUpdated) einen neuen Bestätigungslink angefordert. Die Anmeldung war $userCreated . - -Hier ist der neue Link: -- - - - - - - - - - - - - - - - - - - - - -$baseUrl/guest/user/user_confirm_account.xhtml?confirmKey=$userConfirmKey -- - - - - - - - - - - - - - - - - - - - - - -Falls der Link nicht funktioniert, rufen Sie bitte folgenden auf und lassen sich einen neuen Link zuschicken: - -- - - - - - - - - - - - - - - - - - - - - -$baseUrl/guest/user/resend_link.xhtml -- - - - - - - - - - - - - - - - - - - - - - -Sollten Sie dies bereits getan haben und nicht weiterkommen, so melden Sie sich bitte bei uns. - -Mit freundlichen Grüßen - -Kontaktmöglichkeit und Impressum: -$baseUrl/imprint.xhtml diff --git a/src/java/templates/de/account_confirmed.vm b/src/java/templates/de/user_account_confirmed.vm similarity index 100% rename from src/java/templates/de/account_confirmed.vm rename to src/java/templates/de/user_account_confirmed.vm diff --git a/src/java/templates/de/user_password_change_1.vm b/src/java/templates/de/user_password_change_1.vm deleted file mode 100644 index 1757a45..0000000 --- a/src/java/templates/de/user_password_change_1.vm +++ /dev/null @@ -1,13 +0,0 @@ -Hallo $contactPersonalTitle $contactFirstName $contactFamilyName, - -Sie haben soeben Ihr Zugangspasswort geändert. Das alte Passwort ist somit nicht mehr gültig. Aus Sicherheitsgründen kann Ihr neuesd Passwort hier nicht mit gesendet werden. - ------------------------------------ -Ihr Benutzername: $userName -Benutzer-Id: $userId ------------------------------------ - -Mit freundlichen Grüßen - -Kontaktmöglichkeit und Impressum: -$baseUrl/imprint.xhtml diff --git a/src/java/templates/de/registration.vm b/src/java/templates/de/user_registration.vm similarity index 100% rename from src/java/templates/de/registration.vm rename to src/java/templates/de/user_registration.vm diff --git a/src/java/templates/de/resend_confirmation_link.vm b/src/java/templates/de/user_resend_confirmation_link.vm similarity index 100% rename from src/java/templates/de/resend_confirmation_link.vm rename to src/java/templates/de/user_resend_confirmation_link.vm diff --git a/src/java/templates/en/user_account_confirmed_1.vm b/src/java/templates/en/user_account_confirmed_1.vm deleted file mode 100644 index b19185f..0000000 --- a/src/java/templates/en/user_account_confirmed_1.vm +++ /dev/null @@ -1,10 +0,0 @@ -Hello $contactPersonalTitle $contactFirstName $contactFamilyName, - -You have just ($userUpdated) confirmed your account. Thank you. - -You can now login with your username $userName and password into the member area. - -Best regards - -Contact us: -$baseUrl/imprint.xhtml diff --git a/src/java/templates/en/user_password_change_1.vm b/src/java/templates/en/user_password_change_1.vm deleted file mode 100644 index 07c1ec2..0000000 --- a/src/java/templates/en/user_password_change_1.vm +++ /dev/null @@ -1,13 +0,0 @@ -Hello $contactPersonalTitle $contactFirstName $contactFamilyName, - -You have just changed your password. Your old password is no longer valid. For security reasons your new password is not included in this email. - ------------------------------------ -Your user name: $userName -User id: $userId ------------------------------------ - -Best regards - -Contact us: -$baseUrl/imprint.xhtml diff --git a/src/java/templates/en/user_registration_1.vm b/src/java/templates/en/user_registration_1.vm deleted file mode 100644 index f38cffe..0000000 --- a/src/java/templates/en/user_registration_1.vm +++ /dev/null @@ -1,53 +0,0 @@ -Hello $contactPersonalTitle $contactFirstName $contactFamilyName, - -You have just ($userCreated) registered. If this wasn't you, please contact us immediately. - -Here is your data: ---------------------- -User id: -$userId ---------------------- -User name: -$userName ---------------------- -Personal title: -$contactPersonalTitle ---------------------- -Academical title: -$contactTitle ---------------------- -First name: -$contactFirstName ---------------------- -Family name: -$contactFamilyName ---------------------- -Street + house number: -$contactStreet $contactHouseNumber ---------------------- -ZIP code + city: -$contactZipCode $contactCity ---------------------- -Date of birth: -$contactBirthday ---------------------- -Email address: -$contactEmailAddress ---------------------- - -If you want to register, you have confirm your account. Please click on following link or copy it into your browser: - -- - - - - - - - - - - - - - - - - - - - - -$baseUrl/guest/user/user_confirm_account.xhtml?confirmKey=$userConfirmKey -- - - - - - - - - - - - - - - - - - - - - - -If the above link is not working, please visit following link and send out a new link: - -- - - - - - - - - - - - - - - - - - - - - -$baseUrl/guest/user/resend_link.xhtml -- - - - - - - - - - - - - - - - - - - - - - -Best regards - -Contact us: -$baseUrl/imprint.xhtml diff --git a/src/java/templates/en/user_resend_confirmation_link_1.vm b/src/java/templates/en/user_resend_confirmation_link_1.vm deleted file mode 100644 index fcc12ec..0000000 --- a/src/java/templates/en/user_resend_confirmation_link_1.vm +++ /dev/null @@ -1,21 +0,0 @@ -Hello $contactPersonalTitle $contactFirstName $contactFamilyName, - -you have just ($userUpdated) requested a new confirmation link. Your registration happened on $userCreated . - -Here is your new link: -- - - - - - - - - - - - - - - - - - - - - -$baseUrl/guest/user/user_confirm_account.xhtml?confirmKey=$userConfirmKey -- - - - - - - - - - - - - - - - - - - - - - -If the link is not working, please visit following link and send a new link to this email address.: - -- - - - - - - - - - - - - - - - - - - - - -$baseUrl/guest/user/resend_link.xhtml -- - - - - - - - - - - - - - - - - - - - - - -If you have already tried this and you are stuck here, please contact us. - -Best regards - -Contact us: -$baseUrl/imprint.xhtml -- 2.39.5