Bug 232413 - remove occurrences of   in favour of [%+ construct to prevent whitespace chomping. Patch by gerv; r=kiko, a=justdave.

1 files changed, 7 insertions, 5 deletions

diff --git a/template/en/default/bug/process/confirm-duplicate.html.tmpl b/template/en/default/bug/process/confirm-duplicate.html.tmpl
index de32c12e5..7fd72a2d0 100644
--- a/template/en/default/bug/process/confirm-duplicate.html.tmpl
+++ b/template/en/default/bug/process/confirm-duplicate.html.tmpl
@@ -37,12 +37,13 @@
 <p>
   When marking [% terms.abug %] as a duplicate, the reporter of the duplicate
   is normally added to the CC list of the original. The permissions
-  on [% terms.bug %]&nbsp;[% original_bug_id %] (the original) are currently set
+  on [% terms.bug %] [%+ original_bug_id %] (the original) are currently set
   such that the reporter would not normally be able to see it.
 </p>
 
 <p>
-  <b>Adding the reporter to the CC list of [% terms.bug %]&nbsp;[% original_bug_id %]
+  <b>Adding the reporter to the CC list of [% terms.bug %] 
+    [%+ original_bug_id %]
   [% IF cclist_accessible %]
     will immediately
   [% ELSE %]
@@ -58,15 +59,16 @@
 
 <p>
   <input type="radio" name="confirm_add_duplicate" value="1">
-    Yes, add the reporter to CC list on [% terms.bug %]&nbsp;[% original_bug_id %]
+    Yes, add the reporter to CC list on [% terms.bug %] [%+ original_bug_id %]
 </p>
 <p>
   <input type="radio" name="confirm_add_duplicate" value="0" checked="checked">
-    No, do not add the reporter to CC list on [% terms.bug %]&nbsp;[% original_bug_id %]
+    No, do not add the reporter to CC list on [% terms.bug %] 
+    [%+ original_bug_id %]
 </p>
 <p>
   <a href="show_bug.cgi?id=[% duplicate_bug_id %]">Throw away my changes,
-    and revisit [% terms.bug %]&nbsp;[% duplicate_bug_id %]</a>
+    and revisit [% terms.bug %] [%+ duplicate_bug_id %]</a>
 <p>
   <input type="submit" value="Submit">
 </p>