Bugzilla – Attachment 77951 Details for
Bug 19817
Merge local and online documentations
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19817: (QA follow-up) Add German manual and fix system preference help files
Bug-19817-QA-follow-up-Add-German-manual-and-fix-s.patch (text/plain), 4.85 KB, created by
Katrin Fischer
on 2018-08-16 19:20:52 UTC
(
hide
)
Description:
Bug 19817: (QA follow-up) Add German manual and fix system preference help files
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2018-08-16 19:20:52 UTC
Size:
4.85 KB
patch
obsolete
>From 0399aff6796f9bd606cca367af47b19f1ffdfab0 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >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 >--- > 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 de3dcbc..56ef9a4 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 cdc1a95..554fd67 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 86b9cfb..5ba1eee 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -241,7 +241,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 0c63b35..fe4b537 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 >@@ -411,6 +411,7 @@ Enhanced Content: > en: English > ar: Arabic > cs: Czech >+ de: German > es: Spanish > fr: French > it: Italian >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 19817
:
69807
|
69808
|
70131
|
70132
|
70133
|
73523
|
73524
|
73525
|
73526
|
73527
|
73651
|
73652
|
73872
|
73877
|
73931
|
73932
|
73933
|
73934
|
73935
|
73936
|
73937
|
73938
|
74567
|
74568
|
74569
|
74570
|
74571
|
74572
|
74573
|
74574
|
74644
|
74645
|
74646
|
74647
|
74648
|
74649
|
74650
|
74651
|
75370
|
75371
|
75372
|
75373
|
75374
|
75375
|
75376
|
75377
|
76151
|
76152
|
76153
|
76154
|
76155
|
76156
|
76157
|
76158
|
77791
|
77792
|
77793
|
77794
|
77795
|
77797
|
77798
|
77799
|
77932
|
77942
|
77943
|
77944
|
77945
|
77946
|
77947
|
77948
|
77949
|
77950
| 77951 |
78953
|
87238