From 86e9584a9f744c284a6f393b2d83944fe8db1d93 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 19 Aug 2020 07:25:06 +0200 Subject: [PATCH] Bug 26162: [19.11] Fix DT info label There is an inconsistency in 19.11: % grep Showing koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc koha-tmpl/intranet-tmpl/prog/js/datatables.js koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc: var MSG_DT_INFO = _("Showing _START_ to _END_ of _TOTAL_"); koha-tmpl/intranet-tmpl/prog/js/datatables.js: "sInfo" : window.MSG_DT_INFO || "Showing _START_ to _END_ of _TOTAL_ entries", The "entries" is not always displayed. datatables.inc has been removed from 20.05 by Bug 24662: Remove global variables MSG_* from datatables.inc --- t/lib/Selenium.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/lib/Selenium.pm b/t/lib/Selenium.pm index 42cda1d65f..9d16063ad0 100644 --- a/t/lib/Selenium.pm +++ b/t/lib/Selenium.pm @@ -193,7 +193,7 @@ sub show_all_entries { my $dt_infos = $self->driver->get_text( $xpath_selector . '//div[@class="dataTables_info"]' ); - if ( $dt_infos =~ m|Showing 1 to (\d+) of (\d+) entries| ) { + if ( $dt_infos =~ m|Showing 1 to (\d+) of (\d+)(\sentries)?| ) { # FIXME entries is not always displayed $all_displayed = 1 if $1 == $2; } -- 2.20.1