resolve merge conflict

Signed-off-by: Michael Robinson <merobi@gmail.com>
MarquezProject · Aug 4, 2023 · 36f852c · 36f852c
2 parents 55246f7 + 59f4552
commit 36f852c
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 7 deletions.
diff --git a/web/src/components/jobs/RunInfo.tsx b/web/src/components/jobs/RunInfo.tsx
@@ -69,7 +69,7 @@ const RunInfo: FunctionComponent<RunInfoProps> = props => {
             searchable={true} 
             aria-label={i18next.t('jobs.facets_subhead_aria')} 
             aria-required='true' 
-            placeholder='Search' 
+            placeholder={i18next.t('jobs.search')} 
           />
         </Box>
       )}

diff --git a/web/src/components/search/Search.tsx b/web/src/components/search/Search.tsx
@@ -23,23 +23,25 @@ import SearchPlaceholder from './SearchPlaceholder'
 import debounce from '@material-ui/core/utils/debounce'
 import withStyles, { WithStyles } from '@material-ui/core/styles/withStyles'
 
+const i18next = require('i18next')
+
 const INITIAL_SEARCH_FILTER = [
   {
-    text: 'All',
+    text: i18next.t('search.filter.all'),
     value: 'All'
   },
   {
     icon: faCog,
     foregroundColor: theme.palette.common.white,
     backgroundColor: theme.palette.primary.main,
-    text: 'Jobs',
+    text: i18next.t('search.filter.jobs'),
     value: 'JOB'
   },
   {
     icon: faDatabase,
     foregroundColor: theme.palette.common.white,
     backgroundColor: theme.palette.primary.main,
-    text: 'Datasets',
+    text: i18next.t('search.filter.datasets'),
     value: 'DATASET'
   }
 ]
@@ -53,11 +55,11 @@ const INITIAL_SEARCH_SORT_FILTER = [
     selectable: false
   },
   {
-    text: 'Updated',
+    text: i18next.t('search.filter.updated'),
     value: 'UPDATE_AT'
   },
   {
-    text: 'Name',
+    text: i18next.t('search.filter.name'),
     value: 'NAME'
   }
 ]
@@ -222,6 +224,7 @@ class Search extends React.Component<SearchProps, SearchState> {
 
   render() {
     const { classes, isSearching, isSearchingInit } = this.props
+    const i18next = require('i18next')
     return (
       <Box width={538} position={'relative'} px={10} mr={-8} id={'searchContainer'}>
         <Box className={classes.searchIcon}>
@@ -275,7 +278,7 @@ class Search extends React.Component<SearchProps, SearchState> {
                     {this.props.searchResults.size === 0 && (
                       <Box m={2} display={'flex'} alignItems={'center'} justifyContent={'center'}>
                         <MqText>
-                          {isSearching || !isSearchingInit ? 'Searching...' : 'No Results'}
+                          {isSearching || !isSearchingInit ? i18next.t('search.status') : i18next.t('search.none')}
                         </MqText>
                       </Box>
                     )}

diff --git a/web/src/i18n/config.ts b/web/src/i18n/config.ts
@@ -26,6 +26,7 @@ i18next
             docs_link: 'API Docs'
           },
           jobs: {
+            search: 'Search',
             latest_tab: 'LATEST RUN',
             history_tab: 'RUN HISTORY',
             location: 'LOCATION',
@@ -38,6 +39,15 @@ i18next
             dialog_confirmation_title: 'Are you sure?'
           },
           search: {
+            filter: {
+              all: 'All',
+              jobs: 'Jobs',
+              datasets: 'Datasets',
+              updated: 'Updated',
+              name: 'Name'
+            },
+            status: 'Searching...',
+            none: 'No Results',
             search: 'Search',
             search_aria: 'Search jobs and datasets',
             jobs: 'Jobs',
@@ -140,6 +150,7 @@ i18next
             docs_link: 'Documents API'
           },
           jobs: {
+            search: 'Recherche',
             latest_tab: 'DERNIÈRE COURSE',
             history_tab: "HISTORIQUE D'EXECUTION",
             location: 'EMPLACEMENT',
@@ -152,6 +163,15 @@ i18next
             dialog_confirmation_title: 'Êtes-vous sûr?'
           },
           search: {
+            filter: {
+              all: 'Tout',
+              jobs: "d'Emplois",
+              datasets: 'Jeux de Données',
+              updated: 'Mis à jour',
+              name: 'Nom'
+            },
+            status: 'Recherche...',
+            none: 'Aucun Résultat',
             search: 'Recherche',
             search_aria: 'Recherchez des emplois et des ensembles de données',
             jobs: "d'Emplois",
@@ -257,6 +277,7 @@ i18next
             docs_link: 'Documentos API'
           },
           jobs: {
+            search: 'Buscar',
             latest_tab: 'ÚLTIMA EJECUCIÓN',
             history_tab: 'HISTORIAL DE EJECUCIONES',
             location: 'UBICACIÓN',
@@ -269,6 +290,15 @@ i18next
             dialog_confirmation_title: 'Estás seguro?'
           },
           search: {
+            filter: {
+              all: 'Todo',
+              jobs: 'Trabajos',
+              datasets: 'Conjuntos de Datos',
+              updated: 'Actualizado',
+              name: 'Nombre'
+            },
+            status: 'Buscando...',
+            none: 'No Hay Resultados',
             search: 'Buscar',
             search_aria: 'Buscar trabajos y conjuntos de datos',
             jobs: 'Trabajos',
@@ -374,6 +404,7 @@ i18next
             docs_link: 'Dokumentacja API'
           },
           jobs: {
+            search: 'Wyszukiwanie',
             latest_tab: 'OSTATNI WYKONANIE',
             history_tab: 'HISTORIA WYKONAŃ',
             location: 'LOKALIZACJA',
@@ -386,6 +417,15 @@ i18next
             dialog_confirmation_title: 'Jesteś pewny?'
           },
           search: {
+            filter: {
+              all: 'Wszystko',
+              jobs: 'Zadania',
+              datasets: 'Zbiory Danych',
+              updated: 'Zaktualizowano',
+              name: 'Nazwa'
+            },
+            status: 'Badawczy...',
+            none: 'Brak Wyników',
             search: 'Wyszukiwanie',
             search_aria: 'Wyszukiwanie zadań i zbiorów danych',
             jobs: 'Zadania',