From e86665d8909b85b8076e60e4a28819e48d2b5c34 Mon Sep 17 00:00:00 2001
From: Robert Baillie <robert.baillie@ortooapps.com>
Date: Mon, 13 Dec 2021 11:55:05 +0000
Subject: [PATCH] Added label for the 'close' text on the modal

---
 .../default/labels/ortoo-core-CustomLabels.labels-meta.xml | 7 +++++++
 framework/default/ortoo-core/default/lwc/modal/modal.html  | 4 ++--
 framework/default/ortoo-core/default/lwc/modal/modal.js    | 6 +++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/framework/default/ortoo-core/default/labels/ortoo-core-CustomLabels.labels-meta.xml b/framework/default/ortoo-core/default/labels/ortoo-core-CustomLabels.labels-meta.xml
index 7c5e114962a..7ff92e95187 100644
--- a/framework/default/ortoo-core/default/labels/ortoo-core-CustomLabels.labels-meta.xml
+++ b/framework/default/ortoo-core/default/labels/ortoo-core-CustomLabels.labels-meta.xml
@@ -63,4 +63,11 @@
         <shortDescription>Message when CRUD violation occurs on a publish. {0} is the name of the Event.</shortDescription>
         <value>Attempted to publish {0} events without the required permission</value>
     </labels>
+    <labels>
+        <fullName>ortoo_core_close</fullName>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>The word 'Close', capitalised.</shortDescription>
+        <value>Close</value>
+    </labels>
 </CustomLabels>
\ No newline at end of file
diff --git a/framework/default/ortoo-core/default/lwc/modal/modal.html b/framework/default/ortoo-core/default/lwc/modal/modal.html
index 13fe2d3c231..f6d9c712dbf 100644
--- a/framework/default/ortoo-core/default/lwc/modal/modal.html
+++ b/framework/default/ortoo-core/default/lwc/modal/modal.html
@@ -15,7 +15,7 @@
                         <!-- TODO: labels for 'Close' -->
                         <button
                             class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse"
-                            title="Close"
+                            title={labels.close}
                             onclick={handleCancel}
                             aria-id="cancel-cross"
                         >
@@ -25,7 +25,7 @@
                                 variant="inverse"
                                 size="small"
                             ></lightning-icon>
-                            <span class="slds-assistive-text">Close</span>
+                            <span class="slds-assistive-text">{labels.close}</span>
                         </button>
                         <h2 id="modal-heading-01" class="slds-text-heading_medium slds-hyphenate">
                             <slot name="title"></slot>
diff --git a/framework/default/ortoo-core/default/lwc/modal/modal.js b/framework/default/ortoo-core/default/lwc/modal/modal.js
index d952dc2bf0e..a84bcc6c02c 100644
--- a/framework/default/ortoo-core/default/lwc/modal/modal.js
+++ b/framework/default/ortoo-core/default/lwc/modal/modal.js
@@ -1,8 +1,13 @@
 import { LightningElement, api } from 'lwc';
+import CLOSE_LABEL from '@salesforce/label/c.ortoo_core_close';
 
 export default class Modal extends LightningElement {
     @api visible;
 
+    labels = {
+        close: CLOSE_LABEL
+    };
+
     dispatchCancel() {
         const event = new CustomEvent( 'cancel' );
         this.dispatchEvent( event );
@@ -12,7 +17,6 @@ export default class Modal extends LightningElement {
         this.dispatchCancel();
     }
 
-    // Ideally the modal would auto-focus on launch
     handleKeyDown( event ) {
         if( event.code == 'Escape' ) {
             this.dispatchCancel();