From 2ae18c005fe6045787e1aaa7f8d8f1f35018a246 Mon Sep 17 00:00:00 2001
From: Giulio Gratta <giulio@giuliogratta.com>
Date: Wed, 5 Mar 2014 15:13:13 -0800
Subject: [PATCH] change 'modal' wording to something more general and less
 jargony

---
 lms/templates/dashboard.html                  | 20 +++++++++----------
 lms/templates/forgot_password_modal.html      |  2 +-
 lms/templates/help_modal.html                 |  6 +++---
 lms/templates/login_modal.html                |  2 +-
 .../modal/_modal-settings-language.html       |  4 ++--
 lms/templates/signup_modal.html               |  2 +-
 lms/templates/wiki/edit.html                  |  4 ++--
 lms/templates/wiki/history.html               |  8 ++++----
 lms/templates/wiki/includes/cheatsheet.html   |  4 ++--
 9 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index cdf98d902dd..c1b5e71179e 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -288,7 +288,7 @@
     <button class="close-modal">&#10005;
       <span class="sr">
         ## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
-        ${_('Close Modal')}
+        ${_('Close')}
       </span>
     </button>
 
@@ -297,7 +297,7 @@
         ${_('Email Settings for {course_number}').format(course_number='<span id="email_settings_course_number"></span>')}
         <span class="sr">,
           ## Translators: this text gives status on if the modal interface (a menu or piece of UI that takes the full focus of the screen) is open or not
-          ${_("modal open")}
+          ${_("window open")}
         </span>
       </h2>
       <hr/>
@@ -320,7 +320,7 @@
     <button class="close-modal">&#10005;
       <span class="sr">
         ## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
-        ${_('Close Modal')}
+        ${_('Close')}
       </span>
     </button>
 
@@ -329,7 +329,7 @@
         ${_('Password Reset Email Sent')}
         <span class="sr">,
           ## Translators: this text gives status on if the modal interface (a menu or piece of UI that takes the full focus of the screen) is open or not
-          ${_("modal open")}
+          ${_("window open")}
         </span>
       </h2>
       <hr/>
@@ -349,7 +349,7 @@
     <button class="close-modal">&#10005;
       <span class="sr">
         ## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
-        ${_('Close Modal')}
+        ${_('Close')}
       </span>
     </button>
 
@@ -358,7 +358,7 @@
         <span id="change_email_title">${_("Change Email")}</span>
         <span class="sr">,
           ## Translators: this text gives status on if the modal interface (a menu or piece of UI that takes the full focus of the screen) is open or not
-          ${_("modal open")}
+          ${_("window open")}
         </span>
       </h2>
       <hr/>
@@ -392,7 +392,7 @@
     <button class="close-modal">&#10005;
       <span class="sr">
         ## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
-        ${_('Close Modal')}
+        ${_('Close')}
       </span>
     </button>
 
@@ -401,7 +401,7 @@
         ${_("Change your name")}
         <span class="sr">,
           ## Translators: this text gives status on if the modal interface (a menu or piece of UI that takes the full focus of the screen) is open or not
-          ${_("modal open")}
+          ${_("window open")}
         </span>
       </h2>
       <hr/>
@@ -434,7 +434,7 @@
     <button class="close-modal">&#10005;
       <span class="sr">
         ## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
-        ${_('Close Modal')}
+        ${_('Close')}
       </span>
     </button>
 
@@ -443,7 +443,7 @@
         ${_('<span id="track-info"></span> {course_number}?  <span id="refund-info"></span>').format(course_number='<span id="unenroll_course_number"></span>')}
         <span class="sr">,
           ## Translators: this text gives status on if the modal interface (a menu or piece of UI that takes the full focus of the screen) is open or not
-          ${_("modal open")}
+          ${_("window open")}
         </span>
       </h2>
       <hr/>
diff --git a/lms/templates/forgot_password_modal.html b/lms/templates/forgot_password_modal.html
index 5aaa38585e5..a6b797a03aa 100644
--- a/lms/templates/forgot_password_modal.html
+++ b/lms/templates/forgot_password_modal.html
@@ -7,7 +7,7 @@
     <button class="close-modal">&#10005;
       <span class="sr">
         ## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
-        ${_('Close Modal')}
+        ${_('Close')}
       </span>
     </button>
 
diff --git a/lms/templates/help_modal.html b/lms/templates/help_modal.html
index 8650e75a124..56d8240b59e 100644
--- a/lms/templates/help_modal.html
+++ b/lms/templates/help_modal.html
@@ -21,7 +21,7 @@
       &#10005;
       <span class="sr">
         ## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
-        ${_('Close Modal')}
+        ${_('Close')}
       </span>
     </button>
 
@@ -72,7 +72,7 @@ discussion_link = get_discussion_link(course) if course else None
       &#10005;
       <span class="sr">
         ## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
-        ${_('Close Modal')}
+        ${_('Close')}
       </span>
     </button>
 
@@ -106,7 +106,7 @@ discussion_link = get_discussion_link(course) if course else None
       &#10005;
       <span class="sr">
         ## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
-        ${_('Close Modal')}
+        ${_('Close')}
       </span>
     </button>
 
diff --git a/lms/templates/login_modal.html b/lms/templates/login_modal.html
index 9cacaff51c3..9220d035d61 100644
--- a/lms/templates/login_modal.html
+++ b/lms/templates/login_modal.html
@@ -8,7 +8,7 @@
       <button class="close-modal">&#10005;
         <span class="sr">
           ## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
