Bugzilla – Attachment 99584 Details for
Bug 24725
xgettext does not support (yet) ES template literals
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 24725: Remove ES template literals in checkouts.js
Bug-24725-Remove-ES-template-literals-in-checkouts.patch (text/plain), 6.14 KB, created by
Jonathan Druart
on 2020-02-25 13:54:24 UTC
(
hide
)
Description:
Bug 24725: Remove ES template literals in checkouts.js
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2020-02-25 13:54:24 UTC
Size:
6.14 KB
patch
obsolete
>From 5892f5f176b765cd729cc445a42c4ac333be1d66 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >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 = '<a class="return-claim-title strong" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber= ' + oObj.biblionumber '">' >+ let title = '<a class="return-claim-title strong" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=' + oObj.biblionumber + '">' > + oObj.title >- + oObj.enumchron || "" >+ + ( oObj.enumchron || "" ) > + '</a>'; > if ( oObj.author ) { > title += 'by ' + oObj.author; >@@ -915,8 +915,7 @@ $(document).ready(function() { > { > "sClass": "return-claim-notes-td", > "mDataProp": function ( oObj ) { >- return >- '<span id="return-claim-notes-static-' + oObj.id + '" class="return-claim-notes" data-return-claim-id=' + oObj.id + '">' + oObj.notes + '</span>' >+ return '<span id="return-claim-notes-static-' + oObj.id + '" class="return-claim-notes" data-return-claim-id="' + oObj.id + '">' + oObj.notes + '</span>' > + '<i style="float:right" class="fa fa-pencil-square-o" title="Double click to edit"></i>'; > } > }, >@@ -937,7 +936,7 @@ $(document).ready(function() { > if ( ! oObj.resolution ) return ""; > > let desc = '<strong>' + oObj.resolution_data.lib + '</strong> on <i>' + oObj.resolved_on + '</i>'; >- if (oObj.resolved_by_data) desc += ' by <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=' + oObj.resolved_by_data.borrowernumber + '">' + oObj.resolved_by_data.firstname || "" + oObj.resolved_by_data.surname || "" + '</a>'; >+ if (oObj.resolved_by_data) desc += ' by <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=' + oObj.resolved_by_data.borrowernumber + '">' + ( oObj.resolved_by_data.firstname || "" ) + ( oObj.resolved_by_data.surname || "" ) + '</a>'; > return desc; > } > }, >@@ -950,17 +949,16 @@ $(document).ready(function() { > ? '<li><a href="#" class="return-claim-tools-resolve" data-return-claim-id="' + oObj.id + '"><i class="fa fa-check-square"></i> Resolve</a></li>' > : ""; > >- return >- '<div class="btn-group">' >- + '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">' >- + 'Actions <span class="caret"></span>' >- + '</button>' >- + '<ul class="dropdown-menu">' >- + ' <li><a href="#" class="return-claim-tools-editnotes" data-return-claim-id="' + oObj.id + '"><i class="fa fa-edit"></i> Edit notes</a></li>' >- + resolve_html >- + delete_html >- + '</ul>' >- + '</div>'; >+ return '<div class="btn-group">' >+ + ' <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">' >+ + ' Actions <span class="caret"></span>' >+ + ' </button>' >+ + ' <ul class="dropdown-menu">' >+ + ' <li><a href="#" class="return-claim-tools-editnotes" data-return-claim-id="' + oObj.id + '"><i class="fa fa-edit"></i> Edit notes</a></li>' >+ + resolve_html >+ + delete_html >+ + ' </ul>' >+ + ' </div>'; > } > }, > ], >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 24725
:
99584
|
99585
|
99646
|
99814
|
99815