View | Details | Raw Unified | Return to bug 19817
Collapse All | Expand All

(-)a/Koha/Manual.pm (-3 / +13 lines)
Lines 17-24 sub _get_help_version { Link Here
17
}
17
}
18
18
19
sub _get_base_url {
19
sub _get_base_url {
20
    my ( $preferred_language ) = @_;
21
22
    my @available_languages = qw( en ar cs es fr it pt_BZ tz zh_TW );
23
24
    my ( $language ) = grep {
25
        my $preferred_short = substr $preferred_language, 0, 2;
26
        my $avail_short = substr $_, 0, 2;
27
        $preferred_short eq $avail_short ? $_ : ()
28
    } @available_languages;
29
30
    my $KohaManualLanguage = $language || C4::Context->preference('KohaManualLanguage') || 'en';
20
    my $KohaManualBaseURL = C4::Context->preference('KohaManualBaseURL') || 'http://koha-community.org/manual';
31
    my $KohaManualBaseURL = C4::Context->preference('KohaManualBaseURL') || 'http://koha-community.org/manual';
21
    my $KohaManualLanguage = C4::Context->preference('KohaManualLanguage') || 'en';
22
    if ( $KohaManualBaseURL =~ m|^/| ) {
32
    if ( $KohaManualBaseURL =~ m|^/| ) {
23
        $KohaManualBaseURL = C4::Context->preference('staffClientBaseURL') . $KohaManualBaseURL;
33
        $KohaManualBaseURL = C4::Context->preference('staffClientBaseURL') . $KohaManualBaseURL;
24
    }
34
    }
Lines 221-227 our $mapping = { Link Here
221
};
231
};
222
232
223
sub get_url {
233
sub get_url {
224
    my $url = shift;
234
    my ( $url, $preferred_language ) = @_;
225
    my $file;
235
    my $file;
226
    if ($url =~ /koha\/(.*)\.pl/) {
236
    if ($url =~ /koha\/(.*)\.pl/) {
227
        $file = $1;
237
        $file = $1;
Lines 230-236 sub get_url { Link Here
230
    }
240
    }
231
    $file =~ s/[^a-zA-Z0-9_\-\/]*//g;
241
    $file =~ s/[^a-zA-Z0-9_\-\/]*//g;
232
242
233
    my $base_url = _get_base_url;
243
    my $base_url = _get_base_url( $preferred_language );
234
    return $base_url . ( exists $mapping->{$file} ? $mapping->{$file} : $mapping->{mainpage} );
244
    return $base_url . ( exists $mapping->{$file} ? $mapping->{$file} : $mapping->{mainpage} );
235
}
245
}
236
246
(-)a/help.pl (-1 / +14 lines)
Lines 20-34 Link Here
20
use Modern::Perl;
20
use Modern::Perl;
21
use CGI qw ( -utf8 );
21
use CGI qw ( -utf8 );
22
22
23
use C4::Auth;
23
use C4::Context;
24
use C4::Context;
24
use Koha::Manual;
25
use Koha::Manual;
25
26
26
my $query = new CGI;
27
my $query = new CGI;
27
28
29
# We need to call get_template_and_user to let it does the job correctly
30
# for the language
31
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
32
    {
33
        template_name   => "intranet-main.tt", # Just a valid template path
34
        query           => $query,
35
        type            => "intranet",
36
        authnotrequired => 1,
37
    }
38
);
39
28
# find the script that called the online help using the CGI referer()
40
# find the script that called the online help using the CGI referer()
29
our $refer = $query->param('url');
41
our $refer = $query->param('url');
30
$refer = $query->referer()  if !$refer || $refer eq 'undefined';
42
$refer = $query->referer()  if !$refer || $refer eq 'undefined';
31
43
32
my $manual_url = Koha::Manual::get_url($refer);
44
my $language = C4::Languages::getlanguage( $query );
45
my $manual_url = Koha::Manual::get_url($refer, $language);
33
46
34
print $query->redirect($manual_url);
47
print $query->redirect($manual_url);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref (-1 / +1 lines)
Lines 417-419 Enhanced Content: Link Here
417
                pt_BR: Portuguese – Brazil
417
                pt_BR: Portuguese – Brazil
418
                tr: Turkish
418
                tr: Turkish
419
                zh_TW: Chinese – Taiwan
419
                zh_TW: Chinese – Taiwan
420
- 
420
            - It will be used as a fallback value if the language used by the interface does not have an online manual version.

Return to bug 19817