From: Matt Selsky <selsky@columbia.edu>
Date: Tue, 4 Mar 2014 20:33:46 +0000 (+0000)
Subject: Bug 365050 - removal notice doesn't use English correctly (lists: =and)
X-Git-Tag: bugzilla-4.5.3~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8256d4e7716f777523a7fe0cd4b922624d5f9480;p=thirdparty%2Fbugzilla.git

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 9203d103ae..34c678e4fe 100644
--- 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 %]