Revert "fix: move hardcoded text to language settings (#16990) (#17133)"

This reverts commit 16c722d1d87c8e75ceced96fcc6a1aa7c09d362d.
2025-04-18 11:49:41 +08:00 · 2025-04-05 11:36:03 +08:00 · 2025-04-05 11:36:03 +08:00 · 80a50633ea
commit 80a50633ea
parent fcd5fcca83
12 changed files with 14 additions and 40 deletions
--- a/api/core/rag/retrieval/dataset_retrieval.py
+++ b/api/core/rag/retrieval/dataset_retrieval.py
@ -52,7 +52,6 @@ from core.rag.retrieval.template_prompts import (
    METADATA_FILTER_USER_PROMPT_2,
    METADATA_FILTER_USER_PROMPT_3,
 )
-from core.tools.entities.common_entities import I18nObject
 from core.tools.utils.dataset_retriever.dataset_retriever_base_tool import DatasetRetrieverBaseTool
 from extensions.ext_database import db
 from libs.json_in_md_parser import parse_and_check_json_markdown
@ -295,10 +294,7 @@ class DatasetRetrieval:
        for dataset in available_datasets:
            description = dataset.description
            if not description:
-                description = I18nObject(
-                    en_US="useful for when you want to answer queries about the " + dataset.name,
-                    zh_Hans="用于回答关于 " + dataset.name + " 的查询",
-                )
+                description = "useful for when you want to answer queries about the " + dataset.name

            description = description.replace("\n", "").replace("\r", "")
            message_tool = PromptMessageTool(
--- a/api/core/tools/utils/dataset_retriever/dataset_retriever_tool.py
+++ b/api/core/tools/utils/dataset_retriever/dataset_retriever_tool.py
@ -6,7 +6,6 @@ from core.rag.datasource.retrieval_service import RetrievalService
 from core.rag.entities.context_entities import DocumentContext
 from core.rag.models.document import Document as RetrievalDocument
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
-from core.tools.entities.common_entities import I18nObject
 from core.tools.utils.dataset_retriever.dataset_retriever_base_tool import DatasetRetrieverBaseTool
 from extensions.ext_database import db
 from models.dataset import Dataset
@ -39,10 +38,7 @@ class DatasetRetrieverTool(DatasetRetrieverBaseTool):
    def from_dataset(cls, dataset: Dataset, **kwargs):
        description = dataset.description
        if not description:
-            description = I18nObject(
-                en_US="useful for when you want to answer queries about the " + dataset.name,
-                zh_Hans="用于回答关于 " + dataset.name + " 的查询",
-            )
+            description = "useful for when you want to answer queries about the " + dataset.name

        description = description.replace("\n", "").replace("\r", "")
        return cls(
--- a/api/services/dataset_service.py
+++ b/api/services/dataset_service.py
@ -21,7 +21,6 @@ from core.plugin.entities.plugin import ModelProviderID
 from core.rag.index_processor.constant.built_in_field import BuiltInField
 from core.rag.index_processor.constant.index_type import IndexType
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
-from core.tools.entities.common_entities import I18nObject
 from events.dataset_event import dataset_was_deleted
 from events.document_event import document_was_deleted
 from extensions.ext_database import db
@ -1379,10 +1378,7 @@ class DocumentService:
        cut_length = 18
        cut_name = documents[0].name[:cut_length]
        dataset.name = cut_name + "..."
-        dataset.description = I18nObject(
-            en_US="useful for when you want to answer queries about the " + documents[0].name,
-            zh_Hans="用于回答关于 " + documents[0].name + " 的查询",
-        )
+        dataset.description = "useful for when you want to answer queries about the " + documents[0].name
        db.session.commit()

        return dataset, documents, batch
--- a/web/app/(commonLayout)/datasets/Container.tsx
+++ b/web/app/(commonLayout)/datasets/Container.tsx
@ -38,8 +38,6 @@ const Container = () => {
  const { showExternalApiPanel, setShowExternalApiPanel } = useExternalApiPanel()
  const [includeAll, { toggle: toggleIncludeAll }] = useBoolean(false)

-  document.title = `${t('dataset.knowledge')} - Dify`
-
  const options = useMemo(() => {
    return [
      { value: 'dataset', text: t('dataset.datasets') },
--- a/web/app/(commonLayout)/datasets/page.tsx
+++ b/web/app/(commonLayout)/datasets/page.tsx
@ -4,4 +4,8 @@ const AppList = async () => {
  return <Container />
 }

+export const metadata = {
+  title: 'Datasets - Dify',
+}
+
 export default AppList
--- a/web/app/(commonLayout)/plugins/page.tsx
+++ b/web/app/(commonLayout)/plugins/page.tsx
@ -13,4 +13,8 @@ const PluginList = async () => {
  )
 }

+export const metadata = {
+  title: 'Plugins - Dify',
+}
+
 export default PluginList
--- a/web/app/components/base/app-icon-picker/ImageInput.tsx
+++ b/web/app/components/base/app-icon-picker/ImageInput.tsx
@ -4,7 +4,6 @@ import type { ChangeEvent, FC } from 'react'
 import { createRef, useEffect, useState } from 'react'
 import Cropper, { type Area, type CropperProps } from 'react-easy-crop'
 import classNames from 'classnames'
-import { useTranslation } from 'react-i18next'

 import { ImagePlus } from '../icons/src/vender/line/images'
 import { useDraggableUploader } from './hooks'
@ -27,7 +26,6 @@ const ImageInput: FC<UploaderProps> = ({
  cropShape,
  onImageInput,
 }) => {
-  const { t } = useTranslation()
  const [inputImage, setInputImage] = useState<{ file: File; url: string }>()
  const [isAnimatedImage, setIsAnimatedImage] = useState<boolean>(false)
  useEffect(() => {
@ -105,8 +103,8 @@ const ImageInput: FC<UploaderProps> = ({
            ? <>
              <ImagePlus className="pointer-events-none mb-3 h-[30px] w-[30px]" />
              <div className="mb-[2px] text-sm font-medium">
-                <span className="pointer-events-none">{t('common.imageInput.dropImageHere')}&nbsp;</span>
-                <button className="text-components-button-primary-bg" onClick={() => inputRef.current?.click()}>{t('common.imageInput.browse')}</button>
+                <span className="pointer-events-none">Drop your image here, or&nbsp;</span>
+                <button className="text-components-button-primary-bg" onClick={() => inputRef.current?.click()}>browse</button>
                <input
                  ref={inputRef} type="file" className="hidden"
                  onClick={e => ((e.target as HTMLInputElement).value = '')}
@ -114,7 +112,7 @@ const ImageInput: FC<UploaderProps> = ({
                  onChange={handleLocalFileInput}
                />
              </div>
-              <div className="pointer-events-none">{t('common.imageInput.supportedFormats')}</div>
+              <div className="pointer-events-none text-xs">Supports PNG, JPG, JPEG, WEBP and GIF</div>
            </>
            : handleShowImage()
        }
--- a/web/app/components/plugins/plugin-page/index.tsx
+++ b/web/app/components/plugins/plugin-page/index.tsx
@ -56,8 +56,6 @@ const PluginPage = ({
  const searchParams = useSearchParams()
  const { replace } = useRouter()

-  document.title = `${t('plugin.metadata.title')} - Dify`
-
  // just support install one package now
  const packageId = useMemo(() => {
    const idStrings = searchParams.get(PACKAGE_IDS_KEY)
--- a/web/i18n/en-US/common.ts
+++ b/web/i18n/en-US/common.ts
@ -652,11 +652,6 @@ const translation = {
  pagination: {
    perPage: 'Items per page',
  },
-  imageInput: {
-    dropImageHere: 'Drop your image here, or',
-    browse: 'browse',
-    supportedFormats: 'Supports PNG, JPG, JPEG, WEBP and GIF',
-  },
 }

 export default translation
--- a/web/i18n/en-US/plugin.ts
+++ b/web/i18n/en-US/plugin.ts
@ -1,7 +1,4 @@
 const translation = {
-  metadata: {
-    title: 'Plugins',
-  },
  category: {
    all: 'All',
    models: 'Models',
--- a/web/i18n/zh-Hans/common.ts
+++ b/web/i18n/zh-Hans/common.ts
@ -652,11 +652,6 @@ const translation = {
  pagination: {
    perPage: '每页显示',
  },
-  imageInput: {
-    dropImageHere: '将图片拖放到此处，或',
-    browse: '浏览',
-    supportedFormats: '支持PNG、JPG、JPEG、WEBP和GIF格式',
-  },
 }

 export default translation
--- a/web/i18n/zh-Hans/plugin.ts
+++ b/web/i18n/zh-Hans/plugin.ts
@ -1,7 +1,4 @@
 const translation = {
-  metadata: {
-    title: '插件',
-  },
  category: {
    all: '全部',
    models: '模型',