[Koha-patches] [PATCH] Removing hard-coded $ symbols from the template, addressing Bug 2547
Owen Leonard
oleonard at myacpl.org
Mon Jun 29 18:17:49 CEST 2009
Pending a system for displaying the correct currency symbol based on the system's default currency all dollar-specific symbols should be removed in favor of no symbol.
---
.../prog/en/modules/admin/categorie.tmpl | 8 ++++----
.../prog/en/modules/admin/smart-rules.tmpl | 4 ++--
.../prog/en/modules/catalogue/moredetail.tmpl | 2 +-
.../prog/en/modules/circ/circulation.tmpl | 4 ++--
.../prog/en/modules/members/boraccount.tmpl | 6 +++---
.../prog/en/modules/reports/stats_screen.tmpl | 8 ++++----
.../opac-tmpl/prog/en/modules/opac-account.tmpl | 6 +++---
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
index e46b381..720463f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
@@ -110,7 +110,7 @@
<li><label for="enrolmentperiod">Enrollment period: </label> <input type="text" name="enrolmentperiod" id="enrolmentperiod" size="3" maxlength="3" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->" /> months</li>
<li><label for="dateofbirthrequired">Age required: </label> <input type="text" name="dateofbirthrequired" id="dateofbirthrequired" value="<!-- TMPL_VAR NAME="dateofbirthrequired" -->" size="3" maxlength="3" /> years</li>
<li><label for="upperagelimit">Upperage limit: </label> <input type="text" name="upperagelimit" id="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME="upperagelimit" -->" /> years</li>
- <li><label for="enrolmentfee">Enrollment fee: </label>$<input type="text" name="enrolmentfee" id="enrolmentfee" size="6" value="<!-- TMPL_VAR NAME="enrolmentfee" -->" /></li>
+ <li><label for="enrolmentfee">Enrollment fee: </label><input type="text" name="enrolmentfee" id="enrolmentfee" size="6" value="<!-- TMPL_VAR NAME="enrolmentfee" -->" /></li>
<li><label for="overduenoticerequired">Overdue notice required: </label> <select name="overduenoticerequired" id="overduenoticerequired">
<!-- TMPL_IF NAME="overduenoticerequired" -->
<option value="0">No</option>
@@ -120,7 +120,7 @@
<option value="1">Yes</option>
<!-- /TMPL_IF -->
</select></li>
- <li><label for="reservefee">Hold fee: </label>$<input type="text" name="reservefee" id="reservefee" size="6" value="<!-- TMPL_VAR NAME="reservefee" -->" /></li>
+ <li><label for="reservefee">Hold fee: </label><input type="text" name="reservefee" id="reservefee" size="6" value="<!-- TMPL_VAR NAME="reservefee" -->" /></li>
<li><label for="category_type">Category type: </label> <select name="category_type" id="category_type">
<!-- TMPL_IF NAME="type_n" --><option value="" selected="selected">Select a Category type</option><!-- TMPL_ELSE --><option value="">Select a Category type</option><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="type_A" --><option value="A" selected="selected">Adult</option><!-- TMPL_ELSE --><option value="A">Adult</option><!-- /TMPL_IF -->
@@ -167,9 +167,9 @@ Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" escape="html" -->
<tr><th scope="row">Enrollment period: </th><td><!-- TMPL_VAR NAME="enrolmentperiod" --> months</td></tr>
<tr><th scope="row">Age required: </th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td></tr>
<tr><th scope="row">Upperage limit: </th><td><!-- TMPL_VAR NAME="upperagelimit" --> years</td></tr>
- <tr><th scope="row">Enrollment fee: </th><td>$<!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
+ <tr><th scope="row">Enrollment fee: </th><td><!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
<tr><th scope="row">Receives overdue notices: </th><td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td></tr>
- <tr><th scope="row">Hold fee: </th><td>$<!-- TMPL_VAR NAME="reservefee" --></td></tr>
+ <tr><th scope="row">Hold fee: </th><td><!-- TMPL_VAR NAME="reservefee" --></td></tr>
</table>
<fieldset class="action"><!-- TMPL_IF NAME="totalgtzero" -->
<input type="submit" value="OK" /></form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
index 166746e..96481aa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
@@ -88,7 +88,7 @@ $(document).ready(function() {
<!-- TMPL_VAR NAME="humanitemtype" -->
<!-- /TMPL_IF -->
</td>
- <td>$<!-- TMPL_VAR NAME="fine" --></td>
+ <td><!-- TMPL_VAR NAME="fine" --></td>
<td><!-- TMPL_IF NAME="firstremind" --><!-- TMPL_VAR NAME="firstremind" --> day(s)<!-- /TMPL_IF --></td>
<td><!-- TMPL_IF NAME="chargeperiod" --><!-- TMPL_VAR NAME="chargeperiod" --> day(s)<!-- /TMPL_IF --></td>
<td><!-- TMPL_IF NAME="unlimited_maxissueqty" -->
@@ -120,7 +120,7 @@ $(document).ready(function() {
<!-- /TMPL_LOOP -->
</select>
</td>
- <td>$<input name="fine" size="4" /></td>
+ <td><input name="fine" size="4" /></td>
<td><input name="firstremind" size="2" /> day(s)</td>
<td><input name="chargeperiod" size="2" /> day(s)</td>
<td><input name="maxissueqty" size="3" /></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
index 0026405..9e8165f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
@@ -26,7 +26,7 @@
<li><span class="label">Item type:</span> <!-- TMPL_VAR NAME="itemtypename" --> </li>
<!-- /TMPL_UNLESS -->
<!-- deprecated? <li><span class="label">Loan length:</span> <!-- TMPL_VAR NAME="loanlength" --> </li> -->
- <li><span class="label">Rental charge:</span>$<!-- TMPL_VAR NAME="rentalcharge" --> </li>
+ <li><span class="label">Rental charge:</span><!-- TMPL_VAR NAME="rentalcharge" --> </li>
<li><span class="label">ISBN:</span> <!-- TMPL_VAR NAME="isbn" --> </li>
<li><span class="label">Publisher:</span><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" ESCAPE="html" --> <!-- TMPL_VAR NAME="publicationyear" --> </li>
<!-- TMPL_IF NAME="volumeddesc" --><li><span class="label">Volume:</span> <!-- TMPL_VAR NAME="volumeddesc" --></li><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 8bdbedd..f48f9c5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -88,7 +88,7 @@ $.tablesorter.addParser({
<ul>
<!-- TMPL_IF NAME="DEBT" -->
- <li>The patron has a debt of $<!-- TMPL_VAR name="DEBT" --></li>
+ <li>The patron has a debt of <!-- TMPL_VAR name="DEBT" --></li>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="RENEW_ISSUE" -->
@@ -373,7 +373,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
<!-- TMPL_ELSE -->
<li>
<!-- /TMPL_IF -->
- <span class="circ-hlt">Fines:</span> Patron has <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">Outstanding fines<!-- TMPL_IF NAME="chargesamount" --> of $<!-- TMPL_VAR NAME="chargesamount" --><!-- /TMPL_IF --></a>.
+ <span class="circ-hlt">Fines:</span> Patron has <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">Outstanding fines<!-- TMPL_IF NAME="chargesamount" --> of <!-- TMPL_VAR NAME="chargesamount" --><!-- /TMPL_IF --></a>.
<!-- TMPL_IF NAME="charges_is_blocker" -->
Checkouts are blocked because fine balance is over the limit.
<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
index d71b744..1661161 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
@@ -40,15 +40,15 @@
<!-- TMPL_IF NAME="toggle" --> <tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
<td><!-- TMPL_VAR NAME="date" --></td>
<td><!-- TMPL_VAR NAME="description" --> <!-- TMPL_IF NAME="itemnumber" --><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">View item</a> <!-- /TMPL_IF --><!-- TMPL_IF NAME="printtitle" --> <!-- TMPL_VAR NAME="title" escape="html" --><!-- /TMPL_IF --></td>
- <!-- TMPL_IF NAME="amountcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR NAME="amount" --></td>
- <!-- TMPL_IF NAME="amountoutstandingcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR NAME="amountoutstanding" --></td>
+ <!-- TMPL_IF NAME="amountcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="amount" --></td>
+ <!-- TMPL_IF NAME="amountoutstandingcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="amountoutstanding" --></td>
</tr>
<!-- /TMPL_LOOP -->
<tfoot>
<tr>
<td colspan="3">Total due</td>
- <!-- TMPL_IF NAME="totalcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR NAME="total" --></td>
+ <!-- TMPL_IF NAME="totalcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="total" --></td>
</tr>
</tfoot>
</table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tmpl
index 4318511..6453d90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tmpl
@@ -77,7 +77,7 @@
</table>
<p>
- <b>Total amount paid: $<!-- TMPL_VAR NAME="totalpaid" --></b>
+ <b>Total amount paid: <!-- TMPL_VAR NAME="totalpaid" --></b>
</p>
@@ -107,7 +107,7 @@
<!-- /TMPL_LOOP -->
</table>
<p>
- <ul><li> <b>Total amount credits: $<!-- TMPL_VAR NAME="totalcredits" --></b></li>
+ <ul><li> <b>Total amount credits: <!-- TMPL_VAR NAME="totalcredits" --></b></li>
<li><b>Total number written off: <!-- TMPL_VAR NAME="totalwritten" --> charges</b></li></ul>
</p>
@@ -138,8 +138,8 @@
<!-- /TMPL_LOOP -->
</table>
<p>
- <ul><li><b>Total amount refunds: $<!-- TMPL_VAR NAME="totalrefund" --></b></li>
- <li><b>Total amount of cash collected:$ <!-- TMPL_VAR NAME="totalcash" --> </b></li></ul>
+ <ul><li><b>Total amount refunds: <!-- TMPL_VAR NAME="totalrefund" --></b></li>
+ <li><b>Total amount of cash collected: <!-- TMPL_VAR NAME="totalcash" --> </b></li></ul>
</p>
</div>
</div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
index 54d9156..7082eec 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
@@ -28,7 +28,7 @@
<tfoot>
<tr>
<th class="sum" colspan="3">Total Due</th>
- <td class="sum">$<!-- TMPL_VAR NAME="total" --></td>
+ <td class="sum"><!-- TMPL_VAR NAME="total" --></td>
</tr>
</tfoot>
@@ -38,8 +38,8 @@
<td><!-- TMPL_VAR NAME="date" --></td>
<td><!-- TMPL_VAR NAME="description" -->
<!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" escape="html" --><!-- /TMPL_IF --></td>
- <!-- TMPL_IF NAME="amountcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR NAME="amount" --></td>
- <!-- TMPL_IF NAME="amountoutstandingcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR NAME="amountoutstanding" --></td>
+ <!-- TMPL_IF NAME="amountcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="amount" --></td>
+ <!-- TMPL_IF NAME="amountoutstandingcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="amountoutstanding" --></td>
</tr>
<!-- /TMPL_LOOP -->
</tbody>
--
1.5.6.5
More information about the Koha-patches
mailing list