raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-12 23:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use JS I18n function in asset, avoid parsing error

Browse Source 
A deployment to the French server failed because a translation contained
an apostrophe `'` and we were rendering it without escaping in
Javascript. We don't have that problem and avoid other issues by using
the javascript translate function. That way the error message is
translated in the browser with the user's language and we don't have to
do any additional escaping.
This commit is contained in:
Maikel Linke
2021-01-27 14:12:25 +11:00
parent 0393e902c4
commit 06983c4dc7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/spree/orders/variant_autocomplete.js.erb
View File

@@ -45,7 +45,7 @@ $(document).ready(function() {
if (quantity > maxQuantity) {
quantity = maxQuantity;
save.parents('tr').find('input.line_item_quantity').val(maxQuantity);
alert('<%= I18n.t("js.admin.orders.quantity_adjusted") %>');
alert(t("js.admin.orders.quantity_adjusted"));
}
toggleItemEdit();
@@ -84,7 +84,7 @@ adjustItems = function(shipment_number, variant_id, quantity){
url += '.json';
if (new_quantity == 0) {
alert('<%= I18n.t("js.admin.orders.quantity_unchanged") %>');
alert(t("js.admin.orders.quantity_unchanged"));
} else {
$.ajax({
type: "PUT",