-          ${_('Close Modal')}
+          ${_('Close')}
       </span>
     </button>
 
diff --git a/lms/templates/modal/_modal-settings-language.html b/lms/templates/modal/_modal-settings-language.html
index 5c0be2e11cc..00def90240c 100644
--- a/lms/templates/modal/_modal-settings-language.html
+++ b/lms/templates/modal/_modal-settings-language.html
@@ -10,7 +10,7 @@
     <button class="close-modal">&#10005;
       <span class="sr">
         ## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
-        ${_('Close Modal')}
+        ${_('Close')}
       </span>
     </button>
 
@@ -19,7 +19,7 @@
         <span id="change_language_title">${_("Change Preferred Language")}</span>
         <span class="sr">,
           ## Translators: this text gives status on if the modal interface (a menu or piece of UI that takes the full focus of the screen) is open or not
-          ${_("modal open")}
+          ${_("window open")}
         </span>
       </h2>
       <hr/>
diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html
index 85c2732571e..24beff0f8c2 100644
--- a/lms/templates/signup_modal.html
+++ b/lms/templates/signup_modal.html
@@ -13,7 +13,7 @@
     <button class="close-modal">&#10005;
       <span class="sr">
         ## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
-        ${_('Close Modal')}
+        ${_('Close')}
       </span>
     </button>
 
diff --git a/lms/templates/wiki/edit.html b/lms/templates/wiki/edit.html
index 1f271576204..749620d3eb1 100644
--- a/lms/templates/wiki/edit.html
+++ b/lms/templates/wiki/edit.html
@@ -45,10 +45,10 @@
   </div>
   <section id="previewModal" class="modal" aria-hidden="true">
     <div class="inner-wrapper" role="dialog" aria-labelledby="preview-title">
-      <button class="close-modal">&#10005; <span class="sr">{% trans 'Close Modal' %}</span></button>
+      <button class="close-modal">&#10005; <span class="sr">{% trans 'Close' %}</span></button>
 
       <header>
-        <h2 id="preview-title">{% trans "Wiki Preview" %}<span class="sr">, {% trans "modal open" %}</span></h2>
+        <h2 id="preview-title">{% trans "Wiki Preview" %}<span class="sr">, {% trans "window open" %}</span></h2>
         <hr/>
       </header>
 
diff --git a/lms/templates/wiki/history.html b/lms/templates/wiki/history.html
index 78f595a112c..d0165af4fc5 100644
--- a/lms/templates/wiki/history.html
+++ b/lms/templates/wiki/history.html
@@ -201,10 +201,10 @@
   <input type="hidden" name="r" value="" />
   <section id="previewRevisionModal" class="modal" aria-hidden="true">
     <div class="inner-wrapper" role="dialog" aria-labelledby="preview-title">
-      <button class="close-modal">&#10005; <span class="sr">{% trans 'Close Modal' %}</span></button>
+      <button class="close-modal">&#10005; <span class="sr">{% trans 'Close' %}</span></button>
 
       <header>
-        <h2 id="preview-title">{% trans "Wiki Revision Preview" %}<span class="sr">, {% trans "modal open" %}</span></h2>
+        <h2 id="preview-title">{% trans "Wiki Revision Preview" %}<span class="sr">, {% trans "window open" %}</span></h2>
         <hr/>
       </header>
       <div class="modal-body">
@@ -232,10 +232,10 @@
 
   <section id="mergeModal" class="modal" aria-hidden="true">
     <div class="inner-wrapper" role="dialog" aria-labelledby="merge-title">
-      <button class="close-modal">&#10005; <span class="sr">{% trans 'Close Modal' %}</span></button>
+      <button class="close-modal">&#10005; <span class="sr">{% trans 'Close' %}</span></button>
 
       <header>
-        <h2 id="merge-title">{% trans "Merge Revision" %}<span class="sr">, {% trans "modal open" %}</span></h2>
+        <h2 id="merge-title">{% trans "Merge Revision" %}<span class="sr">, {% trans "window open" %}</span></h2>
         <hr/>
       </header>
       <div class="modal-header">
diff --git a/lms/templates/wiki/includes/cheatsheet.html b/lms/templates/wiki/includes/cheatsheet.html
index 6ab8b605328..39ef742e9ed 100644
--- a/lms/templates/wiki/includes/cheatsheet.html
+++ b/lms/templates/wiki/includes/cheatsheet.html
@@ -1,10 +1,10 @@
 {% load i18n %}
 <section id="cheatsheetModal" class="modal" aria-hidden="true">
   <div class="inner-wrapper" role="dialog" aria-labelledby="cheatsheet-title">
-    <button class="close-modal">&#10005; <span class="sr">{% trans 'Close Modal' %}</span></button>
+    <button class="close-modal">&#10005; <span class="sr">{% trans 'Close' %}</span></button>
 
     <header>
-      <h2 id="cheatsheet-title">{% trans "Wiki Cheatsheet" %}<span class="sr">, {% trans "modal open" %}</span></h2>
+      <h2 id="cheatsheet-title">{% trans "Wiki Cheatsheet" %}<span class="sr">, {% trans "window open" %}</span></h2>
       <hr/>
     </header>
     <div id="cheatsheet-body" class="modal-body">
-- 
GitLab