gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 15918 - Obsolete file datatables-strings.inc can be removed 

The include file datatables-strings.inc is no longer necessary. Its
contents are now in datatables.inc. This patch corrects two references
in comments to datatables-strings.inc (replacing it with datatables.inc)
and removes the obsolete file.

To test, apply the patch and load any page with a DataTables-enabled
table configured to show pagination buttons, e.g. Saved Reports.
Pagination labels like "Next," "Previous," and "Showing X of X..."
should be correct.

Search the codebase to confirm that no references remain for
datatables-strings.inc.

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Owen Leonard 2016-02-25 14:41:11 -05:00 committed by Kyle M Hall
parent 9e42850491
commit 94af2b3212
3 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc
View File

@ -1,19 +0,0 @@
<script type="text/javascript">
//<![CDATA[
var MSG_DT_FIRST = _("First");
var MSG_DT_LAST = _("Last");
var MSG_DT_NEXT = _("Next");
var MSG_DT_PREVIOUS = _("Previous");
var MSG_DT_EMPTY_TABLE = _("No data available in table");
var MSG_DT_INFO = _("Showing _START_ to _END_ of _TOTAL_");
var MSG_DT_INFO_EMPTY = _("No entries to show");
var MSG_DT_INFO_FILTERED = _("(filtered from _MAX_ total entries)");
var MSG_DT_LENGTH_MENU = _("Show _MENU_ entries");
var MSG_DT_LOADING_RECORDS = _("Loading...");
var MSG_DT_PROCESSING = _("Processing...");
var MSG_DT_SEARCH = _("Search:");
var MSG_DT_ZERO_RECORDS = _("No matching records found");
var MSG_DT_ALL = _("All");
var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = _("a an the");
//]]>
</script>

2
koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
View File

@ -1,6 +1,6 @@
// These default options are for translation but can be used
// for any other datatables settings
// MSG_DT_* variables comes from datatables-strings.inc
// MSG_DT_* variables comes from datatables.inc
// To use it, write:
// $("#table_id").dataTable($.extend(true, {}, dataTableDefaults, {
// // other settings

2
koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
View File

@ -11,7 +11,7 @@
var MSG_ID_HELP = _("Click on the quote's id to select or deselect the quote. Multiple quotes may be selected.");
var oTable; /* oTable needs to be global */
var sEmptyTable = _("No quotes available. Please use the 'Add quote' button to add a quote."); /* override the default message in datatables-strings.inc */
var sEmptyTable = _("No quotes available. Please use the 'Add quote' button to add a quote."); /* override the default message in datatables.inc */
$(document).ready(function() {
/* NOTE: This is an ajax-source datatable and *not* a server-side sourced datatable. */
/* See the datatable docs if you don't understand this difference. */