From b695aaabafb4e78d616c9567a26840f9a8ca2adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?= Date: Tue, 26 Nov 2013 11:26:54 +0100 Subject: [PATCH] [PASSED QA] Bug 11304 Bootstrap OPAC detail page doesn't display holding tabs properly Detail page tabs are not displayed properly because JavaScript is broken in French. This is due to _(' JS string construction used in place of _(". This patch fixes: - opac-detail.tt page - xt/single_quotes to test bootstrap theme Signed-off-by: Owen Leonard Tested by applying the patch, running translate update, then translate install. Saw no JavaScript error on the French detail page. Signed-off-by: Katrin Fischer Switches from single to double quotes for translatatable strings. Unit tests for xt/single_quotes passes now. --- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 6 +++--- xt/single_quotes.t | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index 8b7cfdd..867cb74 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -1467,17 +1467,17 @@ }, function (data) { if (data.auth_status != 'ok') { - window.alert(_('Your CGI session cookie is not current. Please refresh the page and try again.')); + window.alert(_("Your CGI session cookie is not current. Please refresh the page and try again.")); } else { $("#rating_value").val(data.rating_value); if (data.rating_value) { - $("#rating_value_text").text(_('your rating: ') + data.rating_value + ', '); + $("#rating_value_text").text(_("your rating: ") + data.rating_value + ", "); } else { $("#rating_value_text").text(''); } - $("#rating_text").text(_('average rating: ') + data.rating_avg_int + ' (' + data.rating_total + ' ' + _("votes") + ')'); + $("#rating_text").text(_("average rating: ") + data.rating_avg_int + " (" + data.rating_total + ' ' + _("votes") + ")"); } }, "json"); diff --git a/xt/single_quotes.t b/xt/single_quotes.t index b123a6d..89b539c 100755 --- a/xt/single_quotes.t +++ b/xt/single_quotes.t @@ -28,8 +28,11 @@ find( open my $fh, $_ or die "Could not open $_: $!"; my @lines = sort grep /\_\(\'/, <$fh>; push @files, { name => "$_", lines => \@lines } if @lines; - }, - ( "./koha-tmpl/opac-tmpl/prog/en", "./koha-tmpl/intranet-tmpl/prog/en" ) + },qw# + ./koha-tmpl/opac-tmpl/prog/en + ./koha-tmpl/opac-tmpl/bootstrap/en + ./koha-tmpl/intranet-tmpl/prog/en + # ); ok( !@files, "Files do not contain single quotes _(' " ) -- 1.8.3.2