Skip to content

Localize TimeField label in DatePicker and DateRangePicker #3433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devongovett merged 1 commit into from
Aug 23, 2022
+16 −5
Merged

Localize TimeField label in DatePicker and DateRangePicker #3433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/@react-spectrum/datepicker/intl/en-US-.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"time": "Time",
"startTime": "Start time",
"endTime": "End time"
}
7 changes: 5 additions & 2 deletions packages/@react-spectrum/datepicker/src/DatePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import {Field} from '@react-spectrum/label';
import {FieldButton} from '@react-spectrum/button';
import {FocusableRef} from '@react-types/shared';
import {Input} from './Input';
// @ts-ignore
import intlMessages from '../intl/*.json';
import {mergeProps} from '@react-aria/utils';
import React, {ReactElement, useRef} from 'react';
import '@adobe/spectrum-css-temp/components/textfield/vars.css'; // HACK: must be included BEFORE inputgroup
Expand All @@ -32,7 +34,7 @@ import {useDatePickerState} from '@react-stately/datepicker';
import {useFocusManagerRef, useFormatHelpText, useVisibleMonths} from './utils';
import {useFocusRing} from '@react-aria/focus';
import {useHover} from '@react-aria/interactions';
import {useLocale} from '@react-aria/i18n';
import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
import {useProviderProps} from '@react-spectrum/provider';

function DatePicker<T extends DateValue>(props: SpectrumDatePickerProps<T>, ref: FocusableRef<HTMLElement>) {
Expand All @@ -55,6 +57,7 @@ function DatePicker<T extends DateValue>(props: SpectrumDatePickerProps<T>, ref:
let {isOpen, setOpen} = state;
let {direction} = useLocale();
let domRef = useFocusManagerRef(ref);
let stringFormatter = useLocalizedStringFormatter(intlMessages);

let {isFocused, isFocusVisible, focusProps} = useFocusRing({
within: true,
Expand Down Expand Up @@ -159,7 +162,7 @@ function DatePicker<T extends DateValue>(props: SpectrumDatePickerProps<T>, ref:
{showTimeField &&
<div className={classNames(datepickerStyles, 'react-spectrum-Datepicker-timeFields')}>
<TimeField
label="Time"
label={stringFormatter.format('time')}
value={state.timeValue}
onChange={state.setTimeValue}
placeholderValue={timePlaceholder}
Expand Down
9 changes: 6 additions & 3 deletions packages/@react-spectrum/datepicker/src/DateRangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import {FieldButton} from '@react-spectrum/button';
import {Flex} from '@react-spectrum/layout';
import {FocusableRef} from '@react-types/shared';
import {Input} from './Input';
// @ts-ignore
import intlMessages from '../intl/*.json';
import {mergeProps} from '@react-aria/utils';
import {RangeCalendar} from '@react-spectrum/calendar';
import React, {ReactElement, useRef} from 'react';
Expand All @@ -32,7 +34,7 @@ import {useDateRangePickerState} from '@react-stately/datepicker';
import {useFocusManagerRef, useFormatHelpText, useVisibleMonths} from './utils';
import {useFocusRing} from '@react-aria/focus';
import {useHover} from '@react-aria/interactions';
import {useLocale} from '@react-aria/i18n';
import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
import {useProviderProps} from '@react-spectrum/provider';

function DateRangePicker<T extends DateValue>(props: SpectrumDateRangePickerProps<T>, ref: FocusableRef<HTMLElement>) {
Expand All @@ -55,6 +57,7 @@ function DateRangePicker<T extends DateValue>(props: SpectrumDateRangePickerProp
let {isOpen, setOpen} = state;
let {direction} = useLocale();
let domRef = useFocusManagerRef(ref);
let stringFormatter = useLocalizedStringFormatter(intlMessages);

let {isFocused, isFocusVisible, focusProps} = useFocusRing({
within: true,
Expand Down Expand Up @@ -173,7 +176,7 @@ function DateRangePicker<T extends DateValue>(props: SpectrumDateRangePickerProp
{showTimeField &&
<Flex gap="size-100" marginTop="size-100" UNSAFE_className={classNames(datepickerStyles, 'react-spectrum-Datepicker-timeFields')}>
<TimeField
label="Start time"
label={stringFormatter.format('startTime')}
value={state.timeRange?.start || null}
onChange={v => state.setTime('start', v)}
placeholderValue={timePlaceholder}
Expand All @@ -184,7 +187,7 @@ function DateRangePicker<T extends DateValue>(props: SpectrumDateRangePickerProp
hideTimeZone={props.hideTimeZone}
flex />
<TimeField
label="End time"
label={stringFormatter.format('endTime')}
value={state.timeRange?.end || null}
onChange={v => state.setTime('end', v)}
placeholderValue={timePlaceholder}
Expand Down