diff options
author | gerv%gerv.net <> | 2003-07-04 06:31:13 +0200 |
---|---|---|
committer | gerv%gerv.net <> | 2003-07-04 06:31:13 +0200 |
commit | 44b48df3901d829e1423749136d142964ccb4a3e (patch) | |
tree | f87659c97f6c97654cde63005c514a5504913631 /template/en/default/bug/process/midair.html.tmpl | |
parent | 7b35e1a271f27612cba91216d50e5f497dd0c69a (diff) | |
download | bugzilla-44b48df3901d829e1423749136d142964ccb4a3e.tar.gz bugzilla-44b48df3901d829e1423749136d142964ccb4a3e.tar.xz |
Bug 13540 - allow key terms, like "Bugzilla" and "bug", to be altered without changing all the templates. Patch by jwilmoth@starbucks.com; r=gerv, a=justdave.
Diffstat (limited to 'template/en/default/bug/process/midair.html.tmpl')
-rw-r--r-- | template/en/default/bug/process/midair.html.tmpl | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl index e3698a640..f8b198689 100644 --- a/template/en/default/bug/process/midair.html.tmpl +++ b/template/en/default/bug/process/midair.html.tmpl @@ -33,7 +33,9 @@ # comments: array; all the comments on the bug. # bug_id: number; the ID of the bug being changed. #%] - + +[% PROCESS global/variables.none.tmpl %] + [% UNLESS header_done %] [% PROCESS bug/process/header.html.tmpl %] [% END %] @@ -41,14 +43,14 @@ <h1>Mid-air collision detected!</h1> <p> - Someone else has made changes to this bug at the same time you were trying to. + Someone else has made changes to this [% terms.bug %] at the same time you were trying to. The changes made were: </p> <p> [% PROCESS "bug/activity/table.html.tmpl" incomplete_data=0 %] </p> - + [% IF comments.size > start_at %] <p> Added comments: @@ -72,8 +74,8 @@ You have the following choices: </form> </li> <li> - <a href="show_bug.cgi?id=[% bug_id %]">Throw away my changes, - and revisit bug [% bug_id %]</a> + <a href="show_bug.cgi?id=[% bug_id %]">Throw away my changes, + and revisit [% terms.bug %] [% bug_id %]</a> </li> </ul> |