[livejournal] r17347: LJSUP-6763

U   trunk/bin/upgrading/en.dat
U   trunk/htdocs/community/pending.bml

Modified: trunk/bin/upgrading/en.dat
===================================================================
--- trunk/bin/upgrading/en.dat	2010-09-10 08:44:55 UTC (rev 17346)
+++ trunk/bin/upgrading/en.dat	2010-09-10 09:05:40 UTC (rev 17347)
@@ -1558,13 +1558,13 @@
 pending.mail.reject.subject=Your Request to Join [[community]] community
 
 pending.mail.reject.body<<
-Dear [[username]], 
-
-Your request to join the [[community]] community has been declined by the maintainer(s) of the community for the following reason: [[reason]]. 
-
-Replies to this email are not sent to the community's maintainer(s). If you would like to discuss the reasons your membership request was rejected, you will need to contact a maintainer directly. Maintainers are listed on the community's Profile page. 
-
-Regards, 
+Dear [[username]],<br> 
+<br>
+Your request to join the [[community]] community has been declined by the maintainer(s) of the community for the following reason: [[reason]]. <br/>
+<br/>
+Replies to this email are not sent to the community's maintainer(s). If you would like to discuss the reasons your membership request was rejected, you will need to contact a maintainer directly. Maintainers are listed on the community's Profile page. <br/>
+<br/>
+Regards, </br>
 [[sitename]] Team
 
 .

Modified: trunk/htdocs/community/pending.bml
===================================================================
--- trunk/htdocs/community/pending.bml	2010-09-10 08:44:55 UTC (rev 17346)
+++ trunk/htdocs/community/pending.bml	2010-09-10 09:05:40 UTC (rev 17347)
@@ -146,14 +146,20 @@
                                     'wrap' => 1,
                                     'charset' => 'utf-8',
                                     'subject' => LJ::Lang::ml ('pending.mail.reject.subject', { community => $cname }),
-                                    'body'    => ( LJ::Lang::ml ('pending.mail.reject.body', 
+                                    'html'    => ( LJ::Lang::ml ('pending.mail.reject.body', 
                                                     {
-                                                        community => $cname,
-                                                        username  => $us->{$id}->{'user'},
+                                                        community => $c->ljuser_display,
+                                                        username  => $us->{$id}->ljuser_display,
                                                         reason    => $reason,
                                                         sitename  => $LJ::SITENAMESHORT,
                                                     }
-                                                ))
+                                                ).
+                                                    LJ::Lang::ml ('esn.footer.html', 
+                                                    {
+                                                        siteroot    => $LJ::SITEROOT,
+                                                    }
+                                                )
+                                                )
                                            });
                 }
             }