Attachment 48375 Details for Bug 15918 – Bug 15918 - Obsolete file datatables-strings.inc can be removed

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

Bug-15918---Obsolete-file-datatables-stringsinc-ca.patch (text/plain), 3.79 KB, created by Owen Leonard on 2016-02-25 19:51:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2016-02-25 19:51:46 UTC

Size: 3.79 KB

patch

obsolete

>From ce43e75f2a1822064354a99c0647a0deed2d8c6f Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 25 Feb 2016 14:41:11 -0500
>Subject: [PATCH] Bug 15918 - Obsolete file datatables-strings.inc can be
> removed
>Content-Type: text/plain; charset="utf-8"
>
>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.
>---
> .../prog/en/includes/datatables-strings.inc           | 19 -------------------
> koha-tmpl/intranet-tmpl/prog/en/js/datatables.js      |  2 +-
> .../intranet-tmpl/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 ead071b..0000000
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc
>+++ /dev/null
>@@ -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>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
>index 71185c6..e4ab873 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 6f777d9..47643b4 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.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 15918: 48375 | 50294 | 50295 | 50318 | 50319