summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authormkanat%bugzilla.org <>2008-10-03 08:28:31 +0200
committermkanat%bugzilla.org <>2008-10-03 08:28:31 +0200
commit931bd3b651ccca832a618f7b28bbc35e503665d4 (patch)
tree44518a36cc628b44c329319501fcb8e402c72d97 /template/en
parent7bfd680d6fb32886fcbad107ffed75974ff7009f (diff)
downloadbugzilla-931bd3b651ccca832a618f7b28bbc35e503665d4.tar.gz
bugzilla-931bd3b651ccca832a618f7b28bbc35e503665d4.tar.xz
Bug 455632: Add Bugzilla::Field::Choice->create and have editvalues.cgi use it
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=bbaetz, a=mkanat
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/global/code-error.html.tmpl6
-rw-r--r--template/en/default/global/user-error.html.tmpl21
2 files changed, 20 insertions, 7 deletions
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index b93b92efd..f85375849 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -145,6 +145,12 @@
in the database for '[% username FILTER html %]', but your
account source says that '[% extern_user FILTER html %]' has that ID.
+ [% ELSIF error == "field_choice_must_use_type" %]
+ When you call a class method on <code>Bugzilla::Field::Choice</code>,
+ you must call <code>Bugzilla::Field::Choice-&gt;type('some_field')</code>
+ to generate the right class (you can't call class methods directly
+ on Bugzilla::Field::Choice).
+
[% ELSIF error == "field_type_mismatch" %]
Cannot seem to handle <code>[% field FILTER html %]</code>
and <code>[% type FILTER html %]</code> together.
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index c61a1f42a..bcb6b6630 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -432,7 +432,7 @@
[% ELSIF error == "fieldvalue_already_exists" %]
[% title = "Field Value Already Exists" %]
The value '[% value FILTER html %]' already exists for the
- '[%- field.description FILTER html %]' field.
+ [%+ field.description FILTER html %] field.
[% ELSIF error == "fieldvalue_doesnt_exist" %]
[% title = "Specified Field Value Does Not Exist" %]
@@ -450,8 +450,9 @@
[% ELSIF error == "fieldvalue_name_too_long" %]
[% title = "Field Value Is Too Long" %]
- The value of a field is limited to 60 characters.
- '[% value FILTER html %]' is too long ([% value.length %] characters).
+ The value of a field is limited to [% constants.FIELD_VALUE_MAX_SIZE %]
+ characters. '[% value FILTER html %]' is too long ([% value.length %]
+ characters).
[% ELSIF error == "fieldvalue_not_editable" %]
[% title = "Field Value Not Editable" %]
@@ -475,8 +476,9 @@
[% ELSIF error == "fieldvalue_sortkey_invalid" %]
[% title = "Invalid Field Value Sortkey" %]
- The sortkey '[% sortkey FILTER html %]' for the '[% name FILTER html %]'
- field is not a valid (positive) number.
+ The sortkey '[% sortkey FILTER html %]' for the
+ [%+ field.description FILTER html %] field is not a valid
+ (positive) number.
[% ELSIF error == "fieldvalue_still_has_bugs" %]
[% title = "You Cannot Delete This Field Value" %]
@@ -1178,13 +1180,13 @@
is less than the minimum allowable value of '[% min_num FILTER html %]'.
[% ELSIF error == "object_name_not_specified" %]
- [% type = BLOCK %][% PROCESS object_name %][% END %]
+ [% type = BLOCK %][% INCLUDE object_name class = class %][% END %]
[% title = BLOCK %][% type FILTER ucfirst FILTER html %] Not
Specified[% END %]
You must select/enter a [% type FILTER html %].
[% ELSIF error == "object_does_not_exist" %]
- [% type = BLOCK %][% PROCESS object_name %][% END %]
+ [% type = BLOCK %][% INCLUDE object_name class = class %][% END %]
[% title = BLOCK %]Invalid [% type FILTER ucfirst FILTER html %][% END %]
There is no [% type FILTER html %] named '[% name FILTER html %]'
[% IF product.defined %]
@@ -1672,5 +1674,10 @@
milestone
[% ELSIF class == "Bugzilla::Status" %]
status
+ [% ELSIF class == "Bugzilla::Field" %]
+ field
+ [% ELSIF ( matches = class.match('^Bugzilla::Field::Choice::(.+)') ) %]
+ [% SET field_name = matches.0 %]
+ [% field_descs.$field_name %]
[% END %]
[% END %]