This is an automated email from the ASF dual-hosted git repository. shuai pushed a commit to branch test in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
commit 9d829ff64d2923b9eb36586528f3343326c60448 Merge: be8098a4 7a15e24f Author: shuai <[email protected]> AuthorDate: Fri Dec 27 12:13:48 2024 +0800 fix: conflict i18n/en_US.yaml | 4 ++ i18n/zh_CN.yaml | 3 ++ ui/src/components/Editor/Viewer.tsx | 7 ++- ui/src/components/Editor/utils/index.ts | 58 +++++++++++++++++++++- ui/src/index.scss | 21 ++++++++ ui/src/pages/Legal/Privacy/index.tsx | 5 +- ui/src/pages/Legal/Tos/index.tsx | 5 +- .../Questions/Detail/components/Answer/index.tsx | 9 +++- .../Questions/Detail/components/Question/index.tsx | 5 +- ui/src/pages/Questions/EditAnswer/index.tsx | 5 +- .../pages/Review/components/FlagContent/index.tsx | 5 +- .../Review/components/QueuedContent/index.tsx | 5 +- ui/src/pages/Tags/Info/index.tsx | 5 +- 13 files changed, 126 insertions(+), 11 deletions(-) diff --cc i18n/en_US.yaml index 8391a1d6,b11ba3a6..e327e4ed --- a/i18n/en_US.yaml +++ b/i18n/en_US.yaml @@@ -2304,6 -2300,7 +2304,10 @@@ ui user_deleted: This user has been deleted. badge_activated: This badge has been activated. badge_inactivated: This badge has been inactivated. + users_deleted: These users have been deleted. + posts_deleted: These questions have been deleted. + answers_deleted: These answers have been deleted. + copy: Copy to clipboard + copied: Copied + + diff --cc i18n/zh_CN.yaml index 17ba2e47,9eb0254a..847cf395 --- a/i18n/zh_CN.yaml +++ b/i18n/zh_CN.yaml @@@ -2266,6 -2262,6 +2266,9 @@@ ui user_deleted: 此用户已被删除 badge_activated: 此徽章已被激活。 badge_inactivated: 此徽章已被禁用。 + users_deleted: 这些用户已被删除。 + posts_deleted: 这些帖子已被删除。 + answers_deleted: 这些回答已被删除。 + copy: 复制 + copied: 已复制 +
