Attachment 156448 Details for Bug 34801 – Bug 34801: Fix incorrect use of __() in .tt and .inc files (bug 34038 follow-up)

[patch] Bug 34801: Fix incorrect use of __() in .tt and .inc files (bug 34038 follow-up)

Bug-34801-Fix-incorrect-use-of--in-tt-and-inc-file.patch (text/plain), 2.41 KB, created by David Nind on 2023-10-01 19:39:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2023-10-01 19:39:13 UTC

Size: 2.41 KB

patch

obsolete

>From 97a72a3cd473ddbd99b6cf93b3fb6fd48d61851b Mon Sep 17 00:00:00 2001
>From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
>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 <david@davidnind.com>
>---
> 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 += '</span>';
> 
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 34801: 155662 | 156448 | 156452