#961292 by yoroy: 'Close the drawer' needs a better title for screen readers

2 files changed, 5 insertions, 5 deletions

diff --git a/modules/toolbar/toolbar.js b/modules/toolbar/toolbar.js
index 4336218b6..3dd215e1e 100644
--- a/modules/toolbar/toolbar.js
+++ b/modules/toolbar/toolbar.js
@@ -42,7 +42,7 @@ Drupal.toolbar.init = function() {
  * Collapse the toolbar.
  */
 Drupal.toolbar.collapse = function() {
-  var toggle_text = Drupal.t('Open the drawer');
+  var toggle_text = Drupal.t('Show shortcuts');
   $('#toolbar div.toolbar-drawer').addClass('collapsed');
   $('#toolbar a.toggle')
     .removeClass('toggle-active')
@@ -64,7 +64,7 @@ Drupal.toolbar.collapse = function() {
  * Expand the toolbar.
  */
 Drupal.toolbar.expand = function() {
-  var toggle_text = Drupal.t('Close the drawer');
+  var toggle_text = Drupal.t('Hide shortcuts');
   $('#toolbar div.toolbar-drawer').removeClass('collapsed');
   $('#toolbar a.toggle')
     .addClass('toggle-active')
diff --git a/modules/toolbar/toolbar.module b/modules/toolbar/toolbar.module
index bd774c5ee..8c8916bfe 100644
--- a/modules/toolbar/toolbar.module
+++ b/modules/toolbar/toolbar.module
@@ -17,7 +17,7 @@ function toolbar_help($path, $arg) {
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Displaying administrative links') . '</dt>';
-      $output .= '<dd>' . t('The Toolbar module displays a bar containing top-level administrative links across the top of the screen. Below that, the Toolbar module has a <em>drawer</em> section where it displays links provided by other modules, such as the core <a href="@shortcuts-help">Shortcut module</a>. The drawer can be hidden/shown by using the close/open drawer link at the end of the toolbar.', array('@shortcuts-help' => url('admin/help/shortcut'))) . '</dd>';
+      $output .= '<dd>' . t('The Toolbar module displays a bar containing top-level administrative links across the top of the screen. Below that, the Toolbar module has a <em>drawer</em> section where it displays links provided by other modules, such as the core <a href="@shortcuts-help">Shortcut module</a>. The drawer can be hidden/shown by using the show/hide shortcuts link at the end of the toolbar.', array('@shortcuts-help' => url('admin/help/shortcut'))) . '</dd>';
       $output .= '</dl>';
       return $output;
   }
@@ -90,11 +90,11 @@ function toolbar_toggle_page() {
  */
 function theme_toolbar_toggle($variables) {
   if ($variables['collapsed']) {
-    $toggle_text = t('Open the drawer');
+    $toggle_text = t('Show shortcuts');
     return '<a href="' . url('toolbar/toggle', array('query' => drupal_get_destination())) . '" title="' . $toggle_text . '"' .  drupal_attributes($variables['attributes']) . '>' . $toggle_text . '</a>';
   }
   else {
-    $toggle_text = t('Close the drawer');
+    $toggle_text = t('Hide shortcuts');
     $variables['attributes']['class'][] = 'toggle-active';
     return '<a href="' . url('toolbar/toggle', array('query' => drupal_get_destination())) . '" title="' . $toggle_text . '"' .  drupal_attributes($variables['attributes']) . '>' . $toggle_text . '</a>';
   }