Bugzilla – Attachment 95160 Details for
Bug 23983
Contextualization of "Order" (verb) vs "Order" (noun)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23983: Contextualization of 'Order' (verb) vs 'Order' (noun)
Bug-23983-Contextualization-of-Order-verb-vs-Order.patch (text/plain), 15.17 KB, created by
Caroline Cyr La Rose
on 2019-11-07 14:49:51 UTC
(
hide
)
Description:
Bug 23983: Contextualization of 'Order' (verb) vs 'Order' (noun)
Filename:
MIME Type:
Creator:
Caroline Cyr La Rose
Created:
2019-11-07 14:49:51 UTC
Size:
15.17 KB
patch
obsolete
>From d3def51ff7e862c0618873b025b41c13b6e38f48 Mon Sep 17 00:00:00 2001 >From: caroline <caroline@inlibro.com> >Date: Thu, 7 Nov 2019 09:49:08 -0500 >Subject: [PATCH] Bug 23983: Contextualization of 'Order' (verb) vs 'Order' > (noun) > >This patch adds context (word class, either verb or noun) to the word >'Order' when it is displayed alone in the acquisitions module. > >The following files have been modified: >basket.tt >neworderbiblio.tt >newordersubscription.tt >newordersuggestion.tt >ordered.tt >parcel.tt >spent.tt >transferorder.tt >uncertainprice.tt >z3950_search.tt > >To test, check all those pages in English to make sure there is >no change. >1- Go to Acquisitions >2- Create a basket >3- Add to basket from an existing record (neworderbiblio) >4- Add to basket from a subscription (newordersubscription) >5- Add to basket from a suggestion (newordersuggestion) >6- Add to basket from an external source (z3950_search) >7- In one of the orders, check the uncertain price box >8- Check the basket display table (basket) >9- Click transfer on one of the orders (transferorder) >10- Go to the vendor page and click on 'Uncertain prices' (uncertainprice) >11- Click on 'Receive parcel' (parcel) >12- Go to the Acquisitions home page and click on the >amount for 'ordered' (ordered) >13- Go to the Acquisitions home page and click on the >amount for 'spent' (spent) > >Next, install a new language (fr-CA used as example) >1- translate create fr-CA >2- open fr-CA-messages.po and add a translation for Order >(verb) and Order (noun) (it doesn't have to be real, just >write something different for each) >3- translate install fr-CA >4- in the system preferences, enable the french language in >'language' >5- change interface language to french > >Redo the tests above to make sure the word you put in the translation >for the verb is in the places where 'Order' should be a verb and that >the translation you put in for the noun is in the places where 'Order' >should be a noun >--- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 4 ++-- > .../intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt | 2 +- > .../prog/en/modules/acqui/newordersubscription.tt | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/transferorder.tt | 4 ++-- > .../intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt | 4 ++-- > 10 files changed, 15 insertions(+), 15 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 fab69b08e1..2c4b83989b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -395,7 +395,7 @@ > <thead> > <tr> > <th>No.</th> >- <th>[% tp('noun', 'Order') %]</th> >+ <th>[% tp('noun', 'Order') | html %]</th> > <th>RRP tax exc.</th> > <th>Actual cost tax exc.</th> > <th>ecost tax exc.</th> >@@ -590,7 +590,7 @@ > <thead> > <tr> > <th>No.</th> >- <th>[% tp('noun', 'Order') %]</th> >+ <th>[% tp('noun', 'Order') | html %]</th> > <th class="tax_excluded">RRP tax exc.</th> > <th class="tax_excluded">ecost tax exc.</th> > <th class="tax_included">RRP tax inc.</th> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >index 58562bdbaf..6c04b2ac99 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >@@ -70,7 +70,7 @@ > </td> > <td class="actions"> > <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber | uri %]&viewas=html" class="previewMARC btn btn-default btn-xs"><i class="fa fa-eye"></i> View MARC</a> >- <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&biblionumber=[% biblio.biblionumber | uri %]" title="Order this one" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') %]</a> >+ <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&biblionumber=[% biblio.biblionumber | uri %]" title="Order this one" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >index d4443aecfd..3e14e75775 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >@@ -75,7 +75,7 @@ > [% END %] > [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %] > <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&biblionumber=[% sub.biblionumber | uri %]&from_subscriptionid=[% sub.subscriptionid | uri %]" title="Order this one" class="btn btn-default btn-xs"> >- <i class="fa fa-plus"></i> [% tp('verb', 'Order') %] >+ <i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %] > </a> > [% ELSE %] > <a title="This subscription depends on another supplier" style="cursor:help">Cannot be ordered</a> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >index 6f6ba03f67..4286e382e9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >@@ -80,9 +80,9 @@ > </td> > <td class="actions"> > [% IF ( suggestions_loo.biblionumber ) %] >- <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&suggestionid=[% suggestions_loo.suggestionid | uri %]&biblio=[% suggestions_loo.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') %]</a> >+ <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&suggestionid=[% suggestions_loo.suggestionid | uri %]&biblio=[% suggestions_loo.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a> > [% ELSE %] >- <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&suggestionid=[% suggestions_loo.suggestionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') %]</a> >+ <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&suggestionid=[% suggestions_loo.suggestionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a> > [% END %] > </td> > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >index 2cbe13d4f0..f5169b0696 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >@@ -29,7 +29,7 @@ > <thead> > <tr> > <th class="anti-the"> Title </th> >- <th> [% tp('noun', 'Order') %] </th> >+ <th> [% tp('noun', 'Order') | html %] </th> > <th> Vendor </th> > <th> Item types </th> > <th> Left on order </th> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index 1016a60760..dde19d60a9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -167,7 +167,7 @@ > [% END %] > </td> > <td> >- <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% loop_order.ordernumber | uri %]" class="previewData">[% tp('noun', 'Order') %]</a><br> >+ <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% loop_order.ordernumber | uri %]" class="previewData">[% tp('noun', 'Order') | html %]</a><br> > <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber | uri %]" class="previewData">MARC</a><br> > <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% loop_order.biblionumber | uri %]" class="previewData">Card</a> > </td> >@@ -331,7 +331,7 @@ > [% END %] > </td> > <td> >- <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% order.ordernumber | uri %]" class="previewData">[% tp('noun', 'Order') %]</a><br> >+ <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% order.ordernumber | uri %]" class="previewData">[% tp('noun', 'Order') | html %]</a><br> > <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber | uri %]" class="previewData">MARC</a><br> > <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% order.biblionumber | uri %]" class="previewData">Card</a> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >index f52bcac7bd..1c6c7510b6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >@@ -29,7 +29,7 @@ > <thead> > <tr> > <th class="anti-the">Title</th> >- <th>[% tp('noun', 'Order') %]</th> >+ <th>[% tp('noun', 'Order') | html %]</th> > <th>Vendor</th> > <th>Invoice</th> > <th>Item types</th> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >index d73e703405..df3b1cf0bc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >@@ -15,7 +15,7 @@ > <ul> > <li><span class="label">From vendor: </span>[% booksellerfromname | html %]</li> > <li><span class="label">Basket: </span>[% basketfromname | html %]</li> >- <li><span class="label">[% tp('noun', 'Order') %]: </span>[% ordernumber | html %]</li> >+ <li><span class="label">[% tp('noun', 'Order') | html %]: </span>[% ordernumber | html %]</li> > </ul> > </div> > [% ELSE %] >@@ -67,7 +67,7 @@ > <table> > <thead> > <tr> >- <th>[% tp('noun', 'Order') %]</th> >+ <th>[% tp('noun', 'Order') | html %]</th> > <th>Summary</th> > <th> </th> > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >index a9646189e9..eb3fdeb1d9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >@@ -79,7 +79,7 @@ > <thead> > <tr> > <th>Basket</th> >- <th>[% tp('noun', 'Order') %]</th> >+ <th>[% tp('noun', 'Order') | html %]</th> > <th>By</th> > <th>Uncertain</th> > <th>Price</th> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >index bf5b13a783..3fe1674949 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >@@ -117,7 +117,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > [% IF ( breeding_loo.breedingid ) %] > > <tr> >- <td>[% breeding_loo.server | html %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&breedingid=[% breeding_loo.breedingid | html %]&booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">[% tp('verb', 'Order') %]</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td> >+ <td>[% breeding_loo.server | html %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&breedingid=[% breeding_loo.breedingid | html %]&booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">[% tp('verb', 'Order') | html %]</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td> > <td>[% breeding_loo.title | html %]</td> > <td>[% breeding_loo.author | html %]</td> > <td>[% breeding_loo.isbn | html %]</td> >@@ -145,7 +145,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > </ul> > </div> > </td> >- <td class="actions"><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&breedingid=[% breeding_loo.breedingid | uri %]&booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') %]</a></td> >+ <td class="actions"><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&breedingid=[% breeding_loo.breedingid | uri %]&booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a></td> > </tr> > [% END %] > [% END %]</tbody> >-- >2.17.1
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=95160">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 23983
:
95129
|
95160
|
95183
|
95360
|
95361
|
95367
|
95368
|
95371
|
95372