From: Joshua Ferraro Date: Sun, 11 Nov 2007 05:58:46 +0000 (-0600) Subject: refactoring changelanguage, better var names, etc. X-Git-Tag: v3.00.00-alpha~4 X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=678b52a2f2040e4c939d5303809a7f0c2c628dc8;p=koha.git refactoring changelanguage, better var names, etc. Signed-off-by: Joshua Ferraro --- diff --git a/C4/Languages.pm b/C4/Languages.pm index c90f615cb7..7a2d00b11e 100644 --- a/C4/Languages.pm +++ b/C4/Languages.pm @@ -74,7 +74,7 @@ sub getFrameworkLanguages { push @languages, { 'language_code'=>$dirname, 'language_description'=>$language_set->{language_description}, - 'language_native_descrition'=>$language_set->{language_native_description} } + 'native_descrition'=>$language_set->{language_native_description} } } } } @@ -260,11 +260,11 @@ sub _build_languages_arrayref { unless ($seen_languages{$language}) { for my $language_code (@$all_languages) { if ($language_subtags_hashref->{language} eq $language_code->{'subtag'}) { - $language_code->{'language'} = $language; - $language_code->{'language_code'} = $language; - $language_code->{'language_script'} = $language_subtags_hashref->{'script'}; - $language_code->{'language_region'} = $language_subtags_hashref->{'region'}; - $language_code->{'language_variant'} = $language_subtags_hashref->{'variant'}; + $language_code->{'language_lang'} = $language; + $language_code->{'language_code'} = $language_subtags_hashref->{'language'}; + $language_code->{'script_code'} = $language_subtags_hashref->{'script'}; + $language_code->{'region_code'} = $language_subtags_hashref->{'region'}; + $language_code->{'variant_code'} = $language_subtags_hashref->{'variant'}; push @final_languages, $language_code; $found_languages{$language}++; } @@ -274,7 +274,7 @@ sub _build_languages_arrayref { # Handle languages not in our database with their code unless ($found_languages{$language}) { my $language_code; - $language_code->{'language'} = $language; + $language_code->{'language_lang'} = $language; $language_code->{'language_code'} = $language; push @final_languages, $language_code; } @@ -284,11 +284,11 @@ sub _build_languages_arrayref { } sub language_get_description { - my ($script,$lang) = @_; + my ($script,$lang,$type) = @_; my $dbh = C4::Context->dbh; my $desc; - my $sth = $dbh->prepare('SELECT description FROM language_descriptions WHERE subtag=? AND lang=?'); - $sth->execute($script,$lang); + my $sth = $dbh->prepare('SELECT description FROM language_descriptions WHERE subtag=? AND lang=? AND type=?'); + $sth->execute($script,$lang,$type); while (my $descriptions = $sth->fetchrow_hashref) { $desc = $descriptions->{'description'}; } diff --git a/C4/Output.pm b/C4/Output.pm index 26f7887f76..2873c64bfa 100644 --- a/C4/Output.pm +++ b/C4/Output.pm @@ -107,18 +107,26 @@ sub gettemplate { lang => $lang ); - # Language, Script, and Locale + # Bidirectionality my $language_subtags_hashref = regex_lang_subtags($lang); my $bidi; $bidi = get_bidi($language_subtags_hashref->{script}) if $language_subtags_hashref->{script}; + + # Languages + my $current_lang = regex_lang_subtags($lang); my @template_languages; my $languages_loop = getTranslatedLanguages($interface,$theme); for my $language_hashref (@$languages_loop) { - $language_hashref->{'language_script_description'} = language_get_description($language_hashref->{'language_script'},$lang); - $language_hashref->{'language_region_description'} = language_get_description($language_hashref->{'language_region'},$lang); - $language_hashref->{'language_variant_description'} = language_get_description($language_hashref->{'language_variant'},$lang); - - if ($language_hashref->{'language_code'} eq $lang) { + $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; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc index 7435153ede..5a3835e58d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc @@ -5,9 +5,9 @@