summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2006-02-26 08:10:23 +0100
committerlpsolit%gmail.com <>2006-02-26 08:10:23 +0100
commit645307b7dad849212762afcecf819a268cc810d3 (patch)
treed4dfdb2ec688efd2ea17f7ff3fc9382175b7c2bc /template/en/default
parent0bd92669e6bd6cde59e85cbf9e827feb94d2536c (diff)
downloadbugzilla-645307b7dad849212762afcecf819a268cc810d3.tar.gz
bugzilla-645307b7dad849212762afcecf819a268cc810d3.tar.xz
Bug 284875: Move GetBugLink, GetAttachmentLink, and quoteUrls out of globals.pl - Patch by Frédéric Buclin <LpSolit@gmail.com> r=mkanat a=justdave
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/attachment/create.html.tmpl2
-rw-r--r--template/en/default/attachment/edit.html.tmpl2
-rw-r--r--template/en/default/attachment/show-multiple.html.tmpl2
-rw-r--r--template/en/default/bug/summarize-time.html.tmpl2
-rw-r--r--template/en/default/filterexceptions.pl2
-rw-r--r--template/en/default/global/user-error.html.tmpl12
-rw-r--r--template/en/default/global/variables.none.tmpl2
7 files changed, 14 insertions, 10 deletions
diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index 4de1e5a08..410f274f2 100644
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -26,7 +26,7 @@
[%# Define strings that will serve as the title and header of this page %]
[% title = BLOCK %]Create New Attachment for [% terms.Bug %] #[% bugid %][% END %]
[% h1 = BLOCK %]Create New Attachment for
- [%+ GetBugLink(bugid, "$terms.Bug $bugid") %][% END %]
+ [%+ "$terms.Bug $bugid" FILTER bug_link(bugid) FILTER none %][% END %]
[% h2 = BLOCK %][% bugsummary FILTER html %][% END %]
[% PROCESS global/header.html.tmpl
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 53eb44d9e..b2b5b13e5 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -28,7 +28,7 @@
[% END %]
[% h1 = BLOCK %]
Attachment [% attachment.id %] Details for
- [%+ GetBugLink(attachment.bug_id, "$terms.Bug ${attachment.bug_id}") %]
+ [%+ "$terms.Bug ${attachment.bug_id}" FILTER bug_link(attachment.bug_id) FILTER none %]
[% END %]
[% h2 = BLOCK %][% bugsummary FILTER html %][% END %]
diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl
index 06cea8683..03ad0ea47 100644
--- a/template/en/default/attachment/show-multiple.html.tmpl
+++ b/template/en/default/attachment/show-multiple.html.tmpl
@@ -22,7 +22,7 @@
[% PROCESS global/variables.none.tmpl %]
[% filtered_summary = bugsummary FILTER html %]
[% h1 = BLOCK %]View All Attachments for
- [%+ GetBugLink(bugid, "$terms.Bug $bugid") %][% END %]
+ [%+ "$terms.Bug $bugid" FILTER bug_link(bugid) FILTER none %][% END %]
[% PROCESS global/header.html.tmpl
title = "View All Attachments for $terms.Bug #$bugid"
h1 = h1
diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl
index 5761b24cf..35808f951 100644
--- a/template/en/default/bug/summarize-time.html.tmpl
+++ b/template/en/default/bug/summarize-time.html.tmpl
@@ -21,7 +21,7 @@
[% title = "Time Summary " %]
[% IF do_depends %]
[% title = title _ "for " %]
- [% h1 = title _ GetBugLink(ids.0, "$terms.Bug $ids.0") %]
+ [% h1 = title _ "$terms.Bug $ids.0" FILTER bug_link(ids.0) FILTER none %]
[% title = title _ "$terms.Bug $ids.0: " %]
[% h1 = (h1 _ " (and $terms.bugs blocking it)") IF do_depends %]
[% ELSE %]
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index dbc618ee6..40a96e70b 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -29,7 +29,7 @@
# Simple literals - [% " selected" ...
# Values always used for numbers - [% (i|j|k|n|count) %]
# Params - [% Param(...
-# Safe functions - [% (time2str|GetBugLink)...
+# Safe functions - [% (time2str)...
# Safe vmethods - [% foo.size %] [% foo.length %]
# [% foo.push() %]
# TT loop variables - [% loop.count %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 3863cb150..390c6b12c 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -82,8 +82,9 @@
[% ELSIF error == "alias_in_use" %]
[% title = "Alias In Use" %]
- [% terms.Bug %] [%+ bug_link FILTER none %] has already taken the alias
- <em>[% alias FILTER html %]</em>. Please choose another one.
+ [% terms.Bug %] [%+ bug_id FILTER bug_link(bug_id) FILTER none %]
+ has already taken the alias <em>[% alias FILTER html %]</em>.
+ Please choose another one.
[% ELSIF error == "alias_not_defined" %]
[% title = "Alias Is Not Defined" %]
@@ -303,8 +304,11 @@
[% title = "Dependency Loop Detected" %]
The following [% terms.bug %](s) would appear on both the "depends on"
and "blocks" parts of the dependency tree if these changes
- are committed: [% both FILTER none %]. This would create a circular
- dependency, which is not allowed.
+ are committed:
+ [% FOREACH dep = deps %]
+ [%+ dep FILTER bug_link(dep) FILTER none %]
+ [% END %].
+ This would create a circular dependency, which is not allowed.
[% ELSIF error == "dependency_loop_single" %]
[% title = "Dependency Loop Detected" %]
diff --git a/template/en/default/global/variables.none.tmpl b/template/en/default/global/variables.none.tmpl
index 76ec1bec6..d19d6407f 100644
--- a/template/en/default/global/variables.none.tmpl
+++ b/template/en/default/global/variables.none.tmpl
@@ -33,7 +33,7 @@
# This means if you change "bug" to "problem", then if you have
# "problem 3" in a comment, it won't become a clickable URL.
# To have that feature, you must edit the quoteUrls function in
- # globals.pl (in the base Bugzilla directory).
+ # Bugzilla/Template.pm.
# Change the line:
# my $bug_re = qr/bug\s*\#?\s*(\d+)/i;
# to something like: