Fix for 2184

[koha.git] / C4 / Languages.pm

diff --git a/C4/Languages.pm b/C4/Languages.pm
index 77bbf49..7c3503c 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);
@@ -94,7 +94,7 @@ sub getFrameworkLanguages {
 Returns a reference to an array of hashes:
 
  my $languages = getTranslatedLanguages();
- print "Available translated langauges:\n";
+ print "Available translated languages:\n";
  for my $language(@$trlanguages) {
     print "$language->{language_code}\n"; # language code in iso 639-2
     print "$language->{language_name}\n"; # language name in native script
@@ -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);
     }
 }
@@ -158,7 +161,7 @@ sub getTranslatedLanguages {
 Returns a reference to an array of hashes:
 
  my $alllanguages = getAllLanguages();
- print "Available translated langauges:\n";
+ print "Available translated languages:\n";
  for my $language(@$alllanguages) {
     print "$language->{language_code}\n";
     print "$language->{language_name}\n";
@@ -170,20 +173,35 @@ Returns a reference to an array of hashes:
 sub getAllLanguages {
     my @languages_loop;
     my $dbh=C4::Context->dbh;
-    my $current_language = 'en';
+    my $current_language = shift || 'en';
     my $sth = $dbh->prepare('SELECT * FROM language_subtag_registry WHERE type=\'language\'');
     $sth->execute();
     while (my $language_subtag_registry = $sth->fetchrow_hashref) {
 
         # pull out all the script descriptions for each language
-        my $sth2= $dbh->prepare("SELECT * FROM language_descriptions LEFT JOIN language_rfc4646_to_iso639 on language_rfc4646_to_iso639.rfc4646_subtag = language_descriptions.subtag WHERE type='language' AND subtag =?");
-        $sth2->execute($language_subtag_registry->{subtag});
+        my $sth2= $dbh->prepare("SELECT * FROM language_descriptions LEFT JOIN language_rfc4646_to_iso639 on language_rfc4646_to_iso639.rfc4646_subtag = language_descriptions.subtag WHERE type='language' AND subtag =? AND language_descriptions.lang = ?");
+        $sth2->execute($language_subtag_registry->{subtag},$current_language);
+
+        my $sth3 = $dbh->prepare("SELECT description FROM language_descriptions WHERE type='language' AND subtag=? AND lang=?");
 
         # add the correct description info
         while (my $language_descriptions = $sth2->fetchrow_hashref) {
-        # fill in the ISO6329 code
-        $language_subtag_registry->{iso639_2_code} = $language_descriptions->{iso639_2_code};
-            $language_subtag_registry->{language_description} = $language_descriptions->{description};
+            $sth3->execute($language_subtag_registry->{subtag},$language_subtag_registry->{subtag});
+            my $native_description;
+            while (my $description = $sth3->fetchrow_hashref) {
+                $native_description = $description->{description};
+            }
+
+            # fill in the ISO6329 code
+            $language_subtag_registry->{iso639_2_code} = $language_descriptions->{iso639_2_code};
+            # fill in the native description of the language, as well as the current language's translation of that if it exists
+            if ($native_description) {
+                $language_subtag_registry->{language_description} = $native_description;
+                $language_subtag_registry->{language_description}.=" ($language_descriptions->{description})" if $language_descriptions->{description};
+            }
+            else {
+                $language_subtag_registry->{language_description} = $language_descriptions->{description};
+            }
         }
         push @languages_loop, $language_subtag_registry;
     }
@@ -235,7 +253,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);