Skip to content

Commit 881d299

Browse files
committed
I18Next: Merge Accessibility NS into Common NS
There is little reason to keep the accessibility string separate from the other ones. Merging them into single file will ease the TS typing related migration coming in the next commit.
1 parent f39db24 commit 881d299

61 files changed

Lines changed: 233 additions & 241 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ui/src/components/common/LineDetailsButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export const LineDetailsButton: FC<LineDetailsButtonProps> = ({
3636
};
3737
return (
3838
<IconButton
39-
tooltip={t('accessibility:lines.details', { label })}
39+
tooltip={t('accessibility.lines.details', { label })}
4040
className={twMerge(
4141
'h-10 w-10 rounded-full border border-grey bg-white text-tweaked-brand',
4242
'hover:border-tweaked-brand hover:outline-tweaked-brand',

ui/src/components/common/LineTimetablesButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export const LineTimetablesButton: FC<LineTimetablesButtonProps> = ({
3838
};
3939
return (
4040
<IconButton
41-
tooltip={t('accessibility:lines.showTimetables', { label })}
41+
tooltip={t('accessibility.lines.showTimetables', { label })}
4242
className={twMerge(
4343
'h-10 w-10 rounded-full border border-grey bg-white text-tweaked-brand',
4444
'disabled:pointer-events-none disabled:bg-background disabled:opacity-70',

ui/src/components/common/RouteLineTableRow.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,13 @@ export const RouteLineTableRow: FC<RouteLineTableRowProps> = ({
146146
// eslint-disable-next-line no-underscore-dangle
147147
switch (item.__typename) {
148148
case 'route_line': {
149-
return t('accessibility:lines.showOnMap', { label });
149+
return t('accessibility.lines.showOnMap', { label });
150150
}
151151
case 'route_route': {
152-
return t('accessibility:routes.showOnMap', { label });
152+
return t('accessibility.routes.showOnMap', { label });
153153
}
154154
default: {
155-
return t('accessibility:common.showOnMap', { label });
155+
return t('accessibility.common.showOnMap', { label });
156156
}
157157
}
158158
}

ui/src/components/common/search/SearchBar/ExtraFiltersToggle.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ export const ExtraFiltersToggle: FC<ExtraFiltersToggleProps> = ({
3838
testId={testIds.toggleExpand(testIdPrefix)}
3939
title={
4040
searchIsExpanded
41-
? t('accessibility:common.closeSearch')
42-
: t('accessibility:common.expandSearch')
41+
? t('accessibility.common.closeSearch')
42+
: t('accessibility.common.expandSearch')
4343
}
4444
/>
4545
);

ui/src/components/forms/line/LinePropertiesForm.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ export const LinePropertiesForm: FC<LinePropertiesFormProps> = ({
101101
isOpen={showNameVersions}
102102
onToggle={setShowNameVersions}
103103
testId={testIds.showNameVersionsButton}
104-
openTooltip={t('accessibility:lines.expandNameVersions')}
105-
closeTooltip={t('accessibility:lines.closeNameVersions')}
104+
openTooltip={t('accessibility.lines.expandNameVersions')}
105+
closeTooltip={t('accessibility.lines.closeNameVersions')}
106106
controls="nameVersions"
107107
/>
108108
</label>

ui/src/components/forms/stop-area/ConfirmStopAreaDeletionDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function getDeleteBlockedContent(
4343
target="_blank"
4444
rel="noreferrer"
4545
data-testid={testIds.linkToMemberStop(quay.publicCode ?? '')}
46-
title={t('accessibility:stops.showStopDetails', {
46+
title={t('accessibility.stops.showStopDetails', {
4747
stopLabel: quay.publicCode,
4848
})}
4949
>

ui/src/components/forms/stop/components/StopAreaInfoSection.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export const StopAreaInfoSection: FC<StopAreaInfoSectionProps> = ({
6262
observationDate,
6363
})}
6464
target="_blank"
65-
title={t('accessibility:stopAreas.showStopAreaDetails', {
65+
title={t('accessibility.stopAreas.showStopAreaDetails', {
6666
areaLabel: stopArea.nameFin ?? stopArea.nameSwe,
6767
})}
6868
>

ui/src/components/map/FilterPanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ export const FilterPanel: FC<FilterPanelProps> = ({
122122
</div>
123123

124124
<IconButton
125-
tooltip={t('accessibility:map.showFilters')}
125+
tooltip={t('accessibility.map.showFilters')}
126126
className="block h-11 w-11 rounded-md border border-black"
127127
icon={
128128
<MdLayers aria-hidden className="text-2xl text-tweaked-brand" />

ui/src/components/map/routes/RouteStopsOverlay.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export const RouteStopsOverlay: FC<RouteStopsOverlayProps> = ({
9191
<Visible visible={creatingNewRoute}>
9292
<EditButton
9393
onClick={() => dispatch(setRouteMetadataFormOpenAction(true))}
94-
tooltip={t('accessibility:map.editRoute', { routeName })}
94+
tooltip={t('accessibility.map.editRoute', { routeName })}
9595
/>
9696
</Visible>
9797
</MapOverlayHeader>

ui/src/components/map/routes/RouteStopsOverlayRow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export const RouteStopsOverlayRow: FC<RouteStopsOverlayRowProps> = ({
7070
<div className="text-tweaked-brand">
7171
<SimpleDropdownMenu
7272
testId={testIds.menuButton}
73-
tooltip={t('accessibility:map.routeStopsOverlayRowActions', {
73+
tooltip={t('accessibility.map.routeStopsOverlayRowActions', {
7474
stopLabel: stop.label,
7575
})}
7676
>

0 commit comments

Comments
 (0)