Skip to content
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

UHF-11299: Changed texts and translations for linkedevents #1193

Merged
merged 2 commits into from
Feb 19, 2025
Merged

UHF-11299: Changed texts and translations for linkedevents #1193

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fe11b5
UHF-11299: Changed texts and translations for linkedevents
annadruid Feb 17, 2025
58e3b33
UHF-11299: Merge branch 'main' of https://github.com/City-of-Helsinki…
khalima Feb 19, 2025
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
2 changes: 1 addition & 1 deletion dist/js/linkedevents.min.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/js/react/apps/linkedevents/components/FullLocationFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const FullLocationFilter = memo(() => {
}
};

const selectVenueLabel: string = Drupal.t('Select a venue', {}, {context: 'Events search'});
const selectVenueLabel: string = Drupal.t('Venue', {}, {context: 'Events search'});

const storage = useSelectStorage({
id: SearchComponents.LOCATION,
Expand Down Expand Up @@ -112,7 +112,7 @@ const FullLocationFilter = memo(() => {
clearButtonAriaLabel_one: Drupal.t('Clear @label selection', {'@label': selectVenueLabel}, { context: 'React search clear selection label' }),
clearButtonAriaLabel_multiple: Drupal.t('Clear @label selection', {'@label': selectVenueLabel}, { context: 'React search clear selection label' }),
label: selectVenueLabel,
placeholder: Drupal.t('All', {}, { context: 'React search: all available options' }),
placeholder: Drupal.t('All venues', {}, { context: 'React search: all available options' }),
}}
theme={{
'--checkbox-background-selected': 'var(--hdbt-color-black)',
Expand Down
6 changes: 3 additions & 3 deletions src/js/react/apps/linkedevents/components/LocationFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const LocationFilter = () => {
updateParams({ [ApiKeys.LOCATION]: value.map((location: any) => location.value).join(',') });
};

const selectVenueLabel: string = Drupal.t('Select a venue', {}, {context: 'Events search'});
const selectVenueLabel: string = Drupal.t('Venue', {}, {context: 'Events search'});

const storage = useSelectStorage({
id: SearchComponents.LOCATION,
Expand All @@ -32,7 +32,7 @@ const LocationFilter = () => {
clearButtonAriaLabel_one: Drupal.t('Clear @label selection', {'@label': selectVenueLabel}, { context: 'React search clear selection label' }),
clearButtonAriaLabel_multiple: Drupal.t('Clear @label selection', {'@label': selectVenueLabel}, { context: 'React search clear selection label' }),
label: selectVenueLabel,
placeholder: Drupal.t('All', {}, { context: 'React search: all available options' }),
placeholder: Drupal.t('All venues', {}, { context: 'React search: all available options' }),
},
theme: {
'--checkbox-background-selected': 'var(--hdbt-color-black)',
Expand Down Expand Up @@ -67,7 +67,7 @@ const LocationFilter = () => {
clearButtonAriaLabel_one: Drupal.t('Clear @label selection', {'@label': selectVenueLabel}, { context: 'React search clear selection label' }),
clearButtonAriaLabel_multiple: Drupal.t('Clear @label selection', {'@label': selectVenueLabel}, { context: 'React search clear selection label' }),
label: selectVenueLabel,
placeholder: Drupal.t('All', {}, { context: 'React search: all available options' }),
placeholder: Drupal.t('All venues', {}, { context: 'React search: all available options' }),
}}
theme={{
'--checkbox-background-selected': 'var(--hdbt-color-black)',
Expand Down
2 changes: 1 addition & 1 deletion src/js/react/apps/linkedevents/components/SeeAllButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function SeeAllButton() {
data-hds-component="button"
data-hds-variant="secondary"
href={eventsUrl}
title={seeAllButtonOverride || Drupal.t('Refine search in tapahtumat.hel.fi', {}, { context: 'Events search' })} />
title={seeAllButtonOverride || Drupal.t('Search for more events on the Events website', {}, { context: 'Events search' })} />
</div>
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/js/react/apps/linkedevents/helpers/GetDate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import HDS_DATE_FORMAT from '../utils/HDS_DATE_FORMAT';

const getDateString = ({ startDate, endDate }: DateSelectDateTimes): string => {
if ((!startDate || !startDate.isValid) && (!endDate || !endDate.isValid)) {
return Drupal.t('All', {}, { context: 'Events search' });
return Drupal.t('All dates', {}, { context: 'Events search' });
}

if ((startDate && startDate.isValid) && (!endDate || !endDate.isValid)) {
Expand Down
18 changes: 9 additions & 9 deletions translations/fi.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,7 @@ msgstr "Virheellinen lopetuspäivämäärä"

msgctxt "Events search"
msgid "Select a time period in which the event takes place"
msgstr "Valitse ajankohta, johon tapahtuma sijoittuu"
msgstr "Valitse aikaväli, johon tapahtuma sijoittuu"

msgctxt "Events search"
msgid "The last day of the time period is the same as the first day"
Expand All @@ -1183,8 +1183,8 @@ msgid "Last day of the time period"
msgstr "Asti"

msgctxt "Events search"
msgid "Select a venue"
msgstr "Valitse tapahtumapaikka"
msgid "Venue"
msgstr "Tapahtumapaikka"

msgctxt "Events search"
msgid "Free-of-charge events"
Expand All @@ -1195,12 +1195,12 @@ msgid "Remote events"
msgstr "Etätapahtumat"

msgctxt "Events search"
msgid "All"
msgstr "Kaikki"
msgid "All dates"
msgstr "Kaikki ajankohdat"

msgctxt "Events search"
msgid "Refine search in tapahtumat.hel.fi"
msgstr "Tarkenna hakua tapahtumat.hel.fi:ssä"
msgid "Search for more events on the Events website"
msgstr "Etsi lisää tapahtumia Tapahtumat-sivustolta"

msgctxt "Events search: event type prefix"
msgid "Show only"
Expand Down Expand Up @@ -1251,8 +1251,8 @@ msgid "at"
msgstr "klo"

msgctxt "React search: all available options"
msgid "All"
msgstr "Kaikki"
msgid "All venues"
msgstr "Kaikki tapahtumapaikat"

msgctxt "React search: topics filter"
msgid "Event topic"
Expand Down
18 changes: 9 additions & 9 deletions translations/sv.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,7 @@ msgstr "Ogiltigt slutdatum"

msgctxt "Events search"
msgid "Select a time period in which the event takes place"
msgstr "Välj tidsperiod då evenemanget äger rum"
msgstr "Sätt ut tidpunkterna inom vilka evenemanget ordnas"

msgctxt "Events search"
msgid "The last day of the time period is the same as the first day"
Expand All @@ -1185,8 +1185,8 @@ msgid "Last day of the time period"
msgstr "Tidsperiodens sista dag"

msgctxt "Events search"
msgid "Select a venue"
msgstr "Välj tidpunkt"
msgid "Venue"
msgstr "Evenmangsplats"

msgctxt "Events search"
msgid "Free-of-charge events"
Expand All @@ -1197,12 +1197,12 @@ msgid "Remote events"
msgstr "Evenemang på distans"

msgctxt "Events search"
msgid "All"
msgstr "Alla"
msgid "All dates"
msgstr "Alla tidpunkter"

msgctxt "Events search"
msgid "Refine search in tapahtumat.hel.fi"
msgstr "Förfina sökningen i tapahtumat.hel.fi"
msgid "Search for more events on the Events website"
msgstr "Sök fler evenemang på webbplatsen Evenemang"

msgctxt "Events search: event type prefix"
msgid "Show only"
Expand Down Expand Up @@ -1253,8 +1253,8 @@ msgid "at"
msgstr "klockan"

msgctxt "React search: all available options"
msgid "All"
msgstr "Alla"
msgid "All venues"
msgstr "Alla evenmangsplatser"

msgctxt "React search: topics filter"
msgid "Event topic"
Expand Down
Loading