From 3a821600d534776b263448910bfd7e1739a15ee8 Mon Sep 17 00:00:00 2001
From: drafish <xwlyy1991@163.com>
Date: Fri, 11 Aug 2023 16:53:00 +0800
Subject: [PATCH] patch en locale messages for search

---
 .../src/app/tabs/locales/en/search.json       | 12 ++++++++-
 .../src/lib/components/FindContainer.tsx      |  3 ++-
 .../search/src/lib/components/Replace.tsx     |  6 +++--
 .../search/src/lib/components/StopSearch.tsx  |  3 ++-
 .../search/src/lib/components/Undo.tsx        |  3 ++-
 .../src/lib/components/results/ResultItem.tsx | 25 ++++++++++++++-----
 .../lib/components/results/ResultSummary.tsx  | 19 ++++++++++----
 .../src/lib/components/results/Results.tsx    |  5 ++--
 8 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/locales/en/search.json b/apps/remix-ide/src/app/tabs/locales/en/search.json
index 5bb29ab8d2..9eff38fb36 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/search.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/search.json
@@ -10,5 +10,15 @@
   "search.useRegularExpression": "Use Regular Expression",
   "search.replaceWithoutConfirmation": "replace without confirmation",
   "search.filesToInclude": "Files to include",
-  "search.filesToExclude": "Files to exclude"
+  "search.filesToExclude": "Files to exclude",
+  "search.toggleReplace": "Toggle Replace",
+  "search.replaceInFiles": "replace in files",
+  "search.stop": "stop",
+  "search.undoChanges": "Undo changes to {path}",
+  "search.confirmreplaceMsg": "Are you sure you want to replace \"{find}\" by \"{replace}\" in {filename}?",
+  "search.yes": "Yes",
+  "search.no": "No",
+  "search.loading": "Loading",
+  "search.text1": "showing {count} results in {fileCount} files",
+  "search.text2": "Too many resuls to display...{br}Please narrow down your search."
 }
diff --git a/libs/remix-ui/search/src/lib/components/FindContainer.tsx b/libs/remix-ui/search/src/lib/components/FindContainer.tsx
index 82311b08b6..7568fa7576 100644
--- a/libs/remix-ui/search/src/lib/components/FindContainer.tsx
+++ b/libs/remix-ui/search/src/lib/components/FindContainer.tsx
@@ -1,5 +1,6 @@
 import {CustomTooltip} from '@remix-ui/helper'
 import React, {useContext, useEffect, useState} from 'react'
+import {FormattedMessage} from 'react-intl'
 import {SearchContext} from '../context/context'
 import {Find} from './Find'
 import {OverWriteCheck} from './OverWriteCheck'
