From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 20 Oct 2010 23:13:27 +0000 (+0200)
Subject: Bug 605425: Non-english templates are no longer precompiled by checksetup
X-Git-Tag: bugzilla-3.6.3~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f3df2b04dfa2a26cb4c5b51627aed4904bcee10;p=thirdparty%2Fbugzilla.git

Bug 605425: Non-english templates are no longer precompiled by checksetup
r/a=mkanat
---

diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm
index 66658ff244..6d1a4c93b9 100644
--- a/Bugzilla/Install/Util.pm
+++ b/Bugzilla/Install/Util.pm
@@ -313,7 +313,14 @@ sub include_languages {
     
     my @wanted;
     if ($params->{only_language}) {
-        @wanted = ($params->{only_language});
+        # We can pass several languages at once as an arrayref
+        # or a single language.
+        if (ref $params->{only_language}) {
+            @wanted = @{ $params->{only_language} };
+        }
+        else {
+            @wanted = ($params->{only_language});
+        }
     }
     else {
         @wanted = _sort_accept_language($ENV{'HTTP_ACCEPT_LANGUAGE'} || '');
@@ -434,7 +441,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 88d3700e9a..ad81d5e44b 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -823,7 +823,8 @@ sub precompile_templates {
 
     print install_string('template_precompile') if $output;
 
-    my $paths = template_include_path({ use_languages => Bugzilla->languages });
+    my $paths = template_include_path({ use_languages => Bugzilla->languages,
+                                        only_language => Bugzilla->languages });
 
     foreach my $dir (@$paths) {
         my $template = Bugzilla::Template->create(include_path => [$dir]);