[Bug 34038] New: Fix incorrect use of __() in .tt and .inc files
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 Bug ID: 34038 Summary: Fix incorrect use of __() in .tt and .inc files Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: ASSIGNED Severity: normal Priority: P5 - low Component: Templates Assignee: oleonard@myacpl.org Reporter: oleonard@myacpl.org QA Contact: testopia@bugs.koha-community.org Depends on: 21156 We have several instances of translatable strings in templates and include files being wrapped in the double-underscore function which should only be used in .js files. Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21156 [Bug 21156] Internationalization: plural forms, context, and more for JS files -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff Patch complexity|--- |Small patch -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 --- Comment #1 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 152421 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=152421&action=edit 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" -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |caroline.cyr-la-rose@inlibr | |o.com --- Comment #2 from Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> --- 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? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 --- Comment #3 from Owen Leonard <oleonard@myacpl.org> --- Caroline could you try again? It seems to work for me, and it sounds like you're testing correctly. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #152421|0 |1 is obsolete| | --- Comment #4 from David Cook <dcook@prosentient.com.au> --- Created attachment 155246 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=155246&action=edit 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> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dcook@prosentient.com.au --- Comment #5 from David Cook <dcook@prosentient.com.au> --- No problemo on this end -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 --- Comment #6 from David Cook <dcook@prosentient.com.au> --- Btw also passed QA tools -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|testopia@bugs.koha-communit |katrin.fischer@bsz-bw.de |y.org | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #155246|0 |1 is obsolete| | --- Comment #7 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 155408 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=155408&action=edit 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> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to master Version(s)| |23.11.00 released in| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 --- Comment #8 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Pushed to master for 23.11. Nice work everyone, thanks! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |fridolin.somers@biblibre.co | |m --- Comment #9 from Fridolin Somers <fridolin.somers@biblibre.com> --- Added to https://gitlab.com/koha-community/qa-test-tools/-/issues/55 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to master |Pushed to stable Version(s)|23.11.00 |23.11.00,23.05.04 released in| | --- Comment #10 from Fridolin Somers <fridolin.somers@biblibre.com> --- Pushed to 23.05.x for 23.05.04 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to stable |Pushed to oldstable Version(s)|23.11.00,23.05.04 |23.11.00,23.05.04,22.11.10 released in| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 --- Comment #11 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Nice work everyone! Pushed to oldstable for 22.11.x -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34038 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |34801 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34801 [Bug 34801] Fix incorrect use of __() in .tt and .inc files (bug 34038 follow-up) -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org