[dw-free] Error message in journals that have disabled anonymous commenting

[afuna]

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

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

Clearer error message if anonymous commenting is disabled.

Patch by yvi.

Files modified:

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

--------------------------------------------------------------------------------
diff -r cdc29a206198 -r 62bb21d6c40f cgi-bin/talklib.pl
--- a/cgi-bin/talklib.pl	Sun Jun 28 03:35:57 2009 +0000
+++ b/cgi-bin/talklib.pl	Sun Jun 28 03:40:19 2009 +0000
@@ -2967,8 +2967,10 @@ sub init {
             } else {
                 $err->(BML::ml("$SC.error.badusername2", {'sitename' => $LJ::SITENAMESHORT, 'aopts' => "href='$LJ::SITEROOT/lostinfo.bml'"}));
             }
+        } elsif ($journalu->{'opt_whocanreply'} eq "all") {
+            $err->(BML::ml("$SC.error.nousername", {'sitename' => $LJ::SITENAMESHORT}));
         } else {
-            $bmlerr->("$SC.error.nousername");
+            $err->(BML::ml("$SC.error.nousername.noanon", {'sitename' => $LJ::SITENAMESHORT}));
         }
     }
 
diff -r cdc29a206198 -r 62bb21d6c40f htdocs/talkpost_do.bml.text
--- a/htdocs/talkpost_do.bml.text	Sun Jun 28 03:35:57 2009 +0000
+++ b/htdocs/talkpost_do.bml.text	Sun Jun 28 03:40:19 2009 +0000
@@ -42,7 +42,9 @@
 
 .error.notamember=Sorry, you are not a member of <b>[[user]]</b>, and commenting is restricted to members only.
 
-.error.nousername=You did not enter your LiveJournal username.  You can choose to post as "Anonymous" if you don't have a LiveJournal user account.
+.error.nousername=You did not enter your [[sitename]] username.  You can choose to post as "Anonymous" if you don't have a [[sitename]] user account.
+
+.error.nousername.noanon=You did not enter your [[sitename]] username and this user does not allow anonymous commenting. Please go back and enter your [[sitename]] username and password to comment.
 
 .error.noverify2=Sorry, you aren't allowed to post comments until your email address has been validated. If you've lost the confirmation email to do this, you can <a [[aopts]]>have it re-sent</a>.
 
--------------------------------------------------------------------------------