replaced language config option by default_language

16 years ago · ad0eac8c89
parent 95b629abb8
commit ad0eac8c89
3 changed files with 7 additions and 4 deletions
--- a/etc/csc.conf
+++ b/etc/csc.conf
@ -22,8 +22,11 @@
        cpe_autoconf_url="https://your.server.tld/autoconf/init"
 >
    <site_config title="CSC site title"
-                 language="de"
+                 default_language="en"
    >
+        <languages>en</languages>
+        <languages>de</languages>
+        <languages>es</languages>
        <css>/css/style.css</css>
        <css>/css/sipwise.css</css>
        <company name="your company"
--- a/lib/csc.pm
+++ b/lib/csc.pm
@ -35,7 +35,7 @@ our $VERSION = '2';
 # load configuration from admin.conf XML
 my $xs = new XML::Simple;
 my $xc = $xs->XMLin( '/usr/local/etc/csc.conf', ForceArray => 0);
-$$xc{site_config}{language} = 'en' unless $$xc{site_config}{language} =~ /^\w+$/;
+$$xc{site_config}{default_language} = 'en' unless $$xc{site_config}{default_language} =~ /^\w+$/;

 __PACKAGE__->config( authentication => {}, %$xc );

@ -53,7 +53,7 @@ sub begin : Private {
    $c->response->headers->push_header( 'Vary' => 'Accept-Language' );  # hmm vary and param?

    # set default language
-    $c->session->{lang} = $c->config->{site_config}{language} unless $c->session->{lang};
+    $c->session->{lang} = $c->config->{site_config}{default_language} unless $c->session->{lang};

    if($c->request->params->{lang} =~ /^\w+$/) {
        $c->languages([$c->request->params->{lang}]);
--- a/root/layout/html
+++ b/root/layout/html
@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="[% Catalyst.config.site_config.language %]">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="[% Catalyst.language %]">

 <head>