From 6729119489b933d21e7d2175b96c0b641cc41453 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Thu, 3 Mar 2022 20:59:04 +0000 Subject: [PATCH] Fix Angular interpolation for translations with apostrophes --- app/views/shared/menu/_cart_sidebar.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/shared/menu/_cart_sidebar.html.haml b/app/views/shared/menu/_cart_sidebar.html.haml index 7db40fd944..93ea539fdc 100644 --- a/app/views/shared/menu/_cart_sidebar.html.haml +++ b/app/views/shared/menu/_cart_sidebar.html.haml @@ -49,6 +49,8 @@ %div.fullwidth %a.edit-cart.button.large.dark.left{href: main_app.cart_path, "ng-disabled" => "Cart.dirty || Cart.empty()", "ng-class" => "{ dirty: Cart.dirty }"} - = "{{ Cart.dirty ? '#{t(:cart_updating)}' : (Cart.empty() ? '#{t(:cart_empty)}' : '#{t('.edit_cart')}' ) }}" + %div{ ng: { if: "Cart.dirty" } }= t(:cart_updating) + %div{ ng: { if: "!Cart.dirty && Cart.empty()" } }= t(:cart_empty) + %div{ ng: { if: "!Cart.dirty && !Cart.empty()" } }= t('.edit_cart') %a.checkout.button.large.bright.right{href: main_app.checkout_path, "ng-disabled" => "Cart.dirty || Cart.empty()"} = t '.checkout'