Attachment 81544 Details for Bug 21715 – Bug 21715: Ease translation of account and account offset type descriptions

[patch] Bug 21715: Ease translation of account and account offset type descriptions

Bug-21715-Ease-translation-of-account-and-account-.patch (text/plain), 12.36 KB, created by Josef Moravec on 2018-10-29 20:40:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2018-10-29 20:40:19 UTC

Size: 12.36 KB

patch

obsolete

>From ec7890affacdfb9b05f1850f295bf2d216b86fda Mon Sep 17 00:00:00 2001
>From: Tomas Cohen Arazi <tomascohen@theke.io>
>Date: Mon, 29 Oct 2018 12:15:19 -0300
>Subject: [PATCH] Bug 21715: Ease translation of account and account offset
> type descriptions
>
>This patch moves accounts-related descriptions into a single file to
>ease finding them, and also encloses descriptions inside tags to
>make it easier to translate.
>
>To test:
>- Apply this patch
>- Verify the templates work as expected
>=> SUCCESS: No behaviour change
>- Sign off :-D
>
>Bonus: there were two cases in which the INCLUDE line used 'accountline'
>as parameter, making it fail to pick the right account type!
>
>Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
>---
> .../prog/en/includes/account_offset_type.inc | 10 ------
> .../intranet-tmpl/prog/en/includes/accounts.inc | 39 ++++++++++++++++++++++
> .../intranet-tmpl/prog/en/includes/accounttype.inc | 24 -------------
> .../prog/en/modules/members/accountline-details.tt | 8 +++--
> .../prog/en/modules/members/boraccount.tt | 5 ++-
> .../prog/en/modules/members/moremember-print.tt | 5 ++-
> .../prog/en/modules/members/printfeercpt.tt | 5 ++-
> .../prog/en/modules/members/printinvoice.tt | 5 ++-
> 8 files changed, 60 insertions(+), 41 deletions(-)
> delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/account_offset_type.inc
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
> delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/accounttype.inc
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/account_offset_type.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/account_offset_type.inc
>deleted file mode 100644
>index 94edb23..0000000
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/account_offset_type.inc
>+++ /dev/null
>@@ -1,10 +0,0 @@
>-[% SWITCH account_offset.type %]
>- [% CASE 'Credit Applied' %]Credit applied
>- [% CASE 'Payment' %]Payment
>- [% CASE 'Manual Credit' %]Manual credit
>- [% CASE 'Manual Debit' %]Manual invoice
>- [% CASE 'Lost Item' %]Lost item returned
>- [% CASE 'Writeoff' %]Writeoff
>- [% CASE 'Void Payment' %]Void payment
>- [% CASE %][% account_offset.type | html %]
>-[%- END -%]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
>new file mode 100644
>index 0000000..cf38823
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
>@@ -0,0 +1,39 @@
>+[%- BLOCK account_type_description -%]
>+ [%- SWITCH account.accounttype -%]
>+ [%- CASE 'Pay' -%]Payment, thanks
>+ [%- CASE 'Pay00' -%]Payment, thanks (cash via SIP2)
>+ [%- CASE 'Pay01' -%]Payment, thanks (VISA via SIP2)
>+ [%- CASE 'Pay02' -%]Payment, thanks (credit card via SIP2)
>+ [%- CASE 'VOID' -%]Voided
>+ [%- CASE 'N' -%]New card
>+ [%- CASE 'F' -%]Fine
>+ [%- CASE 'A' -%]Account management fee
>+ [%- CASE 'M' -%]Sundry
>+ [%- CASE 'L' -%]Lost item
>+ [%- CASE 'W' -%]Writeoff
>+ [%- CASE 'FU' -%]Accruing fine
>+ [%- CASE 'HE' -%]Hold waiting too long
>+ [%- CASE 'Rent' -%]Rental fee
>+ [%- CASE 'FOR' -%]Forgiven
>+ [%- CASE 'LR' -%]Lost item fee refund
>+ [%- CASE 'PF' -%]Processing fee
>+ [%- CASE 'PAY' -%]Payment
>+ [%- CASE 'WO' -%]Writeoff
>+ [%- CASE 'C' -%]Credit
>+ [%- CASE 'CR' -%]Credit
>+ [%- CASE -%][% account.accounttype | html %]
>+ [%- END -%]
>+[%- END -%]
>+
>+[%- BLOCK offset_type_description -%]
>+ [%- SWITCH account_offset.type -%]
>+ [%- CASE 'Credit Applied' -%]Credit applied
>+ [%- CASE 'Payment' -%]Payment
>+ [%- CASE 'Manual Credit' -%]Manual credit
>+ [%- CASE 'Manual Debit' -%]Manual invoice
>+ [%- CASE 'Lost Item' -%]Lost item returned
>+ [%- CASE 'Writeoff' -%]Writeoff
>+ [%- CASE 'Void Payment' -%]Void payment
>+ [%- CASE -%][% account_offset.type | html %]
>+ [%- END -%]
>+[%- END -%]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounttype.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounttype.inc
>deleted file mode 100644
>index 0d30f65..0000000
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounttype.inc
>+++ /dev/null
>@@ -1,24 +0,0 @@
>-[% SWITCH account.accounttype %]
>- [% CASE 'Pay' %]Payment, thanks
>- [% CASE 'Pay00' %]Payment, thanks (cash via SIP2)
>- [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2)
>- [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
>- [% CASE 'VOID' %]Voided
>- [% CASE 'N' %]New card
>- [% CASE 'F' %]Fine
>- [% CASE 'A' %]Account management fee
>- [% CASE 'M' %]Sundry
>- [% CASE 'L' %]Lost item
>- [% CASE 'W' %]Writeoff
>- [% CASE 'FU' %]Accruing fine
>- [% CASE 'HE' %]Hold waiting too long
>- [% CASE 'Rent' %]Rental fee
>- [% CASE 'FOR' %]Forgiven
>- [% CASE 'LR' %]Lost item fee refund
>- [% CASE 'PF' %]Processing fee
>- [% CASE 'PAY' %]Payment
>- [% CASE 'WO' %]Writeoff
>- [% CASE 'C' %]Credit
>- [% CASE 'CR' %]Credit
>- [% CASE %][% account.accounttype | html %]
>-[%- END -%]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
>index dc5ad32..ae66f7e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
>@@ -3,6 +3,8 @@
> [%- USE AuthorisedValues -%]
> [%- USE Branches -%]
> 
>+[% PROCESS 'accounts.inc' %]
>+
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Patrons &rsaquo; Account for [% INCLUDE 'patron-title.inc' %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -41,7 +43,7 @@
> [% accountline.date |$KohaDates %]
> </td>
> <td>
>- [%- INCLUDE 'accounttype.inc' account => accountline -%]
>+ [%- PROCESS account_type_description account=accountline -%]
> [%- IF accountline.payment_type -%]
> , [% AuthorisedValues.GetByCode('PAYMENT_TYPE', accountline.payment_type) | html %]
> [%- END =%]
>@@ -109,12 +111,12 @@
> <td>[% offset_accountline.timestamp | $KohaDates with_hours => 1 | html %]</td>
> <td>[% offset_accountline.amount | $Price %]</td>
> <td>[% offset_accountline.amountoutstanding | $Price %]</td>
>- <td>[% INCLUDE 'accounttype.inc' account => offset_accountline %]</td>
>+ <td>[% PROCESS account_type_description account=offset_accountline %]</td>
> <td>[% offset_accountline.note | html %]</td>
> <td>[% IF offset_accountline.manager_id %]<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id | uri %]">[% offset_accountline.manager_id | html %]</a>[% END %]</td>
> <td>[% ao.created_on | $KohaDates with_hours => 1 | html %]</td>
> <td>[% ao.amount | $Price %]</td>
>- <td>[% INCLUDE 'account_offset_type.inc' account_offset => ao %]</td>
>+ <td>[% PROCESS offset_type_description account_offset=ao %]</td>
> <td><a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | uri %]" class="btn btn-default btn-xs"> Details</a></td>
> </tr>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>index 44015bb..a369540 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>@@ -8,6 +8,9 @@
> [% USE Price %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
>+
>+[% PROCESS 'accounts.inc' %]
>+
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Patrons &rsaquo; Account for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -61,7 +64,7 @@
> <tr>
> <td>[% account.date |$KohaDates %]</td>
> <td>
>- [% INCLUDE 'accounttype.inc' accountline => account %]
>+ [% PROCESS account_type_description account=account %]
> [%- IF account.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
> [%- IF account.description %], [% account.description | html %][% END %]
> &nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>[% END %]</td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
>index 9deff58..3df5ab4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
>@@ -3,6 +3,9 @@
> [% USE KohaDates %]
> [% USE Price %]
> [% SET footerjs = 1 %]
>+
>+[% PROCESS 'accounts.inc' %]
>+
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Summary for [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -109,7 +112,7 @@
> <tr>
> <td>[% account.date | $KohaDates %]</td>
> <td>
>- [% INCLUDE 'accounttype.inc' accountline => account %]
>+ [% PROCESS account_type_description account=account %]
> [%- IF account.payment_type %]
> , [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
>index 74fbc25..45d6eda 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
>@@ -5,6 +5,9 @@
> [% USE Branches %]
> [% USE Price %]
> [% SET footerjs = 1 %]
>+
>+[% PROCESS 'accounts.inc' %]
>+
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Print receipt for [% patron.cardnumber | html %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -51,7 +54,7 @@
> <tr class="highlight">
> <td>[% account.date | $KohaDates %]</td>
> <td>
>- [% INCLUDE 'accounttype.inc' account => account %]
>+ [% PROCESS account_type_description account=account %]
> [%- IF account.description %], [% account.description | html %][% END %]
> </td>
> <td>[% account.note | html %]</td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
>index 33ae62c..a28ac03 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
>@@ -5,6 +5,9 @@
> [% USE KohaDates %]
> [% USE Price %]
> [% SET footerjs = 1 %]
>+
>+[% PROCESS 'accounts.inc' %]
>+
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Print receipt for [% patron.cardnumber | html %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -51,7 +54,7 @@
> <tr class="highlight">
> <td>[% account.date | $KohaDates%]</td>
> <td>
>- [% INCLUDE 'accounttype.inc' account => account %]
>+ [% PROCESS account_type_description account=account %]
> [%- IF account.description %], [% account.description | html %][% END %]
> </td>
> <td>[% account.note | html %]</td>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 21715: 81519 | 81524 | 81544 | 81651