From 32f3ff65a8019fded30601f59f37306312576547 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Tue, 12 Dec 2006 02:00:46 +0000
Subject: =?UTF-8?q?Bug=20297186:=20Send=20emails=20in=20the=20recipient's?=
 =?UTF-8?q?=20locale,=20not=20the=20current=20user's=20-=20Patch=20by=20Fr?=
 =?UTF-8?q?=C3=83=C2=A9d=C3=83=C2=A9ric=20Buclin=20<LpSolit@gmail.com>=20r?=
 =?UTF-8?q?=3Dbkor=20a=3Djustdave?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bugzilla.pm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'Bugzilla.pm')

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 32f731859..f278adb2e 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -146,14 +146,17 @@ init_page() if !$ENV{MOD_PERL};
 
 sub template {
     my $class = shift;
+    request_cache()->{language} = "";
     request_cache()->{template} ||= Bugzilla::Template->create();
     return request_cache()->{template};
 }
 
 sub template_inner {
-    my $class = shift;
-    $class->request_cache->{template_inner} ||= Bugzilla::Template->create();
-    return $class->request_cache->{template_inner};
+    my ($class, $lang) = @_;
+    $lang = defined($lang) ? $lang : (request_cache()->{language} || "");
+    request_cache()->{language} = $lang;
+    request_cache()->{"template_inner_$lang"} ||= Bugzilla::Template->create();
+    return request_cache()->{"template_inner_$lang"};
 }
 
 sub cgi {
@@ -497,7 +500,10 @@ The current C<Template> object, to be used for output
 =item C<template_inner>
 
 If you ever need a L<Bugzilla::Template> object while you're already
-processing a template, use this.
+processing a template, use this. Also use it if you want to specify
+the language to use. If no argument is passed, it uses the last
+language set. If the argument is "" (empty string), the language is
+reset to the current one (the one used by Bugzilla->template).
 
 =item C<cgi>
 
-- 
cgit v1.2.1