@@ -14,7 +15,7 @@ export const FindContainer = (props) => {
   }, [expanded])
   return (
     <div className="search_plugin_find_container">
-      <CustomTooltip tooltipText="Toggle Replace" tooltipClasses="text-nowrap" tooltipId="toggleReplaceTooltip" placement="left-start">
+      <CustomTooltip tooltipText={<FormattedMessage id="search.toggleReplace" />} tooltipClasses="text-nowrap" tooltipId="toggleReplaceTooltip" placement="left-start">
         <div
           data-id="toggle_replace"
           className={`codicon codicon-find-${expanded ? 'expanded' : 'collapsed'} search_plugin_find_container_arrow`}
diff --git a/libs/remix-ui/search/src/lib/components/Replace.tsx b/libs/remix-ui/search/src/lib/components/Replace.tsx
index ee736e3a55..a47be3660b 100644
--- a/libs/remix-ui/search/src/lib/components/Replace.tsx
+++ b/libs/remix-ui/search/src/lib/components/Replace.tsx
@@ -1,5 +1,5 @@
 import React, {useContext, useRef} from 'react'
-import {useIntl} from 'react-intl'
+import {FormattedMessage, useIntl} from 'react-intl'
 import {SearchContext} from '../context/context'
 
 export const Replace = (props) => {
@@ -15,7 +15,9 @@ export const Replace = (props) => {
   return (
     <>
       <div className="search_plugin_find-part ">
-        <label className="d-none">replace in files</label>
+        <label className="d-none">
+          <FormattedMessage id="search.replaceInFiles" />
+        </label>
         <input id="search_replace" placeholder={intl.formatMessage({id: 'search.replace'})} className="form-control" onChange={change}></input>
       </div>
     </>
diff --git a/libs/remix-ui/search/src/lib/components/StopSearch.tsx b/libs/remix-ui/search/src/lib/components/StopSearch.tsx
index 391a33b45f..90d9e68859 100644
--- a/libs/remix-ui/search/src/lib/components/StopSearch.tsx
+++ b/libs/remix-ui/search/src/lib/components/StopSearch.tsx
@@ -1,5 +1,6 @@
 import React from 'react'
 import {useContext} from 'react'
+import {FormattedMessage} from 'react-intl'
 import {SearchContext} from '../context/context'
 
 export const StopSearch = () => {
@@ -9,7 +10,7 @@ export const StopSearch = () => {
   }
   return (
     <a className="badge badge-danger search_plugin_stop" onClick={async () => await cancel()}>
-      stop
+      <FormattedMessage id="search.stop" />
     </a>
   )
 }
diff --git a/libs/remix-ui/search/src/lib/components/Undo.tsx b/libs/remix-ui/search/src/lib/components/Undo.tsx
index 7111667cb9..da7bd94604 100644
--- a/libs/remix-ui/search/src/lib/components/Undo.tsx
+++ b/libs/remix-ui/search/src/lib/components/Undo.tsx
@@ -1,6 +1,7 @@
 import {useDialogDispatchers} from '@remix-ui/app'
 import React from 'react'
 import {useContext} from 'react'
+import {FormattedMessage} from 'react-intl'
 import {SearchContext} from '../context/context'
 import * as path from 'path'
 
@@ -30,7 +31,7 @@ export const Undo = () => {
           className="undo-button btn btn-secondary btn-block my-3"
         >
           <div className="fas fa-undo mr-2"></div>
-          Undo changes to {path.basename(state.undoBuffer[`${state.workspace}/${state.currentFile}`].path)}
+          <FormattedMessage id="search.undoChanges" values={{path: path.basename(state.undoBuffer[`${state.workspace}/${state.currentFile}`].path)}} />
         </button>
       ) : null}
     </>
diff --git a/libs/remix-ui/search/src/lib/components/results/ResultItem.tsx b/libs/remix-ui/search/src/lib/components/results/ResultItem.tsx
index 191e51c2f9..5c3d88b54c 100644
--- a/libs/remix-ui/search/src/lib/components/results/ResultItem.tsx
+++ b/libs/remix-ui/search/src/lib/components/results/ResultItem.tsx
@@ -1,6 +1,6 @@
 import {useDialogDispatchers} from '@remix-ui/app'
 import React, {useContext, useEffect, useRef, useState} from 'react'
-import {FormattedMessage} from 'react-intl'
+import {FormattedMessage, useIntl} from 'react-intl'
 import {SearchContext} from '../../context/context'
 import {SearchResult, SearchResultLine} from '../../types'
 import {ResultFileName} from './ResultFileName'
@@ -12,6 +12,7 @@ interface ResultItemProps {
 }
 
 export const ResultItem = (props: ResultItemProps) => {
+  const intl = useIntl()
   const {state, findText, disableForceReload, updateCount, replaceAllInFile} = useContext(SearchContext)
   const [loading, setLoading] = useState<boolean>(false)
   const [lines, setLines] = useState<SearchResultLine[]>([])
@@ -72,11 +73,18 @@ export const ResultItem = (props: ResultItemProps) => {
     } else {
       modal({
         id: 'confirmreplace',
-        title: 'Replace',
-        message: `Are you sure you want to replace '${state.find}' by '${state.replace}' in ${props.file.filename}?`,
-        okLabel: 'Yes',
+        title: intl.formatMessage({id: 'search.replace'}),
+        message: intl.formatMessage(
+          {id: 'search.confirmreplaceMsg'},
+          {
+            find: state.find,
+            replace: state.replace,
+            filename: props.file.filename
+          }
+        ),
+        okLabel: intl.formatMessage({id: 'search.yes'}),
         okFn: confirmReplace,
-        cancelLabel: 'No',
+        cancelLabel: intl.formatMessage({id: 'search.no'}),
         cancelFn: () => {},
         data: null
       })
@@ -122,7 +130,12 @@ export const ResultItem = (props: ResultItemProps) => {
               <div className="search_plugin_result_count_number badge badge-pill badge-secondary">{props.file.count}</div>
             </div>
           </div>
-          {loading ? <div className="loading">Loading...</div> : null}
+          {loading ? (
+            <div className="loading">
+              <FormattedMessage id="search.loading" />
+              ...
+            </div>
+          ) : null}
           {!toggleExpander && !loading ? (
             <div className="search_plugin_wrap_summary">
               {state.replaceEnabled ? (
diff --git a/libs/remix-ui/search/src/lib/components/results/ResultSummary.tsx b/libs/remix-ui/search/src/lib/components/results/ResultSummary.tsx
index bb10a8b4c8..7578ffd62e 100644
--- a/libs/remix-ui/search/src/lib/components/results/ResultSummary.tsx
+++ b/libs/remix-ui/search/src/lib/components/results/ResultSummary.tsx
@@ -1,6 +1,7 @@
 import {useDialogDispatchers} from '@remix-ui/app'
 import {CustomTooltip} from '@remix-ui/helper'
 import React, {useContext} from 'react'
+import {FormattedMessage, useIntl} from 'react-intl'
 import {SearchContext} from '../../context/context'
 import {SearchResult, SearchResultLine, SearchResultLineLine} from '../../types'
 
@@ -11,6 +12,7 @@ interface ResultSummaryProps {
 }
 
 export const ResultSummary = (props: ResultSummaryProps) => {
+  const intl = useIntl()
   const {hightLightInPath, replaceText, state} = useContext(SearchContext)
   const {modal} = useDialogDispatchers()
   const selectLine = async (line: SearchResultLineLine) => {
@@ -32,11 +34,18 @@ export const ResultSummary = (props: ResultSummaryProps) => {
     } else {
       modal({
         id: 'confirmreplace',
-        title: 'Replace',
-        message: `Are you sure you want to replace '${line.center}' by '${state.replace}' in ${props.searchResult.filename}?`,
-        okLabel: 'Yes',
+        title: intl.formatMessage({id: 'search.replace'}),
+        message: intl.formatMessage(
+          {id: 'search.confirmreplaceMsg'},
+          {
+            find: line.center,
+            replace: state.replace,
+            filename: props.searchResult.filename
+          }
+        ),
+        okLabel: intl.formatMessage({id: 'search.yes'}),
         okFn: confirmReplace,
-        cancelLabel: 'No',
+        cancelLabel: intl.formatMessage({id: 'search.no'}),
         cancelFn: () => {},
         data: line
       })
@@ -62,7 +71,7 @@ export const ResultSummary = (props: ResultSummaryProps) => {
           </div>
           {state.replaceEnabled ? (
             <div className="search_plugin_search_control">
-              <CustomTooltip tooltipText="Replace" tooltipClasses="text-nowrap" tooltipId="replaceTooltip" placement="top-start">
+              <CustomTooltip tooltipText={<FormattedMessage id="search.replace" />} tooltipClasses="text-nowrap" tooltipId="replaceTooltip" placement="top-start">
                 <div
                   data-id={`replace-${props.searchResult.filename}-${lineItem.position.start.line}-${lineItem.position.start.column}`}
                   onClick={async () => {
diff --git a/libs/remix-ui/search/src/lib/components/results/Results.tsx b/libs/remix-ui/search/src/lib/components/results/Results.tsx
index 82d702f845..f94d94d868 100644
--- a/libs/remix-ui/search/src/lib/components/results/Results.tsx
+++ b/libs/remix-ui/search/src/lib/components/results/Results.tsx
@@ -1,4 +1,5 @@
 import React, {useContext, useEffect} from 'react'
+import {FormattedMessage} from 'react-intl'
 import {SearchContext} from '../../context/context'
 import {StopSearch} from '../StopSearch'
 import {ResultItem} from './ResultItem'
@@ -14,12 +15,12 @@ export const Results = () => {
 
       {state.find && !state.clipped ? (
         <div className="search_plugin_result_count_number badge badge-pill badge-secondary">
-          showing {state.count} results {state.fileCount} in files
+          <FormattedMessage id="search.text1" values={{count: state.count, fileCount: state.fileCount}} />
         </div>
       ) : null}
       {state.find && state.clipped ? (
         <div className="alert alert-warning mt-1">
-          Too many resuls to display...<br></br>Please narrow down your search.
+          <FormattedMessage id="search.text2" values={{br: <br />}} />
         </div>
       ) : null}
       {state.searchResults &&