diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2012-10-15 15:00:20 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2012-10-15 15:18:10 +0100 |
| commit | 7ff54542f29751b465b4580bac8bfd622eb296da (patch) | |
| tree | eb5f1091f5e8b73b2eee9c23e0be361eb1e6c267 /perllib | |
| parent | 3eacb63bccd893ddd77de63303e0cb085ae250c4 (diff) | |
Pass in headers from Catalyst if present for HTTP language negotiation.
Diffstat (limited to 'perllib')
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Default.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm index cfc9455b5..b9a893778 100644 --- a/perllib/FixMyStreet/Cobrand/Default.pm +++ b/perllib/FixMyStreet/Cobrand/Default.pm @@ -159,7 +159,8 @@ sub set_lang_and_domain { my $lang_override = $self->language_override || $lang; my $lang_domain = $self->language_domain || 'FixMyStreet'; - my $set_lang = mySociety::Locale::negotiate_language( $languages, $lang_override ); + my $headers = $self->{c} ? $self->{c}->req->headers : undef; + my $set_lang = mySociety::Locale::negotiate_language( $languages, $lang_override, $headers ); mySociety::Locale::gettext_domain( $lang_domain, $unicode, $dir ); mySociety::Locale::change(); return $set_lang; |