From 5616e22236e8c263da0629a25b3aa7146e19c866 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Mon, 13 Aug 2018 02:04:29 +0000 Subject: [PATCH] Bug 19817: (QA follow-up) Add German manual and fix system preference help files - German language manuals were added since this patch was started - The structure of the manual was changed slightly, system preferences were moved into their own chapter To test: - Test help files display correctly for system preferences display correctly Note: Local use uses a different page than the other tabs - Test German shows up as option in KohaManualLanguage and links correctly Signed-off-by: Nick Clemens --- Koha/Manual.pm | 4 ++-- installer/data/mysql/atomicupdate/bug_19817.sql | 2 +- installer/data/mysql/sysprefs.sql | 2 +- .../prog/en/modules/admin/preferences/enhanced_content.pref | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Koha/Manual.pm b/Koha/Manual.pm index de3dcbc5a8..56ef9a4b8a 100644 --- a/Koha/Manual.pm +++ b/Koha/Manual.pm @@ -90,9 +90,9 @@ our $mapping = { 'admin/oai_set_mappings' => '/administration.html#oai-sets-configuration', 'admin/oai_sets' => '/administration.html#oai-sets-configuration', 'admin/patron-attr-types' => '/administration.html#patron-attribute-types', - 'admin/preferences' => '/administration.html#global-system-preferences', + 'admin/preferences' => '/systempreferences.html', 'admin/smart-rules' => '/administration.html#circulation-and-fine-rules', - 'admin/systempreferences' => '/administration.html#global-system-preferences', + 'admin/systempreferences' => '/systempreferences.html#local-use', 'admin/transport-cost-matrix' => '/administration.html#transport-cost-matrix', 'admin/z3950servers' => '/administration.html#z39.50/sru-servers', 'authorities/authorities-home' => '/cataloging.html#authorities', diff --git a/installer/data/mysql/atomicupdate/bug_19817.sql b/installer/data/mysql/atomicupdate/bug_19817.sql index cdc1a95775..554fd6764f 100644 --- a/installer/data/mysql/atomicupdate/bug_19817.sql +++ b/installer/data/mysql/atomicupdate/bug_19817.sql @@ -2,4 +2,4 @@ INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanat VALUES ('KohaManualBaseURL','https://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'); INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) -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'); +VALUES ('KohaManualLanguage','en','en|ar|cs|es|de|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice'); diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index fd5c2073e4..868e6039a6 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -243,7 +243,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('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'), ('KohaAdminEmailAddress','root@localhost','','Define the email address where patron modification requests are sent','free'), ('KohaManualBaseURL','https://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'), -('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'), +('KohaManualLanguage','en','en|ar|cs|de|es|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice'), ('LabelMARCView','standard','standard|economical','Define how a MARC record will display','Choice'), ('language','en',NULL,'Set the default language in the staff client.','Languages'), ('LetterLog','1',NULL,'If ON, log all notices sent','YesNo'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref index 93d8ace0f0..9701280aae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref @@ -395,6 +395,7 @@ Enhanced Content: en: English ar: Arabic cs: Czech + de: German es: Spanish fr: French it: Italian -- 2.39.5