my $htdocs;
my $all_languages = getAllLanguages();
my @languages;
- my $lang;
my @enabled_languages;
if ($interface && $interface eq 'opac' ) {
$htdocs = C4::Context->config('opachtdocs');
if ( $theme and -d "$htdocs/$theme" ) {
(@languages) = _get_language_dirs($htdocs,$theme);
- return _build_languages_arrayref($all_languages,\@languages,$current_language,\@enabled_languages);
}
else {
for my $theme ( _get_themes('opac') ) {
push @languages, _get_language_dirs($htdocs,$theme);
}
- return _build_languages_arrayref($all_languages,\@languages,$current_language,\@enabled_languages);
}
}
elsif ($interface && $interface eq 'intranet' ) {
$htdocs = C4::Context->config('intrahtdocs');
if ( $theme and -d "$htdocs/$theme" ) {
@languages = _get_language_dirs($htdocs,$theme);
- return _build_languages_arrayref($all_languages,\@languages,$current_language,\@enabled_languages);
}
else {
foreach my $theme ( _get_themes('intranet') ) {
push @languages, _get_language_dirs($htdocs,$theme);
}
- return _build_languages_arrayref($all_languages,\@languages,$current_language,\@enabled_languages);
}
}
else {
my %seen;
$seen{$_}++ for @languages;
@languages = keys %seen;
- return _build_languages_arrayref($all_languages,\@languages,$current_language,\@enabled_languages);
}
+ return _build_languages_arrayref($all_languages,\@languages,$current_language,\@enabled_languages);
}
=head2 getAllLanguages
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;
}
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;
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;
if ($clientPreferences) {
# There should be no whitespace anways, but a cleanliness/sanity check
$clientPreferences =~ s/\s//g;
-
# Prepare the list of client-acceptable languages
foreach my $tag (split(/,/, $clientPreferences)) {
my ($language, $quality) = split(/\;/, $tag);
my %supportedLanguages = ();
my %secondaryLanguages = ();
foreach my $language (@$supportedLanguages) {
- # warn "Language supported: " . $language->{language_code};
- $supportedLanguages{lc($language->{language_code})} = $language->{language_code};
- if ($language->{language_code} =~ /^([^-]+)-?/) {
- $secondaryLanguages{lc($1)} = $language->{language_code};
+ # warn "Language supported: " . $language->{language};
+ my $subtag = $language->{rfc4646_subtag};
+ $supportedLanguages{lc($subtag)} = $subtag;
+ if ( $subtag =~ /^([^-]+)-?/ ) {
+ $secondaryLanguages{lc($1)} = $subtag;
}
}