From 3cf06078a2b876f562796933865d828a60d66ad7 Mon Sep 17 00:00:00 2001
From: Sean Lip <sll@google.com>
Date: Tue, 23 Aug 2016 16:01:25 -0700
Subject: [PATCH] Minor wording edits. Fix issue with Voiceover not detecting
 changes to block labels.

---
 accessible/messages.js                 | 2 +-
 accessible/notifications.service.js    | 4 +++-
 accessible/tree.service.js             | 2 +-
 accessible/workspace-tree.component.js | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/accessible/messages.js b/accessible/messages.js
index b45f26b2e..681b5d535 100644
--- a/accessible/messages.js
+++ b/accessible/messages.js
@@ -52,7 +52,7 @@ Blockly.Msg.TEXT = 'text';
 Blockly.Msg.BUTTON = 'button';
 Blockly.Msg.DISABLED = 'disabled';
 Blockly.Msg.CURRENT_ARGUMENT_VALUE = 'current argument value:';
-Blockly.Msg.COPY_TO_WORKSPACE = 'copy to workspace';
+Blockly.Msg.COPY_TO_WORKSPACE = 'create new group with this block';
 Blockly.Msg.COPY_TO_CLIPBOARD = 'copy to clipboard';
 Blockly.Msg.COPY_TO_MARKED_SPOT = 'copy to marked spot';
 Blockly.Msg.TOOLBOX = 'Toolbox';
diff --git a/accessible/notifications.service.js b/accessible/notifications.service.js
index 5bcf497f3..ad5af84ce 100644
--- a/accessible/notifications.service.js
+++ b/accessible/notifications.service.js
@@ -36,9 +36,11 @@ blocklyApp.NotificationsService = ng.core
       // operations are done in succession, both messages will be read.
       this.statusMessage_ = '';
 
+      // We need a non-zero timeout here, otherwise NVDA does not read the
+      // notification messages properly.
       var that = this;
       setTimeout(function() {
         that.statusMessage_ = newMessage;
-      });
+      }, 20);
     }
   });
diff --git a/accessible/tree.service.js b/accessible/tree.service.js
index 3b41659d9..ecf5fd8cc 100644
--- a/accessible/tree.service.js
+++ b/accessible/tree.service.js
@@ -233,7 +233,7 @@ blocklyApp.TreeService = ng.core
         for (var i = 0; i < workspaceTreeNodes.length; i++) {
           if (workspaceTreeNodes[i].id == treeId) {
             this.notificationsService.setStatusMessage(
-                'Now in workspace component ' + (i + 1) + ' of ' +
+                'Now in workspace group ' + (i + 1) + ' of ' +
                 workspaceTreeNodes.length);
           }
         }
diff --git a/accessible/workspace-tree.component.js b/accessible/workspace-tree.component.js
index 0f391f6f8..04ec09b12 100644
--- a/accessible/workspace-tree.component.js
+++ b/accessible/workspace-tree.component.js
@@ -29,7 +29,7 @@ blocklyApp.WorkspaceTreeComponent = ng.core
     selector: 'blockly-workspace-tree',
     template: `
     <li [id]="idMap['blockRoot']" role="treeitem" class="blocklyHasChildren"
-        [attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap['blockSummary'], 'blockly-workspace-block')"
+        [attr.aria-label]="getBlockDescription() + ' ' + ('WORKSPACE_BLOCK'|translate) + ' ' + ('SUBMENU_INDICATOR'|translate)"
         [attr.aria-level]="level">
       <label [id]="idMap['blockSummary']">{{getBlockDescription()}}</label>