From 67ed2721c8824db40092c2a1a4b301ff6c7bd509 Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Tue, 31 Jul 2018 13:06:08 -0400 Subject: review nits --- .../en/default/admin/params/editparams.html.tmpl | 1 - template/en/default/admin/params/general.html.tmpl | 5 -- template/en/default/global/field-descs.none.tmpl | 10 ++-- template/en/default/global/messages.html.tmpl | 62 +++++++++------------- 4 files changed, 28 insertions(+), 50 deletions(-) (limited to 'template/en/default') diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl index 838bff7ef..6e8bc2257 100644 --- a/template/en/default/admin/params/editparams.html.tmpl +++ b/template/en/default/admin/params/editparams.html.tmpl @@ -21,7 +21,6 @@ [%# INTERFACE: # panels: array of hashes representing the panels available. # param_changed: array of parameters which have been changed. - # shutdown_is_active: boolean; is true when 'shutdownhtml' has been turned on. #%] [% PROCESS global/variables.none.tmpl %] diff --git a/template/en/default/admin/params/general.html.tmpl b/template/en/default/admin/params/general.html.tmpl index f1b86e19f..05e8f09a2 100644 --- a/template/en/default/admin/params/general.html.tmpl +++ b/template/en/default/admin/params/general.html.tmpl @@ -48,11 +48,6 @@ _ " "on", you must re-run checksetup.pl immediately" _ " afterward.

", - shutdownhtml => - "If this field is non-empty, then $terms.Bugzilla will be completely" - _ " disabled and this text will be displayed instead of all the" - _ " $terms.Bugzilla pages.", - announcehtml => "If this field is non-empty, then $terms.Bugzilla will" _ " display whatever is in this field at the top of every" diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl index 3e0a528dc..cb6240c29 100644 --- a/template/en/default/global/field-descs.none.tmpl +++ b/template/en/default/global/field-descs.none.tmpl @@ -162,13 +162,11 @@ if ( $stash->get("in_template_var") ) { # database. If you want to override this for your language # or your installation, just use a hook. %] my $bug_fields = $stash->get("bug_fields"); - unless ( Bugzilla->params->{shutdownhtml} ) { - foreach my $bz_field ( values %$bug_fields ) { - $vars->{field_descs}{$bz_field->name} //= $bz_field->description; - } - - $context->process("bug/field-help.none.tmpl"); + foreach my $bz_field ( values %$bug_fields ) { + $vars->{field_descs}{$bz_field->name} //= $bz_field->description; } + + $context->process("bug/field-help.none.tmpl"); } [% END %] diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index 591617f3e..278b0f161 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -140,7 +140,7 @@ [% ELSIF message_tag == "buglist_updated_named_query" %] [% title = "Search updated" %] - Your search named [% queryname FILTER html %] has been updated. @@ -298,22 +298,22 @@ [% ELSIF message_tag == "email_change_canceled_reinstated" %] [% title = "Cancel Request to Change Email Address" %] The request to change the email address for the - account [%+ old_email FILTER html %] to + account [%+ old_email FILTER html %] to [%+ new_email FILTER html %] has been canceled. Your old account settings have been reinstated. [% ELSIF message_tag == "extension_created" %] An extension named [% name FILTER html %] has been created - in [% path FILTER html %]. Make sure you change "YOUR NAME" and + in [% path FILTER html %]. Make sure you change "YOUR NAME" and "YOUR EMAIL ADDRESS" in the code to your name and your email address. [% ELSIF message_tag == "field_value_created" %] [% title = "New Field Value Created" %] - The value [% value.name FILTER html %] has been added as a + The value [% value.name FILTER html %] has been added as a valid choice for the [% field.description FILTER html %] ([% field.name FILTER html %]) field. [% IF field.name == "bug_status" %] - You should now visit the status workflow + You should now visit the status workflow page to include your new [% terms.bug %] status. [% END %] @@ -331,7 +331,7 @@ ([% field.name FILTER html %]) field has been changed: