Merge branch 'develop' into chore/legal-router

Author: raclim

client/modules/IDE/components/Toast.jsx

@@ -13,7 +13,7 @@ export default function Toast() {
     return null;
   }
   return (
-    <section className="toast">
+    <section className="toast" role="status" aria-live="polite">
       <p>{t(text)}</p>
       <button
         className="toast__close"

client/modules/IDE/components/Toast.test.jsx

@@ -0,0 +1,50 @@
+import React from 'react';
+import {
+  act,
+  reduxRender,
+  screen,
+  fireEvent,
+  waitFor
+} from '../../../test-utils';
+import { showToast } from '../actions/toast';
+import Toast from './Toast';
+
+describe(`Toast`, () => {
+  it('is hidden by default', () => {
+    reduxRender(<Toast />);
+    expect(screen.queryByRole('status')).not.toBeInTheDocument();
+  });
+
+  it('opens when an action is dispatched', async () => {
+    const { store } = reduxRender(<Toast />);
+    act(() => {
+      store.dispatch(showToast('Toast.SketchSaved'));
+    });
+
+    const toast = screen.queryByRole('status');
+    expect(toast).toBeVisible();
+    expect(toast).toHaveTextContent('Sketch saved.');
+  });
+
+  it('closes automatically after time', async () => {
+    const { store } = reduxRender(<Toast />);
+    act(() => {
+      store.dispatch(showToast('Toast.SketchSaved', 100));
+    });
+
+    expect(screen.queryByRole('status')).toBeInTheDocument();
+
+    await waitFor(() => {
+      expect(screen.queryByRole('status')).not.toBeInTheDocument();
+    });
+  });
+
+  it('closes when "X" button is pressed', () => {
+    reduxRender(<Toast />, {
+      initialState: { toast: { isVisible: true, text: 'Hello World' } }
+    });
+    const button = screen.getByRole('button');
+    fireEvent.click(button);
+    expect(screen.queryByRole('status')).not.toBeInTheDocument();
+  });
+});

translations/locales/hi/translations.json

@@ -3,9 +3,9 @@
       "File": {
         "Title": "फाइल",
         "New": "नई",
-        "Share": "शेयर",
-        "Duplicate": "डुप्लिकेट",
-        "Open": "ओपन",
+        "Share": "भेजें",
+        "Duplicate": "प्रतिलिपि बनाएँ",
+        "Open": "खोलें",
         "Download": "डाउनलोड",
         "AddToCollection": "संग्रह में जोड़ें",
         "Examples": "उदाहरण"
@@ -17,7 +17,7 @@
         "Replace": "बदली करें"
       },
       "Sketch": {
-        "Title": "स्केच",
+        "Title": "चित्र",
         "AddFile": "फाइल जोड़ें",
         "AddFolder": "फोल्डर जोड़ें",
         "Run": "चलाएं",
@@ -42,7 +42,7 @@
         "My": "मेरा",
         "MySketches": "मेरे स्केच",
         "MyCollections": "मेरे संग्रह",
-        "Asset": "ऐसेट",
+        "Asset": "संपत्ति",
         "MyAssets": "मेरे ऐसेट",
         "LogOut": "लॉग आउट"
       }
@@ -95,7 +95,7 @@
       "Learn": "सीखें",
       "Resources": "साधन",
       "Libraries": "लाइब्रेरीज़",
-      "Forum": "फोरम",
+      "Forum": "समूह",
       "Examples": "उदाहरण"
     },
     "Toast": {