Committer: sbelyaev
LJSV-2314: HTML-formatted notifications about joining communities has no line-breaksU trunk/bin/upgrading/en.dat U trunk/cgi-bin/LJ/Event/CommunityJoinApprove.pm
Modified: trunk/bin/upgrading/en.dat =================================================================== --- trunk/bin/upgrading/en.dat 2012-07-17 10:14:26 UTC (rev 22458) +++ trunk/bin/upgrading/en.dat 2012-07-17 10:31:56 UTC (rev 22459) @@ -1829,6 +1829,19 @@ . +esn.comm_join_approve.email_html<< +Dear [[username]],<br /> +<br /> +Your request to join the "[[community]]" community has been approved. The community has been added to your 'Watching' list, so that its entries appear on your Friends page.<br /> +<br /> +Please note that replies to this email are not sent to the community's maintainer(s). If you <br /> +have any questions, you will need to contact them directly.<br/> +<br /> +Regards,<br /> +[[sitename]] Team<br /> +. + + esn.comm_join_reject.alert|staleness=1 esn.comm_join_reject.alert=Your request to join [[community]] community has been declined. Modified: trunk/cgi-bin/LJ/Event/CommunityJoinApprove.pm =================================================================== --- trunk/cgi-bin/LJ/Event/CommunityJoinApprove.pm 2012-07-17 10:14:26 UTC (rev 22458) +++ trunk/cgi-bin/LJ/Event/CommunityJoinApprove.pm 2012-07-17 10:31:56 UTC (rev 22459) @@ -37,6 +37,7 @@ #[[sitename]] Team # #', + 'esn.comm_join_approve.email_html', ); sub as_email_subject { @@ -67,7 +68,10 @@ 'esn.add_friend_community' => [ 1, "$LJ::SITEROOT/friends/add.bml?user=" . $cu->{user} ], }); - return LJ::Lang::get_text($lang, 'esn.comm_join_approve.email_text', undef, $vars); + my $lang_var = $is_html ? 'esn.comm_join_approve.email_html' : + 'esn.comm_join_approve.email_text'; + + return LJ::Lang::get_text($lang, $lang_var, undef, $vars); } sub as_email_string {