Bugzilla – Attachment 158074 Details for
Bug 34900
The translation of the string "The " should depend on context
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 34900: Simplify text of about page license information
Bug-34900-Simplify-text-of-about-page-license-info.patch (text/plain), 21.73 KB, created by
Owen Leonard
on 2023-10-30 15:21:36 UTC
(
hide
)
Description:
Bug 34900: Simplify text of about page license information
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2023-10-30 15:21:36 UTC
Size:
21.73 KB
patch
obsolete
>From 56b4ee3aa8b03908f0c77f214223d8be0d72e4bd Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 26 Oct 2023 10:35:12 +0000 >Subject: [PATCH] Bug 34900: Simplify text of about page license information > >This patch simplifies the language describing third-party libraries and >their licenses so that translation are not so complicated. > >The patch also removes information about some assets which are no longer >part of Koha. > >The license information now lists only the library name, version (if >possible) and license. > >To test, apply the patch and go to the about page in the staff >interface. Open the "Licenses" tab and check the content. >--- > .../intranet-tmpl/prog/en/modules/about.tt | 109 +++++++----------- > 1 file changed, 39 insertions(+), 70 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >index 2903094203..dc01d5e946 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >@@ -923,207 +923,176 @@ > [% WRAPPER tab_panel tabname= "licenses" %] > <h2>Koha</h2> > <p> >- <a href="http://www.gnu.org/licenses/gpl-3.0.html">Koha is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.</a> >+ Koha is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. <a rel="license" href="http://www.gnu.org/licenses/gpl-3.0.html">GNU General Public License</a> > </p> > <h2>jQuery and jQueryUI</h2> > <p> >- <a href="http://jquery.com/">jQuery</a> and <a href="http://jqueryui.com/">jQueryUI</a> are licensed under the <a href="http://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt">MIT license</a> >+ <a href="http://jquery.com/">jQuery</a>, <a href="http://jqueryui.com/">jQueryUI</a>: <a href="http://github.com/jquery/jquery/blob/master/LICENSE.txt">MIT license</a> > </p> > > <h2>Bootstrap</h2> > <p> >- <a href="https://getbootstrap.com/">Bootstrap</a> code and <a href="http://glyphicons.com">Glyphicons Free</a> licensed under the <a href="https://github.com/twbs/bootstrap/blob/master/LICENSE">MIT license</a>. >+ <a href="https://getbootstrap.com/">Bootstrap</a>, <a href="http://glyphicons.com">Glyphicons Free</a>: <a href="https://github.com/twbs/bootstrap/blob/master/LICENSE">MIT license</a> > </p> > > <h2>Bootstrap Icons</h2> > <p> >- <a href="https://icons.getbootstrap.com/">Bootstrap Icons</a> licensed under the <a href="https://github.com/twbs/icons/blob/main/LICENSE.md">MIT license</a>. >+ <a href="https://icons.getbootstrap.com/">Bootstrap Icons</a>: <a href="https://github.com/twbs/icons/blob/main/LICENSE">MIT license</a>. > </p> > > <h2>Famfamfam iconset</h2> >- <ul> >- <li> >- <a href="http://www.famfamfam.com/lab/icons/silk/">FamFamFam Site</a> >- </li> >- <li> >- <a href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License</a> >- </li> >- </ul> >- <h2>The Bridge Material Type Icon Set</h2> >- <ul> >- <li> >- <a href="http://apps.carleton.edu/campus/library/bridge_icons/">Bridge Material Type Icons Project</a> >- </li> >- <li>The Bridge Material Type Icon Set is licensed under a >- <a rel="license" href="http://creativecommons.org/licenses/by-sa/2.5/">Creative Commons Attribution-ShareAlike 2.5 License</a> >- by the Bridge Consortium of Carleton College and St. Olaf College.</li> >- </ul> >+ <p> >+ <a href="http://www.famfamfam.com/lab/icons/silk/">FamFamFam</a>: <a href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License</a> >+ </p> > >- <h2>jQuery Bar Rating Plugin</h2> >+ <h2>Bridge Material Type Icon Set</h2> > <p> >- jQuery Bar Rating Plugin v1.22 by <a href="http://antenna.io/demo/jquery-bar-rating/examples/">Antenna.io</a> is licensed under the <a href="http://en.wikipedia.org/wiki/MIT_License">MIT License</a>. >+ <a href="http://apps.carleton.edu/campus/library/bridge_icons/">Bridge Material Type Icons Project</a>: <a href="http://creativecommons.org/licenses/by-sa/2.5/">Creative Commons Attribution-ShareAlike 2.5 License</a> > </p> >+ >+ <h2>jQuery Bar Rating Plugin</h2> > <p> >- Copyright © 2012-2016 <a href="http://antenna.io">Kazik Pietruszewski</a> >+ <a href="https://antennaio.github.io/jquery-bar-rating/">jQuery Bar Rating</a>: <a href="https://github.com/antennaio/jquery-bar-rating/blob/master/LICENSE.txt">MIT License</a>. > </p> > > <h2>jQuery insertAtCaret Plugin</h2> > <p> > jQuery insertAtCaret Plugin v1.0 by the phpMyAdmin devel team is licensed under the <a href="http://www.gnu.org/licenses/gpl.html">GPL License</a>. > </p> >- <p> >- Copyright © 2003-2010 phpMyAdmin devel team >- </p> > > <h2>jQuery treetable Plugin</h2> > <p> >- The <a href="http://ludo.cubicphuse.nl/jquery-treetable/">jQuery treetable Plugin 3.1.0</a> is released under MIT license by Ludo van den Boom. >+ <a href="https://github.com/ludo/jquery-treetable">jQuery treetable Plugin 3.1.0</a>: <a href="https://github.com/ludo/jquery-treetable/blob/3.1.0/GPL-LICENSE.txt">GPL license v2.0</a>, <a href="https://github.com/ludo/jquery-treetable/blob/3.1.0/MIT-LICENSE.txt">MIT License</a>. > </p> > > <h2>OpenJS Keyboard Shortcuts Library</h2> > <p> >- The <a href="http://www.openjs.com/scripts/events/keyboard_shortcuts/">OpenJS keyboard shortcuts library</a> by Binny V A is licensed under the BSD license. >- </p> >- >- <h2>jquery.dataTables.grouping.js</h2> >- <p> >- The <a href="https://code.google.com/p/jquery-datatables-row-grouping/">jquery.dataTables.grouping.js</a> plugin by Jovan Popovic is licensed under the BSD and GPL v2 license. >- </p> >- >- <h2>jQuery Colvis plugin</h2> >- <p> >- The <a href="http://datatables.net/extensions/colvis/">controls for column visiblity in DataTables</a> >- by Allan Jardine is licensed under the BSD 3 and GPL v2 license. >+ <a href="http://www.openjs.com/scripts/events/keyboard_shortcuts/">OpenJS keyboard shortcuts library</a>: By Binny V A under the BSD license. > </p> > > <h2>jQuery Multiple Select Plugin</h2> > <p> >- The <a href="https://multiple-select.wenzhixin.net.cn/">jQuery Multiple Select plugin</a> by Zhixin Wen is licensed under the MIT license. >+ <a href="https://multiple-select.wenzhixin.net.cn/">jQuery Multiple Select plugin</a>: <a href="https://github.com/wenzhixin/multiple-select/blob/develop/LICENSE">MIT license</a>. > </p> > > <h2>Javascript Diff Algorithm</h2> > <p> >- The <a href="http://ejohn.org/projects/javascript-diff-algorithm/">Javascript Diff Algorithm</a> plugin by John Resig is licensed under the <a href="http://opensource.org/licenses/mit-license.php">MIT License</a>. >+ <a href="https://johnresig.com/projects/javascript-diff-algorithm/">Javascript Diff Algorithm</a>: <a href="http://opensource.org/licenses/mit-license.php">MIT License</a>. > </p> > > <h2>jQuery Validation Plugin</h2> > <p> >- The <a href="http://jqueryvalidation.org/">jQuery Validation Plugin</a> written and maintained by Jörn Zaefferer is licensed under the <a href="http://opensource.org/licenses/mit-license.php">MIT License</a>. >+ <a href="http://jqueryvalidation.org/">jQuery Validation Plugin</a>: <a href="https://github.com/jquery-validation/jquery-validation/blob/master/LICENSE.md">MIT License</a>. > </p> > > <h2>TinyMCE WYSIWYG editor</h2> > <p> >- The <a href="https://www.tiny.cloud/">TinyMCE WYSIWYG editor v5.9.2 </a> by Tiny Technologies, Inc. is licensed under the <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt">LGPL v2.1</a>. >+ <a href="https://www.tiny.cloud/">TinyMCE WYSIWYG editor v5.9.2 </a>: <a href="https://github.com/tinymce/tinymce/blob/5.9.2/LICENSE.TXT">LGPL v2.1</a>. > </p> > > <h2>Font Awesome</h2> > <p> >- <a href="http://fontawesome.com/v4/">Font Awesome 4.7.0</a> by Dave Gandy is licensed under the <a href="http://scripts.sil.org/OFL">SIL OFL 1.1</a> and the <a href="http://opensource.org/licenses/mit-license.html">MIT License</a>. >+ <a href="http://fontawesome.com/">Font Awesome v6.3.0</a>: <a href="https://github.com/FortAwesome/Font-Awesome/blob/6.3.0/LICENSE.txt">Various licenses</a>. > </p> > > <h2>CodeMirror editing library</h2> > <p> >- The <a href="http://codemirror.net/">CodeMirror editing library</a> by Marijn Haverbeke is licensed under an <a href="http://codemirror.net/LICENSE">MIT license</a>. >- </p> >- >- <h2>FileSaver library</h2> >- <p> >- The <a href="https://github.com/eligrey/FileSaver.js/">FileSaver library</a> by Eli Grey is licensed under an <a href="https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md">MIT license</a>. >+ <a href="http://codemirror.net/">CodeMirror editing library v5.40.2</a>: <a href="https://github.com/codemirror/codemirror5/blob/5.40.2/LICENSE">MIT license</a>. > </p> > > <h2>Require.js JS module system</h2> > <p> >- The <a href="http://requirejs.org/">Require.js JS module system</a> by The Dojo Foundation is licensed under an <a href="https://github.com/jrburke/requirejs/blob/master/LICENSE">MIT license</a>. >+ <a href="http://requirejs.org/">Require.js JS module system v2.1.8</a>: <a href="https://github.com/requirejs/requirejs/blob/2.1.8/LICENSE">MIT license</a>. > </p> > > <h2>OAI xslt stylesheet</h2> > <p> >- The included OAI.xslt file by the <a href="http://dspace.org/">DSpace project</a> is licensed under a <a href="http://www.dspace.org/license/">BSD License</a>. >+ <a href="http://dspace.org/">Adapted from the DSpace project</a>: <a href="http://www.dspace.org/license/">BSD License</a>. > </p> > > <h2>OpenAPI 2.0 schema</h2> > <p> >- The included <a href="https://github.com/OAI/OpenAPI-Specification/blob/master/schemas/v2.0/schema.json">api/swagger-v2-schema.json</a> file is licensed under the <a href="https://github.com/OAI/OpenAPI-Specification/tree/master/schemas/v2.0">Apache License, Version 2.0</a>, by the <a href="https://www.openapis.org/about">OpenAPI Initiative (OAI)</a>. >+ <a href="https://github.com/OAI/OpenAPI-Specification/blob/master/schemas/v2.0/schema.json">The file api/swagger-v2-schema.json</a>: <a href="https://github.com/OAI/OpenAPI-Specification/tree/master/schemas/v2.0">Apache License, Version 2.0</a>, <a href="https://www.openapis.org/about">OpenAPI Initiative (OAI)</a>. > </p> > > <h2>Select2</h2> > <p> >- The <a href="http://select2.github.io/select2/">Select2</a> library is licensed under <a href="https://github.com/select2/select2/blob/stable/3.5/LICENSE">the Apache License, Version 2.0 (the "Apache License") or the GNU General Public License version 2 (the "GPL License")</a>. >+ <a href="http://select2.github.io/select2/">Select2 library</a>: <a href="https://github.com/select2/select2/blob/stable/3.5/LICENSE">Apache License, Version 2.0 or GNU General Public License version 2</a>. > </p> > > <h2>jquery.tablednd.js</h2> > <p> >- The <a href="https://github.com/isocra/TableDnD">TableDnD plug-in for jQuery</a> by Denis Howlett is licensed under the <a href="http://opensource.org/licenses/mit-license.php">MIT License</a>. >+ <a href="https://github.com/isocra/TableDnD">TableDnD plug-in for jQuery</a>: <a href="http://opensource.org/licenses/mit-license.php">MIT License</a>. > </p> > > <h2>Leaflet</h2> > <p> >- The <a href="http://leafletjs.com">Leaflet</a> JavaScript library by Vladimir Agafonkinis licensed under the <a href="https://github.com/Leaflet/Leaflet/blob/master/LICENSE">BSD License</a>. >+ <a href="http://leafletjs.com">Leaflet JavaScript library v1.0.3</a>: <a href="https://github.com/Leaflet/Leaflet/blob/v1.0.3/LICENSE">BSD License</a>. > </p> > > <h2>jquery.emojiarea.js</h2> > <p> >- The <a href="https://github.com/diy/jquery-emojiarea">Emojiarea plug-in for jQuery</a> by DIY Co is licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">the Apache License, Version 2.0</a>. >+ <a href="https://github.com/diy/jquery-emojiarea">Emojiarea plug-in for jQuery</a>: <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, v2.0</a>. > </p> > > <h2>JSZip</h2> > <p> >- The <a href="https://stuk.github.io/jszip/">JSZip</a> JavaScript library is licensed under both the <a href="https://github.com/Stuk/jszip/blob/master/LICENSE.markdown">MIT and GPLv3 Licenses</a>. >+ <a href="https://stuk.github.io/jszip/">JSZip JavaScript library</a>: <a href="https://github.com/Stuk/jszip/blob/v3.1.3/LICENSE.markdown">MIT, GNU public license v3.0</a>. > </p> > > <h2>D3.js</h2> > <p> >- <a href="https://d3js.org/">D3.js v3.5.17</a> is a JavaScript library for manipulating documents based on data. It is under the <a href="https://github.com/d3/d3/blob/master/LICENSE">BSD 3-clause Licence</a> >+ <a href="https://d3js.org/">D3 JavaScript library v3.5.17</a>, <a href="https://github.com/d3/d3/blob/v3.5.17/LICENSE">ISC Licence</a>. > </p> > > <h2>C3.js</h2> > <p> >- <a href="http://c3js.org/">C3.js v0.4.11</a> is a D3-based reusable chart library under the <a href="https://opensource.org/licenses/mit-license.php">MIT licence</a> >+ <a href="http://c3js.org/">C3.js v0.4.11 JavaScript library</a>: <a href="https://github.com/c3js/c3/blob/0.4.11/LICENSE">MIT licence</a> > </p> > > <h2>Font Face Observer</h2> > <p> >- <a href="https://github.com/bramstein/fontfaceobserver">Font Face Observer</a> is a JavaScript library by Bram Stein licensed under the <a href="https://github.com/bramstein/fontfaceobserver/blob/master/LICENSE">BSD License</a>. >+ <a href="https://github.com/bramstein/fontfaceobserver">Font Face Observer JavaScript library v2.0.3</a>: <a href="https://github.com/bramstein/fontfaceobserver/blob/v2.0.3/README.md">BSD License</a>. > </p> > > <h2>Noto fonts</h2> > <p> >- <a href="https://github.com/googlei18n/noto-fonts">Noto</a> by Google is a family of fonts licensed under the <a href="http://scripts.sil.org/OFL">SIL Open Font License (OFL) v1.1</a>. >+ <a href="https://github.com/googlei18n/noto-fonts">Noto</a>: <a href="https://github.com/notofonts/noto-fonts/blob/main/LICENSE">SIL Open Font License (OFL) v1.1</a>. > </p> > > <h2>HC Sticky</h2> > <p> >- <a href="http://somewebmedia.com/hc-sticky/">HC Sticky</a> by Some Web Media is a JavaScript library that makes any element on your page visible while you scroll, licensed under the <a href="https://github.com/somewebmedia/hc-sticky/blob/master/LICENSE">MIT license</a>. >+ <a href="http://somewebmedia.com/hc-sticky/">HC Sticky JavaScript Library v2.2.3</a>: <a href="https://github.com/somewebmedia/hc-sticky/blob/v2.2.3/LICENSE">MIT license</a>. > </p> > > <h2>kjua</h2> > <p> >- <a href="https://larsjung.de/kjua/">kjua</a> by Lars Jung is a JavaScript library that generates QR codes, licensed under the <a href="https://github.com/lrsjng/kjua/blob/master/README.md">MIT license</a>. >+ <a href="https://larsjung.de/kjua/">kjua JavaScript library v0.6.0</a>: <a href="https://github.com/lrsjng/kjua/blob/master/README.md">MIT license</a>. > </p> > > <h2>Verovio</h2> > <p> >- <a href="https://www.verovio.org/index.xhtml">Verovio</a> is developed by the Swiss RISM Office with the support of the Swiss National Science Foundation, licensed under the <a href="http://www.gnu.org/licenses/lgpl-3.0.html">LGPL v3.0</a>. >+ <a href="https://www.verovio.org/index.xhtml">Verovio</a>: <a href="https://github.com/rism-digital/verovio/blob/develop/COPYING">GNU public license v3.0</a>, <a href="https://github.com/rism-digital/verovio/blob/develop/COPYING.LESSER">LGPL v3.0</a>. > </p> > > <h2>JavaScript Cookie</h2> > <p> >- <a href="https://github.com/js-cookie/js-cookie">JavaScript Cookie</a> is a "simple, lightweight JavaScript API for handling cookies," licensed under the <a href="https://github.com/js-cookie/js-cookie/blob/master/LICENSE">MIT license</a>. >+ <a href="https://github.com/js-cookie/js-cookie">JavaScript Cookie v3.0.1</a>: <a href="https://github.com/js-cookie/js-cookie/blob/v3.0.1/LICENSE">MIT license</a>. > </p> > > <h2>Day.js</h2> > <p> >- <a href="https://day.js.org/">Day.js</a> licensed under the <a href="https://github.com/iamkun/dayjs/blob/dev/LICENSE">MIT license</a>. >+ <a href="https://day.js.org/">Day.js v1.11.2</a>: <a href="https://github.com/iamkun/dayjs/blob/v1.11.2/LICENSE">MIT license</a>. > </p> > > <h2>Chocolat.js</h2> > <p> >- <a href="http://chocolat.insipi.de">Chocolat.js</a> licensed under the <a href="https://github.com/nicolas-t/Chocolat/blob/master/LICENSE">GPL v3 license</a>. >+ <a href="http://chocolat.insipi.de">Chocolat.js v1.1.0</a>: <a href="https://github.com/nicolas-t/Chocolat/blob/v1.1.0/LICENSE">GNU public license v3.0</a>. > </p> > > <h2>Enquire.js</h2> > <p> >- <a href="https://wicky.nillia.ms/enquire.js">Enquire.js</a> licensed under the <a href="https://github.com/WickyNilliams/enquire.js/blob/master/LICENSE">MIT license</a>. >+ <a href="https://wicky.nillia.ms/enquire.js">Enquire.js v2.0.1</a> licensed under the <a href="https://github.com/WickyNilliams/enquire.js/blob/master/LICENSE">MIT license</a>. > </p> > > [% END # /WRAPPER tab_item licenses %] >-- >2.30.2
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 34900
:
158074
|
159448
|
159501
|
159502
|
159503
|
160069
|
160070
|
160522
|
160523
|
160524
|
160525