diff options
| author | mkanat%bugzilla.org <> | 2007-12-15 10:17:53 +0100 |
|---|---|---|
| committer | mkanat%bugzilla.org <> | 2007-12-15 10:17:53 +0100 |
| commit | c90d3ee4549519e18df0c049ff0777271bb38e1a (patch) | |
| tree | 22965f4b8262b4493b88c3a4abede1a77acb5baa | |
| parent | 87c4017926b4f2b137df629332c6cfcb3895cc1d (diff) | |
| download | bugzilla-c90d3ee4549519e18df0c049ff0777271bb38e1a.tar.gz bugzilla-c90d3ee4549519e18df0c049ff0777271bb38e1a.tar.xz | |
Bug 408448: checksetup now tells you when template precompilation is complete.
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> (module owner) a=mkanat
| -rw-r--r-- | Bugzilla/Template.pm | 8 | ||||
| -rw-r--r-- | template/en/default/setup/strings.txt.pl | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 47520689d..8c3c014fc 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -36,7 +36,7 @@ use strict; use Bugzilla::Constants; use Bugzilla::Install::Requirements; -use Bugzilla::Install::Util qw(template_include_path); +use Bugzilla::Install::Util qw(install_string template_include_path); use Bugzilla::Util; use Bugzilla::User; use Bugzilla::Error; @@ -730,7 +730,7 @@ sub precompile_templates { # Remove the compiled templates. my $datadir = bz_locations()->{'datadir'}; if (-e "$datadir/template") { - print "Removing existing compiled templates ...\n" if $output; + print install_string('template_removing_dir') . "\n" if $output; # XXX This frequently fails if the webserver made the files, because # then the webserver owns the directories. We could fix that by @@ -746,7 +746,7 @@ sub precompile_templates { } } - print "Precompiling templates...\n" if $output; + print install_string('template_precompile') if $output; my $templatedir = bz_locations()->{'templatedir'}; # Don't hang on templates which use the CGI library @@ -803,6 +803,8 @@ sub precompile_templates { # If anything created a Template object before now, clear it out. delete Bugzilla->request_cache->{template}; + + print install_string('done') . "\n" if $output; } # Helper for precompile_templates diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl index cd83dd3a6..2439112bc 100644 --- a/template/en/default/setup/strings.txt.pl +++ b/template/en/default/setup/strings.txt.pl @@ -33,6 +33,7 @@ checking_dbd => 'Checking available perl DBD modules...', checking_optional => 'The following Perl modules are optional:', checking_modules => 'Checking perl modules...', + done => 'done.', header => "* This is Bugzilla ##bz_ver## on perl ##perl_ver##\n" . "* Running on ##os_name## ##os_ver##", install_all => <<EOT, @@ -55,6 +56,8 @@ EOT module_not_found => "not found", module_ok => 'ok', module_unknown_version => "found unknown version", + template_precompile => "Precompiling templates...", + template_removing_dir => "Removing existing compiled templates...", ); 1; |