Андрей (andy) wrote in changelog,
Андрей
andy
changelog

[ljcom] r9581: LJSUP-6867 (Twitter auth)

Committer: ailyin
LJSUP-6867 (Twitter auth)
U   trunk/bin/upgrading/en_LJ.dat
U   trunk/htdocs/identity/twitter-interstitial.bml
Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2010-10-01 10:24:06 UTC (rev 9580)
+++ trunk/bin/upgrading/en_LJ.dat	2010-10-01 10:40:19 UTC (rev 9581)
@@ -1533,6 +1533,16 @@
 
 email.newacct.subject=Welcome to LiveJournal
 
+email.newacct.twitter.body<<
+Hi [[display_name]],
+
+You've connected your Twitter account with LiveJournal; to complete the process,
+click the following link to verify your email address: [[conflink]].
+
+[[sitename]] Team
+[[siteroot]]/
+.
+
 email.newacct2.body|notes=This string replaces email.newacct.body.  You may refer to the old string while translating if you wish.
 email.newacct2.body<<
 Congratulations, you have a new [[sitename]] account!

Modified: trunk/htdocs/identity/twitter-interstitial.bml
===================================================================
--- trunk/htdocs/identity/twitter-interstitial.bml	2010-10-01 10:24:06 UTC (rev 9580)
+++ trunk/htdocs/identity/twitter-interstitial.bml	2010-10-01 10:40:19 UTC (rev 9581)
@@ -70,13 +70,14 @@
             'to' => $email,
             'from' => $LJ::DONOTREPLY_EMAIL,
             'charset' => 'utf-8',
-            'subject' => LJ::Lang::ml('/editinfo.bml.newemail.subject'),
+            'subject' => LJ::Lang::ml('email.newacct.subject'),
             'body' => LJ::Lang::ml(
-                '/editinfo.bml.newemail.body2',
-                { 
-                    username => $u->{user},
+                'email.newacct.twitter.body',
+                {
+                    username => $u->username,
+                    display_name => $u->display_name,
                     sitename => $LJ::SITENAME,
-                    sitelink => $LJ::SITEROOT,
+                    siteroot => $LJ::SITEROOT,
                     conflink => "$LJ::SITEROOT/confirm/$aa->{'aaid'}." .
                                 $aa->{'authcode'},
                 }

Tags: andy, bml, dat, ljcom
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