fix: fixed post coment actions menu accessibilty for keyboard

Merge pull request #454 from openedx/repo_checks/ensure_workflows
Update standard workflow files.
2023-03-01 18:09:35 +05:00 · 2023-02-28 09:40:08 -05:00 · 2023-02-28 09:34:03 -05:00 · 2023-02-28 09:34:03 -05:00 · 2023-02-28 09:34:03 -05:00 · 2023-02-24 12:39:46 +05:00
42 changed files with 1340 additions and 607 deletions
--- a/.github/workflows/add-depr-ticket-to-depr-board.yml
+++ b/.github/workflows/add-depr-ticket-to-depr-board.yml
@@ -16,4 +16,4 @@ jobs:
    secrets:
      GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
      GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}
-      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}
+      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}
--- a/.github/workflows/add-remove-label-on-comment.yml
+++ b/.github/workflows/add-remove-label-on-comment.yml
@@ -0,0 +1,20 @@
+# This workflow runs when a comment is made on the ticket
+# If the comment starts with "label: " it tries to apply
+# the label indicated in rest of comment.
+# If the comment starts with "remove label: ", it tries
+# to remove the indicated label.
+# Note: Labels are allowed to have spaces and this script does
+# not parse spaces (as often a space is legitimate), so the command
+# "label: really long lots of words label" will apply the
+# label "really long lots of words label"
+
+name: Allows for the adding and removing of labels via comment
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  add_remove_labels:
+    uses: openedx/.github/.github/workflows/add-remove-label-on-comment.yml@master
+
--- a/.github/workflows/self-assign-issue.yml
+++ b/.github/workflows/self-assign-issue.yml
@@ -0,0 +1,12 @@
+# This workflow runs when a comment is made on the ticket
+# If the comment starts with "assign me" it assigns the author to the
+# ticket (case insensitive)
+
+name: Assign comment author to ticket if they say "assign me"
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  self_assign_by_comment:
+    uses: openedx/.github/.github/workflows/self-assign-issue.yml@master
--- a/public/index.html
+++ b/public/index.html
@@ -13,41 +13,178 @@
      window.MathJax = {
        tex: {
          inlineMath: [
-            ['$', '$'],
-            ['\\\\(', '\\\\)'],
-            ['\\(', '\\)'],
-            ['[mathjaxinline]', '[/mathjaxinline]'],
-            ['\\begin{math}', '\\end{math}'],
+            ["$", "$"],
+            ["\\\\(", "\\\\)"],
+            ["\\(", "\\)"],
+            ["[mathjaxinline]", "[/mathjaxinline]"],
+            ["\\begin{math}", "\\end{math}"],
          ],
          displayMath: [
-            ['[mathjax]', '[/mathjax]'],
-            ['$$', '$$'],
-            ['\\\\[', '\\\\]'],
-            ['\\[', '\\]'],
-            ['\\begin{displaymath}', '\\end{displaymath}'],
-            ['\\begin{equation}', '\\end{equation}'],
+            ["[mathjax]", "[/mathjax]"],
+            ["$$", "$$"],
+            ["\\\\[", "\\\\]"],
+            ["\\[", "\\]"],
+            ["\\begin{displaymath}", "\\end{displaymath}"],
+            ["\\begin{equation}", "\\end{equation}"],
          ],
          processEscapes: true,
          processEnvironments: true,
          autoload: {
            color: [],
-            colorv2: ['color']
+            colorv2: ["color"],
          },
-          packages: {'[+]': ['noerrors']}
+          packages: { "[+]": ["noerrors"] },
        },
        options: {
-          ignoreHtmlClass: 'tex2jax_ignore',
-          processHtmlClass: 'tex2jax_process'
+          ignoreHtmlClass: "tex2jax_ignore",
+          processHtmlClass: "tex2jax_process",
        },
        loader: {
-          load: ['input/asciimath', '[tex]/noerrors']
-        }
+          load: ["input/asciimath", "[tex]/noerrors"],
+        },
      };
    </script>
-    <script async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js" id="MathJax-script"></script>
-
+    <script
+      defer
+      src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"
+      id="MathJax-script"
+    ></script>
  </head>
  <body>
    <div id="root" class="small"></div>
