summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/admin/milestones/updated.html.tmpl11
-rw-r--r--template/en/default/global/user-error.html.tmpl12
2 files changed, 11 insertions, 12 deletions
diff --git a/template/en/default/admin/milestones/updated.html.tmpl b/template/en/default/admin/milestones/updated.html.tmpl
index 3f86e2870..daa6581dd 100644
--- a/template/en/default/admin/milestones/updated.html.tmpl
+++ b/template/en/default/admin/milestones/updated.html.tmpl
@@ -19,11 +19,10 @@
#%]
[%# INTERFACE:
+ # milestone: object; the milestone being edited.
# product: object; Bugzilla::Product object representing the product to
# which the milestone belongs.
- #
- # 'updated_XXX' variables are booleans, and are defined if the
- # 'XXX' field was updated during the edit just being handled.
+ # changes: hashref; contains changes made to the milestone.
#%]
[% title = BLOCK %]Updating Milestone '[% milestone.name FILTER html %]' of Product
@@ -32,15 +31,15 @@
title = title
%]
-[% IF updated_name %]
+[% IF changes.value.defined %]
<p>Updated Milestone name to: '[% milestone.name FILTER html %]'.</p>
[% END %]
-[% IF updated_sortkey %]
+[% IF changes.sortkey.defined %]
<p>Updated Milestone sortkey to: '[% milestone.sortkey FILTER html %]'.</p>
[% END %]
-[% UNLESS updated_sortkey || updated_name %]
+[% UNLESS changes.value.defined || changes.sortkey.defined %]
<p>Nothing changed for milestone '[% milestone.name FILTER html %]'.</p>
[% END %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index f72275bd5..4a5cd58d5 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -895,9 +895,9 @@
[% title = "Default milestone not deletable" %]
[% admindocslinks = {'products.html' => 'Administering products',
'milestones.html' => 'About Milestones'} %]
- Sorry, but [% milestone.name FILTER html %] is the default milestone
- for product '[% product.name FILTER html %]', and so it can not be
- deleted.
+ Sorry, but [% milestone.name FILTER html %] is the default milestone
+ for the '[% milestone.product.name FILTER html %]' product, and so
+ it cannot be deleted.
[% ELSIF error == "milestone_name_too_long" %]
[% title = "Milestone Name Is Too Long" %]
@@ -913,9 +913,9 @@
[% ELSIF error == "milestone_sortkey_invalid" %]
[% title = "Invalid Milestone Sortkey" %]
- The sortkey '[% sortkey FILTER html %]' for milestone '
- [% name FILTER html %]' is not in the range -32768 &le; sortkey
- &le; 32767.
+ The sortkey '[% sortkey FILTER html %]' is not in the range
+ [%+ constants.MIN_SMALLINT FILTER html %] &le; sortkey &le;
+ [%+ constants.MAX_SMALLINT FILTER html %].
[% ELSIF error == "misarranged_dates" %]
[% title = "Misarranged Dates" %]