[dw-free] English-strip cgi-bin/LJ/Support.pm

[fu]

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

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

Tweak to remove strings that don't make sense being stripped.

Patch by fu.

Files modified:

• bin/upgrading/en.dat
• cgi-bin/LJ/Support.pm

--------------------------------------------------------------------------------
diff -r 07d0d22cb369 -r 1ff2ad57b2cc bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Mon Sep 12 16:01:20 2011 +0800
+++ b/bin/upgrading/en.dat	Mon Sep 12 16:32:07 2011 +0800
@@ -958,8 +958,6 @@
 
 error.security.s1=Sorry, security filtering is not supported within S1 styles.
 
-error.support.database=Database error:
-
 error.support.invalid_category=Invalid support category
 
 error.support.nonuser=You cannot submit support requests from non-user accounts.
@@ -968,10 +966,6 @@
 
 error.support.nosummary=You must enter a problem summary.
 
-error.support.report=(report this)
-
-error.support.spid=Didn't get a spid
-
 error.suspended.text=This journal has been either temporarily or permanently suspended by [[sitename]] for policy violation.  If you're [[user]], contact us for more information.
 
 error.suspended.name=Suspended
@@ -3707,12 +3701,6 @@
 
 support.answertype.screened=Screened Response
 
-support.blocked.email=Support request blocked based on email
-
-support.blocked.uniq=Support request blocked based on uniq
-
-support.blocked.user=Support request blocked based on user
-
 support.email.confirmation.body<<
 Your [[sitename]] support request regarding "[[subject]]" has been filed and will be answered as soon as possible. Your request tracking number is [[number]]
 
diff -r 07d0d22cb369 -r 1ff2ad57b2cc cgi-bin/LJ/Support.pm
--- a/cgi-bin/LJ/Support.pm	Mon Sep 12 16:01:20 2011 +0800
+++ b/cgi-bin/LJ/Support.pm	Mon Sep 12 16:32:07 2011 +0800
@@ -570,7 +570,7 @@
             $log->{'email'} = $u->email_raw;
 
             unless ($u->is_person || $u->is_identity) {
-                push @$errors, "You cannot submit support requests from non-user accounts.";
+                push @$errors, LJ::Lang::ml( "error.support.nonuser" );
             }
 
             if (LJ::sysban_check('support_user', $u->{'user'})) {
@@ -652,7 +652,7 @@
     if ($dbh->err) {
         my $error = $dbh->errstr;
         $dbh->do("UNLOCK TABLES");
-        push @$errors, "<b>" . LJ::Lang::ml( "error.support.database" ) . "</b> " . LJ::Lang::ml( "error.support.report" ) . "<br />$error";
+        push @$errors, "<b>Database error:</b> (report this)<br>$error";
         return 0;
     }
     $spid = $dbh->{'mysql_insertid'};
@@ -662,7 +662,7 @@
     $dbh->do("UNLOCK TABLES");
 
     unless ($spid) {
-        push @$errors, "<b>" . LJ::Lang::ml( "error.support.database" ) . "</b> " . LJ::Lang::ml( "error.support.report" ) . "<br />" . LJ::Lang::ml( "error.support.spid" );
+        push @$errors, "<b>Database error:</b> (report this)<br>Didn't get a spid.";
         return 0;
     }
 
--------------------------------------------------------------------------------