wisest owl (wisest_owl) wrote in changelog,
wisest owl
wisest_owl
changelog

[livejournal] r18318: LJSV-1420. The out-of-date text in the n...

Committer: gprochaev
LJSV-1420. The out-of-date text in the notification email about assignment by the maintainer

U   trunk/bin/upgrading/en.dat
U   trunk/htdocs/community/members.bml
Modified: trunk/bin/upgrading/en.dat
===================================================================
--- trunk/bin/upgrading/en.dat	2011-02-16 07:59:39 UTC (rev 18317)
+++ trunk/bin/upgrading/en.dat	2011-02-16 08:22:06 UTC (rev 18318)
@@ -51,6 +51,43 @@
  
 community.election.owner.election.link=The owner of the [[community]] community is not selected yet. You can <a [[href]]>vote for owner here</a>.
 
+community.members.maintainer.remove.email_html<<
+<p>Dear [[sitenameshort]] user [[user]],</p>
+<p>[[remote]] has removed you as a maintainer of the community <a [[mailclink]]>[[usercname]].</a></p>
+<p>Regards,<br/>
+[[sitename]] Team<br/>[[siteroot]]</p>
+.
+
+community.members.maintainer.remove.email_plain<<
+Dear [[sitenameshort]] user [[user]],
+[[remote]] has removed you as a maintainer of the community [[usercname]].
+Regards,
+[[sitename]] Team
+[[siteroot]]
+.
+
+community.members.maintainer.add.email_html<<
+<p>Dear [[sitenameshort]] user [[user]],</p>
+<p>You have just been added as a maintainer of the community <a [[mailclink]]>[[usercname]]</a> by one of the current maintainers. As the maintainer, you have the ability to control and manage the community. If you do not wish to take on this responsibility, you can remove your maintainership or transfer your community to another user.</p>
+<p>To manage your communities please visit <a href="[[mailcommanlink]]">your community management page.</a></p>
+<p>Regards,<br/>
+[[sitename]] Team<br/>[[siteroot]]</p>
+.
+
+community.members.maintainer.add.email_plain<<
+Dear [[sitenameshort]] user [[user]],
+
+You have just been added as a maintainer of the community [[usercname]] by one of the current maintainers. As the maintainer, you have the ability to control and manage the community. If you do not wish to take on this responsibility, you can remove your maintainership or transfer your community to another user.
+
+To manage your communities please visit the following URL:
+
+[[mailcommanlink]]
+
+Regards,
+[[sitename]] Team
+[[siteroot]]
+.
+
 contentflag.viewingconcepts|staleness=1
 contentflag.viewingconcepts=You are about to view content that may not be appropriate for minors.
 

Modified: trunk/htdocs/community/members.bml
===================================================================
--- trunk/htdocs/community/members.bml	2011-02-16 07:59:39 UTC (rev 18317)
+++ trunk/htdocs/community/members.bml	2011-02-16 08:22:06 UTC (rev 18318)
@@ -342,22 +342,25 @@
             my $mailusercname = $c->{name};
             my $mailclink = LJ::journal_base($c, ['community']);
 
-            my $html = qq(
-<p>Dear $LJ::SITENAMESHORT user $mailusername,</p>
-<p>$remote->{user} has removed you as a maintainer of the community <a href="$mailclink">$mailusercname.</a></p>
-<p>Regards,<br/>
-$LJ::SITENAME Team<br/>$LJ::SITEROOT</p>
-                          );
+            my $html = LJ::Lang::ml('community.members.maintainer.remove.email_html', {
+                            sitenameshort   => $LJ::SITENAMESHORT,
+                            user            => $mailusername,
+                            usercname       => $mailusercname,
+                            mailclink       => "href='$mailclink'",
+                            remote          => $remote->{user},
+                            sitename        => $LJ::SITENAME,
+                            siteroot        => $LJ::SITEROOT,
+                        });
+            my $plain = LJ::Lang::ml('community.members.maintainer.remove.email_plain', {
+                            sitenameshort   => $LJ::SITENAMESHORT,
+                            user            => $mailusername,
+                            usercname       => $mailusercname,
+                            mailclink       => $mailclink,
+                            remote          => $remote->{user},
+                            sitename        => $LJ::SITENAME,
+                            siteroot        => $LJ::SITEROOT,
+                        });
 
-            my $plain = qq(
-Dear $LJ::SITENAMESHORT user $mailusername,
-
-$remote->{user} has removed you as a maintainer of the community $mailusercname.
-
-Regards,
-$LJ::SITENAME Team
-$LJ::SITEROOT
-                           );
             my $subject = "Maintainership removal: $mailusercname";
             $sendmail->($delmaintu, $html, $plain, $subject);
         }
@@ -413,26 +416,26 @@
             my $mailclink = LJ::journal_base($c, ['community']);
             my $mailcommanlink = "$LJ::SITEROOT/community/manage.bml";
 
-            my $html = qq(
-<p>Dear $LJ::SITENAMESHORT user $mailusername,</p>
-<p>You have just been added as a maintainer of the community <a href="$mailclink">$mailusercname</a> by one of the current maintainers. As the maintainer, you have the ability to control and manage the community. If you do not wish to take on this responsibility, you can remove your maintainership or transfer your community to another user.</p>
-<p>To manage your communities please visit <a href="$mailcommanlink">your community management page.</a></p>
-<p>Regards,<br/>
-$LJ::SITENAME Team<br/>$LJ::SITEROOT</p>
-                          );
+            my $html = LJ::Lang::ml('community.members.maintainer.add.email_html', {
+                            sitenameshort   => $LJ::SITENAMESHORT,
+                            user            => $mailusername,
+                            usercname       => $mailusercname,
+                            mailclink       => "href='$mailclink'",
+                            mailcommanlink  => $mailcommanlink,
+                            sitename        => $LJ::SITENAME,
+                            siteroot        => $LJ::SITEROOT,
+                        });
 
-            my $plain = qq(
-Dear $LJ::SITENAMESHORT user $mailusername,
-You have just been added as a maintainer of the community $mailusercname by one of the current maintainers. As the maintainer, you have the ability to control and manage the community. If you do not wish to take on this responsibility, you can remove your maintainership or transfer your community to another user.
+            my $plain = LJ::Lang::ml('community.members.maintainer.add.email_plain', {
+                            sitenameshort   => $LJ::SITENAMESHORT,
+                            user            => $mailusername,
+                            usercname       => $mailusercname,
+                            mailclink       => $mailclink,
+                            mailcommanlink  => $mailcommanlink,
+                            sitename        => $LJ::SITENAME,
+                            siteroot        => $LJ::SITEROOT,
+                        });
 
-To manage your communities please visit the following URL:
-
-$mailcommanlink
-
-Regards,
-$LJ::SITENAME Team
-$LJ::SITEROOT
-                           );
             my $subject = "You have been added as a maintainer of $mailusercname";
             $sendmail->($newmaintu, $html, $plain, $subject);
         }

Tags: bml, dat, livejournal, wisest-owl
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments