From e9f859e128e5c9c6e74a95c79ab60ed123a94c14 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Sun, 23 Oct 2011 12:59:42 +0200 Subject: Bug 696256: global/variables.none.tmpl should be PRE_PROCESS'ed r/a=mkanat --- .../en/default/global/choose-product.html.tmpl | 2 -- template/en/default/global/field-descs.none.tmpl | 2 -- template/en/default/global/initialize.none.tmpl | 32 ---------------------- template/en/default/global/message.html.tmpl | 2 -- template/en/default/global/message.txt.tmpl | 2 -- template/en/default/global/messages.html.tmpl | 2 -- template/en/default/global/setting-descs.none.tmpl | 2 -- .../en/default/global/site-navigation.html.tmpl | 2 -- template/en/default/global/useful-links.html.tmpl | 2 -- template/en/default/global/user-error.html.tmpl | 2 -- template/en/default/global/variables.none.tmpl | 1 + 11 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 template/en/default/global/initialize.none.tmpl (limited to 'template/en/default/global') diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl index ae00bf503..0f5a54dff 100644 --- a/template/en/default/global/choose-product.html.tmpl +++ b/template/en/default/global/choose-product.html.tmpl @@ -27,8 +27,6 @@ # format: the desired format to display the target. #%] -[% PROCESS global/variables.none.tmpl %] - [% IF target == "enter_bug.cgi" %] [% title = "Enter $terms.Bug" %] [% h2 = BLOCK %]First, you must pick a product on which to enter [% terms.abug %]: [% END %] diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl index 21f41c86c..58fa688e6 100644 --- a/template/en/default/global/field-descs.none.tmpl +++ b/template/en/default/global/field-descs.none.tmpl @@ -21,8 +21,6 @@ [%# Remember to PROCESS rather than INCLUDE this template. %] -[% PROCESS global/variables.none.tmpl %] - [% SET search_descs = { "noop" => "---", "equals" => "is equal to", diff --git a/template/en/default/global/initialize.none.tmpl b/template/en/default/global/initialize.none.tmpl deleted file mode 100644 index a6c48973c..000000000 --- a/template/en/default/global/initialize.none.tmpl +++ /dev/null @@ -1,32 +0,0 @@ -[%# The contents of this file are subject to the Mozilla Public - # License Version 1.1 (the "License"); you may not use this file - # except in compliance with the License. You may obtain a copy of - # the License at http://www.mozilla.org/MPL/ - # - # Software distributed under the License is distributed on an "AS - # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - # implied. See the License for the specific language governing - # rights and limitations under the License. - # - # The Original Code is the Bugzilla Bug Tracking System. - # - # The Initial Developer of the Original Code is Netscape Communications - # Corporation. Portions created by Netscape are - # Copyright (C) 1998 Netscape Communications Corporation. All - # Rights Reserved. - # - # Contributor(s): Myk Melez - #%] - -[%# This template is a place to put directives that should get processed - # every time a primary template gets processed. Primary templates are those - # called from Perl code rather than from other templates via the PROCESS - # and INCLUDE directives. - # - # This template gets auto-processed at the beginning of primary templates - # via the PRE_PROCESS configuration parameter. Note that it gets processed - # for non-HTML templates too, so don't put HTML-specific stuff in here; - # put that into header.html.tmpl instead. - #%] - -[% USE Hook %] diff --git a/template/en/default/global/message.html.tmpl b/template/en/default/global/message.html.tmpl index e578a7f1b..60e752f54 100644 --- a/template/en/default/global/message.html.tmpl +++ b/template/en/default/global/message.html.tmpl @@ -23,8 +23,6 @@ # link: string. The link text for that URL. #%] -[% PROCESS global/variables.none.tmpl %] - [% DEFAULT title = "$terms.Bugzilla Message" %] [% PROCESS global/header.html.tmpl %] diff --git a/template/en/default/global/message.txt.tmpl b/template/en/default/global/message.txt.tmpl index 9329cdbbf..318cec4f5 100644 --- a/template/en/default/global/message.txt.tmpl +++ b/template/en/default/global/message.txt.tmpl @@ -17,8 +17,6 @@ # Contributor(s): Max Kanat-Alexander #%] -[% PROCESS global/variables.none.tmpl %] - [%# Yes, this may show some HTML. But it's the best we # can do at the moment. %] [% PROCESS global/messages.html.tmpl %] diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index a57449d7c..f75bc4eb9 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -23,8 +23,6 @@ # alphabetical order by message tag, and leave a blank line between messages. #%] -[% PROCESS global/variables.none.tmpl %] - [% PROCESS "global/field-descs.none.tmpl" %] [% message_tag = message %] diff --git a/template/en/default/global/setting-descs.none.tmpl b/template/en/default/global/setting-descs.none.tmpl index a0b11f048..724e63206 100644 --- a/template/en/default/global/setting-descs.none.tmpl +++ b/template/en/default/global/setting-descs.none.tmpl @@ -16,8 +16,6 @@ [%# Remember to PROCESS rather than INCLUDE this template. %] -[% PROCESS global/variables.none.tmpl %] - [% setting_descs = { "comment_sort_order" => "When viewing $terms.abug, show comments in this order", "csv_colsepchar" => "Field separator character for CSV files", diff --git a/template/en/default/global/site-navigation.html.tmpl b/template/en/default/global/site-navigation.html.tmpl index 06b0eaa92..00bf24a69 100644 --- a/template/en/default/global/site-navigation.html.tmpl +++ b/template/en/default/global/site-navigation.html.tmpl @@ -23,8 +23,6 @@ # bug.bug_id: integer. Number of current bug (for navigation purposes) #%] -[% PROCESS global/variables.none.tmpl %] - [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl index dd4fed424..bad0971cd 100644 --- a/template/en/default/global/useful-links.html.tmpl +++ b/template/en/default/global/useful-links.html.tmpl @@ -23,8 +23,6 @@ [%# Migration note: this whole file corresponds to the old %commandmenu% substitution param in 'footerhtml' %] -[% PROCESS global/variables.none.tmpl %] -