Summary: | Fix incorrect use of __() in .tt and .inc files | ||
---|---|---|---|
Product: | Koha | Reporter: | Owen Leonard <oleonard> |
Component: | Templates | Assignee: | Owen Leonard <oleonard> |
Status: | CLOSED FIXED | QA Contact: | Katrin Fischer <katrin.fischer> |
Severity: | normal | ||
Priority: | P5 - low | CC: | caroline.cyr-la-rose, dcook, fridolin.somers |
Version: | Main | ||
Hardware: | All | ||
OS: | All | ||
Change sponsored?: | --- | Patch complexity: | Small patch |
Documentation contact: | Documentation submission: | ||
Text to go in the release notes: | Version(s) released in: |
23.11.00,23.05.04,22.11.10
|
|
Circulation function: | |||
Bug Depends on: | 21156 | ||
Bug Blocks: | 34801 | ||
Attachments: |
Bug 34038: Fix incorrect use of __() in .tt and .inc files
Bug 34038: Fix incorrect use of __() in .tt and .inc files Bug 34038: Fix incorrect use of __() in .tt and .inc files |
Description
Owen Leonard
2023-06-16 14:02:09 UTC
Created attachment 152421 [details] [review] Bug 34038: Fix incorrect use of __() in .tt and .inc files This patch corrects instances of the double-underscore function being used in .tt and .inc files where the single-underscore function should be used instead. To test, apply the patch and update a translation, e.g. fr-FR: > cd misc/translator > perl translate update fr-FR - Open the corresponding .po file for JavaScript strings, in this case misc/translator/po/fr-FR-staff-prog.po - Confirm that the strings are now in the .po file for translation. You should find these lines: - koha-tmpl/intranet-tmpl/prog/en/includes/js-biblio-format.inc: "No title." - koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt: "Check in and add to bundle" "Ignore holds and add to bundle" - koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt: "Please enter only a barcode, or only a biblionumber." - koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt: "Please enter only barcodes, or only biblionumbers." - koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt: "Please specify a content for 'Default'" - Check fr-FR-opac-bootstrap.po for these lines: - koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc: "Please enter a valid date (should match %s)." - koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt: "No item was selected" - koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt, koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt, koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt: "No item was selected" Hi Owen, I tried this and I still don't see the strings in the po file. I applied the patch, then ./misc/translator/translate update fr-CA then checked in fr-CA-staff-prog.po for the strings (specifically "Check in and add to bundle" since it's unique) and they are not there. I'm probably missing a step? Caroline could you try again? It seems to work for me, and it sounds like you're testing correctly. Created attachment 155246 [details] [review] Bug 34038: Fix incorrect use of __() in .tt and .inc files This patch corrects instances of the double-underscore function being used in .tt and .inc files where the single-underscore function should be used instead. To test, apply the patch and update a translation, e.g. fr-FR: > cd misc/translator > perl translate update fr-FR - Open the corresponding .po file for JavaScript strings, in this case misc/translator/po/fr-FR-staff-prog.po - Confirm that the strings are now in the .po file for translation. You should find these lines: - koha-tmpl/intranet-tmpl/prog/en/includes/js-biblio-format.inc: "No title." - koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt: "Check in and add to bundle" "Ignore holds and add to bundle" - koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt: "Please enter only a barcode, or only a biblionumber." - koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt: "Please enter only barcodes, or only biblionumbers." - koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt: "Please specify a content for 'Default'" - Check fr-FR-opac-bootstrap.po for these lines: - koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc: "Please enter a valid date (should match %s)." - koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt: "No item was selected" - koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt, koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt, koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt: "No item was selected" Signed-off-by: David Cook <dcook@prosentient.com.au> No problemo on this end Btw also passed QA tools Created attachment 155408 [details] [review] Bug 34038: Fix incorrect use of __() in .tt and .inc files This patch corrects instances of the double-underscore function being used in .tt and .inc files where the single-underscore function should be used instead. To test, apply the patch and update a translation, e.g. fr-FR: > cd misc/translator > perl translate update fr-FR - Open the corresponding .po file for JavaScript strings, in this case misc/translator/po/fr-FR-staff-prog.po - Confirm that the strings are now in the .po file for translation. You should find these lines: - koha-tmpl/intranet-tmpl/prog/en/includes/js-biblio-format.inc: "No title." - koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt: "Check in and add to bundle" "Ignore holds and add to bundle" - koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt: "Please enter only a barcode, or only a biblionumber." - koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt: "Please enter only barcodes, or only biblionumbers." - koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt: "Please specify a content for 'Default'" - Check fr-FR-opac-bootstrap.po for these lines: - koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc: "Please enter a valid date (should match %s)." - koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt: "No item was selected" - koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt, koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt, koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt: "No item was selected" Signed-off-by: David Cook <dcook@prosentient.com.au> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Pushed to master for 23.11. Nice work everyone, thanks! Pushed to 23.05.x for 23.05.04 Nice work everyone! Pushed to oldstable for 22.11.x |