adding famfamfam iconset, improving isbn for amazon content, etc.

[koha_gimpoz] / C4 / Languages.pm

diff --git a/C4/Languages.pm b/C4/Languages.pm
index bc578f0..c8b1bab 100644 (file)
--- a/C4/Languages.pm
+++ b/C4/Languages.pm
@@ -20,7 +20,7 @@ package C4::Languages;
 
 
 use strict; 
-use warnings;   #FIXME: turn off warnings before release
+#use warnings;   #FIXME: turn off warnings before release
 use Carp;
 use C4::Context;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $DEBUG);
@@ -149,6 +149,9 @@ sub getTranslatedLanguages {
         foreach my $theme ( _get_themes('opac') ) {
             push @languages, _get_language_dirs($htdocs,$theme);
         }
+        my %seen;
+        $seen{$_}++ for @languages;
+        @languages = keys %seen;
         return _build_languages_arrayref($all_languages,\@languages,$current_language,\@enabled_languages);
     }
 }
@@ -235,7 +238,7 @@ sub _get_language_dirs {
         next if $lang_string =~/css$/;
         next if $lang_string =~/CVS$/;
         next if $lang_string =~/\.txt$/i;     #Don't read the readme.txt !
-        next if $lang_string =~/img|images/;
+        next if $lang_string =~/img|images|famfam/;
         push @lang_strings, $lang_string;
     }
         return (@lang_strings);
@@ -254,6 +257,8 @@ sub _build_languages_arrayref {
         my @translated_languages = @$translated_languages;
         my @languages_loop; # the final reference to an array of hashrefs
         my @enabled_languages = @$enabled_languages;
+        # how many languages are enabled, if one, take note, some contexts won't need to display it
+        my $one_language_enabled = 1 unless @enabled_languages > 1;
         my %seen_languages; # the language tags we've seen
         my %found_languages;
         my $language_groups;
@@ -298,6 +303,7 @@ sub _build_languages_arrayref {
                             plural => $track_language_groups->{$key} >1 ? 1 : 0,
                             current => $current_language_regex->{language} eq $key ? 1 : 0,
                             group_enabled => $enabled,
+                            one_language_enabled => $one_language_enabled,
                            };
         }
         return \@languages_loop;