From fab5d3a38aadaed1e6153c0fbd820449258586b2 Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" <> Date: Fri, 3 Oct 2008 06:30:38 +0000 Subject: Bug 455641: Implement Bugzilla::Field::Choice->update and have editvalues.cgi use it Patch By Max Kanat-Alexander r=bbaetz, a=mkanat --- template/en/default/global/messages.html.tmpl | 25 ++++++++++++++----------- template/en/default/global/user-error.html.tmpl | 5 +++-- 2 files changed, 17 insertions(+), 13 deletions(-) (limited to 'template/en/default') diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index eb869a776..82a71a5a2 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -314,20 +314,23 @@ [% ELSIF message_tag == "field_value_updated" %] [% title = "Field Value Updated" %] - [% IF updated_value || updated_sortkey %] - Changes to the [% value FILTER html %] value of the + [% IF changes.keys.size %] + The [% value FILTER html %] value of the [% field.description FILTER html %] - ([% field.name FILTER html %]) field have been changed: + ([% field.name FILTER html %]) field has been changed: [% ELSE %] diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index bcb6b6630..c306b692a 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -457,7 +457,8 @@ [% ELSIF error == "fieldvalue_not_editable" %] [% title = "Field Value Not Editable" %] The value '[% old_value FILTER html %]' cannot be renamed because - it plays some special role for the '[% field.description FILTER html %]' field. + it plays some special role for the '[% field.description FILTER html %]' + field. [% ELSIF error == "fieldvalue_not_deletable" %] [% title = "Field Value Not Deletable" %] @@ -470,7 +471,7 @@ [% ELSIF error == "fieldvalue_reserved_word" %] [% title = "Reserved Word Not Allowed" %] - You cannot use the '[% value FILTER html %]' value for the + You cannot use the value '[% value FILTER html %]' for the '[% field.description FILTER html %]' field. This value is used internally. Please choose another one. -- cgit v1.2.3-24-g4f1b