[livejournal] r21443: LJSUP-11534: We need new language variab...

U   trunk/htdocs/talkpost_do.bml
U   trunk/htdocs/talkpost_do.bml.text

Modified: trunk/htdocs/talkpost_do.bml
===================================================================
--- trunk/htdocs/talkpost_do.bml	2012-03-19 06:48:09 UTC (rev 21442)
+++ trunk/htdocs/talkpost_do.bml	2012-03-19 07:06:04 UTC (rev 21443)
@@ -469,8 +469,7 @@
             }
 
             $mlcode = '.success.message2';
-        }
-        else {
+        } elsif ($comment->{state} eq 'S') {
             # otherwise, it's a screened comment.
             if ($journalu->{'journaltype'} eq 'C') {
                 $mlcode = $POST{'usertype'} eq 'anonymous'
@@ -486,6 +485,21 @@
                 $message = $ML{$mlcode};
                 return $redirect->($commentlink) if $ajax;
             }
+        } else {
+            # otherwise, it's a spammed comment.
+            if ($journalu->{'journaltype'} eq 'C') {
+                $mlcode = $POST{'usertype'} eq 'anonymous'
+                    ? '.success.spammed.comm.anon3'
+                    : '.success.spammed.comm3';
+                $message = $ML{$mlcode};
+                return $redirect->($commentlink) if $ajax;
+            } else {
+                $mlcode = $POST{'usertype'} eq 'anonymous'
+                    ? '.success.spammed.user.anon3'
+                    : '.success.spammed.user3';
+                $message = $ML{$mlcode};
+                return $redirect->($commentlink) if $ajax;
+            }
         }
 
 

Modified: trunk/htdocs/talkpost_do.bml.text
===================================================================
--- trunk/htdocs/talkpost_do.bml.text	2012-03-19 06:48:09 UTC (rev 21442)
+++ trunk/htdocs/talkpost_do.bml.text	2012-03-19 07:06:04 UTC (rev 21443)
@@ -99,6 +99,14 @@
 
 .success.screened.user3=Your comment has been added. According to this journal's settings, it was marked as screened, and will be visible only to you and the journal's owner until the owner chooses to unscreen it.
 
+.success.spammed.comm.anon3=Your anonymous comment has been added. According to this community's settings, it was marked as spam.
+
+.success.spammed.comm3=Your comment has been added. According to this community's settings, it was marked as spam.
+
+.success.spammed.user.anon3=Your anonymous comment has been added. According to this journal's settings, it was marked as spam.
+
+.success.spammed.user3=Your comment has been added. According to this journal's settings, it was marked as spam.
+
 .success.title=Success
 
 .success.unscreened=Additionally, the screened comment you were replying to has been unscreened and is now visible.