From abdc10ae7062a26233b26ce1fff69ba9a175e909 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Tue, 7 Apr 2020 12:10:39 -0700
Subject: [PATCH] FIX: Labels for modal close and dismiss-error buttons

---
 .../javascripts/discourse/templates/components/d-modal.hbs    | 4 ++--
 config/locales/client.en.yml                                  | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
index 6c6106bbad8..9df8af3a177 100644
--- a/app/assets/javascripts/discourse/templates/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
@@ -3,7 +3,7 @@
     <div class="modal-inner-container">
       <div class="modal-header">
         {{#if dismissable}}
-          {{d-button icon="times" action=(route-action "closeModal") class="btn btn-flat modal-close close" }}
+          {{d-button icon="times" action=(route-action "closeModal") class="btn btn-flat modal-close close" title="modal.close"}}
         {{/if}}
 
         {{#if panels}}
@@ -33,7 +33,7 @@
 
       {{#each errors as |error|}}
         <div class="alert alert-error">
-          <button class="close" data-dismiss="alert">×</button>
+          <button class="close" data-dismiss="alert" aria-label={{i18n "modal.dismiss_error"}}>×</button>
           {{error}}
         </div>
       {{/each}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 7e28c6620d2..9345ba52723 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1381,6 +1381,9 @@ en:
         back: "Go Back"
         again: "Try Again"
         fixed: "Load Page"
+    modal:
+      close: "close"
+      dismiss_error: "Dismiss error"
     close: "Close"
     assets_changed_confirm: "This site was just updated. Refresh now for the latest version?"
     logout: "You were logged out."