diff options
| author | Frédéric Buclin <LpSolit@gmail.com> | 2010-10-21 00:49:07 +0200 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2010-10-21 00:49:07 +0200 |
| commit | bd8840d647ea4901b55c5b69838dd8c872adffa5 (patch) | |
| tree | 41ecca9e7c8b887da76bb83b0f6ef6fbeb974e22 | |
| parent | 7c94f7af271125fef6224ebe166d645085e349b8 (diff) | |
| download | bugzilla-bd8840d647ea4901b55c5b69838dd8c872adffa5.tar.gz bugzilla-bd8840d647ea4901b55c5b69838dd8c872adffa5.tar.xz | |
Bug 605425: Non-english templates are no longer precompiled by checksetup
r/a=mkanat
| -rw-r--r-- | Bugzilla/Install/Util.pm | 7 | ||||
| -rw-r--r-- | Bugzilla/Template.pm | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm index 14744ef8c..ef71f5b75 100644 --- a/Bugzilla/Install/Util.pm +++ b/Bugzilla/Install/Util.pm @@ -364,7 +364,10 @@ sub include_languages { # supports. my $wanted; if ($params->{language}) { - $wanted = [$params->{language}]; + # We can pass several languages at once as an arrayref + # or a single language. + $wanted = $params->{language}; + $wanted = [$wanted] unless ref $wanted; } else { $wanted = _wanted_languages(); @@ -441,7 +444,7 @@ sub _template_base_directories { sub template_include_path { my ($params) = @_; - my @used_languages = include_languages(@_); + my @used_languages = include_languages($params); # Now, we add template directories in the order they will be searched: my $template_dirs = _template_base_directories(); diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 46a4b6b72..e2d5280e8 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -1017,7 +1017,8 @@ sub precompile_templates { print install_string('template_precompile') if $output; - my $paths = template_include_path(); + # Pre-compile all available languages. + my $paths = template_include_path({ language => Bugzilla->languages }); foreach my $dir (@$paths) { my $template = Bugzilla::Template->create(include_path => [$dir]); |