summaryrefslogtreecommitdiffstats
path: root/template/en/default/global
diff options
context:
space:
mode:
authormkanat%bugzilla.org <>2006-11-13 11:50:16 +0100
committermkanat%bugzilla.org <>2006-11-13 11:50:16 +0100
commit790e8bbba2ae44ebc7473c61b3e9f7aafa8e2d5e (patch)
treeea9d837aa0a314357e96856721b62b3cb1ff9b8e /template/en/default/global
parentdacf3a2a88daac318c600712ebd75e74e9430c12 (diff)
downloadbugzilla-790e8bbba2ae44ebc7473c61b3e9f7aafa8e2d5e.tar.gz
bugzilla-790e8bbba2ae44ebc7473c61b3e9f7aafa8e2d5e.tar.xz
Bug 350307: Split out the create and update functionality of Bugzilla::Field::create_or_update
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=justdave
Diffstat (limited to 'template/en/default/global')
-rw-r--r--template/en/default/global/messages.html.tmpl4
-rw-r--r--template/en/default/global/user-error.html.tmpl48
2 files changed, 26 insertions, 26 deletions
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 3d05214dc..a3b29bee7 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -168,12 +168,12 @@
[% ELSIF message_tag == "custom_field_created" %]
[% title = "Custom Field Created" %]
- The new custom field '[% name FILTER html %]' has been
+ The new custom field '[% field.name FILTER html %]' has been
successfully created.
[% ELSIF message_tag == "custom_field_updated" %]
[% title = "Custom Field Updated" %]
- Properties of the '[% name FILTER html %]' field have been
+ Properties of the '[% field.name FILTER html %]' field have been
successfully updated.
[% ELSIF message_tag == "emailold_change_cancelled" %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index d6b596ea5..ef53b2b8e 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -311,34 +311,10 @@
Product [% product FILTER html %] does not have a component
named [% name FILTER html %].
- [% ELSIF error == "customfield_already_exists" %]
- [% title = "Field Already Exists" %]
- The field '[% field.name FILTER html %]' ([% field.description FILTER html %])
- already exists. Please choose another name.
-
- [% ELSIF error == "customfield_invalid_name" %]
- [% title = "Invalid Custom Field Name" %]
- '[% name FILTER html %]' is not a valid name for a custom field.
- A name may contain only letters, numbers, and the underscore character. The
- name should also be different from 'cf_'.
-
[% ELSIF error == "customfield_nonexistent" %]
[% title = "Unknown Custom Field" %]
There is no custom field with the name '[% name FILTER html %]'.
- [% ELSIF error == "customfield_invalid_sortkey" %]
- [% title = "Invalid Sortkey for Field" %]
- The sortkey [% sortkey FILTER html %] that you have provided for
- the '[% name FILTER html %]' field is not a valid positive integer.
-
- [% ELSIF error == "customfield_missing_description" %]
- [% title = "Missing Description for Field" %]
- You must enter a description for the '[% name FILTER html %]' field.
-
- [% ELSIF error == "customfield_missing_name" %]
- [% title = "Missing Name for Field" %]
- You must enter a name for this field.
-
[% ELSIF error == "dependency_loop_multi" %]
[% title = "Dependency Loop Detected" %]
The following [% terms.bug %](s) would appear on both the "depends on"
@@ -400,6 +376,30 @@
does not exist or you aren't authorized to
enter [% terms.abug %] into it.
+ [% ELSIF error == "field_already_exists" %]
+ [% title = "Field Already Exists" %]
+ The field '[% field.name FILTER html %]'
+ ([% field.description FILTER html %]) already exists. Please
+ choose another name.
+
+ [% ELSIF error == "field_invalid_name" %]
+ [% title = "Invalid Field Name" %]
+ '[% name FILTER html %]' is not a valid name for a field.
+ A name may contain only letters, numbers, and the underscore character.
+
+ [% ELSIF error == "field_invalid_sortkey" %]
+ [% title = "Invalid Sortkey for Field" %]
+ The sortkey [% sortkey FILTER html %] that you have provided for
+ this field is not a valid positive integer.
+
+ [% ELSIF error == "field_missing_description" %]
+ [% title = "Missing Description for Field" %]
+ You must enter a description for this field.
+
+ [% ELSIF error == "field_missing_name" %]
+ [% title = "Missing Name for Field" %]
+ You must enter a name for this field.
+
[% ELSIF error == "fieldname_invalid" %]
[% title = "Specified Field Does Not Exist" %]
The field '[% field FILTER html %]' does not exist or