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

Bug 433282: Template hooks do not work if HTTP_ACCEPT_LANGUAGE doesn't match any language available - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=mkanat

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@251548 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
lpsolit%gmail.com 2008-05-12 10:33:49 +00:00
parent 344471269f
commit 59e2e24aaa
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/webtools/bugzilla/Bugzilla/Template/Plugin/Hook.pm
View File

@ -26,7 +26,7 @@ package Bugzilla::Template::Plugin::Hook;
use strict;
use Bugzilla::Constants;
use Bugzilla::Install::Util;
use Bugzilla::Install::Util qw(include_languages);
use Bugzilla::Template;
use Bugzilla::Util;
use Bugzilla::Error;
@ -66,7 +66,7 @@ sub process {
# munge the filename to create the extension hook filename:
my $extensiontemplate = $subpath.'/'.$templatename.'-'.$hook_name.'.'.$type.'.tmpl';
my @extensions = glob(bz_locations()->{'extensionsdir'} . "/*");
my @usedlanguages = getLanguages();
my @usedlanguages = include_languages({use_languages => Bugzilla->languages});
foreach my $extension (@extensions) {
foreach my $language (@usedlanguages) {
my $file = $extension.'/template/'.$language.'/'.$extensiontemplate;
@ -104,27 +104,6 @@ sub process {
return $output;
}
# get a list of languages we accept so we can find the hook
# that corresponds to our desired languages:
sub getLanguages() {
my $languages = join(',', @{Bugzilla->languages});
if (not ($languages =~ /,/)) { # only one language
return $languages;
}
# XXX This should probably be re-worked so that we don't have to
# reach into the internals of another module to get languages.
my @languages = Bugzilla::Install::Util::_sort_accept_language($languages);
my @accept_language = Bugzilla::Install::Util::_sort_accept_language(
$ENV{'HTTP_ACCEPT_LANGUAGE'} || "" );
my @usedlanguages;
foreach my $lang (@accept_language) {
if(my @found = grep /^\Q$lang\E(-.+)?$/i, @languages) {
push (@usedlanguages, @found);
}
}
return @usedlanguages;
}
1;
__END__