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.

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

Added asterisk meaning to reservation info page #291

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions app/i18n/messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
"common.save": "Save",
"common.saving": "Saving...",
"common.select": "Select",
"common.starFieldsAreRequired": "The fields marked with an asterisk (*) are mandatory.",
"common.taxesTotal": "Total taxes",
"common.taxlessTotal": "Tax-free total",
"common.total": "total",
Expand Down
1 change: 1 addition & 0 deletions app/i18n/messages/fi.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
"common.save": "Tallenna",
"common.saving": "Tallennetaan...",
"common.select": "Valitse",
"common.starFieldsAreRequired": "Tähdellä (*) merkityt tiedot ovat pakollisia.",
"common.taxesTotal": "Verot yhteensä",
"common.taxlessTotal": "Veroton yhteensä",
"common.total": "yhteensä",
Expand Down
1 change: 1 addition & 0 deletions app/i18n/messages/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
"common.save": "Spara",
"common.saving": "Sparas...",
"common.select": "Välj",
"common.starFieldsAreRequired": "Uppgifterna markerade med en asterisk (*) är obligatoriska.",
"common.taxesTotal": "Totala skatter",
"common.taxlessTotal": "Skattefritt totalt",
"common.total": "totalt",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@ class ReservationInformation extends Component {
<p>{t('ConfirmReservationModal.formInfo')}</p>
</React.Fragment>
)}
{!resource.needManualConfirmation && (
<p>{t('common.starFieldsAreRequired')}</p>
)}
</div>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ describe('pages/reservation/reservation-information/ReservationInformation', ()
const infoTexts = getWrapper({ resource }).find('.app-ReservationInformation__info-texts');
expect(infoTexts).toHaveLength(1);
expect(infoTexts.text()).toContain('common.contactPurposeHelp');
expect(infoTexts.text()).toContain('common.starFieldsAreRequired');
});

test('renders an ReservationInformationForm element', () => {
Expand Down
Loading