From c558f9f5ab886ca1202ba7095803319361e06290 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Thu, 20 May 2010 17:38:16 +0200 Subject: Bug 565879: Merge ThrowCodeError("action_unrecognized"), ThrowUserError("no_valid_action") and ThrowCodeError("unknown_action") r=ghendricks a=LpSolit --- template/en/default/global/user-error.html.tmpl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'template/en/default/global/user-error.html.tmpl') diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index c5667bd27..1d5997861 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1251,10 +1251,6 @@ Either no products have been defined to enter [% terms.bugs %] against or you have not been given access to any. - [% ELSIF error == "no_valid_action" %] - [% title = "No valid action specified" %] - Cannot edit [% field_descs.$field FILTER html %]: no valid action was specified. - [% ELSIF error == "number_not_numeric" %] [% title = "Numeric Value Required" %] The value '[% num FILTER html %]' in the @@ -1581,6 +1577,13 @@ [% END %] token too recently to request another. Please wait a while and try again. + [% ELSIF error == "unknown_action" %] + [% IF action %] + Unknown action [% action FILTER html %]! + [% ELSE %] + I could not figure out what you wanted to do. + [% END %] + [% ELSIF error == "unknown_keyword" %] [% title = "Unknown Keyword" %] [% keyword FILTER html %] is not a known keyword. -- cgit v1.2.3-24-g4f1b