Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 605425: Non-english templates are no longer precompiled by checksetup

Browse Source 
r/a=mkanat


git-svn-id: svn://10.0.0.236/branches/BUGZILLA-3_6-BRANCH@261436 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkanat%bugzilla.org
2010-10-20 23:17:10 +00:00
parent d4caf8a025
commit 8ab6d52c1a
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@@ -1 +1 @@
7192
7193

11
mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm
View File

@@ -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();

3
mozilla/webtools/bugzilla/Bugzilla/Template.pm
View File

@@ -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]);