summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorGervase Markham <gerv@gerv.net>2015-03-30 19:53:57 +0200
committerGervase Markham <gerv@gerv.net>2015-03-30 19:53:57 +0200
commit79ec29975ac8d1a4f49b83ed404a1ee04c33b73c (patch)
treefd747279bdfb8f3857e7e64468c0915649319523 /template/en
parent2c82105b0fed5d6739111c5de8dba063b01ab446 (diff)
downloadbugzilla-79ec29975ac8d1a4f49b83ed404a1ee04c33b73c.tar.gz
bugzilla-79ec29975ac8d1a4f49b83ed404a1ee04c33b73c.tar.xz
Bug 1007605 - Make FIXED non-fixed, by changing noresolveonopenblockers to define what the fixed resolution is. r,a=glob
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/admin/params/bugchange.html.tmpl4
-rw-r--r--template/en/default/global/user-error.html.tmpl3
2 files changed, 4 insertions, 3 deletions
diff --git a/template/en/default/admin/params/bugchange.html.tmpl b/template/en/default/admin/params/bugchange.html.tmpl
index f442c5953..4d73e0cb1 100644
--- a/template/en/default/admin/params/bugchange.html.tmpl
+++ b/template/en/default/admin/params/bugchange.html.tmpl
@@ -37,6 +37,6 @@
commentonduplicate => "If this option is on, the user needs to enter a short comment " _
"if the $terms.bug is marked as duplicate.",
- noresolveonopenblockers => "Don\'t allow $terms.bugs to be resolved as fixed " _
- "if they have unresolved dependencies." }
+ resolution_forbidden_with_open_blockers => "Don't allow $terms.bugs to be resolved with " _
+ "this resolution if they have unresolved dependencies." }
%]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index dd34f2cd6..299e2a194 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1748,7 +1748,8 @@
[% END %].
They must either be resolved or removed from the
"[% field_descs.dependson FILTER html %]" field before you can resolve
- this [% terms.bug %] as [% display_value("resolution", "FIXED") FILTER html %].
+ this [% terms.bug %] as [% display_value("resolution",
+ Param('resolution_forbidden_with_open_blockers')) FILTER html %].
[% ELSIF error == "sudo_invalid_cookie" %]
[% title = "Invalid Sudo Cookie" %]