Patch for bug 190226: templatize editversions.cgi; patch by GavinS <bugzilla@chimpychompy.org>, r=jouni, a=myk.

2 files changed, 42 insertions, 1 deletions

diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 3d5ba8fb1..e8d63dfb5 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -589,6 +589,14 @@
   'deleted_bug_count'
 ],
 
+'admin/versions/confirm-delete.html.tmpl' => [
+  'bug_count'
+],
+
+'admin/versions/deleted.html.tmpl' => [
+  'deleted_bug_count'
+],
+
 'account/login.html.tmpl' => [
   'target', 
 ],
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 7c6b40201..d2852e80c 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -186,6 +186,11 @@
     Sorry, you aren't a member of the 'editcomponents' group, and so
     you aren't allowed to add, modify or delete milestones.
 
+  [% ELSIF error == "auth_cant_edit_versions" %]
+    [% title = "Access Denied" %]
+    Sorry, you aren't a member of the 'editcomponents' group, and so
+    you aren't allowed to add, modify or delete versions.
+
   [% ELSIF error == "component_already_exists" %]
     [% title = "Component Already Exists" %]
     A component with the name '[% name FILTER html %]' already exists.
@@ -232,7 +237,8 @@
 
   [% ELSIF error == "product_not_specified" %]
     [% title = "No Product Specified" %]
-    No product specified when trying to edit components.
+    No product specified when trying to edit components, milestones or
+    versions.
 
   [% ELSIF error == "component_not_specified" %]
     [% title = "No Component Specified" %]
@@ -925,6 +931,33 @@
     [% title = "Unknown Tab" %]
     <code>[% current_tab_name FILTER html %]</code> is not a legal tab name.
 
+  [% ELSIF error == "version_already_exists" %]
+    [% title = "Version Already Exists" %]
+    The version '[% name FILTER html %]' already exists for product '
+    [%- product FILTER html %]'.
+
+  [% ELSIF error == "version_blank_name" %]
+    [% title = "Blank Version Name Not Allowed" %]
+    You must enter a name for this version.
+
+  [% ELSIF error == "version_name_too_long" %]
+    [% title = "Version Name Is Too Long" %]
+    The name of a version is limited to 20 characters. 
+    '[% name FILTER html %]' is too long ([% name.length %] characters).
+
+  [% ELSIF error == "version_no_action" %]
+    [% title = "No valid action specified" %]
+    No valid action was specified when trying to edit versions.
+
+  [% ELSIF error == "version_not_specified" %]
+    [% title = "No Version Specified" %]
+    No version specified when trying to edit versions.
+
+  [% ELSIF error == "version_not_valid" %]
+    [% title = "Specified Version Does Not Exist" %]
+    The version '[% version FILTER html %]' for product 
+    '[% product FILTER html %]' does not exist.
+
   [% ELSIF error == "votes_must_be_nonnegative" %]
     [% title = "Votes Must Be Non-negative" %]
     Only use non-negative numbers for your [% terms.bug %] votes.