From 74567560f38bb0bbbdadb13e4b1c8173b777429a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cbc-yevhenii-buliuk=E2=80=9D?=
 <“yevhenii.buliuk@bigcommerce.com”>
Date: Tue, 18 May 2021 22:26:14 +0300
Subject: [PATCH] fix(storefront): BCTHEME-494 Translation Gap: Checkbox Option
 selection on Product.

---
 CHANGELOG.md                                     |  1 +
 templates/components/account/order-contents.html | 10 +++++++++-
 templates/components/account/returns-list.html   | 10 +++++++++-
 templates/components/cart/content.html           |  6 +++++-
 templates/components/cart/preview.html           |  8 +++++++-
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e441be270..80dfbe7f57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Draft
+- Translation Gap: Checkbox Option selection on Product. [#2063](https://github.com/bigcommerce/cornerstone/pull/2063)
 
 ## 6.1.1 (10-01-2021)
 - Fix product images on PDP has clipped outline. [#2124](https://github.com/bigcommerce/cornerstone/pull/2124)
diff --git a/templates/components/account/order-contents.html b/templates/components/account/order-contents.html
index dcde21d207..36f11756c8 100644
--- a/templates/components/account/order-contents.html
+++ b/templates/components/account/order-contents.html
@@ -58,7 +58,15 @@ <h6>{{brand.name}}</h6>
                 <dl class="definitionList">
                     {{#each options}}
                         <dt class="definitionList-key">{{name}}:</dt>
-                        <dd class="definitionList-value">{{{sanitize value}}}</dd>
+                        <dd class="definitionList-value">
+                            {{#if value '==' 'Yes'}}
+                                {{lang 'common.yes'}}
+                            {{else if value '==' 'No'}}
+                                {{lang 'common.no'}}
+                            {{else}}
+                                {{{sanitize value}}}
+                            {{/if}}
+                        </dd>
                     {{/each}}
                 </dl>
                 {{/if}}
diff --git a/templates/components/account/returns-list.html b/templates/components/account/returns-list.html
index d2ab2dedec..9ed95eb8d3 100644
--- a/templates/components/account/returns-list.html
+++ b/templates/components/account/returns-list.html
@@ -37,7 +37,15 @@ <h5 class="account-product-title">{{lang 'account.returns.list.return_number' id
                     <dl class="definitionList">
                         {{#each product.options}}
                             <dt class="definitionList-key">{{name}}:</dt>
-                            <dd class="definitionList-value">{{{sanitize value}}}</dd>
+                            <dd class="definitionList-value">
+                                {{#if value '==' 'Yes'}}
+                                    {{lang 'common.yes'}}
+                                {{else if value '==' 'No'}}
+                                    {{lang 'common.no'}}
+                                {{else}}
+                                    {{{sanitize value}}}
+                                {{/if}}
+                            </dd>
                         {{/each}}
                     </dl>
                 {{/if}}
diff --git a/templates/components/cart/content.html b/templates/components/cart/content.html
index 976708a3e1..3366ec94ca 100644
--- a/templates/components/cart/content.html
+++ b/templates/components/cart/content.html
@@ -46,8 +46,12 @@ <h2 class="cart-item-name">
                                 <dd class="definitionList-value">
                                     {{#if is_file}}
                                         <a href="/viewfile.php?attributeId={{id}}&cartitem={{../id}}">{{value}}</a>
+                                    {{else if value '==' 'Yes'}}
+                                        {{lang 'common.yes'}}
+                                    {{else if value '==' 'No'}}
+                                        {{lang 'common.no'}}
                                     {{else}}
-                                        {{{ sanitize value}}}
+                                        {{{sanitize value}}}
                                     {{/if}}
                                 </dd>
                             {{/each}}
diff --git a/templates/components/cart/preview.html b/templates/components/cart/preview.html
index 5fd19560e8..4281d4a60d 100644
--- a/templates/components/cart/preview.html
+++ b/templates/components/cart/preview.html
@@ -88,7 +88,13 @@ <h2 class="productView-title">
                                 {{name}}
                             </dt>
                             <dd class="productView-info-value">
-                                {{{ sanitize value}}}
+                                {{#if value '==' 'Yes'}}
+                                    {{lang 'common.yes'}}
+                                {{else if value '==' 'No'}}
+                                    {{lang 'common.no'}}
+                                {{else}}
+                                    {{{sanitize value}}}
+                                {{/if}}
                             </dd>
                         </dl>
                     {{/each}}