Merge branch 'master' into fix-2157

compulim · Sep 24, 2019 · 76fce74 · 76fce74
2 parents f179ccf + a312e1c
commit 76fce74
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -87,6 +87,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 -  Fix [#2365](https://github.com/microsoft/BotFramework-WebChat/issues/2365). Fix Adaptive Card `pushButton` appearance on Chrome, by [@corinagum](https://github.com/corinagum) in PR [#2382](https://github.com/microsoft/BotFramework-WebChat/pull/2382)
 -  Fix [#2379](https://github.com/microsoft/BotFramework-WebChat/issues/2379). Speech synthesis can be configured off by passing `null`, by [@compulim](https://github.com/compulim) in PR [#2408](https://github.com/microsoft/BotFramework-WebChat/pull/2408)
 -  Fix [#2418](https://github.com/microsoft/BotFramework-WebChat/issues/2418). Connectivity status should not waste-render every 400 ms, by [@compulim](https://github.com/compulim) in PR [#2419](https://github.com/microsoft/BotFramework-WebChat/pull/2419)
+-  Fix [Emulator:#1823](https://github.com/microsoft/BotFramework-Emulator/issues/1823). Fix Sendbox "Type your message" being read twice by AT, by [@corinagum](https://github.com/corinagum) in PR [#2423](https://github.com/microsoft/BotFramework-WebChat/pull/2423)
 
 ### Added
 

diff --git a/packages/component/src/Localization/en-US.js b/packages/component/src/Localization/en-US.js
@@ -79,6 +79,7 @@ export default {
   Retry: 'Retry',
   Right: 'Right',
   Send: 'Send',
+  SendBox: 'Sendbox',
   Sending: 'Sending',
   SendStatus: 'Send status: ',
   SentAt: 'Sent at: ',

diff --git a/packages/component/src/Localization/ja-JP.js b/packages/component/src/Localization/ja-JP.js
@@ -68,6 +68,7 @@ export default {
   Retry: '再送',
   Right: '右',
   Send: '送信',
+  SendBox: 'テキストボックス',
   Sending: '送信中',
   Speak: '話してください',
   'Starting…': 'スタート…',

diff --git a/packages/component/src/SendBox/TextBox.js b/packages/component/src/SendBox/TextBox.js
@@ -55,6 +55,7 @@ const connectSendTextBox = (...selectors) =>
 
 const TextBox = ({ className, disabled, language, onChange, onKeyPress, onSubmit, styleSet, value }) => {
   const typeYourMessageString = localize('Type your message', language);
+  const sendBoxString = localize('Sendbox', language);
   const {
     options: { sendBoxTextWrap }
   } = styleSet;
@@ -69,7 +70,7 @@ const TextBox = ({ className, disabled, language, onChange, onKeyPress, onSubmit
           {({ sendFocusRef }) =>
             !sendBoxTextWrap ? (
               <input
-                aria-label={typeYourMessageString}
+                aria-label={sendBoxString}
                 data-id="webchat-sendbox-input"
                 disabled={disabled}
                 onChange={onChange}
@@ -81,7 +82,7 @@ const TextBox = ({ className, disabled, language, onChange, onKeyPress, onSubmit
             ) : (
               <div>
                 <textarea
-                  aria-label={typeYourMessageString}
+                  aria-label={sendBoxString}
                   data-id="webchat-sendbox-input"
                   disabled={disabled}
                   onChange={onChange}