From b73dfef3e1751ab71562d5a352970bfcb7d814f4 Mon Sep 17 00:00:00 2001 From: Caroline Cyr La Rose Date: Wed, 12 Feb 2020 17:29:41 -0500 Subject: [PATCH] Bug 24648: Contextualization of past tense 'Created' In French, everything has one of the binary genders (male or female), and it affects the past tense verb agreements. This patch adds contextualization for the "Created" verb The following files have been modified: booksellers.tt - refers to a basket basket.tt - refers to a basket transferorder.tt - refers to a basket memberentrygen.tt - refers to a patron restriction suggestion.tt - refers to a suggestion To test, apply the patch and visit all those pages in English to make sure there is no change. 1) Go to Acquisitions 2) Search for vendors 3) On the vendors result pages, check the 'Created by' column heading of the baskets 4) Click on one of the baskets, check the basket info at the top, it should say 'Created by:' 5) Click Transfer on one of the orders 6) Search for and choose a vendor 7) In the list of that vendor's basket, it should say 'Created by' 8) Go to a patron's account 9) Add a manual restriction in the Restrictions tab at the bottom 10) In the restriction info, it should say 'Created' 11) Click on the Purchase suggestions tab on the left 12) Add a new suggestion 13) In the Suggestion management section, it should say 'Created by:' 14) Submit the suggestion 15) From the list of suggestions, click on the title 16) In Suggestion management, it should say 'Created by:' 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 'basket created by', 'patron restriction created on' and 'suggestion created by' (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 basket is in the places where 'Created by' refers to a basket, that the translation for the patron restriction is where it should be and that the translation you put in for the purchase suggestion is in the places where 'Created by' refers to a purchase suggestion Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt | 3 ++- .../intranet-tmpl/prog/en/modules/acqui/transferorder.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 3 ++- .../intranet-tmpl/prog/en/modules/suggestion/suggestion.tt | 5 +++-- 5 files changed, 9 insertions(+), 6 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 c4d4d178dd..867367307a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -219,7 +219,7 @@ [% END %] [% IF deliveryplace %]
  • Delivery place: [% Branches.GetName( deliveryplace ) | html %]
    • [% END %] [% IF billingplace %]
  • Billing place: [% Branches.GetName( billingplace ) | html %]
    • [% END %] - [% IF ( authorisedbyname ) %]
  • Created by: [% authorisedbyname | html %]
    • [% END %] + [% IF ( authorisedbyname ) %]
  • [% tp('basket created by', 'Created by:') | html %] [% authorisedbyname | html %]
    • [% END %]
  • Managed by: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 03f8b93e7e..6271d8d0b1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -1,3 +1,4 @@ +[% PROCESS 'i18n.inc' %] [% USE raw %] [% USE Asset %] [% USE KohaDates %] @@ -87,7 +88,7 @@ Item count Bibliographic record count Items expected - Created by + [% tp('basket created by', 'Created by') | html %] Date Basket group Closed 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 eb94564ccb..7ebb3c3244 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt @@ -41,7 +41,7 @@ Basket (#) - Created by + [% tp('basket created by', 'Created by') | html %] Date   diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index cbb8ae2d0e..30c18d6449 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -1,3 +1,4 @@ +[% PROCESS 'i18n.inc' %] [% USE raw %] [% USE Asset %] [% USE To %] @@ -1177,7 +1178,7 @@ Type Comment Expiration - Created + [% tp('patron restriction created on', 'Created') | html %] [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %] Remove? [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index adc03227a5..66e6d940c7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -1,3 +1,4 @@ +[% PROCESS 'i18n.inc' %] [% USE raw %] [% USE Asset %] [% USE Branches %] @@ -167,7 +168,7 @@  DateBy - Created by: + [% tp('purchase suggestion created by', 'Created by:') | html %] [% suggesteddate | $KohaDates %] [% IF ( suggestedby_borrowernumber ) %] @@ -365,7 +366,7 @@  DateBy - + [% INCLUDE 'date-format.inc' %] [% IF ( suggestedby_borrowernumber ) %][% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %]) [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %])[% END %] -- 2.39.5