diff options
| author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-10-03 16:17:20 +0000 |
|---|---|---|
| committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-10-03 16:17:20 +0000 |
| commit | 00806d7686b6dce4fd9386dfea7f3cc440901524 (patch) | |
| tree | 204b472dc6f59d7eba3a946934aad990836a361b | |
| parent | 5366cd6a4ca12203147407be01a80817fa37ea3a (diff) | |
| download | elgg-00806d7686b6dce4fd9386dfea7f3cc440901524.tar.gz elgg-00806d7686b6dce4fd9386dfea7f3cc440901524.tar.bz2 | |
Refs #311: Modified message slightly
git-svn-id: https://code.elgg.org/elgg/trunk@2178 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | languages/en.php | 2 | ||||
| -rw-r--r-- | mod/uservalidationbyemail/languages/en.php | 2 | ||||
| -rw-r--r-- | mod/uservalidationbyemail/start.php | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/languages/en.php b/languages/en.php index 1ea14c63a..44440a072 100644 --- a/languages/en.php +++ b/languages/en.php @@ -396,7 +396,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.", 'tools:yours' => "Your tools", 'register' => "Register", - 'registerok' => "You have successfully registered for %s. To activate your account, please confirm your email address by clicking on the link we sent you.", + 'registerok' => "You have successfully registered for %s.", 'registerbad' => "Your registration was unsuccessful. The username may already exist, your passwords might not match, or your username or password may be too short.", 'registerdisabled' => "Registration has been disabled by the system administrator", diff --git a/mod/uservalidationbyemail/languages/en.php b/mod/uservalidationbyemail/languages/en.php index b2fe69218..b2ebf2596 100644 --- a/mod/uservalidationbyemail/languages/en.php +++ b/mod/uservalidationbyemail/languages/en.php @@ -23,6 +23,8 @@ Please confirm your email address by clicking on the link below: Congratulations, you have successfully validated your email address.", + 'uservalidationbyemail:registerok' => "To activate your account, please confirm your email address by clicking on the link we sent you." + ); add_translation("en",$english); diff --git a/mod/uservalidationbyemail/start.php b/mod/uservalidationbyemail/start.php index 2479d3b98..674f53872 100644 --- a/mod/uservalidationbyemail/start.php +++ b/mod/uservalidationbyemail/start.php @@ -67,8 +67,11 @@ $link = $CONFIG->site->url . "action/email/confirm?u=$user_guid&c=" . uservalidationbyemail_generate_code($user_guid, $user->email); // Send validation email - return notify_user($user->guid, $CONFIG->site->guid, sprintf(elgg_echo('email:validate:subject'), $user->username), sprintf(elgg_echo('email:validate:body'), $user->name, $link), NULL, 'email'); - + $result = notify_user($user->guid, $CONFIG->site->guid, sprintf(elgg_echo('email:validate:subject'), $user->username), sprintf(elgg_echo('email:validate:body'), $user->name, $link), NULL, 'email'); + if ($result) + system_message(elgg_echo('uservalidationbyemail:registerok')); + + return $result; } return false; |