Bug 365050 - removal notice doesn't use English correctly (lists: =and)

r=dkl,a=justdave

diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 622e3a690299119aea7493b23c224d6b553caeff..f55ab92a49c83fd76b70282cea077146f74a2a16 100644 (file)
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -58,16 +58,14 @@
         [% END %]
         [% IF groups_added_to.size %]
           <li>
-            The account has been added to the
+            The account has been added to the following group[% 's' IF groups_added_to.size > 1 %]:
             [%+ groups_added_to.join(', ') FILTER html %]
-            group[% 's' IF groups_added_to.size > 1 %].
           </li>
         [% END %]
         [% IF groups_removed_from.size %]
           <li>
-            The account has been removed from the
+            The account has been removed from the following group[% 's' IF groups_removed_from.size > 1 %]:
             [%+ groups_removed_from.join(', ') FILTER html %]
-            group[% 's' IF groups_removed_from.size > 1 %].
           </li>
         [% END %]
         [% IF groups_granted_rights_to_bless.size %]