From 7bb7a182a9f98c29c7cb478712df26c0f40d7570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?= Date: Sun, 16 Oct 2011 21:50:24 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 7038 Contextual help is always in English When another language than English is selected in pro interface, the software strings are in this language, but when clicking ?, on the top right of any page, the contextual help page which pop-up is always in English. This patch fixes this bug and another side bug affecting editing contextual help when not in English. help.pl script were in sync with the recently patched/improved theme/language/template selection. Signed-off-by: Katrin Fischer Context help now matches the selected template language. --- edithelp.pl | 10 ++++------ help.pl | 12 +++--------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/edithelp.pl b/edithelp.pl index 32db062..5cde314 100755 --- a/edithelp.pl +++ b/edithelp.pl @@ -97,14 +97,12 @@ elsif ( $type eq 'modify' ) { } else { (-w $file) or $error = "WARNING: You will not be able save, because your webserver cannot write to '$file'. Contact your admin about help file permissions."; - open (INFILE, $file) or die "Cannot read file '$file'"; # unlikely death, since we just checked + open (my $fh, '<', $file) or die "Cannot read file '$file'"; # unlikely death, since we just checked my $help = ''; - while ( my $inp = ) { - unless ( $inp =~ /INCLUDE/ ) { - $help .= $inp; - } + while ( <$fh> ) { + $help .= /\[% INCLUDE .* %\](.*)$/ ? $1 : $_; } - close INFILE; + close $fh; $template->param( 'help' => $help ); $type = 'save'; } diff --git a/help.pl b/help.pl index 69e8ab8..18d27dd 100755 --- a/help.pl +++ b/help.pl @@ -32,15 +32,9 @@ our $refer = $query->param('url'); $refer = $query->referer() if !$refer || $refer eq 'undefined'; $refer =~ /koha\/(.*)\.pl/; -my $from = "modules/help/$1.tt"; - -my $htdocs = C4::Context->config('intrahtdocs'); -my ( $theme, $lang ) = C4::Templates::themelanguage( $htdocs, $from, "intranet", $query ); -unless ( -e "$htdocs/$theme/$lang/$from" ) { - $from = "modules/help/nohelp.tt"; - ( $theme, $lang ) = C4::Templates::themelanguage( $htdocs, $from, "intranet", $query ); -} -my $template = C4::Templates->new('intranet', "$htdocs/$theme/$lang/$from"); +my $from = "help/$1.tt"; + +my $template = C4::Templates::gettemplate($from, 'intranet', $query); $template->param( referer => $refer ); output_html_with_http_headers $query, "", $template->output; -- 1.7.5.4