Bugzilla – Attachment 5094 Details for
Bug 6458
incorrect parsing result in translation processing
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 6458: Incorrect translation processing / acqui/...
Bug-6458-Incorrect-translation-processing--acqui.patch (text/plain), 6.36 KB, created by
Katrin Fischer
on 2011-08-22 21:52:10 UTC
(
hide
)
Description:
Bug 6458: Incorrect translation processing / acqui/...
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2011-08-22 21:52:10 UTC
Size:
6.36 KB
patch
obsolete
>From 83eed7d61bb40d30ada568e1b399f3f053760a86 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >Date: Mon, 22 Aug 2011 23:47:02 +0200 >Subject: [PATCH] Bug 6458: Incorrect translation processing / acqui/... >Content-Type: text/plain; charset="utf-8" > >Patch removes template directives from within HTML tags from >- acquisitions > new vendor / modify vendor / vendor details >- acquisitions > late orders >- acquisitons > vendor x > basket groups >--- > .../prog/en/modules/acqui/basketgroup.tt | 12 ++++++++---- > .../prog/en/modules/acqui/lateorders.tt | 6 ++++-- > .../prog/en/modules/acqui/supplier.tt | 10 ++++------ > 3 files changed, 16 insertions(+), 12 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >index ba12d7b..98eb90a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -222,14 +222,16 @@ function submitForm(form) { > <h3><label for="billingplace">Billing Place:</label></h3> > <select name="billingplace" id="billingplace"> > [% FOREACH billingplaceloo IN billingplaceloop %] >- <option value="[% billingplaceloo.value %]" [% IF ( billingplaceloo.selected ) %]selected[% END %]>[% billingplaceloo.branchname %]</option> >+ [% IF ( billingplaceloo.selected ) %]<option value="[% billingplaceloo.value %]" selected="selected">[% billingplaceloo.branchname %]</option> >+ [% ELSE %]<option value="[% billingplaceloo.value %]">[% billingplaceloo.branchname %]</option>[% END%] > [% END %] > </select> > <h3><label for="deliveryplace">Delivery Place:</label></h3> > <select name="deliveryplace" id="deliveryplace"> > <option value="">--</option> > [% FOREACH deliveryplaceloo IN deliveryplaceloop %] >- <option value="[% deliveryplaceloo.value %]" [% IF ( deliveryplaceloo.selected ) %]selected[% END %]>[% deliveryplaceloo.branchname %]</option> >+ [% IF ( deliveryplaceloo.selected ) %]<option value="[% deliveryplaceloo.value %]" selected="selected">[% deliveryplaceloo.branchname %]</option> >+ [% ELSE %]<option value="[% deliveryplaceloo.value %]">[% deliveryplaceloo.branchname %]</option>[% END %] > [% END %] > </select> > <p>or</p> >@@ -272,8 +274,10 @@ function submitForm(form) { > <div class="yui-g"> > <div id="bgtabs" class="yui-navset"> > <ul class="yui-nav"> >- <li[% UNLESS ( closed ) %] class="selected"[% END %]><a href="#opened"><em>Opened</em></a></li> >- <li[% IF ( closed ) %] class="selected"[% END %]><a href="#closed"><em>Closed</em></a></li> >+ [% UNLESS ( closed ) %]<li class="selected"><a href="#opened"><em>Opened</em></a></li> >+ [% ELSE%]<li><a href="#opened"><em>Opened</em></a></li>[% END %] >+ [% IF ( closed ) %]<li class="selected"><a href="#closed"><em>Closed</em></a></li> >+ [% ELSE %]<li><a href="#closed"><em>Closed</em></a></li>[% END %] > </ul> > <div class="yui-content"> > <div id="opened"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >index 5af5862..1e64e1f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -38,7 +38,8 @@ > <th> </th> > </tr> > [% FOREACH lateorder IN lateorders %] >- <tr[% UNLESS ( loop.odd ) %] class="highlight"[% END %]> >+ [% UNLESS ( loop.odd ) %]<tr class="highlight"> >+ [% ELSE %]<tr>[% END %] > <td> > [% lateorder.orderdate %] > ([% lateorder.latesince %] days) >@@ -101,7 +102,8 @@ > <select id="supplierid" size="1" tabindex="" name="supplierid"> > <option value=""/> > [% FOREACH SUPPLIER_LOO IN SUPPLIER_LOOP %] >- <option value="[% SUPPLIER_LOO.id %]"[% IF ( SUPPLIER_LOO.selected ) %] selected="selected"[% END %]>[% SUPPLIER_LOO.name %]</option> >+ [% IF ( SUPPLIER_LOO.selected ) %]<option value="[% SUPPLIER_LOO.id %]" selected="selected">[% SUPPLIER_LOO.name %]</option> >+ [% ELSE %]<option value="[% SUPPLIER_LOO.id %]">[% SUPPLIER_LOO.name %]</option>[% END %] > [% END %] > </select> > </ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >index 13a411c..001bf0d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -89,18 +89,16 @@ if (f.company.value == "") { > <li><label for="list_currency">List prices are</label> > <select name="list_currency" id="list_currency"> > [% FOREACH loop_currenc IN loop_currency %] >- <option value="[% loop_currenc.currency %]" >- [% IF ( loop_currenc.listprice ) %]selected="1"[% END %]> >- [% loop_currenc.currency %]</option> >+ [% IF ( loop_currenc.listprice ) %]<option value="[% loop_currenc.currency %]" selected="1">[% loop_currenc.currency %]</option> >+ [% ELSE %]<option value="[% loop_currenc.currency %]">[% loop_currenc.currency %]</option>[% END %] > [% END %] > </select> > </li> > <li><label for="invoice_currency">Invoice prices are</label> > <select name="invoice_currency" id="invoice_currency"> > [% FOREACH loop_currenc IN loop_currency %] >- <option value="[% loop_currenc.currency %]" >- [% IF ( loop_currenc.invoiceprice ) %]selected="1"[% END %]> >- [% loop_currenc.currency %]</option> >+ [% IF ( loop_currenc.invoiceprice ) %]<option value="[% loop_currenc.currency %]" selected="1">[% loop_currenc.currency %]</option> >+ [% ELSE %]<option value="[% loop_currenc.currency %]">[% loop_currenc.currency %]</option>[% END %] > [% END %] > </select> > </li> >-- >1.7.4.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6458
:
4695
|
4697
|
4699
|
4729
|
4968
|
5070
|
5071
|
5072
|
5074
|
5078
|
5079
|
5080
|
5081
|
5082
|
5090
|
5091
|
5092
|
5093
|
5094
|
5095
|
5096
|
5121
|
5125
|
5126
|
5127
|
5128
|
5129
|
5130
|
5131
|
5132
|
5133
|
5147
|
5148
|
5149
|
5150
|
5152
|
5153
|
5155
|
5156
|
5157
|
5158
|
5159
|
5160
|
5168
|
5169
|
5170
|
5258
|
5259
|
5260
|
5261
|
5262
|
5263
|
5273
|
5274
|
5286
|
5287
|
5288
|
5289
|
5292
|
5293
|
5299
|
5300
|
5416
|
5417
|
5418
|
5419
|
5420
|
5425
|
5426
|
5427