From 0ddb93f7e273ccca157cd87dc2f327a00e5846ed Mon Sep 17 00:00:00 2001 From: "gerv%gerv.net" <> Date: Tue, 3 Feb 2004 05:57:28 +0000 Subject: Bug 232413 - remove occurrences of   in favour of [%+ construct to prevent whitespace chomping. Patch by gerv; r=kiko, a=justdave. --- .../admin/products/groupcontrol/confirm-edit.html.tmpl | 3 ++- template/en/default/attachment/updated.html.tmpl | 2 +- template/en/default/bug/activity/show.html.tmpl | 3 ++- template/en/default/bug/dependency-tree.html.tmpl | 4 ++-- template/en/default/bug/edit.html.tmpl | 4 ++-- template/en/default/bug/process/confirm-duplicate.html.tmpl | 12 +++++++----- template/en/default/bug/process/midair.html.tmpl | 2 +- template/en/default/bug/show-multiple.html.tmpl | 2 +- template/en/default/global/user-error.html.tmpl | 2 +- template/en/default/list/list.html.tmpl | 4 ++-- 10 files changed, 21 insertions(+), 17 deletions(-) diff --git a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl index 5d03c6f60..006189c13 100644 --- a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl @@ -26,7 +26,8 @@ [% FOREACH group = mandatory_groups %]

-group '[% group.name FILTER html %]' impacts [% group.count %] [% terms.bugs %] for +group '[% group.name FILTER html %]' impacts [% group.count %] +[%+ terms.bugs %] for which the group is newly mandatory and will be added. [% END %] diff --git a/template/en/default/attachment/updated.html.tmpl b/template/en/default/attachment/updated.html.tmpl index de9760919..de56341e0 100644 --- a/template/en/default/attachment/updated.html.tmpl +++ b/template/en/default/attachment/updated.html.tmpl @@ -39,7 +39,7 @@

Changes to attachment [% attachid %] - of [% terms.bug %] [% bugid %] submitted + of [% terms.bug %] [%+ bugid %] submitted

[% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %] diff --git a/template/en/default/bug/activity/show.html.tmpl b/template/en/default/bug/activity/show.html.tmpl index 410efe2ee..91743247a 100644 --- a/template/en/default/bug/activity/show.html.tmpl +++ b/template/en/default/bug/activity/show.html.tmpl @@ -39,7 +39,8 @@ [% PROCESS bug/activity/table.html.tmpl %]

- Back to [% terms.bug %] [% bug_id %] + Back to [% terms.bug %] + [%+ bug_id %]

[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl index fbb683265..7d32c8acc 100644 --- a/template/en/default/bug/dependency-tree.html.tmpl +++ b/template/en/default/bug/dependency-tree.html.tmpl @@ -38,7 +38,7 @@ [% ELSE %] [% terms.Bugs %] [% END %] - that [% terms.bug %] [% bugid %] + that [% terms.bug %] [%+ bugid %] depends on [% IF dependson_ids.size > 0 %] ( @@ -60,7 +60,7 @@ [% ELSE %] [% terms.Bugs %] [% END %] - that [% terms.bug %] [% bugid %] + that [% terms.bug %] [%+ bugid %] blocks [% IF blocked_ids.size > 0 %] ( diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 43f030ef2..e912196ca 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -226,7 +226,7 @@ [% bug.resolution FILTER html %] [% IF bug.resolution == "DUPLICATE" %] - of [% terms.bug %] [% "${bug.dup_id}" FILTER bug_link(bug.dup_id) %] + of [% terms.bug %] [%+ "${bug.dup_id}" FILTER bug_link(bug.dup_id) %] [% END %]   @@ -546,7 +546,7 @@ [%############################################################################%] [% BLOCK dependencies %] - [% terms.Bug %] [% bug.bug_id %] [%+ dep.title %]: + [% terms.Bug %] [%+ bug.bug_id %] [%+ dep.title %]: [% FOREACH depbug = bug.${dep.fieldname} %] [% depbug FILTER bug_link(depbug) %][% " " %] 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 @@

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 %] [% 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.

- Adding the reporter to the CC list of [% terms.bug %] [% original_bug_id %] + Adding the reporter to the CC list of [% terms.bug %] + [%+ original_bug_id %] [% IF cclist_accessible %] will immediately [% ELSE %] @@ -58,15 +59,16 @@

- Yes, add the reporter to CC list on [% terms.bug %] [% original_bug_id %] + Yes, add the reporter to CC list on [% terms.bug %] [%+ original_bug_id %]

- No, do not add the reporter to CC list on [% terms.bug %] [% original_bug_id %] + No, do not add the reporter to CC list on [% terms.bug %] + [%+ original_bug_id %]

Throw away my changes, - and revisit [% terms.bug %] [% duplicate_bug_id %] + and revisit [% terms.bug %] [%+ duplicate_bug_id %]

diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl index f06e4a749..de6559582 100644 --- a/template/en/default/bug/process/midair.html.tmpl +++ b/template/en/default/bug/process/midair.html.tmpl @@ -75,7 +75,7 @@ You have the following choices:
  • Throw away my changes, - and revisit [% terms.bug %] [% bug_id %] + and revisit [% terms.bug %] [%+ bug_id %]
    • diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl index ac3578305..d9e3ed546 100644 --- a/template/en/default/bug/show-multiple.html.tmpl +++ b/template/en/default/bug/show-multiple.html.tmpl @@ -49,7 +49,7 @@
    - [% terms.Bug %] [% bug.bug_id %] - [% bug.short_desc FILTER html %] + [% terms.Bug %] [%+ bug.bug_id %] - [% bug.short_desc FILTER html %]
    diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 37eb7bd5b..ac6af177b 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -210,7 +210,7 @@ You asked [% requestee.identity FILTER html %] for [% flag_type.name FILTER html %] on - [%+ terms.bug %] [% bug_id FILTER html %], + [%+ terms.bug %] [%+ bug_id FILTER html %], attachment [% attach_id FILTER html %], but that attachment is restricted to users in the [% Param("insidergroup") FILTER html %] group, and the user diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl index 5af5735aa..97b659c73 100644 --- a/template/en/default/list/list.html.tmpl +++ b/template/en/default/list/list.html.tmpl @@ -72,7 +72,7 @@ [%############################################################################%] [% IF bugs.size > 9 %] - [% bugs.size %] [% terms.bugs %] found. + [% bugs.size %] [%+ terms.bugs %] found. [% END %] [%############################################################################%] @@ -99,7 +99,7 @@ [% ELSIF bugs.size == 1 %] One [% terms.bug %] found. [% ELSE %] - [% bugs.size %] [% terms.bugs %] found. + [% bugs.size %] [%+ terms.bugs %] found. [% END %]
    -- cgit v1.2.3-24-g4f1b