From 94af2b32129b663c634ec64e13110f4e2bfad647 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 25 Feb 2016 14:41:11 -0500 Subject: [PATCH] Bug 15918 - Obsolete file datatables-strings.inc can be removed MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- .../prog/en/includes/datatables-strings.inc | 19 ------------------- .../intranet-tmpl/prog/en/js/datatables.js | 2 +- .../prog/en/modules/tools/quotes.tt | 2 +- 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc deleted file mode 100644 index ead071bfbe..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc +++ /dev/null @@ -1,19 +0,0 @@ - diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js index fd9dfd2662..99aec8396e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js @@ -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 diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt index 6f777d91c0..47643b4296 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt @@ -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. */ -- 2.39.5