Changeset 434 for trunk/lib/Epoll/View

Timestamp:

10/07/10 03:47:16 (14 years ago)

Author:

nanardon

Message:

• choosing locale for mail does not affect the global application
• using generic way to setup locale, this also fix title set in perl code as locale are set before

Location:

trunk/lib/Epoll/View

Files:

• Mail.pm (modified) (2 diffs)
• TT.pm (modified) (1 diff)

trunk/lib/Epoll/View/Mail.pm

@@ -27 +27 @@
     my ($self, $c, $template, $args) = @_;
 
-    my ($locale) = split(';', $c->req->header('Accept-Language') || '');
-    if (my $plocale = ($c->req->param('locale')|| $c->session->{'locale'})) {
-        $c->session->{'locale'} = $locale = $plocale;
-    }
-    $c->languages($locale ? [ $locale ] : '');
-    $c->stash->{locale} = $locale;
+    # Backup locale, change it for mail
+    my $prev_language = $c->languages;
+    $c->languages([ $c->req->param('mail_locale') ])
+        if($c->req->param('mail_locale'));
 
     $ENV{MAILADDRESS} = $args->{From};
@@ -49 +47 @@
     if ($@) {
         $c->stash->{mail_error} = $@;
-    }    
+    }
+    # restore locale
+    $c->languages($prev_language);
 }
 

trunk/lib/Epoll/View/TT.pm

@@ -29 +29 @@
     my ($self, $c) = @_;
 
-    my ($locale) = split(';', $c->req->header('Accept-Language') || '');
-    if (my $plocale = ($c->req->param('locale')|| $c->session->{'locale'})) {
-        $c->session->{'locale'} = $locale = $plocale;
-    }
-    $c->languages($locale ? [ $locale ] : '');
-    $c->stash->{locale} = $locale;
-
     $c->stash->{Epoll}{VERSION} = $Epoll::DB::VERSION;
     Catalyst::View::TT::process($self, $c);