From: Sunil Joshi <joshi_sunil@in.com>
Date: Thu, 19 Sep 2013 03:01:05 +0000 (+1000)
Subject: Bug 365501 - admin/products/groupcontrol/updated uses p as br
X-Git-Tag: bugzilla-4.5.1~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c14936b81e93e6543757529e233dc31b0d93f985;p=thirdparty%2Fbugzilla.git

Bug 365501 - admin/products/groupcontrol/updated uses p as br
r=simon, a=glob
---

diff --git a/template/en/default/admin/products/groupcontrol/updated.html.tmpl b/template/en/default/admin/products/groupcontrol/updated.html.tmpl
index 5ee066c861..1294754fb2 100644
--- a/template/en/default/admin/products/groupcontrol/updated.html.tmpl
+++ b/template/en/default/admin/products/groupcontrol/updated.html.tmpl
@@ -18,24 +18,36 @@
 [% PROCESS global/header.html.tmpl
   title = title
 %]
-<p>
+
 [% IF changes._group_controls.now_na.size %]
   [% FOREACH g = changes._group_controls.now_na %]
-    Removing [% terms.bugs %] from group '[% g.name FILTER html %]' which
-    no longer applies to this product<p>
-    [% g.bug_count FILTER html %] [%+ terms.bugs %] removed<p>
+    <p>
+    Removing [% terms.bugs %] from group '[% g.name FILTER html %]' which is
+    no longer applicable to this product.<br>
+    [% IF g.bug_count == 1 %]
+      One [% terms.bug %] removed.
+    [% ELSE %]
+      [% g.bug_count FILTER html %] [%+ terms.bugs %] removed.
+    [% END %]
+    </p>
   [% END %]
 [% END %]
 
 [% IF changes._group_controls.now_mandatory.size %]
   [% FOREACH g = changes._group_controls.now_mandatory %]
+    <p>
     Adding [% terms.bugs %] to group '[% g.name FILTER html %]' which is 
-    mandatory for this product<p>
-    [% g.bug_count FILTER html %] [%+ terms.bugs %] added<p>
+    now mandatory for this product.<br>
+    [% IF g.bug_count == 1 %]
+      One [% terms.bug %] added.
+    [% ELSE %]
+      [% g.bug_count FILTER html %] [%+ terms.bugs %] added.
+    [% END %]
+    </p>
   [% END %]
 [% END %]
 
-Group control updates done<p>
+<p>Group control updated.</p>
 
 [% PROCESS admin/products/footer.html.tmpl %]