From 23243e09bbdb161dfabb3bf7588fd71f33418106 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 15 Nov 2020 23:37:36 +0100 Subject: [PATCH] Fix some errors on JS string interpolation --- apps/note/static/note/js/transfer.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/note/static/note/js/transfer.js b/apps/note/static/note/js/transfer.js index dff1f8c5..5fe8553a 100644 --- a/apps/note/static/note/js/transfer.js +++ b/apps/note/static/note/js/transfer.js @@ -305,25 +305,25 @@ $('#btn_transfer').click(function () { const newBalance = source.note.balance - source.quantity * dest.quantity * amount if (newBalance <= -5000) { addMsg(interpolate(gettext('Warning, the transaction of %s from the note %s to the note %s succeed, but the emitter note %s is very negative.'), - [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name]), 'danger', 10000) + [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name, source.name]), 'danger', 10000) reset() return } else if (newBalance < 0) { addMsg(interpolate(gettext('Warning, the transaction of %s from the note %s to the note %s succeed, but the emitter note %s is negative.'), - [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name]), 'danger', 10000) + [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name, source.name]), 'danger', 10000) reset() return } } addMsg(interpolate(gettext('Transfer of %s from %s to %s succeed!'), - [pretty_money((source.quantity * dest.quantity * amount), source.name, dest.name)]), 'success', 10000) + [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name]), 'success', 10000) reset() }).fail(function (err) { // do it again but valid = false const errObj = JSON.parse(err.responseText) if (errObj.non_field_errors) { addMsg(interpolate(gettext('Transfer of %s from %s to %s failed: %s'), - [pretty_money(source.quantity * dest.quantity * amount), source.name, + dest.name, errObj.non_field_errors]), 'danger') + [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name, errObj.non_field_errors]), 'danger') LOCK = false return }