From e271d018b70a7cefc731c9ba8d322f15c8ba80e1 Mon Sep 17 00:00:00 2001 From: Claire Date: Thu, 13 Jul 2023 19:33:58 +0200 Subject: [PATCH] Fix home timeline's regexp field --- .../components/column_settings.tsx | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.tsx b/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.tsx index dd873c4ef..5438ba6f7 100644 --- a/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.tsx +++ b/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.tsx @@ -5,7 +5,7 @@ -- the settings store is not yet typed */ import { useCallback } from 'react'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; import SettingText from 'flavours/glitch/components/setting_text'; import { useAppSelector, useAppDispatch } from 'flavours/glitch/store'; @@ -13,9 +13,19 @@ import { useAppSelector, useAppDispatch } from 'flavours/glitch/store'; import { changeSetting } from '../../../actions/settings'; import SettingToggle from '../../notifications/components/setting_toggle'; +const messages = defineMessages({ + filter_regex: { + id: 'home.column_settings.filter_regex', + defaultMessage: 'Filter out by regular expressions', + }, + settings: { id: 'home.settings', defaultMessage: 'Column settings' }, +}); + export const ColumnSettings: React.FC = () => { const settings = useAppSelector((state) => state.settings.get('home')); + const intl = useIntl(); + const dispatch = useAppDispatch(); const onChange = useCallback( (key: string, checked: boolean) => { @@ -91,12 +101,7 @@ export const ColumnSettings: React.FC = () => { settings={settings} settingPath={['regex', 'body']} onChange={onChange} - label={ - - } + label={intl.formatMessage(messages.filter_regex)} />