From ec7d23517b699cd63fe424003f93226fab9acc09 Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Fri, 15 Sep 2023 10:27:39 +0000 Subject: [PATCH] Bug 34801: Fix incorrect use of __() in .tt and .inc files (bug 34038 follow-up) __() should be used in .js files, not .tt files 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 the lines in the commit Signed-off-by: David Nind Signed-off-by: Victor Grousset/tuxayo --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/includes/js-biblio-format.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index 74991def4e..5e86850ccb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -1177,7 +1177,7 @@ if( row.creator ) { $("#creator").html([row.creator.surname, row.creator.firstname].filter(function(name){return name}).join(', ')+" ("+row.creator.patron_id+')') } else { - $("#creator").html(__("Account has been deleted")); + $("#creator").html(_("Account has been deleted")); } $("#quantity_to_receive").val(row.quantity).prop('readonly', !row.subscription_id); $("#quantity").val( effective_create_items == 'cataloguing' ? row.quantity_received || 1 : row.quantity_received ) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/js-biblio-format.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/js-biblio-format.inc index 77c2fe5c18..7d125e2060 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/js-biblio-format.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/js-biblio-format.inc @@ -17,7 +17,7 @@ if (biblio.title != null && biblio.title != '') { title += escape_str(biblio.title); } else { - title += __("No title"); + title += _("No title"); } title += ''; -- 2.42.0