Changeset 32382

Timestamp:

04/14/09 17:08:23 (4 years ago)

Author:

daisuke

Message:

respect "languages" setting from config file

Files:

• lang/perl/Catalyst-Model-Data-Localize/trunk/lib/Catalyst/Model/Data/Localize.pm (modified) (2 diffs)

lang/perl/Catalyst-Model-Data-Localize/trunk/lib/Catalyst/Model/Data/Localize.pm

@@ -25 +25 @@
     }
 
-    # if we're being called at the beginning of the context, then
-    # we won't have have access to $c->req...
-    eval {
-        my @langs = $localize->detect_languages_from_header(
-            $c->req->header('Accept-Language')
-        );
+    if (my $language = $self->{languages}) {
+        $localize->set_languages(@$language);
+    } else {
+        # if we're being called at the beginning of the context, then
+        # we won't have have access to $c->req...
+        eval {
+            my @langs = $localize->detect_languages_from_header(
+                $c->req->header('Accept-Language')
+            );
 
-        $localize->set_languages(@langs);
-    };
+            $localize->set_languages(@langs);
+        };
+    }
     return $localize;
 }
@@ -87 +91 @@
     }
 
+    if ($config->{languages}) {
+        if (ref $config->{languages} ne 'ARRAY') {
+            $config->{languages} = [ $config->{languages} ];
+        }
+    }
     $self->{localize} = Data::Localize->new(%$config);
+    $self->{languages} = $config->{languages};
 }