|
Description
Marc Véron
2017-05-21 17:43:27 UTC
Created attachment 63592 [details] [review] Bug 18648 - Translatability: Get rid of tt directives in translation for macles.tt koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt contains template directives inside a div tag: <span title="[% FOREACH lib IN cell.libs %][% lib.lib |html %] - [% END %]"> This is exposed in translation tool. To test: - Carefully examine code changes - Apply patch, verify that the directive is no longer exposed (picked for po files) - If you know where / how this macles is used, verify that it behaves as before Created attachment 63599 [details] [review] [SIGNED-OFF] Bug 18648 - Translatability: Get rid of tt directives in translation for macles.tt koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt contains template directives inside a div tag: <span title="[% FOREACH lib IN cell.libs %][% lib.lib |html %] - [% END %]"> This is exposed in translation tool. To test: - Carefully examine code changes - Apply patch, verify that the directive is no longer exposed (picked for po files) - If you know where / how this macles is used, verify that it behaves as before Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Found an issue - needs some more workk... Created attachment 63853 [details] [review] Bug 18648: Translatability: Get rid of tt directives in translation for macles.tt koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt contains template directives inside a div tag: <span title="[% FOREACH lib IN cell.libs %][% lib.lib |html %] - [% END %]"> This is exposed in translation tool. To test: - Carefully examine code changes - Apply patch, verify that the directive is no longer exposed (picked for po files), e.g. by creating a new "language" aa-AA and examing aa-AA-staff-prog.po - If you know where / how this macles is used, verify that it behaves as before (Note: New patch, needs new sign off) Created attachment 63987 [details] [review] Bug 18648: Translatability: Get rid of tt directives in translation for macles.tt koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt contains template directives inside a div tag: <span title="[% FOREACH lib IN cell.libs %][% lib.lib |html %] - [% END %]"> This is exposed in translation tool. To test: - Carefully examine code changes - Apply patch, verify that the directive is no longer exposed (picked for po files), e.g. by creating a new "language" aa-AA and examing aa-AA-staff-prog.po - If you know where / how this macles is used, verify that it behaves as before (Note: New patch, needs new sign off) Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Trivial, skipping QA. Created attachment 64060 [details] [review] Bug 18648: Fix syntax 'unexpected end of input' Pushed to master for 17.11, thanks to everybody involved! Pushed to master for 17.11, thanks to everybody involved! This patch removes the hyphen separator : [% FOREACH lib IN cell.libs %][% lib.lib |html %] - [% END %] replaced by : [% FOREACH lib IN cell.libs %][% lib.lib |html %][% END %] Is is normal ? (In reply to Fridolin SOMERS from comment #10) > This patch removes the hyphen separator : > [% FOREACH lib IN cell.libs %][% lib.lib |html %] - [% END %] > replaced by : > [% FOREACH lib IN cell.libs %][% lib.lib |html %][% END %] > > Is is normal ? No, sorry, that's my error, thanks for pointing it out. Since it is already pushed to master I will file a new bug. *** Bug 18769 has been marked as a duplicate of this bug. *** (In reply to Marc Véron from comment #11) > (In reply to Fridolin SOMERS from comment #10) > > This patch removes the hyphen separator : > > [% FOREACH lib IN cell.libs %][% lib.lib |html %] - [% END %] > > replaced by : > > [% FOREACH lib IN cell.libs %][% lib.lib |html %][% END %] > > > > Is is normal ? > > No, sorry, that's my error, thanks for pointing it out. > Since it is already pushed to master I will file a new bug. Patch follows on this bug Created attachment 64160 [details] [review] Bug 18648: Restore hyphen See comment #10 Hyphen restored and moved as string inside the tt directive to avoid that it is picked for translation. Created attachment 64162 [details] [review] Bug 18648: Restore hyphen (In reply to Marc Véron from comment #14) > Created attachment 64160 [details] [review] [review] > Bug 18648: Restore hyphen > > See comment #10 > Hyphen restored and moved as string inside the tt directive to avoid that it > is picked for translation. This patch did not work: Template process failed: file error - parse error - /home/vagrant/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt line 56: unexpected token (_) (In reply to Jonathan Druart from comment #15) > Created attachment 64162 [details] [review] [review] > Bug 18648: Restore hyphen Pushed to master! Pushed to 17.05.x, will be in 17.05.01 This patch has been pushed to 16.11.x and will be in 16.11.09. Pushed to 16.05.x, for 16.05.15 release |