Browse Source

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

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
remotes/origin/19.11.x
Caroline Cyr La Rose 5 years ago
committed by Martin Renvoize
parent
commit
923aab2774
Signed by: martin.renvoize GPG Key ID: 422B469130441A0F
  1. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
  2. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
  3. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
  4. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
  5. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
  6. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
  7. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
  8. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
  9. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
  10. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt

6
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt

@ -1,5 +1,7 @@
[% USE raw %]
[% USE Asset %]
[%# USE the plugin and define some macros %]
[% PROCESS 'i18n.inc' %]
[% BLOCK csv_export %]
<div class="btn-group">
<a id="exportbutton" class="btn btn-default" href="[% script_name | url %]?op=export&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]"><i class="fa fa-download"></i> Export as CSV</a>
@ -395,7 +397,7 @@
<thead>
<tr>
<th>No.</th>
<th>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 +592,7 @@
<thead>
<tr>
<th>No.</th>
<th>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>

4
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt

@ -1,5 +1,7 @@
[% USE raw %]
[% USE Asset %]
[%# USE the plugin and define some macros %]
[% PROCESS 'i18n.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Acquisitions &rsaquo; Search existing records</title>
@ -68,7 +70,7 @@
</td>
<td class="actions">
<a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber | uri %]&amp;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 %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% biblio.biblionumber | uri %]" title="Order this one" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a>
<a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;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 %]

4
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt

@ -3,6 +3,8 @@
[% USE KohaDates %]
[% USE Branches %]
[% USE Koha %]
[%# USE the plugin and define some macros %]
[% PROCESS 'i18n.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Serials [% biblionumber | html %]</title>
@ -73,7 +75,7 @@
[% END %]
[% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %]
<a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% sub.biblionumber | uri %]&amp;from_subscriptionid=[% sub.subscriptionid | uri %]" title="Order this one" class="btn btn-default btn-xs">
<i class="fa fa-plus"></i> 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>

6
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt

@ -2,6 +2,8 @@
[% USE Branches %]
[% USE Price %]
[% USE Asset %]
[%# USE the plugin and define some macros %]
[% PROCESS 'i18n.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Acquisitions &rsaquo; Add order from a suggestion</title>
@ -78,9 +80,9 @@
</td>
<td class="actions">
[% IF ( suggestions_loo.biblionumber ) %]
<a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestions_loo.suggestionid | uri %]&amp;biblio=[% suggestions_loo.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a>
<a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestions_loo.suggestionid | uri %]&amp;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 %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestions_loo.suggestionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a>
<a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;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>

4
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt

@ -3,6 +3,8 @@
[% USE KohaDates %]
[% USE ItemTypes %]
[% USE Price %]
[%# USE the plugin and define some macros %]
[% PROCESS 'i18n.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Acquisitions &rsaquo; Ordered</title>
@ -27,7 +29,7 @@
<thead>
<tr>
<th class="anti-the"> Title </th>
<th> Order </th>
<th> [% tp('noun', 'Order') | html %] </th>
<th> Vendor </th>
<th> Item types </th>
<th> Left on order </th>

6
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt

@ -4,6 +4,8 @@
[% USE KohaDates %]
[% USE Price %]
[% USE currency = format('%.2f') -%]
[%# USE the plugin and define some macros %]
[% PROCESS 'i18n.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( date ) %]
@ -165,7 +167,7 @@
[% END %]
</td>
<td>
<a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% loop_order.ordernumber | uri %]" class="previewData">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&amp;id=[% loop_order.biblionumber | uri %]" class="previewData">Card</a>
</td>
@ -329,7 +331,7 @@
[% END %]
</td>
<td>
<a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% order.ordernumber | uri %]" class="previewData">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&amp;id=[% order.biblionumber | uri %]" class="previewData">Card</a>
</td>

4
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt

@ -3,6 +3,8 @@
[% USE KohaDates %]
[% USE ItemTypes %]
[% USE Price %]
[%# USE the plugin and define some macros %]
[% PROCESS 'i18n.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Acquisitions &rsaquo; Spent</title>
@ -27,7 +29,7 @@
<thead>
<tr>
<th class="anti-the">Title</th>
<th>Order</th>
<th>[% tp('noun', 'Order') | html %]</th>
<th>Vendor</th>
<th>Invoice</th>
<th>Item types</th>

6
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt

@ -1,3 +1,5 @@
[%# USE the plugin and define some macros %]
[% PROCESS 'i18n.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Acquisitions &rsaquo; Transfer order</title>
@ -13,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">Order: </span>[% ordernumber | html %]</li>
<li><span class="label">[% tp('noun', 'Order') | html %]: </span>[% ordernumber | html %]</li>
</ul>
</div>
[% ELSE %]
@ -65,7 +67,7 @@
<table>
<thead>
<tr>
<th>Order</th>
<th>[% tp('noun', 'Order') | html %]</th>
<th>Summary</th>
<th>&nbsp;</th>
</tr>

4
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt

@ -1,6 +1,8 @@
[% USE raw %]
[% USE Asset %]
[% USE Koha %]
[%# USE the plugin and define some macros %]
[% PROCESS 'i18n.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( booksellername ) %]Orders with uncertain prices for vendor [% booksellername | html %][% ELSE %]Orders with uncertain prices[% END %]</title>
@ -77,7 +79,7 @@
<thead>
<tr>
<th>Basket</th>
<th>Order</th>
<th>[% tp('noun', 'Order') | html %]</th>
<th>By</th>
<th>Uncertain</th>
<th>Price</th>

6
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt

@ -1,5 +1,7 @@
[% USE raw %]
[% USE Asset %]
[%# USE the plugin and define some macros %]
[% PROCESS 'i18n.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( opsearch ) %]Order from external source[% ELSE %]Order from external source &rsaquo; Search results[% END %]</title>
@ -115,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&amp;importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | html %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">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&amp;importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | html %]&amp;booksellerid=[% booksellerid | uri %]&amp;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>
@ -143,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 %]&amp;breedingid=[% breeding_loo.breedingid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a></td>
<td class="actions"><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;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>

Loading…
Cancel
Save