[dw-free] Changes to "Request for invite codes has been granted" email

[afuna]

[commit: http://hg.dwscoalition.org/dw-free/rev/da0e247843a5]

http://bugs.dwscoalition.org/show_bug.cgi?id=1849

Fix up the email to:
* include the invite codes being given
* include link to all invite codes
* include the signoff
* remind the user that they don't need to save this email

Patch by denise.

Files modified:

• bin/upgrading/en.dat
• cgi-bin/DW/InviteCodeRequests.pm

--------------------------------------------------------------------------------
diff -r e3c4db5cb410 -r da0e247843a5 bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Tue Oct 13 15:50:29 2009 +0000
+++ b/bin/upgrading/en.dat	Tue Oct 13 16:10:32 2009 +0000
@@ -776,10 +776,20 @@ edges.watch.error.usernotvisible=Your ac
 
 email=Email
 
-email.invitecoderequest.accept.body<<
-Your request for invites has been granted. You can view all your invite codes here:
+email.invitecoderequest.accept.body2<<
+Your previous request for invite codes has been granted. You received [[number]] invite [[?number|code|codes]] from site administrators, listed below:
+
+[[codes]]
+
+You may use [[?number|this code|these codes]] however you want. You don't need to save this email, either. Your unused codes will always be there, at:
 
   [[invitesurl]]
+
+When you run out, feel free to request more. Thanks for supporting [[sitename]]!
+
+Sincerely,
+The [[sitename]] Team,
+[[siteroot]]
 .
 
 email.invitecoderequest.accept.subject=Your invite code request has been granted
diff -r e3c4db5cb410 -r da0e247843a5 cgi-bin/DW/InviteCodeRequests.pm
--- a/cgi-bin/DW/InviteCodeRequests.pm	Tue Oct 13 15:50:29 2009 +0000
+++ b/cgi-bin/DW/InviteCodeRequests.pm	Tue Oct 13 16:10:32 2009 +0000
@@ -224,13 +224,19 @@ sub accept {
 
     $self->change_status( status => "accepted", count => $opts{num_invites} );
     
-    LJ::send_mail({
+    LJ::send_mail( {
         to => $u->email_raw,
         from => $LJ::ACCOUNTS_EMAIL,
         fromname => $LJ::SITENAME,
         charset => $u->mailencoding,
         subject => LJ::Lang::ml( 'email.invitecoderequest.accept.subject' ),
-        body => LJ::Lang::ml( 'email.invitecoderequest.accept.body', { invitesurl => "$LJ::SITEROOT/manage/invitecodes"} ),
+        body => LJ::Lang::ml( 'email.invitecoderequest.accept.body2', { 
+            siteroot => $LJ::SITEROOT, 
+            invitesurl => $LJ::SITEROOT . '/manage/invitecodes',
+            sitename => $LJ::SITENAMESHORT,
+            number => $opts{num_invites},
+            codes => join( "\n", @invitecodes ),
+            } ),
     });
 }
 
--------------------------------------------------------------------------------