From 5892f5f176b765cd729cc445a42c4ac333be1d66 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 25 Feb 2020 14:52:52 +0100 Subject: [PATCH] Bug 24725: Remove ES template literals in checkouts.js From Julian on bug 24661 comment 6: """ It looks like xgettext does not like ES6 template literals. https://savannah.gnu.org/bugs/?50920 From what I understand, support for template literals was added in gettext 0.20 (still not packaged in debian) but is still buggy in latest released version 0.20.1 and a fix is present in master. """ We should not use backticks ` in .js file, it breaks xgettext. To replicate: kohadev-koha@e1f3025cca60:/kohadevbox/koha/misc/translator$ perl translate update es-ES koha-tmpl/intranet-tmpl/prog/js/checkouts.js:569: warning: unterminated string koha-tmpl/intranet-tmpl/prog/js/checkouts.js:858: warning: unterminated string koha-tmpl/intranet-tmpl/prog/js/checkouts.js:904: warning: unterminated string koha-tmpl/intranet-tmpl/prog/js/checkouts.js:911: warning: unterminated string koha-tmpl/intranet-tmpl/prog/js/checkouts.js:1095: warning: RegExp literal terminated too early /usr/bin/msgmerge: error while opening "/kohadevbox/koha/misc/translator/po/es-ES-messages-js.po" for reading: No such file or directory (last error 'No such file or directory' is not related to this). Test plan: Make sure nothing is broken on the claims table Confirm that the errors do not longer appear on `perl translate update LANG` --- koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 30 +++++++++++++--------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js index 145e138e87..cb8535dcdd 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js @@ -900,9 +900,9 @@ $(document).ready(function() { }, { "mDataProp": function ( oObj ) { - let title = '' + let title = '' + oObj.title - + oObj.enumchron || "" + + ( oObj.enumchron || "" ) + ''; if ( oObj.author ) { title += 'by ' + oObj.author; @@ -915,8 +915,7 @@ $(document).ready(function() { { "sClass": "return-claim-notes-td", "mDataProp": function ( oObj ) { - return - '' + oObj.notes + '' + return '' + oObj.notes + '' + ''; } }, @@ -937,7 +936,7 @@ $(document).ready(function() { if ( ! oObj.resolution ) return ""; let desc = '' + oObj.resolution_data.lib + ' on ' + oObj.resolved_on + ''; - if (oObj.resolved_by_data) desc += ' by ' + oObj.resolved_by_data.firstname || "" + oObj.resolved_by_data.surname || "" + ''; + if (oObj.resolved_by_data) desc += ' by ' + ( oObj.resolved_by_data.firstname || "" ) + ( oObj.resolved_by_data.surname || "" ) + ''; return desc; } }, @@ -950,17 +949,16 @@ $(document).ready(function() { ? '
  • Resolve
  • ' : ""; - return - '
    ' - + '' - + '' - + '
    '; + return '
    ' + + ' ' + + ' ' + + '
    '; } }, ], -- 2.11.0