Commit 315a0083 authored by Hugh Davenport's avatar Hugh Davenport Committed by Gerrit Code Review
Browse files

Merge "pending registrations: improve wording of emails"

parents 25879b51 1d527eaa
......@@ -103,11 +103,11 @@ function denyregistration_submit(Pieform $form, $values) {
if (isset($values['message']) && !empty($values['message'])) {
$message = get_string('registrationdeniedmessagereason', 'auth.internal',
$values['firstname'], get_config('sitename'), $values['message'], display_name($USER), get_config('sitename'));
$values['firstname'], get_config('sitename'), $values['message'], display_name($USER));
}
else {
$message = get_string('registrationdeniedmessage', 'auth.internal',
$values['firstname'], get_config('sitename'), display_name($USER), get_config('sitename'));
$values['firstname'], get_config('sitename'), display_name($USER));
}
try {
delete_records('usr_registration', 'email', $values['email']);
......
......@@ -71,9 +71,10 @@ $string['confirmcancelregistration'] = 'Are you sure you want to cancel this reg
$string['confirmemailsubject'] = 'Confirm email for registration at %s';
$string['confirmemailmessagetext'] = 'Hi %s,
Thank you for registering an account on %s. Please select the following link to confirm your email address.
The institution adminstrator will be notified and your application will be considered for approval and you
will be notified of the outcome.
Thank you for requesting to register an account on %s. Please select the
following link to confirm your email address. The institution administrator
will then be notified of your application. You will receive an email whether
your registration was approved or not.
%sregister.php?key=%s
......@@ -95,28 +96,30 @@ The %s Team</pre>';
$string['emailconfirmedok'] = '<p>You have successfully confirmed your email. You will be notified with further registration details soon.</p>';
$string['registrationcancelledok'] = 'You have successfully cancelled your registration application.';
$string['registrationconfirm'] = 'Confirm registration?';
$string['registrationconfirmdescription'] = 'Registration must be approved by institutional adminstrators.';
$string['registrationconfirmdescription'] = 'Registration must be approved by institution adminstrators.';
$string['registrationdeniedemailsubject'] = 'Registration attempt at %s denied.';
$string['registrationdeniedmessage'] = 'Hi %s,
Your registration attempt at %s has been denied.
$string['registrationdeniedmessage'] = 'Hello %s,
--
Regards,
%s
The %s Team';
$string['registrationdeniedmessagereason'] = 'Hi %s,
We have received your application for joining our institution on %s and
decided not to grant you access.
Your registration attempt at %s has been denied.
If you think that this decision was incorrect, please get in touch with me
via email.
Reason:
Regards
%s';
$string['registrationdeniedmessagereason'] = 'Hello %s,
"%s"
We have received your application for joining our institution on %s and decided
not to grant you access for the following reason:
--
Regards,
%s
The %s Team';
If you think that this decision was incorrect, please get in touch with me
via email.
Regards
%s';
$string['registeredokawaitingemail'] = 'You have successfully submitted your application for registration. An email should have been sent to you in order to confirm your email and continue the process.';
$string['registrationreason'] = 'Registration Reason';
$string['registrationreasondesc'] = 'The reason for requesting registration with your chosen institution and any other details you think might be useful for the administrator in processing your application. The registration cannot be completed without this information.';
......@@ -128,7 +131,7 @@ A new user has requested to join the institution '%s'.
Because you are listed as an admin of this institution you need to approve or deny this registration request. To do this, select the following link: %s
Details of the registration request follows:
Details of the registration request follow:
Name: %s
Email: %s
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment