Factor our local string to constant defined in settings

loculus-project · Oct 2, 2024 · 5834b93 · 5834b93
1 parent 3493c70
commit 5834b93
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/website/src/components/IndexPage/OrganismCard.astro b/website/src/components/IndexPage/OrganismCard.astro
@@ -1,6 +1,7 @@
 ---
 import type { OrganismStatistics } from './getOrganismStatistics';
 import { routes } from '../../routes/routes';
+import { DEFAULT_LOCALE } from '../../settings';
 
 interface Props {
     key: string;
@@ -12,7 +13,7 @@ interface Props {
 
 const { key, image, displayName, organismStatistics, numberDaysAgoStatistics } = Astro.props;
 
-const formatNumber = (num: number) => new Intl.NumberFormat('en-US').format(num);
+const formatNumber = (num: number) => new Intl.NumberFormat(DEFAULT_LOCALE).format(num);
 ---
 
 <a

diff --git a/website/src/components/SearchPage/SearchFullUI.tsx b/website/src/components/SearchPage/SearchFullUI.tsx
@@ -12,7 +12,7 @@ import { Table, type TableSequenceData } from './Table';
 import useQueryAsState from './useQueryAsState.js';
 import { getLapisUrl } from '../../config.ts';
 import { lapisClientHooks } from '../../services/serviceHooks.ts';
-import { pageSize } from '../../settings';
+import { DEFAULT_LOCALE, pageSize } from '../../settings';
 import type { Group } from '../../types/backend.ts';
 import {
     type MetadataFilter,
@@ -305,10 +305,10 @@ export const InnerSearchFullUI = ({
                         <div className='mt-auto'>
                             Search returned{' '}
                             {totalSequences !== undefined
-                                ? totalSequences.toLocaleString('en-US')
+                                ? totalSequences.toLocaleString(DEFAULT_LOCALE)
                                 : oldCount !== null
-                                  ? oldCount.toLocaleString('en-US')
-                                  : initialCount.toLocaleString('en-US')}{' '}
+                                  ? oldCount.toLocaleString(DEFAULT_LOCALE)
+                                  : initialCount.toLocaleString(DEFAULT_LOCALE)}{' '}
                             sequence
                             {totalSequences === 1 ? '' : 's'}
                             {detailsHook.isLoading ||

diff --git a/website/src/components/SearchPage/Table.tsx b/website/src/components/SearchPage/Table.tsx
@@ -3,6 +3,7 @@ import type { FC, ReactElement } from 'react';
 import { Tooltip } from 'react-tooltip';
 
 import { routes } from '../../routes/routes.ts';
+import { DEFAULT_LOCALE } from '../../settings.ts';
 import type { Schema } from '../../types/config.ts';
 import type { Metadatum, OrderBy } from '../../types/lapis.ts';
 import MdiTriangle from '~icons/mdi/triangle';
@@ -19,7 +20,7 @@ function formatField(value: any, maxLength: number, type: string): string {
         if (type === 'timestamp') {
             return new Date(value * 1000).toISOString().slice(0, 10);
         }
-        return value.toLocaleString('en-US');
+        return value.toLocaleString(DEFAULT_LOCALE);
     } else if (typeof value === 'boolean') {
         return value ? 'True' : 'False';
     } else {

diff --git a/website/src/components/SearchPage/fields/AutoCompleteField.tsx b/website/src/components/SearchPage/fields/AutoCompleteField.tsx
@@ -4,6 +4,7 @@ import { useEffect, useMemo, useState, useRef, forwardRef } from 'react';
 import { TextField } from './TextField.tsx';
 import { getClientLogger } from '../../../clientLogger.ts';
 import { lapisClientHooks } from '../../../services/serviceHooks.ts';
+import { DEFAULT_LOCALE } from '../../../settings.ts';
 import { type GroupedMetadataFilter, type MetadataFilter, type SetAFieldValue } from '../../../types/config.ts';
 
 type AutoCompleteFieldProps = {
@@ -157,7 +158,7 @@ export const AutoCompleteField = ({
                                             {option.option}
                                         </span>
                                         <span className='inline-block ml-1'>
-                                            ({option.count.toLocaleString('en-US')})
+                                            ({option.count.toLocaleString(DEFAULT_LOCALE)})
                                         </span>
                                         {selected && (
                                             <span

diff --git a/website/src/settings.ts b/website/src/settings.ts
@@ -14,3 +14,5 @@ export const DATA_USE_TERMS_FIELD = 'dataUseTerms';
 export const VERSION_COMMENT_FIELD = 'versionComment';
 
 export const metadataDefaultDownloadDataFormat = 'tsv';
+
+export const DEFAULT_LOCALE = 'en-US';