Terminology correction: cancelled -> withdrawn. Also adding dateformat variable to...

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl
index 7e04907..74cf9b4 100755 (executable)
--- a/circ/view_holdsqueue.pl
+++ b/circ/view_holdsqueue.pl
@@ -55,7 +55,8 @@ if ( $run_report ) {
                                         branch    => $branchlimit,
                      total     => scalar @$items,
                      itemsloop => $items,
-                     run_report => $run_report
+                     run_report => $run_report,
+                     dateformat => C4::Context->preference("dateformat"),
                  );
 }
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
index 75ea48c..2ff691a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -248,7 +248,7 @@ function Dopop(link) {
                         <p class="problem">Item was lost, now found.</p>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF Name="withdrawn" -->
-                        <p class="problem">Item Cancelled</p>
+                        <p class="problem">Item is withdrawn.</p>
                     <!-- /TMPL_IF -->
             <!-- /TMPL_LOOP -->
         <!-- /TMPL_IF -->

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index 2a67dab..285b209 100755 (executable)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -270,7 +270,7 @@
                                 <!-- TMPL_IF name="lostimageurl"--><img src="<!-- TMPL_VAR NAME="lostimageurl" -->" alt="<!-- TMPL_VAR NAME="lostimagelabel" -->" title="<!-- TMPL_VAR NAME="lostimagelabel" -->"><!-- TMPL_ELSE -->Item lost<!-- /TMPL_IF -->
                             <!-- TMPL_ELSE -->
                                 <!-- TMPL_IF NAME="wthdrawn" -->
-                                    Item Cancelled
+                                    Item withdrawn
                                 <!-- TMPL_ELSE -->
                                     Available
                                 <!-- /TMPL_IF -->