gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 18694: Translatability: Get rid of exposing [%% FOREACH in csv/cash_register_stats.tt 

Code exposed is:
%s %s %s [%%- FOREACH field IN row; field IF !loop.last; ItemTypes.GetDescription(field) IF loop.last; sep IF !loop.last; END %%] %s TOTAL [%%- FOREACH field IN total; field; sep IF !loop.last; END %%]

Similar for: csv/orders_by_budget.tt

To test:
- Apply patch
- In staff client, verify that Cash register statistics work as before
  (Home > Reports > Cash register statistics)
- Verify the same for Home > Reports > Orders by fund (triggers orders_by_budget.tt)
- Bonus test: Create a "language" aa-AA (perl translate create aa-AA
  from folder misc/translator, verify that lines mentioned above do
  no longer appear in aa-AA-staff-prog.po )
- Run QA tools (newest version with test for newlines in tt directives)

Rebased on top of Bug 18734 2017-12-06 / mv

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit ec478e18f3)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 3db92ec25a)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
This commit is contained in:
Marc Véron 2017-05-30 08:41:53 +02:00 committed by Katrin Fischer
parent 44965f6040
commit 74bd5c320c
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
koha-tmpl/intranet-tmpl/prog/en/modules/reports/csv/cash_register_stats.tt
View File

@ -1,14 +1,7 @@
[% USE ItemTypes %]
[%- INCLUDE csv_headers/reports/cash_register_stats.tt %]
[%- FOREACH row IN rows %]
[%- FOREACH field IN row;
field IF !loop.last;
ItemTypes.GetDescription(field) IF loop.last;
sep IF !loop.last;
END %]
[%- FOREACH row IN rows # Avoid line breaks in directives because of translatability %]
[%- FOREACH field IN row; field IF !loop.last; ItemTypes.GetDescription(field) IF loop.last; sep IF !loop.last; END %]
[% END -%]
TOTAL
[%- FOREACH field IN total;
field;
sep IF !loop.last;
END %]
[%- FOREACH field IN total; field; sep IF !loop.last; END %]

12
koha-tmpl/intranet-tmpl/prog/en/modules/reports/csv/orders_by_budget.tt
View File

@ -1,12 +1,6 @@
[% INCLUDE csv_headers/reports/orders_by_budget.tt %]
[%- FOREACH row IN rows %]
[%- FOREACH field IN row;
field;
sep IF !loop.last;
END %]
[%- FOREACH row IN rows # Avoid line breaks in directives because of translatability %]
[%- FOREACH field IN row; field; sep IF !loop.last; END %]
[% END -%]
TOTAL
[%- FOREACH field IN totalrow;
field;
sep IF !loop.last;
END %]
[%- FOREACH field IN totalrow; field; sep IF !loop.last; END %]