Merge branch 'master' of github.com:openedx/frontend-app-discussions …

…into Ali-Abbas/react-router-upgrade
openedx · Nov 21, 2023 · 7865d7b · 7865d7b
2 parents 05daa48 + a479f5a
commit 7865d7b
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 36 deletions.
diff --git a/src/discussions/learners/learner/LearnerCard.jsx b/src/discussions/learners/learner/LearnerCard.jsx
@@ -1,6 +1,6 @@
 import React, { useContext } from 'react';
 
-import { Link, useLocation } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 
 import { Routes } from '../../../data/constants';
 import { DiscussionContext } from '../../common/context';
@@ -13,9 +13,8 @@ const LearnerCard = ({ learner }) => {
   const {
     username, threads, inactiveFlags, activeFlags, responses, replies,
   } = learner;
-  const { search } = useLocation();
   const { enableInContextSidebar, learnerUsername, courseId } = useContext(DiscussionContext);
-  const { pathname } = discussionsPath(Routes.LEARNERS.POSTS, {
+  const linkUrl = discussionsPath(Routes.LEARNERS.POSTS, {
     0: enableInContextSidebar ? 'in-context' : undefined,
     learnerUsername: learner.username,
     courseId,
@@ -24,7 +23,7 @@ const LearnerCard = ({ learner }) => {
   return (
     <Link
       className="discussion-post p-0 text-decoration-none text-gray-900 border-bottom border-light-400"
-      to={`${pathname}${enableInContextSidebar ? search : ''}`}
+      to={linkUrl}
     >
       <div
         className="d-flex flex-row flex-fill mw-100 py-3 px-4 border-primary-500"

diff --git a/src/discussions/navigation/breadcrumb-menu/BreadcrumbDropdown.jsx b/src/discussions/navigation/breadcrumb-menu/BreadcrumbDropdown.jsx
@@ -1,12 +1,11 @@
-import React, { useContext } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 
-import { Link, useLocation } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 
 import { useIntl } from '@edx/frontend-platform/i18n';
 import { Dropdown, DropdownButton } from '@edx/paragon';
 
-import { DiscussionContext } from '../../common/context';
 import messages from './messages';
 
 const BreadcrumbDropdown = ({
@@ -19,8 +18,6 @@ const BreadcrumbDropdown = ({
   itemFilterFunc,
 }) => {
   const intl = useIntl();
-  const { search } = useLocation();
-  const { enableInContextSidebar } = useContext(DiscussionContext);
   const showAllMsg = intl.formatMessage(messages.showAll);
 
   return (
@@ -32,7 +29,7 @@ const BreadcrumbDropdown = ({
         key="null"
         active={!currentItem}
         as={Link}
-        to={`${showAllPath().pathname}${enableInContextSidebar ? search : ''}`}
+        to={showAllPath()}
       >
         {showAllMsg}
       </Dropdown.Item>
@@ -42,7 +39,7 @@ const BreadcrumbDropdown = ({
           key={itemLabelFunc(item)}
           active={itemActiveFunc(item)}
           as={Link}
-          to={`${itemPathFunc(item)().pathname}${enableInContextSidebar ? search : ''}`}
+          to={itemPathFunc(item)()}
         >
           {itemLabelFunc(item)}
         </Dropdown.Item>

diff --git a/src/i18n/messages/zh_CN.json b/src/i18n/messages/zh_CN.json
@@ -1,29 +1,29 @@
 {
-  "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",
-  "discussions.actions.report": "Report",
-  "discussions.actions.unreport": "Unreport",
-  "discussions.actions.endorse": "Endorse",
-  "discussions.actions.unendorse": "Unendorse",
-  "discussions.actions.markAnswered": "Mark as answered",
-  "discussions.actions.unMarkAnswered": "Unmark as answered",
-  "discussions.modal.confirmation.button.cancel": "Cancel",
-  "discussions.empty.allTopics": "All discussion activity for these topics will show up here.",
-  "discussions.empty.allPosts": "All discussion activity for your course will show up here.",
-  "discussions.empty.myPosts": "Posts you've interacted with will show up here.",
-  "discussions.empty.topic": "All discussion activity for this topic will show up here.",
-  "discussions.empty.title": "Nothing here yet",
-  "discussions.empty.noPostSelected": "No post selected",
-  "discussions.empty.noTopicSelected": "No topic selected",
-  "discussions.sidebar.noResultsFound": "No results found",
-  "discussions.sidebar.differentKeywords": "Try searching different keywords",
+  "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": "重开",
+  "discussions.actions.report": "报告",
+  "discussions.actions.unreport": "取消报告",
+  "discussions.actions.endorse": "支持",
+  "discussions.actions.unendorse": "取消支持",
+  "discussions.actions.markAnswered": "标记为已回答",
+  "discussions.actions.unMarkAnswered": "取消标记为已回答",
+  "discussions.modal.confirmation.button.cancel": "取消",
+  "discussions.empty.allTopics": "这些主题的所有讨论活动都将显示在这里。",
+  "discussions.empty.allPosts": "您课程的所有讨论活动都将显示在这里。",
+  "discussions.empty.myPosts": "您互动过的帖子会显示在这里。",
+  "discussions.empty.topic": "该主题的所有讨论活动都将显示在这里。",
+  "discussions.empty.title": "什么都没有",
+  "discussions.empty.noPostSelected": "未选择帖子",
+  "discussions.empty.noTopicSelected": "未选择主题",
+  "discussions.sidebar.noResultsFound": "未找到结果",
+  "discussions.sidebar.differentKeywords": "尝试搜索不同的关键字",
   "discussions.sidebar.removeKeywords": "Try searching different keywords or removing some filters",
   "discussions.sidebar.removeKeywordsOnly": "Try searching different keywords",
   "discussions.sidebar.removeFilters": "Try removing some filters",