From d3def51ff7e862c0618873b025b41c13b6e38f48 Mon Sep 17 00:00:00 2001 From: caroline 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 @@ No. - [% tp('noun', 'Order') %] + [% tp('noun', 'Order') | html %] RRP tax exc. Actual cost tax exc. ecost tax exc. @@ -590,7 +590,7 @@ No. - [% tp('noun', 'Order') %] + [% tp('noun', 'Order') | html %] RRP tax exc. ecost tax exc. RRP tax inc. 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 @@ View MARC - [% tp('verb', 'Order') %] + [% tp('verb', 'Order') | html %] [% 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 %] - [% tp('verb', 'Order') %] + [% tp('verb', 'Order') | html %] [% ELSE %] Cannot be ordered 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 @@ [% IF ( suggestions_loo.biblionumber ) %] - [% tp('verb', 'Order') %] + [% tp('verb', 'Order') | html %] [% ELSE %] - [% tp('verb', 'Order') %] + [% tp('verb', 'Order') | html %] [% END %] 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 @@ Title - [% tp('noun', 'Order') %] + [% tp('noun', 'Order') | html %] Vendor Item types Left on order 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 %] - [% tp('noun', 'Order') %]
+ [% tp('noun', 'Order') | html %]
MARC
Card @@ -331,7 +331,7 @@ [% END %] - [% tp('noun', 'Order') %]
+ [% tp('noun', 'Order') | html %]
MARC
Card 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 @@ Title - [% tp('noun', 'Order') %] + [% tp('noun', 'Order') | html %] Vendor Invoice Item types 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 @@ [% ELSE %] @@ -67,7 +67,7 @@ - + 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 @@ - + 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 ) %] - + @@ -145,7 +145,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : - + [% END %] [% END %] -- 2.17.1
[% tp('noun', 'Order') %][% tp('noun', 'Order') | html %] Summary  
Basket[% tp('noun', 'Order') %][% tp('noun', 'Order') | html %] By Uncertain Price
[% breeding_loo.server | html %]
Preview MARC Preview card [% tp('verb', 'Order') %] X
[% breeding_loo.server | html %]
Preview MARC Preview card [% tp('verb', 'Order') | html %] X
[% breeding_loo.title | html %] [% breeding_loo.author | html %] [% breeding_loo.isbn | html %] [% tp('verb', 'Order') %] [% tp('verb', 'Order') | html %]