[dw-free] Change "LiveJournal user" to "[[sitename]] user" on talkread/talkpost

[afuna]

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

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

English strip "LiveJournal user" on comment reply form.

Patch by denise.

Files modified:

• cgi-bin/talklib.pl
• htdocs/talkpost.bml.text

--------------------------------------------------------------------------------
diff -r d3786e423fc6 -r d5863766290c cgi-bin/talklib.pl
--- a/cgi-bin/talklib.pl	Sun Mar 29 05:48:36 2009 +0000
+++ b/cgi-bin/talklib.pl	Sun Mar 29 15:03:26 2009 +0000
@@ -1522,11 +1522,11 @@ sub talkform {
         $ret .= "</tr>\n";
     }
 
-    # ( ) LiveJournal user:
+    # ( ) Site user:
     $ret .= "<tr valign='middle' id='otherljuser_row' name='otherljuser_row'>";
     $ret .= "<td align='center'><img src='$LJ::IMGPREFIX/pencil.gif' onclick='handleRadios(2);' /></td><td align='center'><input type='radio' name='usertype' value='user' id='talkpostfromlj'" .
         $whocheck->('ljuser') . "/>";
-    $ret .= "</td><td align='left'><b><label for='talkpostfromlj' onclick='handleRadios(2); return false;'>$BML::ML{'.opt.ljuser2'}</label></b> ";
+    $ret .= "</td><td align='left'><b><label for='talkpostfromlj' onclick='handleRadios(2); return false;'>" . BML::ml( '.opt.siteuser', { sitename => $LJ::SITENAMESHORT } ) . "</label></b> ";
     $ret .= $BML::ML{'.opt.willscreenfriend'} if $screening eq 'F';
     $ret .= $BML::ML{'.opt.willscreen'} if $screening eq 'A';
     $ret .= "</td></tr>\n";
diff -r d3786e423fc6 -r d5863766290c htdocs/talkpost.bml.text
--- a/htdocs/talkpost.bml.text	Sun Mar 29 05:48:36 2009 +0000
+++ b/htdocs/talkpost.bml.text	Sun Mar 29 15:03:26 2009 +0000
@@ -47,10 +47,6 @@
 
 .opt.from=From:
 
-.opt.ljuser=LiveJournal user:
-
-.opt.ljuser2=LiveJournal user
-
 .opt.loggedin=<b>Logged in user:</b> [[username]]
 
 .opt.membersonly=- this community only allows commenting by members. You may comment here if you are a member of [[username]].
@@ -68,6 +64,8 @@
 .opt.noopenidpost=- you must <a [[aopts1]]>set</a> and <a [[aopts2]]>validate</a> your email address in order to comment.
 
 .opt.preview=Preview
+
+.opt.siteuser=[[sitename]] user
 
 .opt.spellcheck=Spell check entry before posting
 
--------------------------------------------------------------------------------