Bugzilla – Attachment 83251 Details for
Bug 22007
KohaDates output does not need to be html filtered
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 22007: Generated with add_missing_filters.pl
Bug-22007-Generated-with-addmissingfilterspl.patch (text/plain), 12.80 KB, created by
Jonathan Druart
on 2018-12-15 02:58:20 UTC
(
hide
)
Description:
Bug 22007: Generated with add_missing_filters.pl
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2018-12-15 02:58:20 UTC
Size:
12.80 KB
patch
obsolete
>From 3894a64eefed6dd59d81a93f9511c12403ee49c0 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Fri, 14 Dec 2018 17:34:59 -0300 >Subject: [PATCH] Bug 22007: Generated with add_missing_filters.pl > >--- > .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 24 +++++++++++----------- > .../prog/en/modules/acqui/orderreceive.tt | 4 ++-- > .../prog/en/modules/admin/aqbudgetperiods.tt | 2 +- > .../prog/en/modules/admin/aqbudgets.tt | 4 ++-- > .../prog/en/modules/admin/categories.tt | 4 ++-- > .../prog/en/modules/members/paycollect.tt | 2 +- > .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 2 +- > t/LangInstaller/templates/simple.tt | 1 + > 8 files changed, 22 insertions(+), 21 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index f098dfec15..9328a90a97 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -518,14 +518,14 @@ > </td> > [% SET zero_regex = "^0{1,}\.?0{1,}[^1-9]" %] [%# 0 or 0.0 or 0.00 or 00 or 00.0 or 00.00 or 0.000 ... %] > [%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %] >- <td class="number [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded | $Price | html %]</td> >- <td class="number [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price | html %]</td> >- <td class="number [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price | html %]</td> >- <td class="number [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included | $Price | html %]</td> >+ <td class="number [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded | $Price %]</td> >+ <td class="number [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price %]</td> >+ <td class="number [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price %]</td> >+ <td class="number [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included | $Price %]</td> > <td class="number [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]">[% books_loo.replacementprice | $Price %]</td> > <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity | html %]</td> >- <td class="number [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_excluded | $Price | html %]</td> >- <td class="number [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_included | $Price | html %]</td> >+ <td class="number [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_excluded | $Price %]</td> >+ <td class="number [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_included | $Price %]</td> > <td class="number">[% books_loo.tax_rate * 100 | html %]</td> > <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value | $Price %]</td> > <td>[% books_loo.budget_name | html %]</td> >@@ -634,14 +634,14 @@ > </p> > [% END %] > </td> >- <td class="number">[% order.rrp_tax_excluded | $Price | html %]</td> >- <td class="number">[% order.ecost_tax_excluded | $Price | html %]</td> >- <td class="number">[% order.rrp_tax_included | $Price | html %]</td> >- <td class="number">[% order.ecost_tax_included | $Price | html %]</td> >+ <td class="number">[% order.rrp_tax_excluded | $Price %]</td> >+ <td class="number">[% order.ecost_tax_excluded | $Price %]</td> >+ <td class="number">[% order.rrp_tax_included | $Price %]</td> >+ <td class="number">[% order.ecost_tax_included | $Price %]</td> > <td class="number">[% order.replacementprice | $Price %]</td> > <td class="number">[% order.quantity | html %]</td> >- <td class="number">[% order.total_tax_excluded | $Price | html %]</td> >- <td class="number">[% order.total_tax_included | $Price | html %]</td> >+ <td class="number">[% order.total_tax_excluded | $Price %]</td> >+ <td class="number">[% order.total_tax_included | $Price %]</td> > <td class="number">[% order.tax_rate * 100 | html %]</td> > <td class="number">[% order.tax_value | $Price %]</td> > <td>[% order.budget_name | html %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >index a566b5adbd..28e8e47691 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -292,12 +292,12 @@ > <li><label for="rrp">Retail price: </label>[% rrp | $Price %] <span class="hint">(adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])</span></li> > <li> > <label for="replacementprice">Replacement price:</label> >- <input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice | $Price | html %]" /> >+ <input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice | $Price %]" /> > </li> > <li><label for="ecost">Budgeted cost: </label>[% ecost | $Price %] <span class="hint">[% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]</span></li> > <li> > <label for="unitprice">Actual cost:</label> >- <input type="text" size="20" name="unitprice" id="unitprice" value="[% unitprice | $Price on_editing => 1 | html %]" /> <span lass="hint">[% IF (invoiceincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]</span> >+ <input type="text" size="20" name="unitprice" id="unitprice" value="[% unitprice | $Price on_editing => 1 %]" /> <span lass="hint">[% IF (invoiceincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]</span> > </li> > <li><label for="order_internalnote">Internal note: </label><textarea name="order_internalnote" width="40" rows="8" >[% order_internalnote | html %]</textarea></li> > [% IF order_vendornote %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >index 498486ccb2..c165e8d10c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >@@ -230,7 +230,7 @@ > <!-- ############################## --> > <label for="budget_period_total">Total amount: </label> > <input type="text" id="budget_period_total" name="budget_period_total" >- size="10" maxlength="80" value="[% budget_period_total | $Price on_editing => 1 | html %]" /> >+ size="10" maxlength="80" value="[% budget_period_total | $Price on_editing => 1 %]" /> > </li> > > <li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >index ce45d2589c..5266f29bca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -232,7 +232,7 @@ > > <li> > <label style="white-space: nowrap;" for="budget_amount" class="required">Amount: </label> >- <input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount | $Price on_editing => 1 | html %]" size="8" /> >+ <input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount | $Price on_editing => 1 %]" size="8" /> > </li> > > <li> >@@ -243,7 +243,7 @@ > > <li> > <label for="budget_expend">Warning at (amount): </label> >- <input type="text" name="budget_expend" id="budget_expend" value="[% budget_expend | $Price on_editing => 1 | html %]" size="10" /> >+ <input type="text" name="budget_expend" id="budget_expend" value="[% budget_expend | $Price on_editing => 1 %]" size="10" /> > <span class="hint">0 to disable</span> > </li> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >index c5f0e89e18..fd656f497d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >@@ -108,7 +108,7 @@ > </li> > <li> > <label for="enrolmentfee">Enrollment fee: </label> >- <input type="text" name="enrolmentfee" id="enrolmentfee" size="6" value="[% category.enrolmentfee | $Price on_editing => 1 | html %]" /> >+ <input type="text" name="enrolmentfee" id="enrolmentfee" size="6" value="[% category.enrolmentfee | $Price on_editing => 1 %]" /> > </li> > <li> > <label for="overduenoticerequired">Overdue notice required: </label> >@@ -136,7 +136,7 @@ > </li> > <li> > <label for="reservefee">Hold fee: </label> >- <input type="text" name="reservefee" id="reservefee" size="6" value="[% category.reservefee | $Price on_editing => 1 | html %]" /> >+ <input type="text" name="reservefee" id="reservefee" size="6" value="[% category.reservefee | $Price on_editing => 1 %]" /> > </li> > <li> > <label for="category_type" class="required">Category type: </label> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >index 4ffb01716f..e0af674642 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >@@ -157,7 +157,7 @@ > <li> > <label for="paid">Writeoff amount: </label> > <!-- default to writing off all --> >- <input name="amountwrittenoff" id="amountwrittenoff" value="[% amountoutstanding | $Price on_editing => 1 | html %]" type="text" /> >+ <input name="amountwrittenoff" id="amountwrittenoff" value="[% amountoutstanding | $Price on_editing => 1 %]" type="text" /> > </li> > </ol> > </fieldset> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >index b7c74966b6..35812fdc76 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >@@ -161,7 +161,7 @@ > <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds"><span class="user_holds_waiting_count count_label">[% holds_waiting | html %]</span> hold(s) waiting</a></li> > [% END %] > [% IF total_owing && total_owing > 0 %] >- <li><a href="/cgi-bin/koha/opac-account.pl"><span class="user_fines_count count_label">[% total_owing | $Price with_symbol => 1 | html %]</span> due in fines and charges</a></li> >+ <li><a href="/cgi-bin/koha/opac-account.pl"><span class="user_fines_count count_label">[% total_owing | $Price with_symbol => 1 %]</span> due in fines and charges</a></li> > [% END %] > </ul> > </div> >diff --git a/t/LangInstaller/templates/simple.tt b/t/LangInstaller/templates/simple.tt >index 872e66714d..dbc4ce3882 100644 >--- a/t/LangInstaller/templates/simple.tt >+++ b/t/LangInstaller/templates/simple.tt >@@ -1,3 +1,4 @@ >+[% USE raw %] > [% PROCESS 'i18n.inc' %] > [% t('hello') | $raw %] > [% tx('hello {name}', { name = 'Bob' }) | $raw %] >-- >2.11.0
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=83251">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 22007
:
83248
|
83249
|
83250
|
83251
|
83286
|
83287
|
83288
|
83289
|
83561
|
83562
|
83563
|
83564