+
+    <!-- begin usabilla live embed code -->
+    <script defer type="text/javascript">
+      window.lightningjs ||
+        (function (n) {
+          var e = "lightningjs";
+          function t(e, t) {
+            var r, i, a, o, d, c;
+            return (
+              t && (t += (/\?/.test(t) ? "&" : "?") + "lv=1"),
+              n[e] ||
+                ((r = window),
+                (i = document),
+                (a = e),
+                (o = i.location.protocol),
+                (d = "load"),
+                (c = 0),
+                (function () {
+                  n[a] = function () {
+                    var t = arguments,
+                      i = this,
+                      o = ++c,
+                      d = (i && i != r && i.id) || 0;
+                    function s() {
+                      return (s.id = o), n[a].apply(s, arguments);
+                    }
+                    return (
+                      (e.s = e.s || []).push([o, d, t]),
+                      (s.then = function (n, t, r) {
+                        var i = (e.fh[o] = e.fh[o] || []),
+                          a = (e.eh[o] = e.eh[o] || []),
+                          d = (e.ph[o] = e.ph[o] || []);
+                        return (
+                          n && i.push(n), t && a.push(t), r && d.push(r), s
+                        );
+                      }),
+                      s
+                    );
+                  };
+                  var e = (n[a]._ = {});
+                  function s() {
+                    e.P(d), (e.w = 1), n[a]("_load");
+                  }
+                  (e.fh = {}),
+                    (e.eh = {}),
+                    (e.ph = {}),
+                    (e.l = t
+                      ? t.replace(/^\/\//, ("https:" == o ? o : "http:") + "//")
+                      : t),
+                    (e.p = { 0: +new Date() }),
+                    (e.P = function (n) {
+                      e.p[n] = new Date() - e.p[0];
+                    }),
+                    e.w && s(),
+                    r.addEventListener
+                      ? r.addEventListener(d, s, !1)
+                      : r.attachEvent("onload", s);
+                  var l = function () {
+                    function n() {
+                      return [
+                        "<!DOCTYPE ",
+                        o,
+                        "><",
+                        o,
+                        "><head></head><",
+                        t,
+                        "><",
+                        r,
+                        ' src="',
+                        e.l,
+                        '"></',
+                        r,
+                        "></",
+                        t,
+                        "></",
+                        o,
+                        ">",
+                      ].join("");
+                    }
+                    var t = "body",
+                      r = "script",
+                      o = "html",
+                      d = i[t];
+                    if (!d) return setTimeout(l, 100);
+                    e.P(1);
+                    var c,
+                      s = i.createElement("div"),
+                      h = s.appendChild(i.createElement("div")),
+                      u = i.createElement("iframe");
+                    (s.style.display = "none"),
+                      (d.insertBefore(s, d.firstChild).id = "lightningjs-" + a),
+                      (u.frameBorder = "0"),
+                      (u.id = "lightningjs-frame-" + a),
+                      /MSIE[ ]+6/.test(navigator.userAgent) &&
+                        (u.src = "javascript:false"),
+                      (u.allowTransparency = "true"),
+                      h.appendChild(u);
+                    try {
+                      u.contentWindow.document.open();
+                    } catch (n) {
+                      (e.domain = i.domain),
+                        (c =
+                          "javascript:var d=document.open();d.domain='" +
+                          i.domain +
+                          "';"),
+                        (u.src = c + "void(0);");
+                    }
+                    try {
+                      var p = u.contentWindow.document;
+                      p.write(n()), p.close();
+                    } catch (e) {
+                      u.src =
+                        c +
+                        'd.write("' +
+                        n().replace(/"/g, String.fromCharCode(92) + '"') +
+                        '");d.close();';
+                    }
+                    e.P(2);
+                  };
+                  e.l && l();
+                })()),
+              (n[e].lv = "1"),
+              n[e]
+            );
+          }
+          var r = (window.lightningjs = t(e));
+          (r.require = t), (r.modules = n);
+        })({});
+      window.usabilla_live = lightningjs.require(
+        "usabilla_live",
+        "//w.usabilla.com/9e6036348fa1.js"
+      );
+    </script>
+    <!-- end usabilla live embed code -->
  </body>
 </html>
--- a/src/components/HTMLLoader.jsx
+++ b/src/components/HTMLLoader.jsx
@@ -13,12 +13,12 @@ const defaultSanitizeOptions = {
 };

 function HTMLLoader({
-  htmlNode, componentId, cssClassName, testId,
+  htmlNode, componentId, cssClassName, testId, delay,
 }) {
  const sanitizedMath = DOMPurify.sanitize(htmlNode, { ...defaultSanitizeOptions });
  const previewRef = useRef();

-  const debouncedPostContent = useDebounce(htmlNode, 500);
+  const debouncedPostContent = useDebounce(htmlNode, delay);

  useEffect(() => {
    let promise = Promise.resolve(); // Used to hold chain of typesetting calls
@@ -45,6 +45,7 @@ HTMLLoader.propTypes = {
  componentId: PropTypes.string,
  cssClassName: PropTypes.string,
  testId: PropTypes.string,
+  delay: PropTypes.number,
 };

 HTMLLoader.defaultProps = {
@@ -52,6 +53,7 @@ HTMLLoader.defaultProps = {
  componentId: null,
  cssClassName: '',
  testId: '',
+  delay: 0,
 };

 export default HTMLLoader;
--- a/src/components/PostPreviewPane.jsx
+++ b/src/components/PostPreviewPane.jsx
@@ -29,7 +29,13 @@ function PostPreviewPane({
            className="float-right p-3"
            iconClassNames="icon-size"
          />
-          <HTMLLoader htmlNode={htmlNode} cssClassName="text-primary" componentId="post-preview" testId="post-preview" />
+          <HTMLLoader
+            htmlNode={htmlNode}
+            cssClassName="text-primary"
+            componentId="post-preview"
+            testId="post-preview"
+            delay={500}
+          />
        </div>
      )}
      <div className="d-flex justify-content-end">
--- a/src/components/TopicStats.jsx
+++ b/src/components/TopicStats.jsx
@@ -0,0 +1,108 @@
+/* eslint react/prop-types: 0 */
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { useSelector } from 'react-redux';
+
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { Icon, OverlayTrigger, Tooltip } from '@edx/paragon';
+import { HelpOutline, PostOutline, Report } from '@edx/paragon/icons';
+
+import {
+  selectUserHasModerationPrivileges,
+  selectUserIsGroupTa,
+} from '../discussions/data/selectors';
+import messages from '../discussions/in-context-topics/messages';
+
+function TopicStats({
+  threadCounts,
+  activeFlags,
+  inactiveFlags,
+  intl,
+}) {
+  const userHasModerationPrivileges = useSelector(selectUserHasModerationPrivileges);
+  const userIsGroupTa = useSelector(selectUserIsGroupTa);
+  const canSeeReportedStats = (activeFlags || inactiveFlags) && (userHasModerationPrivileges || userIsGroupTa);
+  return (
+    <div className="d-flex align-items-center mt-2.5" style={{ marginBottom: '2px' }}>
+      <OverlayTrigger
+        overlay={(
+          <Tooltip>
+            <div className="d-flex flex-column align-items-start">
+              {intl.formatMessage(messages.discussions, {
+                count: threadCounts?.discussion || 0,
+              })}
+            </div>
+          </Tooltip>
+        )}
+      >
+        <div className="d-flex align-items-center mr-3.5">
+          <Icon src={PostOutline} className="icon-size mr-2" />
+          {threadCounts?.discussion || 0}
+        </div>
+      </OverlayTrigger>
+      <OverlayTrigger
+        overlay={(
+          <Tooltip>
+            <div className="d-flex flex-column align-items-start">
+              {intl.formatMessage(messages.questions, {
+                count: threadCounts?.question || 0,
+              })}
+            </div>
+          </Tooltip>
+        )}
+      >
+        <div className="d-flex align-items-center mr-3.5">
+          <Icon src={HelpOutline} className="icon-size mr-2" />
+          {threadCounts?.question || 0}
+        </div>
+      </OverlayTrigger>
+      {Boolean(canSeeReportedStats) && (
+        <OverlayTrigger
+          overlay={(
+            <Tooltip>
+              <div className="d-flex flex-column align-items-start">
+                {Boolean(activeFlags) && (
+                  <span>
+                    {intl.formatMessage(messages.reported, { reported: activeFlags })}
+                  </span>
+                )}
+                {Boolean(inactiveFlags) && (
+                  <span>
+                    {intl.formatMessage(messages.previouslyReported, { previouslyReported: inactiveFlags })}
+                  </span>
+                )}
+              </div>
+            </Tooltip>
+          )}
+        >
+          <div className="d-flex align-items-center">
+            <Icon src={Report} className="icon-size mr-2 text-danger" />
+            {activeFlags}{Boolean(inactiveFlags) && `/${inactiveFlags}`}
+          </div>
+        </OverlayTrigger>
+      )}
+    </div>
+  );
+}
+
+TopicStats.propTypes = {
+  threadCounts: PropTypes.shape({
+    discussions: PropTypes.number,
+    questions: PropTypes.number,
+  }),
+  activeFlags: PropTypes.number,
+  inactiveFlags: PropTypes.number,
+  intl: intlShape.isRequired,
+};
+
+TopicStats.defaultProps = {
+  threadCounts: {
+    discussions: 0,
+    questions: 0,
+  },
+  activeFlags: null,
+  inactiveFlags: null,
+};
+
+export default injectIntl(TopicStats);
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,3 +1,4 @@
 export { default as PostActionsBar } from '../discussions/posts/post-actions-bar/PostActionsBar';
 export { default as Search } from './Search';
 export { default as TinyMCEEditor } from './TinyMCEEditor';
+export { default as TopicStats } from './TopicStats';
--- a/src/data/constants.js
+++ b/src/data/constants.js
@@ -63,6 +63,7 @@ export const ContentActions = {
 * @enum {string}
 */
 export const RequestStatus = {
+  IDLE: 'idle',
  IN_PROGRESS: 'in-progress',
  SUCCESSFUL: 'successful',
  FAILED: 'failed',
--- a/src/discussions/discussions-home/DiscussionsHome.jsx
+++ b/src/discussions/discussions-home/DiscussionsHome.jsx
@@ -124,7 +124,7 @@ export default function DiscussionsHome() {
            </Switch>
          )}
        </div>
-        <DiscussionsProductTour />
+        {!enableInContextSidebar && <DiscussionsProductTour />}
      </main>
      {!enableInContextSidebar && <Footer />}
    </DiscussionContext.Provider>
--- a/src/discussions/in-context-topics/TopicPostsView.jsx
+++ b/src/discussions/in-context-topics/TopicPostsView.jsx
@@ -1,6 +1,6 @@
-import React, { useContext } from 'react';
+import React, { useContext, useEffect } from 'react';

-import { useSelector } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { useLocation } from 'react-router-dom';

 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
@@ -8,6 +8,7 @@ import { Spinner } from '@edx/paragon';

 import { RequestStatus, Routes } from '../../data/constants';
 import { DiscussionContext } from '../common/context';
+import { selectDiscussionProvider } from '../data/selectors';
 import { selectTopicThreads } from '../posts/data/selectors';
 import PostsList from '../posts/PostsList';
 import { discussionsPath, handleKeyDown } from '../utils';
@@ -15,14 +16,18 @@ import {
  selectArchivedTopic, selectLoadingStatus, selectNonCoursewareTopics,
  selectSubsection, selectSubsectionUnits, selectUnits,
 } from './data/selectors';
+import { fetchCourseTopicsV3 } from './data/thunks';
 import { BackButton, NoResults } from './components';
 import messages from './messages';
 import { Topic } from './topic';

 function TopicPostsView({ intl }) {
  const location = useLocation();
+  const dispatch = useDispatch();
  const { courseId, topicId, category } = useContext(DiscussionContext);
-  const topicsLoadingStatus = useSelector(selectLoadingStatus);
+  const provider = useSelector(selectDiscussionProvider);
+  const topicsStatus = useSelector(selectLoadingStatus);
+  const topicsInProgress = topicsStatus === RequestStatus.IN_PROGRESS;
  const posts = useSelector(selectTopicThreads([topicId]));
  const selectedSubsectionUnits = useSelector(selectSubsectionUnits(category));
  const selectedSubsection = useSelector(selectSubsection(category));
@@ -30,6 +35,12 @@ function TopicPostsView({ intl }) {
  const selectedNonCoursewareTopic = useSelector(selectNonCoursewareTopics)?.find(topic => topic.id === topicId);
  const selectedArchivedTopic = useSelector(selectArchivedTopic(topicId));

+  useEffect(() => {
+    if (provider && topicsStatus === RequestStatus.IDLE) {
+      dispatch(fetchCourseTopicsV3(courseId));
+    }
+  }, [provider]);
+
  const backButtonPath = () => {
    const path = selectedUnit ? Routes.TOPICS.CATEGORY : Routes.TOPICS.ALL;
    const params = selectedUnit ? { courseId, category: selectedUnit?.parentId } : { courseId };
@@ -40,12 +51,14 @@ function TopicPostsView({ intl }) {
    <div className="discussion-posts d-flex flex-column h-100">
      {topicId ? (
        <BackButton
+          loading={topicsInProgress}
          path={backButtonPath()}
          title={selectedUnit?.name || selectedNonCoursewareTopic?.name || selectedArchivedTopic?.name
            || intl.formatMessage(messages.unnamedTopic)}
        />
      ) : (
        <BackButton
+          loading={topicsInProgress}
          path={discussionsPath(Routes.TOPICS.ALL, { courseId })(location)}
          title={selectedSubsection?.displayName || intl.formatMessage(messages.unnamedSubsection)}
        />
@@ -56,6 +69,7 @@ function TopicPostsView({ intl }) {
          <PostsList
            posts={posts}
            topics={[topicId]}
+            parentIsLoading={topicsInProgress}
          />
        ) : (
          selectedSubsectionUnits?.map((unit) => (
@@ -65,10 +79,10 @@ function TopicPostsView({ intl }) {
            />
          ))
        )}
-        {(category && selectedSubsectionUnits.length === 0 && topicsLoadingStatus === RequestStatus.SUCCESSFUL) && (
+        {(category && selectedSubsectionUnits.length === 0 && topicsStatus === RequestStatus.SUCCESSFUL) && (
          <NoResults />
        )}
-        {(category && topicsLoadingStatus === RequestStatus.IN_PROGRESS) && (
+        {(category && topicsInProgress) && (
          <div className="d-flex justify-content-center p-4">
            <Spinner animation="border" variant="primary" size="lg" />
          </div>
--- a/src/discussions/in-context-topics/TopicPostsView.test.jsx
+++ b/src/discussions/in-context-topics/TopicPostsView.test.jsx
@@ -0,0 +1,255 @@
+import {
+  fireEvent, render, screen, waitFor, within,
+} from '@testing-library/react';
+import MockAdapter from 'axios-mock-adapter';
+import { act } from 'react-dom/test-utils';
+import { IntlProvider } from 'react-intl';
+import { generatePath, MemoryRouter, Route } from 'react-router';
+import { Factory } from 'rosie';
+
+import { initializeMockApp } from '@edx/frontend-platform';
+import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
+import { AppProvider } from '@edx/frontend-platform/react';
+
+import { PostActionsBar } from '../../components';
+import { Routes } from '../../data/constants';
+import { initializeStore } from '../../store';
+import { executeThunk } from '../../test-utils';
+import { DiscussionContext } from '../common/context';
+import { getThreadsApiUrl } from '../posts/data/api';
+import { fetchThreads } from '../posts/data/thunks';
+import { getCourseTopicsApiUrl } from './data/api';
+import { selectCoursewareTopics } from './data/selectors';
+import { fetchCourseTopicsV3 } from './data/thunks';
+import TopicPostsView from './TopicPostsView';
+import TopicsView from './TopicsView';
+
+import './data/__factories__';
+import '../posts/data/__factories__/threads.factory';
+
+const courseId = 'course-v1:edX+DemoX+Demo_Course';
+const threadsApiUrl = getThreadsApiUrl();
+const topicsApiUrl = getCourseTopicsApiUrl();
+let store;
+let axiosMock;
+let lastLocation;
+let container;
+
+async function renderComponent({ topicId, category } = { }) {
+  let path = `/${courseId}/topics`;
+  if (topicId) {
+    path = generatePath(Routes.POSTS.PATH, { courseId, topicId });
+  } else if (category) {
+    path = generatePath(Routes.TOPICS.CATEGORY, { courseId, category });
+  }
+  const wrapper = await render(
+    <IntlProvider locale="en">
+      <AppProvider store={store}>
+        <DiscussionContext.Provider value={{
+          courseId,
+          topicId,
+          category,
+          page: 'topics',
+        }}
+        >
+          <MemoryRouter initialEntries={[path]}>
+            <Route exact path={[Routes.POSTS.PATH, Routes.TOPICS.CATEGORY]}>
+              <TopicPostsView />
+            </Route>
+            <Route exact path={[Routes.TOPICS.ALL]}>
+              <PostActionsBar />
+              <TopicsView />
+            </Route>
+            <Route
+              render={({ location }) => {
+                lastLocation = location;
+                return null;
+              }}
+            />
+          </MemoryRouter>
+        </DiscussionContext.Provider>
+      </AppProvider>
+    </IntlProvider>,
+  );
+  container = wrapper.container;
+}
+
+describe('InContext Topic Posts View', () => {
+  let coursewareTopics;
+
+  beforeEach(() => {
+    initializeMockApp({
+      authenticatedUser: {
+        userId: 3,
+        username: 'abc123',
+        administrator: true,
+        roles: [],
+      },
+    });
+
+    store = initializeStore({
+      config: {
+        enableInContext: true,
+        provider: 'openedx',
+        hasModerationPrivileges: true,
+        blackouts: [],
+      },
+    });
+    Factory.resetAll();
+    axiosMock = new MockAdapter(getAuthenticatedHttpClient());
+    lastLocation = undefined;
+  });
+
+  async function setupTopicsMockResponse() {
+    axiosMock.onGet(`${topicsApiUrl}${courseId}`)
+      .reply(200, (Factory.buildList('topic', 1, null, {
+        topicPrefix: 'noncourseware-topic',
+        enabledInContext: true,
+        topicNamePrefix: 'general-topic',
+        usageKey: '',
+        courseware: false,
+        discussionCount: 1,
+        questionCount: 1,
+      })
+        .concat(Factory.buildList('section', 2, null, { topicPrefix: 'courseware' })))
+        .concat(Factory.buildList('archived-topics', 2, null)));
+    await executeThunk(fetchCourseTopicsV3(courseId), store.dispatch, store.getState);
+
+    const state = store.getState();
+    coursewareTopics = selectCoursewareTopics(state);
+  }
+
+  async function setupPostsMockResponse(topicId, numOfResponses = 3) {
+    axiosMock.onGet(threadsApiUrl)
+      .reply(() => {
+        const threadAttrs = { previewBody: 'thread preview body' };
+        return [200, Factory.build('threadsResult', {}, {
+          topicId,
+          threadAttrs,
+          count: numOfResponses,
+        })];
+      });
+    await executeThunk(fetchThreads(courseId), store.dispatch, store.getState);
+  }
+
+  test.each([
+    { parentId: 'noncourseware-topic-1', parentTitle: 'general-topic-1', topicType: 'NonCourseware' },
+    { parentId: 'courseware-topic-1-v3-1', parentTitle: 'Introduction Introduction 1-1-1', topicType: 'Courseware' },
+  ])('\'$topicType\' topic should have a required number of post lengths.', async ({ parentId, parentTitle }) => {
+    await setupTopicsMockResponse();
+    await setupPostsMockResponse(parentId, 3);
+
+    await act(async () => {
+      renderComponent({ topicId: parentId });
+    });
+
+    await waitFor(async () => {
+      const posts = await container.querySelectorAll('.discussion-post');
+      const backButton = screen.getByLabelText('Back to topics list');
+      const parentHeader = await screen.findByText(parentTitle);
+
+      expect(lastLocation.pathname.endsWith(`/topics/${parentId}`)).toBeTruthy();
+      expect(posts).toHaveLength(3);
+      expect(backButton).toBeInTheDocument();
+      expect(parentHeader).toBeInTheDocument();
+    });
+  });
+
+  it('A back button should redirect from list of posts to list of units.', async () => {
+    await setupTopicsMockResponse();
+    const subSection = coursewareTopics[0].children[0];
+    const unit = subSection.children[0];
+
+    await act(async () => {
+      setupPostsMockResponse(unit.id, 2);
+      renderComponent({ topicId: unit.id });
+    });
+
+    const backButton = await screen.getByLabelText('Back to topics list');
+
+    await act(async () => fireEvent.click(backButton));
+    await waitFor(async () => {
+      renderComponent({ category: subSection.id });
+
+      const subSectionList = await container.querySelector('.list-group');
+      const units = subSectionList.querySelectorAll('.discussion-topic');
+      const unitHeader = within(subSectionList).queryByText(unit.name);
+
+      expect(lastLocation.pathname.endsWith(`/category/${subSection.id}`)).toBeTruthy();
+      expect(unitHeader).toBeInTheDocument();
+      expect(units).toHaveLength(4);
+    });
+  });
+
+  it('A back button should redirect from units to the parent/selected subsection.', async () => {
+    await setupTopicsMockResponse();
+    const subSection = coursewareTopics[0].children[0];
+
+    renderComponent({ category: subSection.id });
+
+    const backButton = await screen.getByLabelText('Back to topics list');
+
+    await act(async () => fireEvent.click(backButton));
+    await waitFor(async () => {
+      renderComponent();
+
+      const sectionList = await container.querySelector('.list-group');
+      const subSections = sectionList.querySelectorAll('.discussion-topic-group');
+      const subSectionHeader = within(sectionList).queryByText(subSection.displayName);
+
+      expect(lastLocation.pathname.endsWith('/topics')).toBeTruthy();
+      expect(subSectionHeader).toBeInTheDocument();
+      expect(subSections).toHaveLength(3);
+    });
+  });
+
+  test.each([
+    { searchText: 'hello world', output: 'Showing 0 results for', resultCount: 0 },
+    { searchText: 'introduction', output: 'Showing 8 results for', resultCount: 8 },
+  ])('It should have a search bar with a clear button and \'$output\' results found text.',
+    async ({ searchText, output, resultCount }) => {
+      await setupTopicsMockResponse();
+      await renderComponent();
+
+      const searchField = await within(container).getByPlaceholderText('Search topics');
+      const searchButton = await within(container).getByTestId('search-icon');
+      fireEvent.change(searchField, { target: { value: searchText } });
+
+      await waitFor(async () => expect(searchField).toHaveValue(searchText));
+      await act(async () => fireEvent.click(searchButton));
+      await waitFor(async () => {
+        const clearButton = await within(container).queryByText('Clear results');
+        const searchMessage = within(container).queryByText(`${output} "${searchText}"`);
+        const units = container.querySelectorAll('.discussion-topic');
+
+        expect(searchMessage).toBeInTheDocument();
+        expect(clearButton).toBeInTheDocument();
+        expect(units).toHaveLength(resultCount);
+      });
+    });
+
+  it('When click on the clear button it should move to main topics pages.', async () => {
+    await setupTopicsMockResponse();
+    await renderComponent();
+
+    const searchText = 'hello world';
+    const searchField = await within(container).getByPlaceholderText('Search topics');
+    const searchButton = await within(container).getByTestId('search-icon');
+
+    fireEvent.change(searchField, { target: { value: searchText } });
+
+    await waitFor(async () => expect(searchField).toHaveValue(searchText));
+    await act(async () => fireEvent.click(searchButton));
+    await waitFor(async () => {
+      const clearButton = await within(container).queryByText('Clear results');
+
+      await act(async () => fireEvent.click(clearButton));
+      await waitFor(async () => {
+        const coursewareTopicList = await container.querySelectorAll('.discussion-topic-group');
+
+        expect(coursewareTopicList).toHaveLength(3);
+        expect(within(container).queryByText('Clear results')).not.toBeInTheDocument();
+      });
+    });
+  });
+});
--- a/src/discussions/in-context-topics/TopicsView.test.jsx
+++ b/src/discussions/in-context-topics/TopicsView.test.jsx
@@ -0,0 +1,233 @@
+import {
+  fireEvent, render, screen, waitFor,
+  within,
+} from '@testing-library/react';
+import MockAdapter from 'axios-mock-adapter';
+import { act } from 'react-dom/test-utils';
+import { IntlProvider } from 'react-intl';
+import { MemoryRouter, Route } from 'react-router';
+import { Factory } from 'rosie';
+
+import { initializeMockApp } from '@edx/frontend-platform';
+import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
+import { AppProvider } from '@edx/frontend-platform/react';
+
+import { initializeStore } from '../../store';
+import { executeThunk } from '../../test-utils';
+import { DiscussionContext } from '../common/context';
+import { getCourseTopicsApiUrl } from './data/api';
+import { selectCoursewareTopics, selectNonCoursewareTopics } from './data/selectors';
+import { fetchCourseTopicsV3 } from './data/thunks';
+import TopicPostsView from './TopicPostsView';
+import TopicsView from './TopicsView';
+
+import './data/__factories__';
+
+const courseId = 'course-v1:edX+DemoX+Demo_Course';
+const category = 'section-topic-1';
+
+const topicsApiUrl = `${getCourseTopicsApiUrl()}`;
+let store;
+let axiosMock;
+let lastLocation;
+let container;
+
+function renderComponent() {
+  const wrapper = render(
+    <IntlProvider locale="en">
+      <AppProvider store={store}>
+        <DiscussionContext.Provider value={{ courseId, category }}>
+          <MemoryRouter initialEntries={[`/${courseId}/topics/`]}>
+            <Route path="/:courseId/topics/">
+              <TopicsView />
+            </Route>
+            <Route path="/:courseId/category/:category">
+              <TopicPostsView />
+            </Route>
+            <Route
+              render={({ location }) => {
+                lastLocation = location;
+                return null;
+              }}
+            />
+          </MemoryRouter>
+        </DiscussionContext.Provider>
+      </AppProvider>
+    </IntlProvider>,
+  );
+  container = wrapper.container;
+}
+
+describe('InContext Topics View', () => {
+  let nonCoursewareTopics;
+  let coursewareTopics;
+  beforeEach(() => {
+    initializeMockApp({
+      authenticatedUser: {
+        userId: 3,
+        username: 'abc123',
+        administrator: true,
+        roles: [],
+      },
+    });
+
+    store = initializeStore({
+      config: { enableInContext: true, provider: 'openedx', hasModerationPrivileges: true },
+    });
+    Factory.resetAll();
+    axiosMock = new MockAdapter(getAuthenticatedHttpClient());
+    lastLocation = undefined;
+  });
+
+  async function setupMockResponse() {
+    axiosMock.onGet(`${topicsApiUrl}${courseId}`)
+      .reply(200, (Factory.buildList('topic', 1, null, {
+        topicPrefix: 'noncourseware-topic',
+        enabledInContext: true,
+        topicNamePrefix: 'general-topic',
+        usageKey: '',
+        courseware: false,
+        discussionCount: 1,
+        questionCount: 1,
+      }).concat(Factory.buildList('section', 2, null, { topicPrefix: 'courseware' })))
+        .concat(Factory.buildList('archived-topics', 2, null)));
+    await executeThunk(fetchCourseTopicsV3(courseId), store.dispatch, store.getState);
+
+    const state = store.getState();
+    nonCoursewareTopics = selectNonCoursewareTopics(state);
+    coursewareTopics = selectCoursewareTopics(state);
+  }
+
+  it('A non-courseware topic should be clickable and should have a title', async () => {
+    await setupMockResponse();
+    renderComponent();
+
+    const nonCourseware = nonCoursewareTopics[0];
+    const nonCoursewareTopic = await screen.findByText(nonCourseware.name);
+
+    await act(async () => {
+      fireEvent.click(nonCoursewareTopic);
+    });
+    await waitFor(() => {
+      expect(screen.queryByText(nonCourseware.name)).toBeInTheDocument();
+      expect(lastLocation.pathname.endsWith(`/topics/${nonCourseware.id}`)).toBeTruthy();
+    });
+  });
+
+  it('A non-courseware topic should be on the top of the list', async () => {
+    await setupMockResponse();
+    renderComponent();
+    const topic = await container.querySelector('.discussion-topic');
+
+    expect(within(topic).queryByText('general-topic-1')).toBeInTheDocument();
+    expect(topic.nextSibling).toBe(container.querySelector('.divider'));
+  });
+
+  it('A non-Courseware topic should have 3 stats and should be hoverable', async () => {
+    await setupMockResponse();
+    renderComponent();
+
+    const topic = await container.querySelector('.discussion-topic');
+    const statsList = await topic.querySelectorAll('.icon-size');
+
+    expect(statsList.length).toBe(3);
+    fireEvent.mouseOver(statsList[0]);
+    expect(screen.queryByText('1 Discussion')).toBeInTheDocument();
+  });
+
+  it('Section groups should be listed in the middle of the topics list.', async () => {
+    await setupMockResponse();
+    renderComponent();
+    const topicsList = await screen.getByRole('list');
+    const sectionGroups = await screen.getAllByTestId('section-group');
+
+    expect(topicsList.children[1]).toStrictEqual(topicsList.querySelector('.divider'));
+    expect(sectionGroups.length).toBe(2);
+    expect(topicsList.children[5]).toStrictEqual(topicsList.querySelector('.divider'));
+  });
+
+  it('A section group should have only a title and required subsections.', async () => {
+    await setupMockResponse();
+    renderComponent();
+    const sectionGroups = await screen.getAllByTestId('section-group');
+
+    coursewareTopics.forEach(async (topic, index) => {
+      const stats = await sectionGroups[index].querySelectorAll('.icon-size:not([data-testid="subsection-group"].icon-size)');
+      const subsectionGroups = await within(sectionGroups[index]).getAllByTestId('subsection-group');
+
+      expect(within(sectionGroups[index]).queryByText(topic.displayName)).toBeInTheDocument();
+      expect(stats).toHaveLength(0);
+      expect(subsectionGroups).toHaveLength(2);
+    });
+  });
+
+  it('The subsection should have a title name, be clickable, and have the stats', async () => {
+    await setupMockResponse();
+    renderComponent();
+    const subsectionObject = coursewareTopics[0].children[0];
+    const subSection = await container.querySelector(`[data-subsection-id=${subsectionObject.id}]`);
+    const subSectionTitle = await within(subSection).queryByText(subsectionObject.displayName);
+    const statsList = await subSection.querySelectorAll('.icon-size');
+
+    expect(subSectionTitle).toBeInTheDocument();
+    expect(statsList).toHaveLength(2);
+  });
+
+  it('Subsection names should be clickable and redirected to the units lists', async () => {
+    await setupMockResponse();
+    renderComponent();
+
+    const subsectionObject = coursewareTopics[0].children[0];
+    const subSection = await container.querySelector(`[data-subsection-id=${subsectionObject.id}]`);
+
+    await act(async () => fireEvent.click(subSection));
+    await waitFor(async () => {
+      const backButton = await screen.getByLabelText('Back to topics list');
+      const topicsList = await screen.getByRole('list');
+      const subSectionHeading = await screen.findByText(subsectionObject.displayName);
+      const units = await topicsList.querySelectorAll('.discussion-topic');
+
+      expect(backButton).toBeInTheDocument();
+      expect(subSectionHeading).toBeInTheDocument();
+      expect(units).toHaveLength(4);
+      expect(lastLocation.pathname.endsWith(`/category/${subsectionObject.id}`)).toBeTruthy();
+    });
+  });
+
+  it('The number of units should be matched with the actual unit length.', async () => {
+    await setupMockResponse();
+    renderComponent();
+    const subSection = await container.querySelector(`[data-subsection-id=${coursewareTopics[0].children[0].id}]`);
+
+    await act(async () => fireEvent.click(subSection));
+    await waitFor(async () => {
+      const units = await container.querySelectorAll('.discussion-topic');
+
+      expect(units).toHaveLength(4);
+    });
+  });
+
+  it('A unit should have a title and stats and should be clickable', async () => {
+    await setupMockResponse();
+    renderComponent();
+    const subSectionObject = coursewareTopics[0].children[0];
+    const unitObject = subSectionObject.children[0];
+
+    const subSection = await container.querySelector(`[data-subsection-id=${subSectionObject.id}]`);
+
+    await act(async () => fireEvent.click(subSection));
+    await waitFor(async () => {
+      const unitElement = await screen.findByText(unitObject.name);
+      const unitContainer = await container.querySelector(`[data-topic-id=${unitObject.id}]`);
+      const statsList = await unitContainer.querySelectorAll('.icon-size');
+
+      expect(unitElement).toBeInTheDocument();
+      expect(statsList).toHaveLength(3);
+
+      await act(async () => fireEvent.click(unitContainer));
+      await waitFor(async () => {
+        expect(lastLocation.pathname.endsWith(`/topics/${unitObject.id}`)).toBeTruthy();
+      });
+    });
+  });
+});
--- a/src/discussions/in-context-topics/components/BackButton.jsx
+++ b/src/discussions/in-context-topics/components/BackButton.jsx
@@ -4,12 +4,14 @@ import PropTypes from 'prop-types';
 import { useHistory } from 'react-router-dom';

 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Icon, IconButton } from '@edx/paragon';
+import { Icon, IconButton, Spinner } from '@edx/paragon';
 import { ArrowBack } from '@edx/paragon/icons';

 import messages from '../messages';

-function BackButton({ intl, path, title }) {
+function BackButton({
+  intl, path, title, loading,
+}) {
  const history = useHistory();

  return (
@@ -24,7 +26,7 @@ function BackButton({ intl, path, title }) {
          alt={intl.formatMessage(messages.backAlt)}
        />
        <div className="d-flex flex-fill justify-content-center align-items-center mr-4.5">
-          {title}
+          {loading ? <Spinner animation="border" variant="primary" size="sm" /> : title}
        </div>
      </div>
      <div className="border-bottom border-light-400" />
@@ -36,6 +38,11 @@ BackButton.propTypes = {
  intl: intlShape.isRequired,
  path: PropTypes.shape({}).isRequired,
  title: PropTypes.string.isRequired,
+  loading: PropTypes.bool,
+};
+
+BackButton.defaultProps = {
+  loading: false,
 };

 export default injectIntl(BackButton);
--- a/src/discussions/in-context-topics/data/factories/inContextTopics.factory.js
+++ b/src/discussions/in-context-topics/data/factories/inContextTopics.factory.js
@@ -8,7 +8,7 @@ Factory.define('topic')
  .sequence('name', ['topicNamePrefix'], (idx, topicNamePrefix) => `${topicNamePrefix}-${idx}`)
  .sequence('usage-key', ['usageKey'], (idx, usageKey) => usageKey)
  .sequence('courseware', ['courseware'], (idx, courseware) => courseware)
-
+  .attr('activeFlags', null, true)
  .attr('thread_counts', ['discussionCount', 'questionCount'], (discCount, questCount) => {
    Factory.reset('thread-counts');
    return Factory.build('thread-counts', null, { discussionCount: discCount, questionCount: questCount });
@@ -27,6 +27,11 @@ Factory.define('sub-section')
  .sequence('student_view_url', ['id', 'courseId'],
    (idx, id) => `${getApiBaseUrl}/xblock/block-v1:${id}`)
  .attr('type', null, 'sequential')
+  .attr('activeFlags', null, true)
+  .attr('thread_counts', ['discussionCount', 'questionCount'], (discCount, questCount) => {
+    Factory.reset('thread-counts');
+    return Factory.build('thread-counts', null, { discussionCount: discCount, questionCount: questCount });
+  })
  .attr('children', ['id', 'display-name', 'courseId'], (id, name, courseId) => {
    Factory.reset('topic');
    return Factory.buildList('topic', 2, null, {
@@ -42,7 +47,7 @@ Factory.define('sub-section')
 Factory.define('section')
  .sequence('block_id', (idx) => `${idx}`)
  .option('topicPrefix', null, '')
-  .sequence('id', ['topicPrefix'], (idx, topicPrefix) => `${topicPrefix}-topic-${idx}`)
+  .sequence('id', ['topicPrefix'], (idx, topicPrefix) => `${topicPrefix}-topic-${idx}-v3`)
  .attr('courseware', null, true)
  .sequence('display-name', (idx) => `Introduction ${idx}`)
  .option('courseId', null, 'course-v1:edX+DemoX+Demo_Course')
@@ -53,9 +58,15 @@ Factory.define('section')
  .sequence('student_view_url', ['id', 'courseId'],
    (idx, id, courseId) => `${getApiBaseUrl}/xblock/${courseId.replace('course-v1:', 'block-v1:')}+type@chapter+block@${id}`)
  .attr('type', null, 'chapter')
-  .attr('children', ['display-name'], (name) => {
+  .attr('children', ['id', 'display-name'], (id, name) => {
    Factory.reset('sub-section');
-    return Factory.buildList('sub-section', 2, null, { sectionPrefix: `${name}-`, topicPrefix: 'section' });
+    return Factory.buildList('sub-section', 2, null, {
+      sectionPrefix: `${name}-`,
+      topicPrefix: 'section',
+      id,
+      discussionCount: 1,
+      questionCount: 1,
+    });
  });

 Factory.define('thread-counts')
--- a/src/discussions/in-context-topics/data/redux.test.js
+++ b/src/discussions/in-context-topics/data/redux.test.js
@@ -101,7 +101,7 @@ describe('Redux in context topics tests', () => {
      // contain chapter at first level
      coursewareTopics.forEach((chapter, index) => {
        expect(chapter.courseware).toEqual(true);
-        expect(chapter.id).toEqual(`courseware-topic-${index + 1}`);
+        expect(chapter.id).toEqual(`courseware-topic-${index + 1}-v3`);
        expect(chapter.type).toEqual('chapter');
        expect(chapter).toHaveProperty('blockId');
        expect(chapter).toHaveProperty('lmsWebUrl');
@@ -120,7 +120,7 @@ describe('Redux in context topics tests', () => {
          // contain sub section at third level
          section.children.forEach((subSection, subSecIndex) => {
            expect(subSection.enabledInContext).toEqual(true);
-            expect(subSection.id).toEqual(`${section.id}-${subSecIndex + 1}`);
+            expect(subSection.id).toEqual(`courseware-topic-${index + 1}-v3-${subSecIndex + 1}`);
            expect(subSection).toHaveProperty('usageKey');
            expect(subSection).not.toHaveProperty('blockId');
            expect(subSection?.threadCounts?.discussion).toEqual(1);
--- a/src/discussions/in-context-topics/data/selector.test.jsx
+++ b/src/discussions/in-context-topics/data/selector.test.jsx
@@ -88,7 +88,7 @@ describe('In Context Topics Selector test cases', () => {

      expect(coursewareTopics).not.toBeUndefined();
      coursewareTopics.forEach((topic, index) => {
-        expect(topic?.id).toEqual(`courseware-topic-${index + 1}`);
+        expect(topic?.id).toEqual(`courseware-topic-${index + 1}-v3`);
      });
    });
  });
--- a/src/discussions/in-context-topics/data/slices.js
+++ b/src/discussions/in-context-topics/data/slices.js
@@ -6,7 +6,7 @@ import { RequestStatus } from '../../../data/constants';
 const topicsSlice = createSlice({
  name: 'inContextTopics',
  initialState: {
-    status: RequestStatus.IN_PROGRESS,
+    status: RequestStatus.IDLE,
    topics: [],
    coursewareTopics: [],
    nonCoursewareTopics: [],
--- a/src/discussions/in-context-topics/topic-search/TopicSearchBar.jsx
+++ b/src/discussions/in-context-topics/topic-search/TopicSearchBar.jsx
@@ -50,6 +50,7 @@ function TopicSearchBar({ intl }) {
          <Icon
            src={SearchIcon}
            onClick={() => onSubmit(searchValue)}
+            data-testid="search-icon"
          />
        </span>
      </SearchField.Advanced>
--- a/src/discussions/in-context-topics/topic/SectionBaseGroup.jsx
+++ b/src/discussions/in-context-topics/topic/SectionBaseGroup.jsx
@@ -7,6 +7,7 @@ import { Link } from 'react-router-dom';

 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';

+import TopicStats from '../../../components/TopicStats';
 import { Routes } from '../../../data/constants';
 import { discussionsPath } from '../../utils';
 import messages from '../messages';
@@ -49,12 +50,13 @@ function SectionBaseGroup({
          aria-current={isSelected(section.id) ? 'page' : undefined}
          tabIndex={(isSelected(subsection.id) || index === 0) ? 0 : -1}
        >
-          <div className="d-flex flex-row py-3.5 px-4">
+          <div className="d-flex flex-row pt-2.5 pb-2 px-4">
            <div className="d-flex flex-column flex-fill" style={{ minWidth: 0 }}>
              <div className="d-flex flex-column justify-content-start mw-100 flex-fill">
                <div className="topic-name text-truncate">
                  {subsection?.displayName || intl.formatMessage(messages.unnamedSubsection)}
                </div>
+                <TopicStats threadCounts={subsection?.threadCounts} />
              </div>
            </div>
          </div>
--- a/src/discussions/in-context-topics/topic/Topic.jsx
+++ b/src/discussions/in-context-topics/topic/Topic.jsx
@@ -11,6 +11,7 @@ import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Icon, OverlayTrigger, Tooltip } from '@edx/paragon';
 import { HelpOutline, PostOutline, Report } from '@edx/paragon/icons';

+import TopicStats from '../../../components/TopicStats';
 import { Routes } from '../../../data/constants';
 import { selectUserHasModerationPrivileges, selectUserIsGroupTa } from '../../data/selectors';
 import { discussionsPath } from '../../utils';
@@ -53,65 +54,11 @@ function Topic({
                {topic?.name || topic?.displayName || intl.formatMessage(messages.unnamedTopicSubCategories)}
              </div>
            </div>
-            <div className="d-flex align-items-center mt-2.5" style={{ marginBottom: '2px' }}>
-              <OverlayTrigger
-                overlay={(
-                  <Tooltip>
-                    <div className="d-flex flex-column align-items-start">
-                      {intl.formatMessage(messages.discussions, {
-                        count: topic.threadCounts?.discussion || 0,
-                      })}
-                    </div>
-                  </Tooltip>
-                  )}
-              >
-                <div className="d-flex align-items-center mr-3.5">
-                  <Icon src={PostOutline} className="icon-size mr-2" />
-                  {topic.threadCounts?.discussion || 0}
-                </div>
-              </OverlayTrigger>
-              <OverlayTrigger
-                overlay={(
-                  <Tooltip>
-                    <div className="d-flex flex-column align-items-start">
-                      {intl.formatMessage(messages.questions, {
-                        count: topic.threadCounts?.question || 0,
-                      })}
-                    </div>
-                  </Tooltip>
-                )}
-              >
-                <div className="d-flex align-items-center mr-3.5">
-                  <Icon src={HelpOutline} className="icon-size mr-2" />
-                  {topic.threadCounts?.question || 0}
-                </div>
-              </OverlayTrigger>
-              {Boolean(canSeeReportedStats) && (
-                <OverlayTrigger
-                  overlay={(
-                    <Tooltip>
-                      <div className="d-flex flex-column align-items-start">
-                        {Boolean(activeFlags) && (
-                        <span>
-                          {intl.formatMessage(messages.reported, { reported: activeFlags })}
-                        </span>
-                        )}
-                        {Boolean(inactiveFlags) && (
-                        <span>
-                          {intl.formatMessage(messages.previouslyReported, { previouslyReported: inactiveFlags })}
-                        </span>
-                        )}
-                      </div>
-                    </Tooltip>
-                    )}
-                >
-                  <div className="d-flex align-items-center">
-                    <Icon src={Report} className="icon-size mr-2 text-danger" />
-                    {activeFlags}{Boolean(inactiveFlags) && `/${inactiveFlags}`}
-                  </div>
-                </OverlayTrigger>
-              )}
-            </div>
+            <TopicStats
+              threadCounts={topic?.threadCounts}
+              activeFlags={topic?.activeFlags}
+              inactiveFlags={topic?.inactiveFlags}
+            />
          </div>
        </div>
      </Link>
--- a/src/discussions/post-comments/PostCommentsView.jsx
+++ b/src/discussions/post-comments/PostCommentsView.jsx
@@ -40,6 +40,7 @@ function PostCommentsView({ intl }) {
  const {
    courseId, learnerUsername, category, topicId, page, enableInContextSidebar,
  } = useContext(DiscussionContext);
+  const enableCommentsSort = false;

  useEffect(() => {
    if (!thread) { submitDispatch(fetchThread(postId, courseId, true)); }
@@ -109,7 +110,7 @@ function PostCommentsView({ intl }) {
          />
        )}
      </div>
-      {!!commentsCount && commentsStatus === RequestStatus.SUCCESSFUL && <CommentsSort />}
+      {!!commentsCount && commentsStatus === RequestStatus.SUCCESSFUL && enableCommentsSort && <CommentsSort />}
      {thread.type === ThreadType.DISCUSSION && (
        <CommentsView
          postId={postId}
--- a/src/discussions/post-comments/PostCommentsView.test.jsx
+++ b/src/discussions/post-comments/PostCommentsView.test.jsx
@@ -19,7 +19,6 @@ import DiscussionContent from '../discussions-home/DiscussionContent';
 import { getThreadsApiUrl } from '../posts/data/api';
 import { fetchThreads } from '../posts/data/thunks';
 import { getCommentsApiUrl } from './data/api';
-import { removeComment } from './data/thunks';

 import '../posts/data/__factories__';
 import './data/__factories__';
@@ -35,7 +34,6 @@ const reverseOrder = false;
 let store;
 let axiosMock;
 let testLocation;
-let container;

 function mockAxiosReturnPagedComments() {
  [null, false, true].forEach(endorsed => {
@@ -106,7 +104,7 @@ function renderComponent(postId) {
      </AppProvider>
    </IntlProvider>,
  );
-  container = wrapper.container;
+  return wrapper;
 }

 describe('ThreadView', () => {
@@ -698,68 +696,4 @@ describe('ThreadView', () => {
      expect(screen.queryByRole('dialog', { name: /Delete/i, exact: false })).toBeInTheDocument();
    });
  });
-
-  describe('for comments sort', () => {
-    it('should show sort dropdown if there are endorse or unendorsed comments', async () => {
-      renderComponent(discussionPostId);
-
-      const comment = await waitFor(() => screen.findByTestId('comment-comment-1'));
-      const sortWrapper = container.querySelector('.comments-sort');
-      const sortDropDown = within(sortWrapper).getByRole('button', { name: /Oldest first/i });
-
-      expect(comment).toBeInTheDocument();
-      expect(sortDropDown).toBeInTheDocument();
-    });
-
-    it('should not show sort dropdown if there is no response', async () => {
-      const commentId = 'comment-1';
-      renderComponent(discussionPostId);
-
-      await waitFor(() => screen.findByTestId('comment-comment-1'));
-      axiosMock.onDelete(`${commentsApiUrl}${commentId}/`).reply(201);
-      await executeThunk(removeComment(commentId, discussionPostId), store.dispatch, store.getState);
-
-      expect(await waitFor(() => screen.findByText('No responses', { exact: true }))).toBeInTheDocument();
-      expect(container.querySelector('.comments-sort')).not.toBeInTheDocument();
-    });
-
-    it('should have only two options', async () => {
-      renderComponent(discussionPostId);
-
-      await waitFor(() => screen.findByTestId('comment-comment-1'));
-      await act(async () => { fireEvent.click(screen.getByRole('button', { name: /Oldest first/i })); });
-      const dropdown = await waitFor(() => screen.findByTestId('comment-sort-dropdown-modal-popup'));
-
-      expect(dropdown).toBeInTheDocument();
-      expect(await within(dropdown).getAllByRole('button')).toHaveLength(2);
-    });
-
-    it('should be selected Oldest first and auto focus', async () => {
-      renderComponent(discussionPostId);
-
-      await waitFor(() => screen.findByTestId('comment-comment-1'));
-      await act(async () => { fireEvent.click(screen.getByRole('button', { name: /Oldest first/i })); });
-      const dropdown = await waitFor(() => screen.findByTestId('comment-sort-dropdown-modal-popup'));
-
-      expect(dropdown).toBeInTheDocument();
-      expect(within(dropdown).getByRole('button', { name: /Oldest first/i })).toBeInTheDocument();
-      expect(within(dropdown).getByRole('button', { name: /Oldest first/i })).toHaveFocus();
-      expect(within(dropdown).getByRole('button', { name: /Newest first/i })).not.toHaveFocus();
-    });
-
-    test('successfully handles sort state update', async () => {
-      renderComponent(discussionPostId);
-
-      expect(store.getState().comments.sortOrder).toBeFalsy();
-
-      await waitFor(() => screen.findByTestId('comment-comment-1'));
-      await act(async () => { fireEvent.click(screen.getByRole('button', { name: /Oldest first/i })); });
-      const dropdown = await waitFor(() => screen.findByTestId('comment-sort-dropdown-modal-popup'));
-      await act(async () => {
-        fireEvent.click(within(dropdown).getByRole('button', { name: /Newest first/i }));
-      });
-
-      expect(store.getState().comments.sortOrder).toBeTruthy();
-    });
-  });
 });
--- a/src/discussions/post-comments/comments/comment/Comment.jsx
+++ b/src/discussions/post-comments/comments/comment/Comment.jsx
@@ -119,7 +119,7 @@ function Comment({
          />
        )}
        <EndorsedAlertBanner postType={postType} content={comment} />
-        <div className="d-flex flex-column post-card-comment px-4 pt-3.5 pb-10px" aria-level={5}>
+        <div className="d-flex flex-column post-card-comment px-4 pt-3.5 pb-10px" tabIndex="0">
          <HoverCard
            commentOrPost={comment}
            actionHandlers={actionHandlers}
--- a/src/discussions/post-comments/data/hooks.js
+++ b/src/discussions/post-comments/data/hooks.js
@@ -2,6 +2,8 @@ import { useEffect } from 'react';

 import { useDispatch, useSelector } from 'react-redux';

+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
+
 import { EndorsementStatus } from '../../../data/constants';
 import { useDispatchWithState } from '../../../data/hooks';
 import { selectThread } from '../../posts/data/selectors';
@@ -11,6 +13,16 @@ import {
 } from './selectors';
 import { fetchThreadComments } from './thunks';

+function trackLoadMoreEvent(postId, params) {
+  sendTrackEvent(
+    'edx.forum.responses.loadMore',
+    {
+      postId,
+      params,
+    },
+  );
+}
+
 export function usePost(postId) {
  const dispatch = useDispatch();
  const thread = useSelector(selectThread(postId));
@@ -31,11 +43,15 @@ export function usePostComments(postId, endorsed = null) {
  const hasMorePages = useSelector(selectThreadHasMorePages(postId, endorsed));
  const currentPage = useSelector(selectThreadCurrentPage(postId, endorsed));

-  const handleLoadMoreResponses = async () => dispatch(fetchThreadComments(postId, {
-    endorsed,
-    page: currentPage + 1,
-    reverseOrder,
-  }));
+  const handleLoadMoreResponses = async () => {
+    const params = {
+      endorsed,
+      page: currentPage + 1,
+      reverseOrder,
+    };
+    await dispatch(fetchThreadComments(postId, params));
+    trackLoadMoreEvent(postId, params);
+  };

  useEffect(() => {
    dispatch(fetchThreadComments(postId, {
--- a/src/discussions/posts/PostsList.jsx
+++ b/src/discussions/posts/PostsList.jsx
@@ -23,7 +23,7 @@ import NoResults from './NoResults';
 import { PostLink } from './post';

 function PostsList({
-  posts, topics, intl, isTopicTab,
+  posts, topics, intl, isTopicTab, parentIsLoading,
 }) {
  const dispatch = useDispatch();
  const {
@@ -85,10 +85,10 @@ function PostsList({

  return (
    <>
-      {postInstances(pinnedPosts)}
-      {postInstances(unpinnedPosts)}
+      {!parentIsLoading && postInstances(pinnedPosts)}
+      {!parentIsLoading && postInstances(unpinnedPosts)}
      {posts?.length === 0 && loadingStatus === RequestStatus.SUCCESSFUL && <NoResults />}
-      {loadingStatus === RequestStatus.IN_PROGRESS ? (
+      {loadingStatus === RequestStatus.IN_PROGRESS || parentIsLoading ? (
        <div className="d-flex justify-content-center p-4 mx-auto my-auto">
          <Spinner animation="border" variant="primary" size="lg" />
        </div>
@@ -110,6 +110,7 @@ PostsList.propTypes = {
  })),
  topics: PropTypes.arrayOf(PropTypes.string),
  isTopicTab: PropTypes.bool,
+  parentIsLoading: PropTypes.bool,
  intl: intlShape.isRequired,
 };

@@ -117,6 +118,7 @@ PostsList.defaultProps = {
  posts: [],
  topics: undefined,
  isTopicTab: false,
+  parentIsLoading: undefined,
 };

 export default injectIntl(PostsList);
--- a/src/discussions/posts/PostsView.jsx
+++ b/src/discussions/posts/PostsView.jsx
@@ -37,7 +37,7 @@ function CategoryPostsList({ category }) {
  const groupedCategory = useSelector(selectCurrentCategoryGrouping)(category);
  // If grouping at subsection is enabled, only apply it when browsing discussions in context in the learning MFE.
  const topicIds = useSelector(selectTopicsUnderCategory)(enableInContextSidebar ? groupedCategory : category);
-  const posts = useSelector(selectTopicThreads(topicIds));
+  const posts = useSelector(enableInContextSidebar ? selectAllThreads : selectTopicThreads(topicIds));
  return <PostsList posts={posts} topics={topicIds} />;
 }

--- a/src/discussions/posts/PostsView.test.jsx
+++ b/src/discussions/posts/PostsView.test.jsx
@@ -191,7 +191,7 @@ describe('PostsView', () => {
          .toHaveLength(topicThreadCount);
        // When grouping is enabled, topic 1 will be shown, but not otherwise.
        expect(screen.queryAllByText(/this is thread-\d+ in topic some-topic-1/i))
-          .toHaveLength(grouping ? topicThreadCount : 0);
+          .toHaveLength(grouping ? topicThreadCount : 2);
      },
    );
  });
--- a/src/discussions/posts/post-editor/PostEditor.jsx
+++ b/src/discussions/posts/post-editor/PostEditor.jsx
@@ -106,7 +106,7 @@ function PostEditor({
  const nonCoursewareIds = useSelector(enableInContext ? inContextCoursewareIds : selectNonCoursewareIds);
  const coursewareTopics = useSelector(enableInContext ? inContextCourseware : selectCoursewareTopics);
  const cohorts = useSelector(selectCourseCohorts);
-  const post = useSelector(selectThread(postId));
+  const post = useSelector(editExisting ? selectThread(postId) : () => ({}));
  const userHasModerationPrivileges = useSelector(selectUserHasModerationPrivileges);
  const userIsGroupTa = useSelector(selectUserIsGroupTa);
  const settings = useSelector(selectDivisionSettings);
--- a/src/discussions/posts/post-editor/PostEditor.test.jsx
+++ b/src/discussions/posts/post-editor/PostEditor.test.jsx
@@ -141,6 +141,16 @@ describe('PostEditor', () => {
        }
      },
    );
+    test('selectThread is not called while creating a new post', async () => {
+      const mockSelectThread = jest.fn();
+      jest.mock('../data/selectors', () => ({
+        selectThread: mockSelectThread,
+      }));
+      await renderComponent();
+      expect(mockSelectThread)
+        .not
+        .toHaveBeenCalled();
+    });
  });

  describe('cohorting', () => {
--- a/src/discussions/posts/post/Post.jsx
+++ b/src/discussions/posts/post/Post.jsx
@@ -33,7 +33,7 @@ function Post({
  const history = useHistory();
  const dispatch = useDispatch();
  const { enableInContextSidebar } = useContext(DiscussionContext);
-  const { courseId } = useSelector((state) => state.courseTabs);
+  const courseId = useSelector((state) => state.config.id);
  const topic = useSelector(selectTopic(post.topicId));
  const getTopicSubsection = useSelector(selectorForUnitSubsection);
  const topicContext = useSelector(selectTopicContext(post.topicId));
@@ -90,8 +90,9 @@ function Post({
  return (
    <div
      className="d-flex flex-column w-100 mw-100 post-card-comment"
-      aria-level={5}
      data-testid={`post-${post.id}`}
+      // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
+      tabIndex="0"
    >
      <Confirmation
        isOpen={isDeleting}
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -1,46 +1,6 @@
 {
  "navigation.course.tabs.label": "مواد المساق",
  "learn.course.tabs.navigation.overflow.menu": "المزيد...",
-  "discussions.comments.comment.addComment": "Add comment",
-  "discussions.comments.comment.addResponse": "إضافة رد",
-  "discussions.comments.comment.abuseFlaggedMessage": "تم إبلاغ الطاقم عن هذا المحتوى لمراجعته.",
-  "discussions.actions.back.alt": "العودة إلى القائمة",
-  "discussions.comments.comment.responseCount": "{num، plural, =0 {دون رد} one {تم إظهار ردّ واحد} two {تم إظهار ردّين} few {تم إظهار # ردود} many {تم إظهار # ردًا} other {تم إظهار # ردود}}",
-  "discussions.comments.comment.endorsedResponseCount": "{num، plural, =0 {لا ردود معتمدة} one {تم إظهار ردّ واحد معتمد} two {تم إظهار ردّين معتمدين} few {تم إظهار # ردود معتمدة} many {تم إظهار # ردًا معتمدًا} other {تم إظهار # ردود معتمدة}}",
-  "discussions.comments.comment.loadMoreComments": "تحميل المزيد من التعليقات",
-  "discussions.comments.comment.loadMoreResponses": "تحميل المزيد من الردود",
-  "discussions.comments.comment.visibility": "هذه المشاركة تظهر {group، select، null {للجميع} other {لـ {group}}.",
-  "discussions.comments.comment.postedTime": "تم نشر {postType، select، discussion {المناقشة} question {المنشور} other {{postType}} {relativeTime} من طرف",
-  "discussions.comments.comment.commentTime": "تم النشر {relativeTime}",
-  "discussions.comments.comment.answer": "الإجابة",
-  "discussions.comments.comment.answeredlabel": "تم تعليمها كمُجابة من طرف",
-  "discussions.comments.comment.endorsed": "معتمد",
-  "discussions.comments.comment.endorsedlabel": "اعتمده",
-  "discussions.actions.label": "قائمة الإجراءات",
-  "discussions.actions.edit": "تعديل",
-  "discussions.actions.pin": "تثبيت",
-  "discussions.actions.delete": "حذف",
-  "discussions.editor.submit": "إرسال",
-  "discussions.editor.submitting": "الإرسال جارٍ",
-  "discussions.editor.cancel": "إلغاء",
-  "discussions.editor.error.empty": "لا يمكن أن يكون محتوى المنشور فارغًا.",
-  "discussions.editor.delete.response.title": "حذف الرد",
-  "discussions.editor.delete.response.description": "هل أنت متأكد من رغبتك في حذف هذا الردّ نهائيًا؟",
-  "discussions.editor.delete.comment.title": "حذف التعليق",
-  "discussions.editor.delete.comment.description": "هل أنت متأكد من رغبتك في حذف هذا التعليق نهائيا؟",
-  "discussions.delete.confirmation.button.delete": "حذف",
-  "discussions.editor.response.response.title": "أتريد الإبلاغ عن محتوى غير لائق؟",
-  "discussions.editor.response.description": "سيراجع فريق الإشراف على المناقشة هذا المحتوى و يتخذ الإجراء المناسب.",
-  "discussions.editor.report.comment.title": "أتريد الإبلاغ عن محتوى غير لائق؟",
-  "discussions.editor.report.comment.description": "سيراجع فريق الإشراف على المناقشة هذا المحتوى ويتخذ الإجراء المناسب.",
-  "discussions.editor.comments.editReasonCode": "سبب التعديل",
-  "discussions.editor.posts.editReasonCode.error": "حدد سبب التعديل",
-  "discussions.comment.comments.editedBy": "عدّله",
-  "discussions.comment.comments.fullStop": "•",
-  "discussions.comment.comments.reason": "السبب",
-  "discussions.post.closedBy": "تم إقفال المنشور من طرف",
-  "discussion.comment.time": "منذ {time}",
-  "discussion.thread.notFound": "المناقشة غير موجودة",
  "discussions.topics.backAlt": "Back to topics list",
  "discussions.topics.discussions": "{count، plural, =0 {لا مناقشات} one {مناقشة واحدة} two {مناقشتان} few {# مناقشات} many {# مناقشة} other {# مناقشات}",
  "discussions.topics.questions": "{count، plural, =0 {لا مناقشات} one {سؤال واحد} two {سؤالان} few {# اسئلة} many {# سؤالًا} other {# أسئلة}",
@@ -68,7 +28,10 @@
  "discussion.learner.posts": "المنشورات",
  "discussions.actions.button.alt": "قائمة الإجراءات",
  "discussions.actions.copylink": "نسخ الرابط",
+  "discussions.actions.edit": "تعديل",
+  "discussions.actions.pin": "تثبيت",
  "discussions.actions.unpin": "إلغاء التثبيت",
+  "discussions.actions.delete": "حذف",
  "discussions.confirmation.button.confirm": "تأكيد",
  "discussions.actions.close": "إقفال ",
  "discussions.actions.reopen": "إعادة الفتح",
@@ -109,6 +72,44 @@
  "discussions.navigation.navigationBar.allTopics": "المواضيع",
  "discussions.navigation.navigationBar.myPosts": "منشوراتي",
  "discussions.navigation.navigationBar.learners": "المتعلمون",
+  "discussions.comments.comment.addComment": "Add comment",
+  "discussions.comments.comment.addResponse": "إضافة رد",
+  "discussions.comments.comment.abuseFlaggedMessage": "تم إبلاغ الطاقم عن هذا المحتوى لمراجعته.",
+  "discussions.actions.back.alt": "العودة إلى القائمة",
+  "discussions.comments.comment.responseCount": "{num، plural, =0 {دون رد} one {تم إظهار ردّ واحد} two {تم إظهار ردّين} few {تم إظهار # ردود} many {تم إظهار # ردًا} other {تم إظهار # ردود}}",
+  "discussions.comments.comment.endorsedResponseCount": "{num، plural, =0 {لا ردود معتمدة} one {تم إظهار ردّ واحد معتمد} two {تم إظهار ردّين معتمدين} few {تم إظهار # ردود معتمدة} many {تم إظهار # ردًا معتمدًا} other {تم إظهار # ردود معتمدة}}",
+  "discussions.comments.comment.loadMoreComments": "تحميل المزيد من التعليقات",
+  "discussions.comments.comment.loadMoreResponses": "تحميل المزيد من الردود",
+  "discussions.comments.comment.visibility": "هذه المشاركة تظهر {group، select، null {للجميع} other {لـ {group}}.",
+  "discussions.comments.comment.postedTime": "تم نشر {postType، select، discussion {المناقشة} question {المنشور} other {{postType}} {relativeTime} من طرف",
+  "discussions.comments.comment.commentTime": "تم النشر {relativeTime}",
+  "discussions.comments.comment.answer": "الإجابة",
+  "discussions.comments.comment.answeredlabel": "تم تعليمها كمُجابة من طرف",
+  "discussions.comments.comment.endorsed": "معتمد",
+  "discussions.comments.comment.endorsedlabel": "اعتمده",
+  "discussions.actions.label": "قائمة الإجراءات",
+  "discussions.editor.submit": "إرسال",
+  "discussions.editor.submitting": "الإرسال جارٍ",
+  "discussions.editor.cancel": "إلغاء",
+  "discussions.editor.error.empty": "لا يمكن أن يكون محتوى المنشور فارغًا.",
+  "discussions.editor.delete.response.title": "حذف الرد",
+  "discussions.editor.delete.response.description": "هل أنت متأكد من رغبتك في حذف هذا الردّ نهائيًا؟",
+  "discussions.editor.delete.comment.title": "حذف التعليق",
+  "discussions.editor.delete.comment.description": "هل أنت متأكد من رغبتك في حذف هذا التعليق نهائيا؟",
+  "discussions.delete.confirmation.button.delete": "حذف",
+  "discussions.editor.response.response.title": "أتريد الإبلاغ عن محتوى غير لائق؟",
+  "discussions.editor.response.description": "سيراجع فريق الإشراف على المناقشة هذا المحتوى و يتخذ الإجراء المناسب.",
+  "discussions.editor.report.comment.title": "أتريد الإبلاغ عن محتوى غير لائق؟",
+  "discussions.editor.report.comment.description": "سيراجع فريق الإشراف على المناقشة هذا المحتوى ويتخذ الإجراء المناسب.",
+  "discussions.editor.comments.editReasonCode": "سبب التعديل",
+  "discussions.editor.posts.editReasonCode.error": "حدد سبب التعديل",
+  "discussions.comment.comments.editedBy": "عدّله",
+  "discussions.comment.comments.fullStop": "•",
+  "discussions.comment.comments.reason": "السبب",
+  "discussions.post.closedBy": "تم إقفال المنشور من طرف",
+  "discussion.comment.time": "منذ {time}",
+  "discussion.thread.notFound": "المناقشة غير موجودة",
+  "discussions.comment.sortFilterStatus": "{sort, select,\n      false {Oldest first}\n      true {Newest first}\n      other {{sort}}\n    }",
  "discussions.app.title": "المناقشات",
  "discussions.posts.actionBar.searchAllPosts": "البحث في كافّة المنشورات",
  "discussions.posts.actionBar.search": "{page، select، topics {مواضيع البحث} posts {بحث في كل المشاركات} learners {بحث عن المتعلمين} myPosts} {بحث في كل المشاركات",
--- a/src/i18n/messages/de_DE.json
+++ b/src/i18n/messages/de_DE.json
@@ -1,46 +1,6 @@
 {
  "navigation.course.tabs.label": "Kursmaterial",
  "learn.course.tabs.navigation.overflow.menu": "Mehr...",
-  "discussions.comments.comment.addComment": "Kommentar hinzufügen",
-  "discussions.comments.comment.addResponse": "Fügen Sie eine Antwort hinzu",
-  "discussions.comments.comment.abuseFlaggedMessage": "Inhalte, die den Kursmitarbeitern zur Überprüfung gemeldet wurden",
-  "discussions.actions.back.alt": "Zurück zur Liste",
-  "discussions.comments.comment.responseCount": "{num, plural, =0 {Keine Antworten} one {# Antwort wird angezeigt} other {# Antworten werden angezeigt} }",
-  "discussions.comments.comment.endorsedResponseCount": "{num, plural, =0 {Keine empfohlenen Antworten} one {# empfohlene Antworten werden angezeigt} other {# empfohlene Antworten werden angezeigt} }",
-  "discussions.comments.comment.loadMoreComments": "Weitere Kommentare laden",
-  "discussions.comments.comment.loadMoreResponses": "Weitere Antworten laden",
-  "discussions.comments.comment.visibility": "Dieser Beitrag ist sichtbar für {group, select, null {Jeder} other {{group}} }.",
-  "discussions.comments.comment.postedTime": "{postType, select, discussion {Diskussion} question {Frage} other {{postType}} } gepostet {a0917e9bee14} von.c5z0",
-  "discussions.comments.comment.commentTime": "Gepostet {relativeTime}",
-  "discussions.comments.comment.answer": "Antwort",
-  "discussions.comments.comment.answeredlabel": "Als beantwortet von markiert",
-  "discussions.comments.comment.endorsed": "Bestätigt",
-  "discussions.comments.comment.endorsedlabel": "Bestätigt von",
-  "discussions.actions.label": "Aktionsmenü",
-  "discussions.actions.edit": "Bearbeiten",
-  "discussions.actions.pin": "Veröffentlichen",
-  "discussions.actions.delete": "Löschen",
-  "discussions.editor.submit": "Einreichen",
-  "discussions.editor.submitting": "Übermitteln, einreichen",
-  "discussions.editor.cancel": "Löschen",
-  "discussions.editor.error.empty": "Der Beitragsinhalt darf nicht leer sein.",
-  "discussions.editor.delete.response.title": "Antwort löschen",
-  "discussions.editor.delete.response.description": "Möchten Sie diese Antwort wirklich dauerhaft löschen?",
-  "discussions.editor.delete.comment.title": "Kommentar löschen",
-  "discussions.editor.delete.comment.description": "Möchten Sie diesen Kommentar wirklich dauerhaft löschen?",
-  "discussions.delete.confirmation.button.delete": "Löschen",
-  "discussions.editor.response.response.title": "Unangemessene Inhalte melden?",
-  "discussions.editor.response.description": "Das Diskussionsmoderationsteam überprüft diesen Inhalt und ergreift entsprechende Maßnahmen.",
-  "discussions.editor.report.comment.title": "Unangemessene Inhalte melden?",
-  "discussions.editor.report.comment.description": "Das Diskussionsmoderationsteam überprüft diesen Inhalt und ergreift entsprechende Maßnahmen.",
-  "discussions.editor.comments.editReasonCode": "Grund für die Bearbeitung",
-  "discussions.editor.posts.editReasonCode.error": "Grund für die Bearbeitung auswählen",
-  "discussions.comment.comments.editedBy": "Bearbeitet von",
-  "discussions.comment.comments.fullStop": "•",
-  "discussions.comment.comments.reason": "Grund",
-  "discussions.post.closedBy": "Post geschlossen von",
-  "discussion.comment.time": "{time} vor",
-  "discussion.thread.notFound": "Thema nicht gefunden",
  "discussions.topics.backAlt": "Zurück zur Themenliste",
  "discussions.topics.discussions": "{count, plural, =0 {Diskussion} one {# Diskussion} other {# Diskussionen} }",
  "discussions.topics.questions": "{count, plural, =0 {Frage} one {# Frage} other {# Fragen} }",
@@ -68,7 +28,10 @@
  "discussion.learner.posts": "Beiträge",
  "discussions.actions.button.alt": "Aktionsmenü",
  "discussions.actions.copylink": "Link kopieren",
+  "discussions.actions.edit": "Bearbeiten",
+  "discussions.actions.pin": "Veröffentlichen",
  "discussions.actions.unpin": "Ablösen",
+  "discussions.actions.delete": "Löschen",
  "discussions.confirmation.button.confirm": "Bestätigen",
  "discussions.actions.close": "Schließen",
  "discussions.actions.reopen": "Wieder öffnen",
@@ -109,6 +72,44 @@
  "discussions.navigation.navigationBar.allTopics": "Themen",
  "discussions.navigation.navigationBar.myPosts": "Meine Posts",
  "discussions.navigation.navigationBar.learners": "Lernende",
+  "discussions.comments.comment.addComment": "Kommentar hinzufügen",
+  "discussions.comments.comment.addResponse": "Fügen Sie eine Antwort hinzu",
+  "discussions.comments.comment.abuseFlaggedMessage": "Inhalte, die den Kursmitarbeitern zur Überprüfung gemeldet wurden",
+  "discussions.actions.back.alt": "Zurück zur Liste",
+  "discussions.comments.comment.responseCount": "{num, plural, =0 {Keine Antworten} one {# Antwort wird angezeigt} other {# Antworten werden angezeigt} }",
+  "discussions.comments.comment.endorsedResponseCount": "{num, plural, =0 {Keine empfohlenen Antworten} one {# empfohlene Antworten werden angezeigt} other {# empfohlene Antworten werden angezeigt} }",
+  "discussions.comments.comment.loadMoreComments": "Weitere Kommentare laden",
+  "discussions.comments.comment.loadMoreResponses": "Weitere Antworten laden",
+  "discussions.comments.comment.visibility": "Dieser Beitrag ist sichtbar für {group, select, null {Jeder} other {{group}} }.",
+  "discussions.comments.comment.postedTime": "{postType, select, discussion {Diskussion} question {Frage} other {{postType}} } gepostet {a0917e9bee14} von.c5z0",
+  "discussions.comments.comment.commentTime": "Gepostet {relativeTime}",
+  "discussions.comments.comment.answer": "Antwort",
+  "discussions.comments.comment.answeredlabel": "Als beantwortet von markiert",
+  "discussions.comments.comment.endorsed": "Bestätigt",
+  "discussions.comments.comment.endorsedlabel": "Bestätigt von",
+  "discussions.actions.label": "Aktionsmenü",
+  "discussions.editor.submit": "Einreichen",
+  "discussions.editor.submitting": "Übermitteln, einreichen",
+  "discussions.editor.cancel": "Löschen",
+  "discussions.editor.error.empty": "Der Beitragsinhalt darf nicht leer sein.",
+  "discussions.editor.delete.response.title": "Antwort löschen",
+  "discussions.editor.delete.response.description": "Möchten Sie diese Antwort wirklich dauerhaft löschen?",
+  "discussions.editor.delete.comment.title": "Kommentar löschen",
+  "discussions.editor.delete.comment.description": "Möchten Sie diesen Kommentar wirklich dauerhaft löschen?",
+  "discussions.delete.confirmation.button.delete": "Löschen",
+  "discussions.editor.response.response.title": "Unangemessene Inhalte melden?",
+  "discussions.editor.response.description": "Das Diskussionsmoderationsteam überprüft diesen Inhalt und ergreift entsprechende Maßnahmen.",
+  "discussions.editor.report.comment.title": "Unangemessene Inhalte melden?",
+  "discussions.editor.report.comment.description": "Das Diskussionsmoderationsteam überprüft diesen Inhalt und ergreift entsprechende Maßnahmen.",
+  "discussions.editor.comments.editReasonCode": "Grund für die Bearbeitung",
+  "discussions.editor.posts.editReasonCode.error": "Grund für die Bearbeitung auswählen",
+  "discussions.comment.comments.editedBy": "Bearbeitet von",
+  "discussions.comment.comments.fullStop": "•",
+  "discussions.comment.comments.reason": "Grund",
+  "discussions.post.closedBy": "Post geschlossen von",
+  "discussion.comment.time": "{time} vor",
+  "discussion.thread.notFound": "Thema nicht gefunden",
+  "discussions.comment.sortFilterStatus": "{sort, select,\n      false {Oldest first}\n      true {Newest first}\n      other {{sort}}\n    }",
  "discussions.app.title": "Diskussionen",
  "discussions.posts.actionBar.searchAllPosts": "Einträge durchsuchen",
  "discussions.posts.actionBar.search": "{page, select, topics {Suchthemen} posts {Alle Beiträge durchsuchen} learners {Lernende suchen} myPosts {Alle Beiträge durchsuchen} a00a14c5d87{d9fz}09 {d9fz}09 {d9fz}09 {d9fz}",
--- a/src/i18n/messages/es_419.json
+++ b/src/i18n/messages/es_419.json
@@ -1,46 +1,6 @@
 {
  "navigation.course.tabs.label": "Material del Curso",
  "learn.course.tabs.navigation.overflow.menu": "Más...",
-  "discussions.comments.comment.addComment": "Add comment",
-  "discussions.comments.comment.addResponse": "Agregar una respuesta",
-  "discussions.comments.comment.abuseFlaggedMessage": "Contenido informado para que el personal lo revise",
-  "discussions.actions.back.alt": "Volver a la lista",
-  "discussions.comments.comment.responseCount": "{num, plural, =0 {No responses} one {Showing # response} other {Showing # responses} }",
-  "discussions.comments.comment.endorsedResponseCount": "{num, plural, =0 {Sin respuestas respaldadas} one {Mostrando # respuesta respaldada} other {Mostrando # respuestas respaldadas} }",
-  "discussions.comments.comment.loadMoreComments": "Cargar más comentarios",
-  "discussions.comments.comment.loadMoreResponses": "Cargar más respuestas",
-  "discussions.comments.comment.visibility": "Esta publicación es visible para {group, select, null {Everyone} other {{group}} }.",
-  "discussions.comments.comment.postedTime": "{postType, select,\n      discussion {Discussion}\n      question {Question}\n      other {{postType}}\n    } publicado {relativeTime} por",
-  "discussions.comments.comment.commentTime": "Publicado {relativeTime}",
-  "discussions.comments.comment.answer": "Respuesta",
-  "discussions.comments.comment.answeredlabel": "Marcado como respondido por",
-  "discussions.comments.comment.endorsed": "respaldado",
-  "discussions.comments.comment.endorsedlabel": "Avalado por",
-  "discussions.actions.label": "Menú de acciones",
-  "discussions.actions.edit": "Editar",
-  "discussions.actions.pin": "Marcar",
-  "discussions.actions.delete": "Borrar",
-  "discussions.editor.submit": "Enviar",
-  "discussions.editor.submitting": "Enviando",
-  "discussions.editor.cancel": "Cancelar",
-  "discussions.editor.error.empty": "El contenido de la publicación no puede estar vacío.",
-  "discussions.editor.delete.response.title": "Eliminar respuesta",
-  "discussions.editor.delete.response.description": "¿Está seguro de que desea eliminar esta respuesta de forma permanente?",
-  "discussions.editor.delete.comment.title": "Eliminar comentario",
-  "discussions.editor.delete.comment.description": "¿Estás seguro de que quieres eliminar este comentario de forma permanente?",
-  "discussions.delete.confirmation.button.delete": "Borrar",
-  "discussions.editor.response.response.title": "¿Denunciar contenido inapropiado?",
-  "discussions.editor.response.description": "El equipo de moderación de debates revisará este contenido y tomará las medidas adecuadas.",
-  "discussions.editor.report.comment.title": "¿Denunciar contenido inapropiado?",
-  "discussions.editor.report.comment.description": "El equipo de moderación de debates revisará este contenido y tomará las medidas adecuadas.",
-  "discussions.editor.comments.editReasonCode": "Razón de la edición",
-  "discussions.editor.posts.editReasonCode.error": "Seleccione el motivo de la edición",
-  "discussions.comment.comments.editedBy": "Editado por",
-  "discussions.comment.comments.fullStop": "•",
-  "discussions.comment.comments.reason": "Motivo",
-  "discussions.post.closedBy": "Publicación cerrada por",
-  "discussion.comment.time": "hace {time}",
-  "discussion.thread.notFound": "Hilo no encontrado",
  "discussions.topics.backAlt": "Volver a la lista de temas",
  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
@@ -68,7 +28,10 @@
  "discussion.learner.posts": "Publicaciones",
  "discussions.actions.button.alt": "Menú de acciones",
  "discussions.actions.copylink": "Copiar link",
+  "discussions.actions.edit": "Editar",
+  "discussions.actions.pin": "Marcar",
  "discussions.actions.unpin": "Desmarcar",
+  "discussions.actions.delete": "Borrar",
  "discussions.confirmation.button.confirm": "Confirmar",
  "discussions.actions.close": "Cerrar",
  "discussions.actions.reopen": "Reabrir",
@@ -109,6 +72,44 @@
  "discussions.navigation.navigationBar.allTopics": "Temas",
  "discussions.navigation.navigationBar.myPosts": "Mis publicaciones",
  "discussions.navigation.navigationBar.learners": "Estudiantes",
+  "discussions.comments.comment.addComment": "Añadir comentario",
+  "discussions.comments.comment.addResponse": "Agregar una respuesta",
+  "discussions.comments.comment.abuseFlaggedMessage": "Contenido informado para que el personal lo revise",
+  "discussions.actions.back.alt": "Volver a la lista",
+  "discussions.comments.comment.responseCount": "{num, plural, =0 {No responses} one {Showing # response} other {Showing # responses} }",
+  "discussions.comments.comment.endorsedResponseCount": "{num, plural, =0 {Sin respuestas respaldadas} one {Mostrando # respuesta respaldada} other {Mostrando # respuestas respaldadas} }",
+  "discussions.comments.comment.loadMoreComments": "Cargar más comentarios",
+  "discussions.comments.comment.loadMoreResponses": "Cargar más respuestas",
+  "discussions.comments.comment.visibility": "Esta publicación es visible para {group, select, null {Everyone} other {{group}} }.",
+  "discussions.comments.comment.postedTime": "{postType, select,\n      discussion {Discussion}\n      question {Question}\n      other {{postType}}\n    } publicado {relativeTime} por",
+  "discussions.comments.comment.commentTime": "Publicado {relativeTime}",
+  "discussions.comments.comment.answer": "Respuesta",
+  "discussions.comments.comment.answeredlabel": "Marcado como respondido por",
+  "discussions.comments.comment.endorsed": "respaldado",
+  "discussions.comments.comment.endorsedlabel": "Avalado por",
+  "discussions.actions.label": "Menú de acciones",
+  "discussions.editor.submit": "Enviar",
+  "discussions.editor.submitting": "Enviando",
+  "discussions.editor.cancel": "Cancelar",
+  "discussions.editor.error.empty": "El contenido de la publicación no puede estar vacío.",
+  "discussions.editor.delete.response.title": "Eliminar respuesta",
+  "discussions.editor.delete.response.description": "¿Está seguro de que desea eliminar esta respuesta de forma permanente?",
+  "discussions.editor.delete.comment.title": "Eliminar comentario",
+  "discussions.editor.delete.comment.description": "¿Estás seguro de que quieres eliminar este comentario de forma permanente?",
+  "discussions.delete.confirmation.button.delete": "Borrar",
+  "discussions.editor.response.response.title": "¿Denunciar contenido inapropiado?",
+  "discussions.editor.response.description": "El equipo de moderación de debates revisará este contenido y tomará las medidas adecuadas.",
+  "discussions.editor.report.comment.title": "¿Denunciar contenido inapropiado?",
+  "discussions.editor.report.comment.description": "El equipo de moderación de debates revisará este contenido y tomará las medidas adecuadas.",
+  "discussions.editor.comments.editReasonCode": "Razón de la edición",
+  "discussions.editor.posts.editReasonCode.error": "Seleccione el motivo de la edición",
+  "discussions.comment.comments.editedBy": "Editado por",
+  "discussions.comment.comments.fullStop": "•",
+  "discussions.comment.comments.reason": "Motivo",
+  "discussions.post.closedBy": "Publicación cerrada por",
+  "discussion.comment.time": "hace {time}",
+  "discussion.thread.notFound": "Hilo no encontrado",
+  "discussions.comment.sortFilterStatus": "{sort, select,\n      false {Oldest first}\n      true {Newest first}\n      other {{sort}}\n    }",
  "discussions.app.title": "Debates",
  "discussions.posts.actionBar.searchAllPosts": "Buscar en todas las publicaciones",
  "discussions.posts.actionBar.search": "{page, select, topics {Search topics} posts {Search all posts} learners {Search learners} myPosts {Search all posts} other {{page}} }",
@@ -141,7 +142,7 @@
  "discussions.post.editor.anonymousPost": "Publicar de forma anónima",
  "discussions.post.editor.anonymousToPeersPost": "Publicar de forma anónima para tus compañeros",
  "discussions.editor.posts.editReasonCode": "Motivo de la edición",
-  "discussions.editor.posts.showPreview.button": "Show preview",
+  "discussions.editor.posts.showPreview.button": "Mostrar vista previa",
  "discussions.topic.noName.label": "Categoría sin nombre",
  "discussions.subtopic.noName.label": "Subcategoría sin nombre",
  "discussions.posts.filter.showALl": "Mostrar todo",
@@ -163,7 +164,7 @@
  "discussions.posts.sort.voteCount": "La mayoría me gusta",
  "discussions.posts.sort-filter.sortFilterStatus": "{own, select, false {All} true {Own} other {{own}} } {status, select, statusAll {} statusUnread {unread} statusFollowing {followed} statusReported {reported} statusUnanswered {unanswered} statusUnresponded {unresponded} other { {status}} } {type, select, discussion {discussions} question {questions} all {posts} other {{type}} } {cohortType, select, all {} group {in {cohort}} other {{cohortType}} } ordenado por {sort, select, lastActivityAt {actividad reciente} commentCount {mayor actividad} voteCount {mayor cantidad de Me gusta} other {{a0fc841}bba10}",
  "discussions.post.author.anonymous": "anónimo",
-  "discussions.post.addResponse": "Add response",
+  "discussions.post.addResponse": "Añadir respuesta",
  "discussions.post.lastResponse": "Última respuesta {time}",
  "discussions.post.postedOn": "Publicado {time} por {author} {authorLabel}",
  "discussions.post.contentReported": "Informado",
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -1,46 +1,6 @@
 {
  "navigation.course.tabs.label": "Course Material",
  "learn.course.tabs.navigation.overflow.menu": "Plus...",
-  "discussions.comments.comment.addComment": "Add comment",
-  "discussions.comments.comment.addResponse": "Ajouter une réponse",
-  "discussions.comments.comment.abuseFlaggedMessage": "Contenu signalé au personnel pour examen",
-  "discussions.actions.back.alt": "Back to list",
-  "discussions.comments.comment.responseCount": "{num, plural,\n      =0 {No responses}\n      one {Showing # response}\n      other {Showing # responses}\n    }",
-  "discussions.comments.comment.endorsedResponseCount": "{num, plural,\n      =0 {No endorsed responses}\n      one {Showing # endorsed response}\n      other {Showing # endorsed responses}\n    }",
-  "discussions.comments.comment.loadMoreComments": "Charger plus de commentaires",
-  "discussions.comments.comment.loadMoreResponses": "Charger plus de réponses",
-  "discussions.comments.comment.visibility": "This post is visible to {group, select,\n         null {Everyone}\n         other {{group}}\n    }.",
-  "discussions.comments.comment.postedTime": "{postType, select,\n      discussion {Discussion}\n      question {Question}\n      other {{postType}}\n    } posted {relativeTime} by",
-  "discussions.comments.comment.commentTime": "Posted {relativeTime}",
-  "discussions.comments.comment.answer": "Réponse",
-  "discussions.comments.comment.answeredlabel": "Marqué comme répondu par",
-  "discussions.comments.comment.endorsed": "Approuvé",
-  "discussions.comments.comment.endorsedlabel": "Approuvé par",
-  "discussions.actions.label": "Menu Actions",
-  "discussions.actions.edit": "Modifier",
-  "discussions.actions.pin": "Épingler",
-  "discussions.actions.delete": "Delete",
-  "discussions.editor.submit": "Submit",
-  "discussions.editor.submitting": "Submitting",
-  "discussions.editor.cancel": "Annuler",
-  "discussions.editor.error.empty": "Le contenu de la publication ne peut pas être vide.",
-  "discussions.editor.delete.response.title": "Delete response",
-  "discussions.editor.delete.response.description": "Are you sure you want to permanently delete this response?",
-  "discussions.editor.delete.comment.title": "Delete comment",
-  "discussions.editor.delete.comment.description": "Are you sure you want to permanently delete this comment?",
-  "discussions.delete.confirmation.button.delete": "Delete",
-  "discussions.editor.response.response.title": "Report inappropriate content?",
-  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
-  "discussions.editor.report.comment.title": "Report inappropriate content?",
-  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
-  "discussions.editor.comments.editReasonCode": "Reason for editing",
-  "discussions.editor.posts.editReasonCode.error": "Select reason for editing",
-  "discussions.comment.comments.editedBy": "Édité par",
-  "discussions.comment.comments.fullStop": "•",
-  "discussions.comment.comments.reason": "Motif",
-  "discussions.post.closedBy": "Message fermé par",
-  "discussion.comment.time": "il y a {time}",
-  "discussion.thread.notFound": "Thread not found",
  "discussions.topics.backAlt": "Back to topics list",
  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
@@ -68,7 +28,10 @@
  "discussion.learner.posts": "Posts",
  "discussions.actions.button.alt": "Actions menu",
  "discussions.actions.copylink": "Copy link",
+  "discussions.actions.edit": "Modifier",
+  "discussions.actions.pin": "Épingler",
  "discussions.actions.unpin": "Unpin",
+  "discussions.actions.delete": "Delete",
  "discussions.confirmation.button.confirm": "Confirm",
  "discussions.actions.close": "Close",
  "discussions.actions.reopen": "Reopen",
@@ -109,6 +72,44 @@
  "discussions.navigation.navigationBar.allTopics": "Topics",
  "discussions.navigation.navigationBar.myPosts": "My posts",
  "discussions.navigation.navigationBar.learners": "Learners",
+  "discussions.comments.comment.addComment": "Add comment",
+  "discussions.comments.comment.addResponse": "Ajouter une réponse",
+  "discussions.comments.comment.abuseFlaggedMessage": "Contenu signalé au personnel pour examen",
+  "discussions.actions.back.alt": "Back to list",
+  "discussions.comments.comment.responseCount": "{num, plural,\n      =0 {No responses}\n      one {Showing # response}\n      other {Showing # responses}\n    }",
+  "discussions.comments.comment.endorsedResponseCount": "{num, plural,\n      =0 {No endorsed responses}\n      one {Showing # endorsed response}\n      other {Showing # endorsed responses}\n    }",
+  "discussions.comments.comment.loadMoreComments": "Charger plus de commentaires",
+  "discussions.comments.comment.loadMoreResponses": "Charger plus de réponses",
+  "discussions.comments.comment.visibility": "This post is visible to {group, select,\n         null {Everyone}\n         other {{group}}\n    }.",
+  "discussions.comments.comment.postedTime": "{postType, select,\n      discussion {Discussion}\n      question {Question}\n      other {{postType}}\n    } posted {relativeTime} by",
+  "discussions.comments.comment.commentTime": "Posted {relativeTime}",
+  "discussions.comments.comment.answer": "Réponse",
+  "discussions.comments.comment.answeredlabel": "Marqué comme répondu par",
+  "discussions.comments.comment.endorsed": "Approuvé",
+  "discussions.comments.comment.endorsedlabel": "Approuvé par",
+  "discussions.actions.label": "Menu Actions",
+  "discussions.editor.submit": "Submit",
+  "discussions.editor.submitting": "Submitting",
+  "discussions.editor.cancel": "Annuler",
+  "discussions.editor.error.empty": "Le contenu de la publication ne peut pas être vide.",
+  "discussions.editor.delete.response.title": "Delete response",
+  "discussions.editor.delete.response.description": "Are you sure you want to permanently delete this response?",
+  "discussions.editor.delete.comment.title": "Delete comment",
+  "discussions.editor.delete.comment.description": "Are you sure you want to permanently delete this comment?",
+  "discussions.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.response.response.title": "Report inappropriate content?",
+  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.report.comment.title": "Report inappropriate content?",
+  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.comments.editReasonCode": "Reason for editing",
+  "discussions.editor.posts.editReasonCode.error": "Select reason for editing",
+  "discussions.comment.comments.editedBy": "Édité par",
+  "discussions.comment.comments.fullStop": "•",
+  "discussions.comment.comments.reason": "Motif",
+  "discussions.post.closedBy": "Message fermé par",
+  "discussion.comment.time": "il y a {time}",
+  "discussion.thread.notFound": "Thread not found",
+  "discussions.comment.sortFilterStatus": "{sort, select,\n      false {Oldest first}\n      true {Newest first}\n      other {{sort}}\n    }",
  "discussions.app.title": "Discussions",
  "discussions.posts.actionBar.searchAllPosts": "Search all posts",
  "discussions.posts.actionBar.search": "{page, select,\n      topics {Search topics}\n      posts {Search all posts}\n      learners {Search learners}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
--- a/src/i18n/messages/fr_CA.json
+++ b/src/i18n/messages/fr_CA.json
@@ -1,46 +1,6 @@
 {
  "navigation.course.tabs.label": "Matériel de cours",
  "learn.course.tabs.navigation.overflow.menu": "Plus...",
-  "discussions.comments.comment.addComment": "Ajouter un commentaire",
-  "discussions.comments.comment.addResponse": "Ajouter une réponse",
-  "discussions.comments.comment.abuseFlaggedMessage": "Contenu signalé au personnel pour examen",
-  "discussions.actions.back.alt": "Retour à la liste",
-  "discussions.comments.comment.responseCount": "{num, plural,\n      =0 {Aucune réponse}\n     one {Affiche # réponse}\n     other {Affiche # réponses}\n    }",
-  "discussions.comments.comment.endorsedResponseCount": "{num, plural,\n      =0 {No endorsed responses}\n      one {Showing # endorsed response}\n      other {Showing # endorsed responses}\n    }",
-  "discussions.comments.comment.loadMoreComments": "Charger plus de commentaires",
-  "discussions.comments.comment.loadMoreResponses": "Charger plus de réponses",
-  "discussions.comments.comment.visibility": "Ce message est visible par {group, select,\n         null {Everyone}\n         other {{group}}\n    }.",
-  "discussions.comments.comment.postedTime": "{postType, select,\n      discussion {Discussion}\n      question {Question}\n      other {{postType}}\n    } posted {relativeTime} by",
-  "discussions.comments.comment.commentTime": "Publié {relativeTime}",
-  "discussions.comments.comment.answer": "Réponse",
-  "discussions.comments.comment.answeredlabel": "Marqué comme répondu par",
-  "discussions.comments.comment.endorsed": "Approuvé",
-  "discussions.comments.comment.endorsedlabel": "Approuvé par",
-  "discussions.actions.label": "Menu Actions",
-  "discussions.actions.edit": "Éditer",
-  "discussions.actions.pin": "Épingler",
-  "discussions.actions.delete": "Supprimer",
-  "discussions.editor.submit": "Soumettre",
-  "discussions.editor.submitting": "Soumission",
-  "discussions.editor.cancel": "Annuler",
-  "discussions.editor.error.empty": "Le contenu de la publication ne peut pas être vide.",
-  "discussions.editor.delete.response.title": "Supprimer la réponse",
-  "discussions.editor.delete.response.description": "Êtes-vous sûr de vouloir supprimer définitivement cette réponse?",
-  "discussions.editor.delete.comment.title": "Supprimer le commentaire",
-  "discussions.editor.delete.comment.description": "Êtes-vous sûr de vouloir supprimer définitivement ce commentaire?",
-  "discussions.delete.confirmation.button.delete": "Supprimer",
-  "discussions.editor.response.response.title": "Signaler un contenu inapproprié?",
-  "discussions.editor.response.description": "L'équipe de modération de la discussion examinera ce contenu et prendra les mesures appropriées.",
-  "discussions.editor.report.comment.title": "Signaler un contenu inapproprié?",
-  "discussions.editor.report.comment.description": "L'équipe de modération de la discussion examinera ce contenu et prendra les mesures appropriées.",
-  "discussions.editor.comments.editReasonCode": "Raison de la modification",
-  "discussions.editor.posts.editReasonCode.error": "Sélectionnez la raison de la modification",
-  "discussions.comment.comments.editedBy": "Édité par",
-  "discussions.comment.comments.fullStop": "•",
-  "discussions.comment.comments.reason": "Raison",
-  "discussions.post.closedBy": "Message fermé par",
-  "discussion.comment.time": "il y a {time}",
-  "discussion.thread.notFound": "Sujet introuvable",
  "discussions.topics.backAlt": "Retour à la liste des sujets",
  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
@@ -68,7 +28,10 @@
  "discussion.learner.posts": "Posts",
  "discussions.actions.button.alt": "Menu Actions",
  "discussions.actions.copylink": "Copier le lien",
+  "discussions.actions.edit": "Éditer",
+  "discussions.actions.pin": "Épingler",
  "discussions.actions.unpin": "Détacher",
+  "discussions.actions.delete": "Supprimer",
  "discussions.confirmation.button.confirm": "Confirmer",
  "discussions.actions.close": "Fermer",
  "discussions.actions.reopen": "Rouvrir",
@@ -109,6 +72,44 @@
  "discussions.navigation.navigationBar.allTopics": "Sujets",
  "discussions.navigation.navigationBar.myPosts": "Mes messages",
  "discussions.navigation.navigationBar.learners": "Apprenants",
+  "discussions.comments.comment.addComment": "Ajouter un commentaire",
+  "discussions.comments.comment.addResponse": "Ajouter une réponse",
+  "discussions.comments.comment.abuseFlaggedMessage": "Contenu signalé au personnel pour examen",
+  "discussions.actions.back.alt": "Retour à la liste",
+  "discussions.comments.comment.responseCount": "{num, plural,\n      =0 {Aucune réponse}\n     one {Affiche # réponse}\n     other {Affiche # réponses}\n    }",
+  "discussions.comments.comment.endorsedResponseCount": "{num, plural,\n      =0 {No endorsed responses}\n      one {Showing # endorsed response}\n      other {Showing # endorsed responses}\n    }",
+  "discussions.comments.comment.loadMoreComments": "Charger plus de commentaires",
+  "discussions.comments.comment.loadMoreResponses": "Charger plus de réponses",
+  "discussions.comments.comment.visibility": "Ce message est visible par {group, select,\n         null {Everyone}\n         other {{group}}\n    }.",
+  "discussions.comments.comment.postedTime": "{postType, select,\n      discussion {Discussion}\n      question {Question}\n      other {{postType}}\n    } posted {relativeTime} by",
+  "discussions.comments.comment.commentTime": "Publié {relativeTime}",
+  "discussions.comments.comment.answer": "Réponse",
+  "discussions.comments.comment.answeredlabel": "Marqué comme répondu par",
+  "discussions.comments.comment.endorsed": "Approuvé",
+  "discussions.comments.comment.endorsedlabel": "Approuvé par",
+  "discussions.actions.label": "Menu Actions",
+  "discussions.editor.submit": "Soumettre",
+  "discussions.editor.submitting": "Soumission",
+  "discussions.editor.cancel": "Annuler",
+  "discussions.editor.error.empty": "Le contenu de la publication ne peut pas être vide.",
+  "discussions.editor.delete.response.title": "Supprimer la réponse",
+  "discussions.editor.delete.response.description": "Êtes-vous sûr de vouloir supprimer définitivement cette réponse?",
+  "discussions.editor.delete.comment.title": "Supprimer le commentaire",
+  "discussions.editor.delete.comment.description": "Êtes-vous sûr de vouloir supprimer définitivement ce commentaire?",
+  "discussions.delete.confirmation.button.delete": "Supprimer",
+  "discussions.editor.response.response.title": "Signaler un contenu inapproprié?",
+  "discussions.editor.response.description": "L'équipe de modération de la discussion examinera ce contenu et prendra les mesures appropriées.",
+  "discussions.editor.report.comment.title": "Signaler un contenu inapproprié?",
+  "discussions.editor.report.comment.description": "L'équipe de modération de la discussion examinera ce contenu et prendra les mesures appropriées.",
+  "discussions.editor.comments.editReasonCode": "Raison de la modification",
+  "discussions.editor.posts.editReasonCode.error": "Sélectionnez la raison de la modification",
+  "discussions.comment.comments.editedBy": "Édité par",
+  "discussions.comment.comments.fullStop": "•",
+  "discussions.comment.comments.reason": "Raison",
+  "discussions.post.closedBy": "Message fermé par",
+  "discussion.comment.time": "il y a {time}",
+  "discussion.thread.notFound": "Sujet introuvable",
+  "discussions.comment.sortFilterStatus": "{sort, select,\n      false {Oldest first}\n      true {Newest first}\n      other {{sort}}\n    }",
  "discussions.app.title": "Discussions",
  "discussions.posts.actionBar.searchAllPosts": "Recherche dans les messages",
  "discussions.posts.actionBar.search": "{page, select,\n      topics {Search topics}\n      posts {Search all posts}\n      learners {Search learners}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
--- a/src/i18n/messages/fr_FR.json
+++ b/src/i18n/messages/fr_FR.json
@@ -1,46 +1,6 @@
 {
  "navigation.course.tabs.label": "Course Material",
  "learn.course.tabs.navigation.overflow.menu": "More...",
-  "discussions.comments.comment.addComment": "Add comment",
-  "discussions.comments.comment.addResponse": "Add a response",
-  "discussions.comments.comment.abuseFlaggedMessage": "Content reported for staff to review",
-  "discussions.actions.back.alt": "Back to list",
-  "discussions.comments.comment.responseCount": "{num, plural,\n      =0 {No responses}\n      one {Showing # response}\n      other {Showing # responses}\n    }",
-  "discussions.comments.comment.endorsedResponseCount": "{num, plural,\n      =0 {No endorsed responses}\n      one {Showing # endorsed response}\n      other {Showing # endorsed responses}\n    }",
-  "discussions.comments.comment.loadMoreComments": "Load more comments",
-  "discussions.comments.comment.loadMoreResponses": "Load more responses",
-  "discussions.comments.comment.visibility": "This post is visible to {group, select,\n         null {Everyone}\n         other {{group}}\n    }.",
-  "discussions.comments.comment.postedTime": "{postType, select,\n      discussion {Discussion}\n      question {Question}\n      other {{postType}}\n    } posted {relativeTime} by",
-  "discussions.comments.comment.commentTime": "Posted {relativeTime}",
-  "discussions.comments.comment.answer": "Answer",
-  "discussions.comments.comment.answeredlabel": "Marked as answered by",
-  "discussions.comments.comment.endorsed": "Endorsed",
-  "discussions.comments.comment.endorsedlabel": "Endorsed by",
-  "discussions.actions.label": "Actions menu",
-  "discussions.actions.edit": "Edit",
-  "discussions.actions.pin": "Pin",
-  "discussions.actions.delete": "Delete",
-  "discussions.editor.submit": "Submit",
-  "discussions.editor.submitting": "Submitting",
-  "discussions.editor.cancel": "Cancel",
-  "discussions.editor.error.empty": "Post content cannot be empty.",
-  "discussions.editor.delete.response.title": "Delete response",
-  "discussions.editor.delete.response.description": "Are you sure you want to permanently delete this response?",
-  "discussions.editor.delete.comment.title": "Delete comment",
-  "discussions.editor.delete.comment.description": "Are you sure you want to permanently delete this comment?",
-  "discussions.delete.confirmation.button.delete": "Delete",
-  "discussions.editor.response.response.title": "Report inappropriate content?",
-  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
-  "discussions.editor.report.comment.title": "Report inappropriate content?",
-  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
-  "discussions.editor.comments.editReasonCode": "Reason for editing",
-  "discussions.editor.posts.editReasonCode.error": "Select reason for editing",
-  "discussions.comment.comments.editedBy": "Edited by",
-  "discussions.comment.comments.fullStop": "•",
-  "discussions.comment.comments.reason": "Reason",
-  "discussions.post.closedBy": "Post closed by",
-  "discussion.comment.time": "{time} ago",
-  "discussion.thread.notFound": "Thread not found",
  "discussions.topics.backAlt": "Back to topics list",
  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
@@ -68,7 +28,10 @@
  "discussion.learner.posts": "Posts",
  "discussions.actions.button.alt": "Actions menu",
  "discussions.actions.copylink": "Copy link",
+  "discussions.actions.edit": "Edit",
+  "discussions.actions.pin": "Pin",
  "discussions.actions.unpin": "Unpin",
+  "discussions.actions.delete": "Delete",
  "discussions.confirmation.button.confirm": "Confirm",
  "discussions.actions.close": "Close",
  "discussions.actions.reopen": "Reopen",
@@ -109,6 +72,44 @@
  "discussions.navigation.navigationBar.allTopics": "Topics",
  "discussions.navigation.navigationBar.myPosts": "My posts",
  "discussions.navigation.navigationBar.learners": "Learners",
+  "discussions.comments.comment.addComment": "Add comment",
+  "discussions.comments.comment.addResponse": "Add a response",
+  "discussions.comments.comment.abuseFlaggedMessage": "Content reported for staff to review",
+  "discussions.actions.back.alt": "Back to list",
+  "discussions.comments.comment.responseCount": "{num, plural,\n      =0 {No responses}\n      one {Showing # response}\n      other {Showing # responses}\n    }",
+  "discussions.comments.comment.endorsedResponseCount": "{num, plural,\n      =0 {No endorsed responses}\n      one {Showing # endorsed response}\n      other {Showing # endorsed responses}\n    }",
+  "discussions.comments.comment.loadMoreComments": "Load more comments",
+  "discussions.comments.comment.loadMoreResponses": "Load more responses",
+  "discussions.comments.comment.visibility": "This post is visible to {group, select,\n         null {Everyone}\n         other {{group}}\n    }.",
+  "discussions.comments.comment.postedTime": "{postType, select,\n      discussion {Discussion}\n      question {Question}\n      other {{postType}}\n    } posted {relativeTime} by",
+  "discussions.comments.comment.commentTime": "Posted {relativeTime}",
+  "discussions.comments.comment.answer": "Answer",
+  "discussions.comments.comment.answeredlabel": "Marked as answered by",
+  "discussions.comments.comment.endorsed": "Endorsed",
+  "discussions.comments.comment.endorsedlabel": "Endorsed by",
+  "discussions.actions.label": "Actions menu",
+  "discussions.editor.submit": "Submit",
+  "discussions.editor.submitting": "Submitting",
+  "discussions.editor.cancel": "Cancel",
+  "discussions.editor.error.empty": "Post content cannot be empty.",
+  "discussions.editor.delete.response.title": "Delete response",
+  "discussions.editor.delete.response.description": "Are you sure you want to permanently delete this response?",
+  "discussions.editor.delete.comment.title": "Delete comment",
+  "discussions.editor.delete.comment.description": "Are you sure you want to permanently delete this comment?",
+  "discussions.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.response.response.title": "Report inappropriate content?",
+  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.report.comment.title": "Report inappropriate content?",
+  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.comments.editReasonCode": "Reason for editing",
+  "discussions.editor.posts.editReasonCode.error": "Select reason for editing",
+  "discussions.comment.comments.editedBy": "Edited by",
+  "discussions.comment.comments.fullStop": "•",
+  "discussions.comment.comments.reason": "Reason",
+  "discussions.post.closedBy": "Post closed by",
+  "discussion.comment.time": "{time} ago",
+  "discussion.thread.notFound": "Thread not found",
+  "discussions.comment.sortFilterStatus": "{sort, select,\n      false {Oldest first}\n      true {Newest first}\n      other {{sort}}\n    }",
  "discussions.app.title": "Discussions",
  "discussions.posts.actionBar.searchAllPosts": "Search all posts",
  "discussions.posts.actionBar.search": "{page, select,\n      topics {Search topics}\n      posts {Search all posts}\n      learners {Search learners}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
--- a/src/i18n/messages/it_IT.json
+++ b/src/i18n/messages/it_IT.json
@@ -1,46 +1,6 @@
 {
  "navigation.course.tabs.label": "Materiale del corso",
  "learn.course.tabs.navigation.overflow.menu": "Altro... ",
-  "discussions.comments.comment.addComment": "Add comment",
-  "discussions.comments.comment.addResponse": "Aggiungi una risposta",
-  "discussions.comments.comment.abuseFlaggedMessage": "Contenuto segnalato per la revisione da parte del personale",
-  "discussions.actions.back.alt": "Back to list",
-  "discussions.comments.comment.responseCount": "{num, plural, =0 {Nessuna risposta} one {Mostra # risposte} other {Mostra # risposte} }",
-  "discussions.comments.comment.endorsedResponseCount": "{num, plural, =0 {Nessuna risposta approvata} one {Mostra # risposta approvata} other {Mostra # risposte approvate} }",
-  "discussions.comments.comment.loadMoreComments": "Carica più commenti",
-  "discussions.comments.comment.loadMoreResponses": "Carica più risposte",
-  "discussions.comments.comment.visibility": "Questo post è visibile a {group, select, null {Everyone} other {{group}} }.",
-  "discussions.comments.comment.postedTime": "{postType, select, discussion {Discussione} question {Domanda} other {{postType}} } pubblicato da {a0917e90}14c5z0",
-  "discussions.comments.comment.commentTime": "Inserito {relativeTime}",
-  "discussions.comments.comment.answer": "Risposta",
-  "discussions.comments.comment.answeredlabel": "Contrassegnato come risposta da",
-  "discussions.comments.comment.endorsed": "Approvato",
-  "discussions.comments.comment.endorsedlabel": "Approvato dal",
-  "discussions.actions.label": "Menù Azioni",
-  "discussions.actions.edit": "Modifica",
-  "discussions.actions.pin": "Blocca",
-  "discussions.actions.delete": "Cancella",
-  "discussions.editor.submit": "Invia",
-  "discussions.editor.submitting": "In fase di invio",
-  "discussions.editor.cancel": "Annulla",
-  "discussions.editor.error.empty": "Il contenuto del post non può essere vuoto.",
-  "discussions.editor.delete.response.title": "Elimina risposta",
-  "discussions.editor.delete.response.description": "Sei sicuro di voler eliminare definitivamente questa risposta?",
-  "discussions.editor.delete.comment.title": "Elimina commento",
-  "discussions.editor.delete.comment.description": "Sei sicuro di voler eliminare definitivamente questo commento?",
-  "discussions.delete.confirmation.button.delete": "Cancella",
-  "discussions.editor.response.response.title": "Report inappropriate content?",
-  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
-  "discussions.editor.report.comment.title": "Report inappropriate content?",
-  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
-  "discussions.editor.comments.editReasonCode": "Motivo della modifica",
-  "discussions.editor.posts.editReasonCode.error": "Seleziona il motivo per la modifica",
-  "discussions.comment.comments.editedBy": "A cura di",
-  "discussions.comment.comments.fullStop": "•",
-  "discussions.comment.comments.reason": "Motivo ",
-  "discussions.post.closedBy": "Post chiuso da",
-  "discussion.comment.time": "{time} fa",
-  "discussion.thread.notFound": "Thread not found",
  "discussions.topics.backAlt": "Back to topics list",
  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
@@ -68,7 +28,10 @@
  "discussion.learner.posts": "Posts",
  "discussions.actions.button.alt": "Menù Azioni",
  "discussions.actions.copylink": "Copia link",
+  "discussions.actions.edit": "Modifica",
+  "discussions.actions.pin": "Blocca",
  "discussions.actions.unpin": "Sblocca ",
+  "discussions.actions.delete": "Cancella",
  "discussions.confirmation.button.confirm": "Confirm",
  "discussions.actions.close": "Chiudi",
  "discussions.actions.reopen": "Riaprire",
@@ -109,6 +72,44 @@
  "discussions.navigation.navigationBar.allTopics": "Argomenti",
  "discussions.navigation.navigationBar.myPosts": "I miei post",
  "discussions.navigation.navigationBar.learners": "Utenti",
+  "discussions.comments.comment.addComment": "Add comment",
+  "discussions.comments.comment.addResponse": "Aggiungi una risposta",
+  "discussions.comments.comment.abuseFlaggedMessage": "Contenuto segnalato per la revisione da parte del personale",
+  "discussions.actions.back.alt": "Back to list",
+  "discussions.comments.comment.responseCount": "{num, plural, =0 {Nessuna risposta} one {Mostra # risposte} other {Mostra # risposte} }",
+  "discussions.comments.comment.endorsedResponseCount": "{num, plural, =0 {Nessuna risposta approvata} one {Mostra # risposta approvata} other {Mostra # risposte approvate} }",
+  "discussions.comments.comment.loadMoreComments": "Carica più commenti",
+  "discussions.comments.comment.loadMoreResponses": "Carica più risposte",
+  "discussions.comments.comment.visibility": "Questo post è visibile a {group, select, null {Everyone} other {{group}} }.",
+  "discussions.comments.comment.postedTime": "{postType, select, discussion {Discussione} question {Domanda} other {{postType}} } pubblicato da {a0917e90}14c5z0",
+  "discussions.comments.comment.commentTime": "Inserito {relativeTime}",
+  "discussions.comments.comment.answer": "Risposta",
+  "discussions.comments.comment.answeredlabel": "Contrassegnato come risposta da",
+  "discussions.comments.comment.endorsed": "Approvato",
+  "discussions.comments.comment.endorsedlabel": "Approvato dal",
+  "discussions.actions.label": "Menù Azioni",
+  "discussions.editor.submit": "Invia",
+  "discussions.editor.submitting": "In fase di invio",
+  "discussions.editor.cancel": "Annulla",
+  "discussions.editor.error.empty": "Il contenuto del post non può essere vuoto.",
+  "discussions.editor.delete.response.title": "Elimina risposta",
+  "discussions.editor.delete.response.description": "Sei sicuro di voler eliminare definitivamente questa risposta?",
+  "discussions.editor.delete.comment.title": "Elimina commento",
+  "discussions.editor.delete.comment.description": "Sei sicuro di voler eliminare definitivamente questo commento?",
+  "discussions.delete.confirmation.button.delete": "Cancella",
+  "discussions.editor.response.response.title": "Report inappropriate content?",
+  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.report.comment.title": "Report inappropriate content?",
+  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.comments.editReasonCode": "Motivo della modifica",
+  "discussions.editor.posts.editReasonCode.error": "Seleziona il motivo per la modifica",
+  "discussions.comment.comments.editedBy": "A cura di",
+  "discussions.comment.comments.fullStop": "•",
+  "discussions.comment.comments.reason": "Motivo ",
+  "discussions.post.closedBy": "Post chiuso da",
+  "discussion.comment.time": "{time} fa",
+  "discussion.thread.notFound": "Thread not found",
+  "discussions.comment.sortFilterStatus": "{sort, select,\n      false {Oldest first}\n      true {Newest first}\n      other {{sort}}\n    }",
  "discussions.app.title": "Discussioni",
  "discussions.posts.actionBar.searchAllPosts": "Cerca tutti i messaggi",
  "discussions.posts.actionBar.search": "{page, select,\n      topics {Search topics}\n      posts {Search all posts}\n      learners {Search learners}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
--- a/src/i18n/messages/pl.json
+++ b/src/i18n/messages/pl.json
@@ -1,46 +1,6 @@
 {
  "navigation.course.tabs.label": "Course Material",
  "learn.course.tabs.navigation.overflow.menu": "More...",
-  "discussions.comments.comment.addComment": "Add comment",
-  "discussions.comments.comment.addResponse": "Dodaj odpowiedź",
-  "discussions.comments.comment.abuseFlaggedMessage": "Content reported for staff to review",
-  "discussions.actions.back.alt": "Back to list",
-  "discussions.comments.comment.responseCount": "{num, plural,\n=0 {No responses}\none {Showing # response}\nother {Showing # responses}\n}",
-  "discussions.comments.comment.endorsedResponseCount": "{num, plural,\n=0 {No endorsed responses}\none {Showing # endorsed response}\nother {Showing # endorsed responses}\n}",
-  "discussions.comments.comment.loadMoreComments": "Załaduj więcej komentarzy",
-  "discussions.comments.comment.loadMoreResponses": "Załaduj więcej odpowiedzi",
-  "discussions.comments.comment.visibility": "Ten post jest widoczny dla  {group, select,\n null {Everyone}\nother {{group}}\n }.",
-  "discussions.comments.comment.postedTime": "{postType, select,\n      discussion {Discussion}\n      question {Question}\n      other {{postType}}\n    } posted {relativeTime} by",
-  "discussions.comments.comment.commentTime": "Wysłano {relativeTime}",
-  "discussions.comments.comment.answer": "Answer",
-  "discussions.comments.comment.answeredlabel": "Oznaczono jako odpowiedziane przez",
-  "discussions.comments.comment.endorsed": "Zatwierdzony",
-  "discussions.comments.comment.endorsedlabel": "Zatwierdzony przez",
-  "discussions.actions.label": "Actions menu",
-  "discussions.actions.edit": "Edit",
-  "discussions.actions.pin": "Pin",
-  "discussions.actions.delete": "Delete",
-  "discussions.editor.submit": "Submit",
-  "discussions.editor.submitting": "Submitting",
-  "discussions.editor.cancel": "Cancel",
-  "discussions.editor.error.empty": "Post content cannot be empty.",
-  "discussions.editor.delete.response.title": "Usuń odpowiedź",
-  "discussions.editor.delete.response.description": "Czy na pewno chcesz trwale usunąć tę odpowiedź?",
-  "discussions.editor.delete.comment.title": "Usuń komentarz",
-  "discussions.editor.delete.comment.description": "Czy na pewno chcesz trwale usunąć ten komentarz?",
-  "discussions.delete.confirmation.button.delete": "Delete",
-  "discussions.editor.response.response.title": "Report inappropriate content?",
-  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
-  "discussions.editor.report.comment.title": "Report inappropriate content?",
-  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
-  "discussions.editor.comments.editReasonCode": "Reason for editing",
-  "discussions.editor.posts.editReasonCode.error": "Wybierz powód edycji",
-  "discussions.comment.comments.editedBy": "Edytowany przez",
-  "discussions.comment.comments.fullStop": "•",
-  "discussions.comment.comments.reason": "Reason",
-  "discussions.post.closedBy": "Post zamknięty przez",
-  "discussion.comment.time": "{time} ago",
-  "discussion.thread.notFound": "Thread not found",
  "discussions.topics.backAlt": "Back to topics list",
  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
@@ -68,7 +28,10 @@
  "discussion.learner.posts": "Posts",
  "discussions.actions.button.alt": "Menu czynności",
  "discussions.actions.copylink": "Copy link",
+  "discussions.actions.edit": "Edit",
+  "discussions.actions.pin": "Pin",
  "discussions.actions.unpin": "Unpin",
+  "discussions.actions.delete": "Delete",
  "discussions.confirmation.button.confirm": "Confirm",
  "discussions.actions.close": "Close",
  "discussions.actions.reopen": "Otwórz ponownie",
@@ -109,6 +72,44 @@
  "discussions.navigation.navigationBar.allTopics": "Topics",
  "discussions.navigation.navigationBar.myPosts": "Moje posty",
  "discussions.navigation.navigationBar.learners": "Learners",
+  "discussions.comments.comment.addComment": "Add comment",
+  "discussions.comments.comment.addResponse": "Dodaj odpowiedź",
+  "discussions.comments.comment.abuseFlaggedMessage": "Content reported for staff to review",
+  "discussions.actions.back.alt": "Back to list",
+  "discussions.comments.comment.responseCount": "{num, plural,\n=0 {No responses}\none {Showing # response}\nother {Showing # responses}\n}",
+  "discussions.comments.comment.endorsedResponseCount": "{num, plural,\n=0 {No endorsed responses}\none {Showing # endorsed response}\nother {Showing # endorsed responses}\n}",
+  "discussions.comments.comment.loadMoreComments": "Załaduj więcej komentarzy",
+  "discussions.comments.comment.loadMoreResponses": "Załaduj więcej odpowiedzi",
+  "discussions.comments.comment.visibility": "Ten post jest widoczny dla  {group, select,\n null {Everyone}\nother {{group}}\n }.",
+  "discussions.comments.comment.postedTime": "{postType, select,\n      discussion {Discussion}\n      question {Question}\n      other {{postType}}\n    } posted {relativeTime} by",
+  "discussions.comments.comment.commentTime": "Wysłano {relativeTime}",
+  "discussions.comments.comment.answer": "Answer",
+  "discussions.comments.comment.answeredlabel": "Oznaczono jako odpowiedziane przez",
+  "discussions.comments.comment.endorsed": "Zatwierdzony",
+  "discussions.comments.comment.endorsedlabel": "Zatwierdzony przez",
+  "discussions.actions.label": "Actions menu",
+  "discussions.editor.submit": "Submit",
+  "discussions.editor.submitting": "Submitting",
+  "discussions.editor.cancel": "Cancel",
+  "discussions.editor.error.empty": "Post content cannot be empty.",
+  "discussions.editor.delete.response.title": "Usuń odpowiedź",
+  "discussions.editor.delete.response.description": "Czy na pewno chcesz trwale usunąć tę odpowiedź?",
+  "discussions.editor.delete.comment.title": "Usuń komentarz",
+  "discussions.editor.delete.comment.description": "Czy na pewno chcesz trwale usunąć ten komentarz?",
+  "discussions.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.response.response.title": "Report inappropriate content?",
+  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.report.comment.title": "Report inappropriate content?",
+  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.comments.editReasonCode": "Reason for editing",
+  "discussions.editor.posts.editReasonCode.error": "Wybierz powód edycji",
+  "discussions.comment.comments.editedBy": "Edytowany przez",
+  "discussions.comment.comments.fullStop": "•",
+  "discussions.comment.comments.reason": "Reason",
+  "discussions.post.closedBy": "Post zamknięty przez",
+  "discussion.comment.time": "{time} ago",
+  "discussion.thread.notFound": "Thread not found",
+  "discussions.comment.sortFilterStatus": "{sort, select,\n      false {Oldest first}\n      true {Newest first}\n      other {{sort}}\n    }",
  "discussions.app.title": "Discussions",
  "discussions.posts.actionBar.searchAllPosts": "Search all posts",
  "discussions.posts.actionBar.search": "{page, select,\n      topics {Search topics}\n      posts {Search all posts}\n      learners {Search learners}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
--- a/src/i18n/messages/tr_TR.json
+++ b/src/i18n/messages/tr_TR.json
@@ -1,57 +1,17 @@
 {
  "navigation.course.tabs.label": "Ders Materyali",
  "learn.course.tabs.navigation.overflow.menu": "Daha Fazlası...",
-  "discussions.comments.comment.addComment": "Yorum ekle",
-  "discussions.comments.comment.addResponse": "Bir cevap ekle",
-  "discussions.comments.comment.abuseFlaggedMessage": "Personelin incelemesi için bildirilen içerik",
-  "discussions.actions.back.alt": "Listeye dön",
-  "discussions.comments.comment.responseCount": "{num, plural,\n      =0 {No responses}\n      one {Showing # response}\n      other {Showing # responses}\n    }",
-  "discussions.comments.comment.endorsedResponseCount": "{num, plural,\n      =0 {No endorsed responses}\n      one {Showing # endorsed response}\n      other {Showing # endorsed responses}\n    }",
-  "discussions.comments.comment.loadMoreComments": "Daha fazla yorum yükle",
-  "discussions.comments.comment.loadMoreResponses": "Daha fazla yanıt yükle",
-  "discussions.comments.comment.visibility": "This post is visible to {group, select,\n         null {Everyone}\n         other {{group}}\n    }.",
-  "discussions.comments.comment.postedTime": "{postType, select,\n      discussion {Discussion}\n      question {Question}\n      other {{postType}}\n    } posted {relativeTime} by",
-  "discussions.comments.comment.commentTime": "{relativeTime} önce gönderildi",
-  "discussions.comments.comment.answer": "Cevap",
-  "discussions.comments.comment.answeredlabel": "Yanıtlandı olarak işaretleyen ",
-  "discussions.comments.comment.endorsed": "Doğrulandı",
-  "discussions.comments.comment.endorsedlabel": "Doğrulayan",
-  "discussions.actions.label": "Eylemler menüsü",
-  "discussions.actions.edit": "Düzenle",
-  "discussions.actions.pin": "İşaretle",
-  "discussions.actions.delete": "Sil",
-  "discussions.editor.submit": "Gönder",
-  "discussions.editor.submitting": "Gönderiliyor",
-  "discussions.editor.cancel": "İptal",
-  "discussions.editor.error.empty": "Gönderi içeriği boş olamaz.",
-  "discussions.editor.delete.response.title": "Yanıtı sil",
-  "discussions.editor.delete.response.description": "Bu yanıtı kalıcı olarak silmek istediğinizden emin misiniz?",
-  "discussions.editor.delete.comment.title": "Yorumu sil",
-  "discussions.editor.delete.comment.description": "Bu yorumu kalıcı olarak silmek istediğinizden emin misiniz?",
-  "discussions.delete.confirmation.button.delete": "Sil",
-  "discussions.editor.response.response.title": "Uygunsuz içerik mi raporlayacaksınız?",
-  "discussions.editor.response.description": "Tartışma yöneticileri bu içeriği inceleyecek ve uygun işlemi yapacaktır.",
-  "discussions.editor.report.comment.title": "Uygunsuz içerik mi raporlayacaksınız?",
-  "discussions.editor.report.comment.description": "Tartışma yöneticileri bu içeriği inceleyecek ve uygun işlemi yapacaktır.",
-  "discussions.editor.comments.editReasonCode": "Düzenleme nedeni",
-  "discussions.editor.posts.editReasonCode.error": "Düzenleme nedenini seçin",
-  "discussions.comment.comments.editedBy": "Düzenleyen",
-  "discussions.comment.comments.fullStop": "•",
-  "discussions.comment.comments.reason": "Gerekçe",
-  "discussions.post.closedBy": "Gönderiyi kapatan ",
-  "discussion.comment.time": "{time} önce",
-  "discussion.thread.notFound": "Tartışma zinciri bulunamadı",
-  "discussions.topics.backAlt": "Back to topics list",
+  "discussions.topics.backAlt": "Konular listesine dön",
  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
  "discussions.topics.reported": "{reported} rapor edildi",
  "discussions.topics.previouslyReported": "{previouslyReported} ileti rapor edildi",
  "discussions.topics.find.label": "Konuları ara",
-  "discussions.topics.unnamed.section.label": "Unnamed Section",
-  "discussions.topics.unnamed.subsection.label": "Unnamed Subsection",
-  "discussions.subtopics.unnamed.topic.label": "Unnamed Topic",
-  "discussions.topics.title": "No topic exists",
-  "discussions.topics.createTopic": "Please contact you admin to create a topic",
+  "discussions.topics.unnamed.section.label": "İsimsiz Bölüm",
+  "discussions.topics.unnamed.subsection.label": "İsimsiz Altbölüm",
+  "discussions.subtopics.unnamed.topic.label": "İsimsiz Konu",
+  "discussions.topics.title": "Hiçbir konu yok",
+  "discussions.topics.createTopic": "Bir konu başlatmak için yöneticinizle iletişime geçin",
  "discussions.topics.nothing": "Burada henüz bir şey yok",
  "discussions.topics.archived.label": "Arşivlenmiş",
  "discussions.learner.reported": "{reported} rapor edildi",
@@ -68,14 +28,17 @@
  "discussion.learner.posts": "Gönderiler",
  "discussions.actions.button.alt": "Eylemler menüsü",
  "discussions.actions.copylink": "Bağlantıyı kopyala",
+  "discussions.actions.edit": "Düzenle",
+  "discussions.actions.pin": "İşaretle",
  "discussions.actions.unpin": "İşareti kaldır",
+  "discussions.actions.delete": "Sil",
  "discussions.confirmation.button.confirm": "Onayla",
  "discussions.actions.close": "Kapat",
  "discussions.actions.reopen": "Yeniden aç",
  "discussions.actions.report": "Raporla",
-  "discussions.actions.unreport": "Bildirme",
+  "discussions.actions.unreport": "Raporlamaktan vazgeç",
  "discussions.actions.endorse": "Destekle",
-  "discussions.actions.unendorse": "Destekleme",
+  "discussions.actions.unendorse": "Desteklemekten vazgeç",
  "discussions.actions.markAnswered": "Cevaplandı olarak işaretle",
  "discussions.actions.unMarkAnswered": "Cevaplandı olarak işaretini kaldır",
  "discussions.modal.confirmation.button.cancel": "İptal",
@@ -99,7 +62,7 @@
  "discussion.banner.welcomeMessage": "🎉 Yeni ve geliştirilmiş tartışma deneyimine hoş geldiniz!",
  "discussion.banner.learnMore": "Daha fazlasını öğren",
  "discussion.banner.shareFeedback": "Geri bildirim paylaş",
-  "discussion.blackoutBanner.information": "Posting in discussions is temporarily disabled by the course team",
+  "discussion.blackoutBanner.information": "Tartışmalarda ileti yayınlama, ders ekibi tarafından geçici olarak devre dışı bırakıldı",
  "discussions.editor.image.warning.message": "Genişliği veya yüksekliği 999 pikselden büyük olan resimler, çevrimiçi ders tartışmalarında yer alan gönderi, yanıt veya yorumlarda görüntülenemez.",
  "discussions.editor.image.warning.title": "Uyarı!",
  "discussions.editor.image.warning.dismiss": "Tamam",
@@ -109,6 +72,44 @@
  "discussions.navigation.navigationBar.allTopics": "Konular",
  "discussions.navigation.navigationBar.myPosts": "İletilerim",
  "discussions.navigation.navigationBar.learners": "Öğrenciler",
+  "discussions.comments.comment.addComment": "Yorum ekle",
+  "discussions.comments.comment.addResponse": "Bir cevap ekle",
+  "discussions.comments.comment.abuseFlaggedMessage": "Personelin incelemesi için bildirilen içerik",
+  "discussions.actions.back.alt": "Listeye dön",
+  "discussions.comments.comment.responseCount": "{num, plural,\n      =0 {No responses}\n      one {Showing # response}\n      other {Showing # responses}\n    }",
+  "discussions.comments.comment.endorsedResponseCount": "{num, plural,\n      =0 {No endorsed responses}\n      one {Showing # endorsed response}\n      other {Showing # endorsed responses}\n    }",
+  "discussions.comments.comment.loadMoreComments": "Daha fazla yorum yükle",
+  "discussions.comments.comment.loadMoreResponses": "Daha fazla yanıt yükle",
+  "discussions.comments.comment.visibility": "This post is visible to {group, select,\n         null {Everyone}\n         other {{group}}\n    }.",
+  "discussions.comments.comment.postedTime": "{postType, select,\n      discussion {Discussion}\n      question {Question}\n      other {{postType}}\n    } posted {relativeTime} by",
+  "discussions.comments.comment.commentTime": "{relativeTime} önce gönderildi",
+  "discussions.comments.comment.answer": "Cevap",
+  "discussions.comments.comment.answeredlabel": "Yanıtlandı olarak işaretleyen ",
+  "discussions.comments.comment.endorsed": "Doğrulandı",
+  "discussions.comments.comment.endorsedlabel": "Doğrulayan",
+  "discussions.actions.label": "Eylemler menüsü",
+  "discussions.editor.submit": "Gönder",
+  "discussions.editor.submitting": "Gönderiliyor",
+  "discussions.editor.cancel": "İptal",
+  "discussions.editor.error.empty": "Gönderi içeriği boş olamaz.",
+  "discussions.editor.delete.response.title": "Yanıtı sil",
+  "discussions.editor.delete.response.description": "Bu yanıtı kalıcı olarak silmek istediğinizden emin misiniz?",
+  "discussions.editor.delete.comment.title": "Yorumu sil",
+  "discussions.editor.delete.comment.description": "Bu yorumu kalıcı olarak silmek istediğinizden emin misiniz?",
+  "discussions.delete.confirmation.button.delete": "Sil",
+  "discussions.editor.response.response.title": "Uygunsuz içerik mi raporlayacaksınız?",
+  "discussions.editor.response.description": "Tartışma yöneticileri bu içeriği inceleyecek ve uygun işlemi yapacaktır.",
+  "discussions.editor.report.comment.title": "Uygunsuz içerik mi raporlayacaksınız?",
+  "discussions.editor.report.comment.description": "Tartışma yöneticileri bu içeriği inceleyecek ve uygun işlemi yapacaktır.",
+  "discussions.editor.comments.editReasonCode": "Düzenleme nedeni",
+  "discussions.editor.posts.editReasonCode.error": "Düzenleme nedenini seçin",
+  "discussions.comment.comments.editedBy": "Düzenleyen",
+  "discussions.comment.comments.fullStop": "•",
+  "discussions.comment.comments.reason": "Gerekçe",
+  "discussions.post.closedBy": "Gönderiyi kapatan ",
+  "discussion.comment.time": "{time} önce",
+  "discussion.thread.notFound": "Tartışma zinciri bulunamadı",
+  "discussions.comment.sortFilterStatus": "{sort, select,\n      false {Oldest first}\n      true {Newest first}\n      other {{sort}}\n    }",
  "discussions.app.title": "Forumlar",
  "discussions.posts.actionBar.searchAllPosts": "Tüm gönderilerde ara",
  "discussions.posts.actionBar.search": "{page, select,\n      topics {Search topics}\n      posts {Search all posts}\n      learners {Search learners}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
@@ -141,7 +142,7 @@
  "discussions.post.editor.anonymousPost": "Anonim olarak gönder",
  "discussions.post.editor.anonymousToPeersPost": "Akranlarına anonim olarak gönder",
  "discussions.editor.posts.editReasonCode": "Düzenleme nedeni",
-  "discussions.editor.posts.showPreview.button": "Show preview",
+  "discussions.editor.posts.showPreview.button": "Önizlemeyi göster",
  "discussions.topic.noName.label": "İsimsiz kategori",
  "discussions.subtopic.noName.label": "İsimsiz alt kategori",
  "discussions.posts.filter.showALl": "Tümünü göster",
@@ -163,20 +164,20 @@
  "discussions.posts.sort.voteCount": "En çok beğenilenler",
  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      statusUnresponded {unresponded}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } sorted by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most likes}\n      other {{sort}}\n    }",
  "discussions.post.author.anonymous": "anonim",
-  "discussions.post.addResponse": "Add response",
+  "discussions.post.addResponse": "Yanıt ekle",
  "discussions.post.lastResponse": "Son yanıt {time}",
  "discussions.post.postedOn": "{author} {authorLabel} tarafından {time} önce gönderildi",
  "discussions.post.contentReported": "Rapor edildi",
  "discussions.post.following": "Takip ediliyor",
  "discussions.post.follow": "Takip et",
-  "discussions.post.followed": "Followed",
-  "discussions.post.notFollowed": "Not Followed",
+  "discussions.post.followed": "İzlendi",
+  "discussions.post.notFollowed": "İzlenmedi",
  "discussions.post.answered": "Yanıtlandı",
  "discussions.post.unFollow": "Takibi bırak",
  "discussions.post.like": "Beğen",
  "discussions.post.removeLike": "Beğenmeme",
-  "discussions.post.liked": "liked",
-  "discussions.post.likes": "likes",
+  "discussions.post.liked": "beğendi",
+  "discussions.post.likes": "beğeni",
  "discussions.post.viewActivity": "Etkinliği görüntüle",
  "discussions.post.activity": "Etkinlik",
  "discussions.post.closed": "Yanıtlar ve yorumlar için gönderi kapatıldı",
@@ -195,8 +196,8 @@
  "discussions.post.editedBy": "Düzenleyen",
  "discussions.post.editReason": "Gerekçe",
  "discussions.post.postWithoutPreview": "Önizleme yok",
-  "discussions.post.follow.description": "you are following this post",
-  "discussions.post.unfollow.description": "you are not following this post",
+  "discussions.post.follow.description": "bu iletiyi izliyorsunuz",
+  "discussions.post.unfollow.description": "bu iletiyi izlemiyorsunuz",
  "discussions.topics.sort.message": "{sortBy} ölçütüne göre sıralandı",
  "discussions.topics.sort.lastActivity": "Son etkinlik",
  "discussions.topics.sort.commentCount": "En çok etkinlik",
@@ -204,8 +205,8 @@
  "discussions.topics.unnamed.label": "İsimsiz kategori",
  "discussions.subtopics.unnamed.label": "İsimsiz alt kategori",
  "tour.action.advance": "Sonraki",
-  "tour.action.dismiss": "Dismiss",
+  "tour.action.dismiss": "İptal",
  "tour.action.end": "Tamam",
-  "tour.body.notRespondedFilter": "Now you can filter discussions to find posts with no response.",
-  "tour.title.notRespondedFilter": "New filtering option!"
+  "tour.body.notRespondedFilter": "Artık yanıt vermeyen iletileri bulmak için tartışmaları filtreleyebilirsiniz.",
+  "tour.title.notRespondedFilter": "Yeni filtreleme seçeneği!"
 }
--- a/src/i18n/messages/zh_CN.json
+++ b/src/i18n/messages/zh_CN.json
@@ -1,46 +1,6 @@
 {
  "navigation.course.tabs.label": "Course Material",
  "learn.course.tabs.navigation.overflow.menu": "More...",
-  "discussions.comments.comment.addComment": "Add comment",
-  "discussions.comments.comment.addResponse": "Add a response",
-  "discussions.comments.comment.abuseFlaggedMessage": "Content reported for staff to review",
-  "discussions.actions.back.alt": "Back to list",
-  "discussions.comments.comment.responseCount": "{num, plural,\n      =0 {No responses}\n      one {Showing # response}\n      other {Showing # responses}\n    }",
-  "discussions.comments.comment.endorsedResponseCount": "{num, plural,\n      =0 {No endorsed responses}\n      one {Showing # endorsed response}\n      other {Showing # endorsed responses}\n    }",
-  "discussions.comments.comment.loadMoreComments": "Load more comments",
-  "discussions.comments.comment.loadMoreResponses": "Load more responses",
-  "discussions.comments.comment.visibility": "This post is visible to {group, select,\n         null {Everyone}\n         other {{group}}\n    }.",
-  "discussions.comments.comment.postedTime": "{postType, select,\n      discussion {Discussion}\n      question {Question}\n      other {{postType}}\n    } posted {relativeTime} by",
-  "discussions.comments.comment.commentTime": "Posted {relativeTime}",
-  "discussions.comments.comment.answer": "Answer",
-  "discussions.comments.comment.answeredlabel": "Marked as answered by",
-  "discussions.comments.comment.endorsed": "Endorsed",
-  "discussions.comments.comment.endorsedlabel": "Endorsed by",
-  "discussions.actions.label": "Actions menu",
-  "discussions.actions.edit": "Edit",
-  "discussions.actions.pin": "Pin",
-  "discussions.actions.delete": "Delete",
-  "discussions.editor.submit": "Submit",
-  "discussions.editor.submitting": "Submitting",
-  "discussions.editor.cancel": "Cancel",
-  "discussions.editor.error.empty": "Post content cannot be empty.",
-  "discussions.editor.delete.response.title": "Delete response",
-  "discussions.editor.delete.response.description": "Are you sure you want to permanently delete this response?",
-  "discussions.editor.delete.comment.title": "Delete comment",
-  "discussions.editor.delete.comment.description": "Are you sure you want to permanently delete this comment?",
-  "discussions.delete.confirmation.button.delete": "Delete",
-  "discussions.editor.response.response.title": "Report inappropriate content?",
-  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
-  "discussions.editor.report.comment.title": "Report inappropriate content?",
-  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
-  "discussions.editor.comments.editReasonCode": "Reason for editing",
-  "discussions.editor.posts.editReasonCode.error": "Select reason for editing",
-  "discussions.comment.comments.editedBy": "Edited by",
-  "discussions.comment.comments.fullStop": "•",
-  "discussions.comment.comments.reason": "Reason",
-  "discussions.post.closedBy": "Post closed by",
-  "discussion.comment.time": "{time} ago",
-  "discussion.thread.notFound": "Thread not found",
  "discussions.topics.backAlt": "Back to topics list",
  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
@@ -68,7 +28,10 @@
  "discussion.learner.posts": "Posts",
  "discussions.actions.button.alt": "Actions menu",
  "discussions.actions.copylink": "Copy link",
+  "discussions.actions.edit": "Edit",
+  "discussions.actions.pin": "Pin",
  "discussions.actions.unpin": "Unpin",
+  "discussions.actions.delete": "Delete",
  "discussions.confirmation.button.confirm": "Confirm",
  "discussions.actions.close": "Close",
  "discussions.actions.reopen": "Reopen",
@@ -109,6 +72,44 @@
  "discussions.navigation.navigationBar.allTopics": "Topics",
  "discussions.navigation.navigationBar.myPosts": "My posts",
  "discussions.navigation.navigationBar.learners": "Learners",
+  "discussions.comments.comment.addComment": "Add comment",
+  "discussions.comments.comment.addResponse": "Add a response",
+  "discussions.comments.comment.abuseFlaggedMessage": "Content reported for staff to review",
+  "discussions.actions.back.alt": "Back to list",
+  "discussions.comments.comment.responseCount": "{num, plural,\n      =0 {No responses}\n      one {Showing # response}\n      other {Showing # responses}\n    }",
+  "discussions.comments.comment.endorsedResponseCount": "{num, plural,\n      =0 {No endorsed responses}\n      one {Showing # endorsed response}\n      other {Showing # endorsed responses}\n    }",
+  "discussions.comments.comment.loadMoreComments": "Load more comments",
+  "discussions.comments.comment.loadMoreResponses": "Load more responses",
+  "discussions.comments.comment.visibility": "This post is visible to {group, select,\n         null {Everyone}\n         other {{group}}\n    }.",
+  "discussions.comments.comment.postedTime": "{postType, select,\n      discussion {Discussion}\n      question {Question}\n      other {{postType}}\n    } posted {relativeTime} by",
+  "discussions.comments.comment.commentTime": "Posted {relativeTime}",
+  "discussions.comments.comment.answer": "Answer",
+  "discussions.comments.comment.answeredlabel": "Marked as answered by",
+  "discussions.comments.comment.endorsed": "Endorsed",
+  "discussions.comments.comment.endorsedlabel": "Endorsed by",
+  "discussions.actions.label": "Actions menu",
+  "discussions.editor.submit": "Submit",
+  "discussions.editor.submitting": "Submitting",
+  "discussions.editor.cancel": "Cancel",
+  "discussions.editor.error.empty": "Post content cannot be empty.",
+  "discussions.editor.delete.response.title": "Delete response",
+  "discussions.editor.delete.response.description": "Are you sure you want to permanently delete this response?",
+  "discussions.editor.delete.comment.title": "Delete comment",
+  "discussions.editor.delete.comment.description": "Are you sure you want to permanently delete this comment?",
+  "discussions.delete.confirmation.button.delete": "Delete",
+  "discussions.editor.response.response.title": "Report inappropriate content?",
+  "discussions.editor.response.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.report.comment.title": "Report inappropriate content?",
+  "discussions.editor.report.comment.description": "The discussion moderation team will review this content and take appropriate action.",
+  "discussions.editor.comments.editReasonCode": "Reason for editing",
+  "discussions.editor.posts.editReasonCode.error": "Select reason for editing",
+  "discussions.comment.comments.editedBy": "Edited by",
+  "discussions.comment.comments.fullStop": "•",
+  "discussions.comment.comments.reason": "Reason",
+  "discussions.post.closedBy": "Post closed by",
+  "discussion.comment.time": "{time} ago",
+  "discussion.thread.notFound": "Thread not found",
+  "discussions.comment.sortFilterStatus": "{sort, select,\n      false {Oldest first}\n      true {Newest first}\n      other {{sort}}\n    }",
  "discussions.app.title": "Discussions",
  "discussions.posts.actionBar.searchAllPosts": "Search all posts",
  "discussions.posts.actionBar.search": "{page, select,\n      topics {Search topics}\n      posts {Search all posts}\n      learners {Search learners}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
--- a/src/index.scss
+++ b/src/index.scss
@@ -433,7 +433,7 @@ header {
  pointer-events: none;
 }

-.on-focus:focus-visible {
+.on-focus:focus-within {
  outline: 2px solid black;
 }

@@ -442,6 +442,8 @@ header {
 }

 .post-card-comment {
+  outline: none;
+
  &:not(:hover),
  &:not(:focus) {
    .hover-card {
@@ -450,7 +452,7 @@ header {
  }

  &:hover,
-  &:focus {
+  &:focus-within {
    .hover-card {
      display: flex;
    }
Author	SHA1	Message	Date
ayeshoali	07ec3486a0	fix: fixed post coment actions menu accessibilty for keyboard	2023-03-01 18:09:35 +05:00
Sarina Canelake	ed0c73e051	Merge pull request #454 from openedx/repo_checks/ensure_workflows Update standard workflow files.	2023-02-28 09:40:08 -05:00
Feanil Patel	1041b3e45f	build: Updating a missing workflow file `add-depr-ticket-to-depr-board.yml`. The .github/workflows/add-depr-ticket-to-depr-board.yml workflow is missing or needs an update to stay in sync with the current standard for this workflow as defined in the `.github` repo of the `openedx` GitHub org.	2023-02-28 09:34:03 -05:00
Feanil Patel	493a0610ca	build: Creating a missing workflow file `add-remove-label-on-comment.yml`. The .github/workflows/add-remove-label-on-comment.yml workflow is missing or needs an update to stay in sync with the current standard for this workflow as defined in the `.github` repo of the `openedx` GitHub org.	2023-02-28 09:34:03 -05:00
Feanil Patel	679e21c270	build: Creating a missing workflow file `self-assign-issue.yml`. The .github/workflows/self-assign-issue.yml workflow is missing or needs an update to stay in sync with the current standard for this workflow as defined in the `.github` repo of the `openedx` GitHub org.	2023-02-28 09:34:03 -05:00
sundasnoreen12	62eb9f5e02	test: Added test cases for noncourseware and courseware topic posts (#452 ) * test: Added test cases for noncourseware and courseware topic posts * refactor: optimized code for post view list * refactor: updated selector tag --------- Co-authored-by: sundasnoreen12 <sundasnoreen12@ggmail.com>	2023-02-24 12:39:46 +05:00
Muhammad Adeel Tajamul	dedbc25358	fix: incontext crashing (#453 ) Co-authored-by: adeel.tajamul <adeel.tajamul@arbisoft.com>	2023-02-23 19:05:39 +05:00
Mehak Nasir	0f2ad8b7b4	fix: conditionally skipped some API calls and deffered script loading to improve performance	2023-02-23 14:26:02 +05:00
Ahtisham Shahid	61581ff474	fix: resolved data retention issue in add a post form (#451 ) * fix: resolved data retention issue in adding a post form * test: added unit test for post editor	2023-02-22 22:58:23 +05:00
Ahtisham Shahid	3afce17a32	feat: added event tracking on load more response (#442 ) * feat: added event tracking on load more response	2023-02-21 16:30:30 +05:00
Muhammad Adeel Tajamul	7e36e9f14c	fix: post loading slow (#447 ) Co-authored-by: adeel.tajamul <adeel.tajamul@arbisoft.com>	2023-02-21 15:09:44 +05:00
sundasnoreen12	c662310b08	test: added test cases for v3 Topics and units list page (#440 ) * test: added test cases for v3 Topics and units list page * refactor: v3 topics unit test cases * refactor: v3 topics unit test cases * refactor: v3 topics unit test cases * refactor: removed my added commented line and also optimized the code to get stats for section --------- Co-authored-by: sundasnoreen12 <sundasnoreen12@ggmail.com>	2023-02-21 12:45:08 +05:00
Muhammad Adeel Tajamul	682a118a9b	fix: reduced padding for topic names (#443 ) Co-authored-by: adeel.tajamul <adeel.tajamul@arbisoft.com>	2023-02-21 11:36:05 +05:00
Awais Ansari	d34d0ebbbc	feat: hide the comments sort feature (#441 ) * feat: hide the comments sort feature * test: temporarily comment the commnets/responses test cases * refactor: remove comments sort commented test cases	2023-02-20 16:07:58 +05:00
Awais Ansari	6afb7c7763	temp: testing getFeedback widget response time (#444 )	2023-02-20 14:47:07 +05:00
Jenkins	7dca99dfe3	chore(i18n): update translations	2023-02-19 15:26:47 -05:00
Muhammad Adeel Tajamul	137795f254	feat: added stats at subsection level in topics tab (#437 ) Co-authored-by: adeel.tajamul <adeel.tajamul@arbisoft.com>	2023-02-17 08:29:06 +05:00
ayesha waris	1c2da56e3b	fix: fix filter and sorting effect in discussion sidebar (#438 ) * fix: fix filter and sorting effect in discussion sidebar * test: fix test cases	2023-02-17 00:45:18 +05:00
Awais Ansari	e99c30f213	fix: unnamed topic/unit issue in inContext topics (#432 ) * fix: unnamed topic/unit issue in incontext topics * fix: sync topics and posts list loading for better UX	2023-02-16 20:54:53 +05:00
Muhammad Adeel Tajamul	eacc16b7f1	fix: copy link not working in in-context discussion (#439 ) Co-authored-by: adeel.tajamul <adeel.tajamul@arbisoft.com>	2023-02-16 15:33:23 +05:00