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

(-)a/Koha/Manual.pm (-2 / +2 lines)
Lines 17-28 sub _get_help_version { Link Here
17
}
17
}
18
18
19
sub _get_base_url {
19
sub _get_base_url {
20
    # FIXME /en/ must be configurable (or guessed)
21
    my $KohaManualBaseURL = C4::Context->preference('KohaManualBaseURL') || 'http://koha-community.org/manual';
20
    my $KohaManualBaseURL = C4::Context->preference('KohaManualBaseURL') || 'http://koha-community.org/manual';
21
    my $KohaManualLanguage = C4::Context->preference('KohaManualLanguage') || 'en';
22
    if ( $KohaManualBaseURL =~ m|^/| ) {
22
    if ( $KohaManualBaseURL =~ m|^/| ) {
23
        $KohaManualBaseURL = C4::Context->preference('staffClientBaseURL') . $KohaManualBaseURL;
23
        $KohaManualBaseURL = C4::Context->preference('staffClientBaseURL') . $KohaManualBaseURL;
24
    }
24
    }
25
    return $KohaManualBaseURL . '/' . _get_help_version . '/en/html';
25
    return $KohaManualBaseURL . '/' . _get_help_version . '/' . $KohaManualLanguage . '/html'; # TODO html could be a KohaManualFormat with pdf, html, epub
26
}
26
}
27
27
28
our $mapping = {
28
our $mapping = {
(-)a/installer/data/mysql/atomicupdate/bug_19817.sql (+3 lines)
Lines 1-2 Link Here
1
INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` )
1
INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` )
2
VALUES ('KohaManualBaseURL','http://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free');
2
VALUES ('KohaManualBaseURL','http://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free');
3
4
INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` )
5
VALUES ('KohaManualLanguage','en','en|ar|cs|es|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice');
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 239-244 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
239
('itemcallnumber','082ab',NULL,'The MARC field/subfield that is used to calculate the itemcallnumber (Dewey would be 082ab or 092ab; LOC would be 050ab or 090ab) could be 852hi from an item record','free'),
239
('itemcallnumber','082ab',NULL,'The MARC field/subfield that is used to calculate the itemcallnumber (Dewey would be 082ab or 092ab; LOC would be 050ab or 090ab) could be 852hi from an item record','free'),
240
('KohaAdminEmailAddress','root@localhost','','Define the email address where patron modification requests are sent','free'),
240
('KohaAdminEmailAddress','root@localhost','','Define the email address where patron modification requests are sent','free'),
241
('KohaManualBaseURL','http://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'),
241
('KohaManualBaseURL','http://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'),
242
('KohaManualLanguage','en','en|ar|cs|es|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice'),
242
('LabelMARCView','standard','standard|economical','Define how a MARC record will display','Choice'),
243
('LabelMARCView','standard','standard|economical','Define how a MARC record will display','Choice'),
243
('language','en',NULL,'Set the default language in the staff client.','Languages'),
244
('language','en',NULL,'Set the default language in the staff client.','Languages'),
244
('LetterLog','1',NULL,'If ON, log all notices sent','YesNo'),
245
('LetterLog','1',NULL,'If ON, log all notices sent','YesNo'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref (-1 / +13 lines)
Lines 398-400 Enhanced Content: Link Here
398
            - You can specify the location of the Koha manual to use. By default it is http://koha-community.org/manual/
398
            - You can specify the location of the Koha manual to use. By default it is http://koha-community.org/manual/
399
            - If starts with '/',  the value of staffClientBaseURL will be used as a prefix.
399
            - If starts with '/',  the value of staffClientBaseURL will be used as a prefix.
400
            - Note that it will be suffixed by the version / the language / the format (/17.11/en/html)
400
            - Note that it will be suffixed by the version / the language / the format (/17.11/en/html)
401
- 
401
        -
402
            - Language of the online manual
403
            - pref: KohaManualLanguage
404
              choices:
405
                en: English
406
                ar: Arabic
407
                cs: Czech
408
                es: Spanish
409
                fr: French
410
                it: Italian
411
                pt_BR: Portuguese – Brazil
412
                tr: Turkish
413
                zh_TW: Chinese – Taiwan

Return to bug 19817