additional updates to language support

[koha.git] / C4 / Output.pm

diff --git a/C4/Output.pm b/C4/Output.pm
index aed50ec..c96573f 100644 (file)
--- a/C4/Output.pm
+++ b/C4/Output.pm
@@ -29,8 +29,9 @@ use strict;
 require Exporter;
 
 use C4::Context;
-use HTML::Template::Pro;
+use C4::Languages qw(getTranslatedLanguages get_bidi regex_lang_subtags language_get_description accept_language );
 
+use HTML::Template::Pro;
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
@@ -48,12 +49,7 @@ C4::Output - Functions for managing templates
 
 @ISA    = qw(Exporter);
 push @EXPORT, qw(
-  &themelanguage &gettemplate setlanguagecookie pagination_bar
-);
-
-#Output
-push @EXPORT, qw(
-    &output_html_with_http_headers
+  &themelanguage &gettemplate setlanguagecookie pagination_bar &output_html_with_http_headers
 );
 
 
@@ -77,11 +73,17 @@ sub gettemplate {
     }
     my $path = C4::Context->preference('intranet_includes') || 'includes';
 
-    #    warn "PATH : $path";
     my ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, $interface, $query );
     my $opacstylesheet = C4::Context->preference('opacstylesheet');
+
+       # if the template doesn't exist, load the English one as a last resort
+       my $filename = "$htdocs/$theme/$lang/".($interface eq 'intranet'?"modules":"")."/$tmplbase";
+       unless (-f $filename) {
+               $lang = 'en';
+               $filename = "$htdocs/$theme/$lang/".($interface eq 'intranet'?"modules":"")."/$tmplbase";
+       }
     my $template       = HTML::Template::Pro->new(
-        filename          => "$htdocs/$theme/$lang/modules/$tmplbase",
+               filename          => $filename,
         die_on_bad_params => 1,
         global_vars       => 1,
         case_sensitive    => 1,
@@ -99,30 +101,69 @@ sub gettemplate {
         lang                => $lang
     );
 
+       # Bidirectionality
+       my $current_lang = regex_lang_subtags($lang);
+       my $bidi;
+       $bidi = get_bidi($current_lang->{script}) if $current_lang->{script};
+
+       # Languages
+       my @template_languages;
+       my $languages_loop = getTranslatedLanguages($interface,$theme);
+
+       for my $language_hashref (@$languages_loop) {
+                       $language_hashref->{'current_lang'} = $current_lang->{'language'};
+                       $language_hashref->{'native_description'} = language_get_description($language_hashref->{'language_code'},$language_hashref->{'language_code'},'language');
+                       #warn "($language_hashref->{'language_code'},$language_hashref->{'current_lang'},$language_hashref->{'script_code'}";
+                       $language_hashref->{'locale_description'} = language_get_description($language_hashref->{'language_code'},$language_hashref->{'current_lang'},'language');
+                       $language_hashref->{'language_description'} = language_get_description($language_hashref->{'language_code'},$language_hashref->{'current_lang'},'language');
+                       $language_hashref->{'script_description'} = language_get_description($language_hashref->{'script_code'},$language_hashref->{'current_lang'},'script');
+                       $language_hashref->{'region_description'} = language_get_description($language_hashref->{'region_code'},$language_hashref->{'current_lang'},'region');
+                       $language_hashref->{'variant_description'} = language_get_description($language_hashref->{'variant_code'},$language_hashref->{'current_lang'},'variant');
+
+               if ($language_hashref->{'language_lang'} eq $lang) {
+                       $language_hashref->{current}++;
+               }
+               push @template_languages, $language_hashref;
+       }
+       # load the languages ( for switching from one template to another )
+       $template->param(       languages_loop => \@template_languages,
+                                               bidi => $bidi
+       );
+
     return $template;
 }
 
 #---------------------------------------------------------------------------------------------------------
 # FIXME - POD
 sub themelanguage {
-    my ( $htdocs, $tmpl, $section, $query ) = @_;
+    my ( $htdocs, $tmpl, $interface, $query ) = @_;
+
+       # Set some defaults for language and theme
+       # First, check the user's preferences
+       my $lang;
+       $lang = accept_language($ENV{HTTP_ACCEPT_LANGUAGE},getTranslatedLanguages($interface,'prog'));
+
+       # But, if there's a cookie set, obey it
+       $lang = $query->cookie('KohaOpacLanguage') if $query->cookie('KohaOpacLanguage');
+
+       # Fall back to English
+       $lang = 'en' unless $lang;
+       my $theme = 'prog';
 
-    #   if (!$query) {
-    #     warn "no query";
-    #   }
     my $dbh = C4::Context->dbh;
     my @languages;
     my @themes;
-    if ( $section eq "intranet" ) {
+    if ( $interface eq "intranet" ) {
         @languages = split " ", C4::Context->preference("opaclanguages");
         @themes    = split " ", C4::Context->preference("template");
+        pop @languages, $lang if $lang;
     }
     else {
 
       # we are in the opac here, what im trying to do is let the individual user
       # set the theme they want to use.
       # and perhaps the them as well.
-        my $lang = $query->cookie('KohaOpacLanguage');
+        #my $lang = $query->cookie('KohaOpacLanguage');
         if ($lang) {
 
             push @languages, $lang;
@@ -134,8 +175,6 @@ sub themelanguage {
         }
     }
 
-    my ( $theme, $lang );
-
  # searches through the themes and languages. First template it find it returns.
  # Priority is for getting the theme right.
   THEME:
@@ -143,7 +182,7 @@ sub themelanguage {
         foreach my $la (@languages) {
             for ( my $pass = 1 ; $pass <= 2 ; $pass += 1 ) {
                 $la =~ s/([-_])/ $1 eq '-'? '_': '-' /eg if $pass == 2;
-                if ( -e "$htdocs/$th/$la/modules/$tmpl" ) {
+                if ( -e "$htdocs/$th/$la/".($interface eq 'intranet'?"modules":"")."/$tmpl" ) {
                     $theme = $th;
                     $lang  = $la;
                     last THEME;
@@ -152,12 +191,7 @@ sub themelanguage {
             }
         }
     }
-    if ( $theme and $lang ) {
-        return ( $theme, $lang );
-    }
-    else {
-        return ( 'prog', 'en' );
-    }
+    return ( $theme, $lang );
 }
 
 sub setlanguagecookie {