From 10861e12934db49708b1a61354bb0c01aae70dec Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Sat, 9 Jun 2012 07:04:48 -0400
Subject: [PATCH] Bug 6141 - html glitches causing problems to translator

* opac-topissue.pl = untranslatable string removed
* authorities.pl missing _() in javascript

Rewrite of patch authored by Julian Maurice.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
---
 .../intranet-tmpl/prog/en/modules/authorities/authorities.tt  | 4 ++--
 koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt         | 4 ++--
 opac/opac-topissues.pl                                        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
index 651236068f..fce6ee09d2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
@@ -529,14 +529,14 @@ function searchauthority() {
     var addauthButton = new YAHOO.widget.Button({
                                             id: "addauth",
                                             type: "button",
-                                            label: "Save",
+                                            label: _("Save"),
                                             container: "addauthc",
                                             onclick: {fn: Check }
                                         });
     var addauthButton2 = new YAHOO.widget.Button({
                                             id: "addauth2",
                                             type: "button",
-                                            label: "Save",
+                                            label: _("Save"),
                                             container: "action",
                                             onclick: {fn: Check }
                                         });
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt
index c05f6fc1b2..ff30035555 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt
@@ -52,7 +52,7 @@ function Dopop(link) {
 		<caption>The [% limit %] most checked-out 
         [% IF ( itemtype ) %]
             [% itemtype %]
-        [% ELSE %] titles[% END %]
+        [% END %]
         [% IF ( branch ) %]
         at 
         [% branch %]
@@ -120,7 +120,7 @@ function Dopop(link) {
                         [% END %]
                     </select></li>
 			<li>
-            <label for="timeLimit">Acquired in the last:</label> <select name="timeLimit" id="timeLimit">
+            <label for="timeLimit">of the the last:</label> <select name="timeLimit" id="timeLimit">
                 [% IF ( timeLimit == 3 ) %]<option value="3" selected="selected">3 months</option>[% ELSE %]<option value="3">3 months</option>[% END %]
                  [% IF ( timeLimit == 6 ) %]<option value="6" selected="selected">6 months</option>[% ELSE %]<option value="6">6 months</option>[% END %]
                  [% IF ( timeLimit == 12 ) %]<option value="12" selected="selected">12 months</option>[% ELSE %]<option value="12">12 months</option>[% END %]
diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl
index 7fb902e350..dfdb6cd86c 100755
--- a/opac/opac-topissues.pl
+++ b/opac/opac-topissues.pl
@@ -122,8 +122,8 @@ if($timeLimit eq 999){ $timeLimitFinite = 0 };
 
 $template->param(do_it => 1,
                 limit => $limit,
-                branch => $branches->{$branch}->{branchname} || 'all locations',
-                itemtype => $itemtypes->{$itemtype}->{description} || 'item types',
+                branch => $branches->{$branch}->{branchname},
+                itemtype => $itemtypes->{$itemtype}->{description},
                 timeLimit => $timeLimit,
                 timeLimitFinite => $timeLimit,
                 results_loop => \@results,
-- 
2.39.5