afuna: Cat under a blanket. Text: "Cats are just little people with Fur and Fangs" (Default)
afuna ([personal profile] afuna) wrote in [site community profile] changelog2010-01-20 03:40 pm

[dw-free] /community/pending.bml refers to (deleted) strings in /community/members.bml

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

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

Fix several translation strings on this page, so that we show
correct/appropriate messages.

Patch by [staff profile] denise.

Files modified:
  • htdocs/community/pending.bml
  • htdocs/community/pending.bml.text
--------------------------------------------------------------------------------
diff -r 4f76b117f9cc -r b2a762d1045f htdocs/community/pending.bml
--- a/htdocs/community/pending.bml	Sun Jan 17 17:10:49 2010 +0000
+++ b/htdocs/community/pending.bml	Wed Jan 20 15:39:43 2010 +0000
@@ -29,14 +29,14 @@ body<=
 
     # get $c object
     my $c = LJ::load_user($cname);
-    return $ret . "<?h1 $ML{'Error'} h1?><?p $ML{'/community/members.bml.error.nocomm'} p?>"
+    return $ret . "<?h1 $ML{'Error'} h1?><?p $ML{'.error.nocomm'} p?>"
         unless $c;
     my $cid = $c->{'userid'};
 
     # is $remote an admin?
     unless (LJ::can_manage($remote, $c)) {
         $ret .= "<?h1 $ML{'Error'} h1?><?p ";
-        $ret .= BML::ml('/community/members.bml.error.noaccess', 
+        $ret .= BML::ml('.error.noaccess', 
                         { comm => LJ::ljuser($cname, { type => 'C' }) });
         $ret .= " p?>";
         return $ret;
@@ -98,14 +98,14 @@ body<=
             }
         }
 
-        $ret .= "<?h1 $ML{'/community/members.bml.success.header'} h1?><?p $ML{'/community/members.bml.success.message'} p?>";
+        $ret .= "<?h1 $ML{'/community/members.bml.success.header'} h1?><?p $ML{'/community/members.bml.success.message2'} p?>";
         $ret .= "<?p " . BML::ml('.success.added', { num => $added }) . " p?>" if $added;
         $ret .= "<?p " . BML::ml('.success.rejected', { num => $rejected }) . " p?>" if $rejected;
         $ret .= "<?p " . BML::ml('.success.ignored', { num => $ignored }) . " p?>" if $ignored;
         $ret .= "<?p " . BML::ml('.success.previous', { num => $previous }) . " p?>" if $previous;
         $ret .= "<?p " . BML::ml('.success.banned', { num => $banned }) . " p?>" if $banned;
         $ret .= "<?p " . BML::ml('.success.ban_skipped', { num => $ban_skipped }) . " p?>" if $ban_skipped;
-        $ret .= "<?p " . BML::ml("/community/members.bml.success.return", { 'link' => BML::get_uri() . "?authas=$cname" }) . " p?>";
+        $ret .= "<?p " . BML::ml("/community/members.bml.success.return2", { 'link' => BML::get_uri() . "?authas=$cname" }) . " p?>";
 
         return $ret;
     }
diff -r 4f76b117f9cc -r b2a762d1045f htdocs/community/pending.bml.text
--- a/htdocs/community/pending.bml.text	Sun Jan 17 17:10:49 2010 +0000
+++ b/htdocs/community/pending.bml.text	Wed Jan 20 15:39:43 2010 +0000
@@ -7,6 +7,10 @@
 .button.reject=Reject membership
 
 .button.reject_ban=Reject membership and set ban
+
+.error.noaccess=Only community administrators can accept and reject membership requests. You aren't an administrator of [[comm]].
+
+.error.nocomm=Community not found.
 
 .jump=Jump to user
 
@@ -20,7 +24,9 @@
 
 .success.banned=You have banned [[num]] [[?num|person|persons]] from this community.
 
-.succedd.ban_skipped=You have [[num]] failed [[?num|ban|bans]] from this community. You can clean ban list and try again.
+.success.ban_skipped=You have [[num]] failed [[?num|ban|bans]] from this community. You can clear the ban list and try again.
+
+.success.header=Success
 
 .success.ignored=[[num]] [[?num|request is|requests are]] still on file pending decisions.
 
--------------------------------------------------------------------------------