Merge pull request #1141 from City-of-Helsinki/release/0.10.0

VAR-349 | Release 0.10.0

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Unreleased
 
+# 0.10.0
+  **MINOR CHANGES**
+  - Changed search count to be announced when a search is made
+  - Changed search results sort order to be announced when sort order is changed
+  - Fixed illegible icon names in toggles being read out loud by screen readers
+  - Fixed missing line breaks in generic terms and specific terms
+  - Changed approve and deny buttons to be hidden when irrelevant in the manage reservations view
+  - Fixed translation error in the English version that caused confusion when approving reservations
+  - Fixed resource page sometimes being scrolled to its end after it had been opened
+  - Fixed missing results in search results
+  - Fixed scrollbar flickering in reservation calendar when business hours were of short duration
+  - Fixed premise dropdown returning empty labels
+  - Fixed resource calendar not rendering anything when closing time was 23:00 or later
+  - Changed calendar to be disabled when the user doesn't have privileges to make reservations to the resource
+
+  **CHANGELOG**
+  - [#1118](https://github.com/City-of-Helsinki/varaamo/pull/1118) Added support for unit manager role; unit managers now have the same permissions as unit admins do
+  - [#1125](https://github.com/City-of-Helsinki/varaamo/pull/1125) Added support for unit viewer role; unit viewers are allowed to complete the same actions as unit admins or unit managers in the UI, but Respa may block some requests for users with this role
+  - [#1127](https://github.com/City-of-Helsinki/varaamo/pull/1127) Added support for resource payment terms
+  - [#1126](https://github.com/City-of-Helsinki/varaamo/pull/1126) Fixed my reservation crashing on some devices and improved performance
+  - [#1131](https://github.com/City-of-Helsinki/varaamo/pull/1131) Changed labelling for event name field to distinct it as public instead of private
+  - [#1137](https://github.com/City-of-Helsinki/varaamo/pull/1137) Added support for daily, weekly and fixed resource prices
+  - [#1138](https://github.com/City-of-Helsinki/varaamo/pull/1138) Added support for longer slot sizes
+
 # 0.9.0
   **MINOR CHANGES**
   - Changed `eslint` rules to require comma dangle

CONTRIBUTING.md

@@ -0,0 +1,9 @@
+Contributions are accepted as pull requests.  Please observe our coding
+practices at https://github.com/City-of-Helsinki/bestpractice/ .
+
+If you make a pull request, you may also want to contact
+`[email protected]` to tell about your contribution.
+
+Our contribution handling guidelines are at
+https://github.com/City-of-Helsinki/bestpractice/blob/master/accepting-contributions.md
+

app/i18n/TranslationConstants.js

@@ -0,0 +1,5 @@
+export const SUPPORTED_LANGUAGES = {
+  FI: 'fi',
+  SV: 'sv',
+  EN: 'en',
+};

app/i18n/messages/en.json

@@ -72,7 +72,7 @@
   "common.continue": "Continue",
   "common.denied": "Denied",
   "common.eventDescriptionLabel": "Description of the event",
-  "common.eventSubjectLabel": "Name of the event",
+  "common.eventSubjectLabel": "Name of the event (public)",
   "common.numberOfParticipantsLabel": "Number of participants",
   "common.ok": "OK",
   "common.optionsAllLabel": "All",
@@ -97,6 +97,12 @@
   "common.pay": "Pay",
   "common.userNameLabel": "Account name",
   "common.userEmailLabel": "Account email",
+  "common.language.en": "English",
+  "common.language.fi": "Suomi",
+  "common.language.sv": "Svenska",
+  "common.unit.time.hour": "h",
+  "common.unit.time.day": "day",
+  "common.unit.time.week": "week",
   "paymentTerms.title": "Payment terms and conditions",
   "paymentTerms.terms": "Payment terms and conditions",
   "SelectControl.noOptions": "No options",
@@ -214,7 +220,9 @@
   "ReservationForm.reservationFieldsAsteriskNormal": "The fields marked with an asterisk (*) are mandatory.",
   "ReservationForm.cancel": "Back",
   "ReservationForm.emailError": "Enter a valid e-mail address",
-  "ReservationForm.eventSubjectInfo": "Event name is visible to staff only. Giving a name to the event makes it easier to guide the guests to the right space. Please remember to also tell the name to people arriving to the event.",
+  "ReservationForm.eventSubjectInfo": "Giving a name to the event makes it easier to guide the guests to the right space. Please remember to also tell the name to people arriving to the event.",
+  "ReservationForm.publicFieldsNotice": "Never enter personal information in these fields.",
+  "ReservationForm.publicFieldsNoticeLabel": "Note. Public information is displayed on meeting room screen.",
   "ReservationForm.specificTermsTitle": "Specific terms",
   "ReservationForm.maxLengthError": "The maximum length of the field is {maxLength} characters",
   "ReservationForm.requiredError": "Mandatory information",
@@ -239,7 +247,7 @@
   "ReservationInfo.reservationEarliestDays": "Reservation must be made {time} in advance",
   "ReservationInfo.reservationLatestDays": "Reservations can be made {time} in advance, until {date}",
   "ReservationInfoModal.cancelButton": "Cancel event",
-  "ReservationInfoModal.confirmButton": "Confirm reservation",
+  "ReservationInfoModal.approveButton": "Approve reservation",
   "ReservationInfoModal.denyButton": "Deny reservation",
   "ReservationInfoModal.saveComment": "Save comment",
   "ReservationInfoModal.title": "Reservation information.",
@@ -288,6 +296,12 @@
   "ResourceAvailability.reservingRestricted": "Not available for reservation",
   "ResourceCard.peopleCapacity": "{people} people",
   "ResourceEquipment.headingText": "Equipment",
+  "ResourceHeader.purpose": "Purpose",
+  "ResourceHeader.capacity": "Capacity",
+  "ResourceHeader.maxTime": "Max reservation time",
+  "ResourceHeader.price": "Price",
+  "ResourceHeader.premise": "Premise",
+  "ResourceHeader.distanceAndPremise": "Distance and premise",
   "ResourceHeader.backButton": "Back to search results",
   "ResourceHeader.maxPeriodDays": "max {days} days",
   "ResourceHeader.maxPeriodHours": "max {hours} h",
@@ -336,6 +350,7 @@
   "SearchSort.typeLabel": "Type",
   "SearchSort.premiseLabel": "Premise",
   "SearchSort.peopleLabel": "People",
+  "SearchSort.sortingStyle": "Search result sorting order is ",
   "TestSiteMessage.text": "This is the test version of Varaamo",
   "TimeRangeControl.timeRangeTitle": "Time range and minimum duration",
   "TimeRangeControl.title": "{date} at {start}-{end} {hours}h booking",
@@ -401,6 +416,7 @@
   "TimePickerCalendar.info.minPeriodText": "Reservation must be at least {duration}h long",
   "TimePickerCalendar.info.maxPeriodText": "Reservation must be shorter than {duration}h",
   "TimePickerCalendar.info.today": "Today",
+  "TimePickerCalendar.info.displayedMessage": "The resource cannot be reserved at this time",
 
   "CalendarLegend.closed": "Unavailable",
   "CalendarLegend.selection": "Selected",

app/i18n/messages/fi.json

@@ -72,7 +72,7 @@
   "common.continue": "Jatka",
   "common.denied": "Hylätty",
   "common.eventDescriptionLabel": "Tilaisuuden kuvaus",
-  "common.eventSubjectLabel": "Varauksen tai tilaisuuden nimi",
+  "common.eventSubjectLabel": "Varauksen tai tilaisuuden nimi (julkinen)",
   "common.numberOfParticipantsLabel": "Osallistujamäärä",
   "common.ok": "Valmis",
   "common.optionsAllLabel": "Kaikki",
@@ -97,6 +97,12 @@
   "common.pay": "Maksa",
   "common.userNameLabel": "Tilin nimi",
   "common.userEmailLabel": "Tilin sähköposti",
+  "common.language.en": "English",
+  "common.language.fi": "Suomi",
+  "common.language.sv": "Svenska",
+  "common.unit.time.hour": "h",
+  "common.unit.time.day": "päivä",
+  "common.unit.time.week": "viikko",
   "paymentTerms.title": "Maksuehdot",
   "paymentTerms.terms": "Maksuehdot",
   "SelectControl.noOptions": "Ei valintoja",
@@ -214,7 +220,9 @@
   "ReservationForm.reservationFieldsAsteriskNormal": "Tähdellä (*) merkityt tiedot ovat pakollisia.",
   "ReservationForm.cancel": "Takaisin",
   "ReservationForm.emailError": "Syötä kunnollinen sähköpostiosoite",
-  "ReservationForm.eventSubjectInfo": "Tilaisuuden nimen näkee ainoastaan henkilökunta. Antamalla tilaisuudelle nimen helpotat saapuvien vieraiden opastamista oikeaan tilaan. Muistathan ilmoittaa nimen myös tilaisuuteen saapuville.",
+  "ReservationForm.eventSubjectInfo": "Antamalla tilaisuudelle nimen helpotat saapuvien vieraiden opastamista oikeaan tilaan. Muistathan ilmoittaa nimen myös tilaisuuteen saapuville.",
+  "ReservationForm.publicFieldsNotice": "Älä koskaan täytä henkilötietoja tai muita arkaluontoisia tietoja näihin kenttiin.",
+  "ReservationForm.publicFieldsNoticeLabel": "Huom. Julkiset kentät näkyvät huoneen näytöllä.",
   "ReservationForm.specificTermsTitle": "Resurssikohtaiset ehdot",
   "ReservationForm.maxLengthError": "Kentän maksimipituus on {maxLength} merkkiä",
   "ReservationForm.requiredError": "Pakollinen tieto",
@@ -239,7 +247,7 @@
   "ReservationInfo.reservationEarliestDays": "Varattava vähintään {time} etukäteen",
   "ReservationInfo.reservationLatestDays": "Varauksen voi tehdä {time} etukäteen, {date} asti",
   "ReservationInfoModal.cancelButton": "Peru varaus",
-  "ReservationInfoModal.confirmButton": "Hyväksy varaus",
+  "ReservationInfoModal.approveButton": "Hyväksy varaus",
   "ReservationInfoModal.denyButton": "Hylkää varaus",
   "ReservationInfoModal.saveComment": "Tallenna kommentti",
   "ReservationInfoModal.title": "Varauksen tiedot",
@@ -288,6 +296,12 @@
   "ResourceAvailability.reservingRestricted": "Ei varattavissa",
   "ResourceCard.peopleCapacity": "{people} henkilöä",
   "ResourceEquipment.headingText": "Varustelu",
+  "ResourceHeader.purpose": "Käyttötarkoitus",
+  "ResourceHeader.capacity": "Kapasiteetti",
+  "ResourceHeader.maxTime": "Enimmäisvarausaika",
+  "ResourceHeader.price": "Hinta",
+  "ResourceHeader.premise": "Toimipiste",
+  "ResourceHeader.distanceAndPremise": "Etäisyys ja toimipiste",
   "ResourceHeader.backButton": "Takaisin hakutuloksiin",
   "ResourceHeader.maxPeriodDays": "max {days}pv",
   "ResourceHeader.maxPeriodHours": "max {hours}h",
@@ -345,6 +359,7 @@
   "SearchSort.typeLabel": "Tyyppi",
   "SearchSort.premiseLabel": "Toimipiste",
   "SearchSort.peopleLabel": "Henkilömäärä",
+  "SearchSort.sortingStyle": "Hakutulosten järjestelytapa on ",
   "TimeRangeControl.timeRangeTitle": "Käytä aikaväliä ja varauksen minimipituutta",
   "TimeRangeControl.title": "{date} klo {start}-{end} {hours}h varaus",
   "TestSiteMessage.text": "Tämä on Varaamon testiversio",
@@ -410,6 +425,7 @@
   "TimePickerCalendar.info.minPeriodText": "Varauksen on kestettävä vähintään {duration} tuntia.",
   "TimePickerCalendar.info.maxPeriodText": "Varaus saa kestää enimmillään {duration} tuntia.",
   "TimePickerCalendar.info.today": "Tänään",
+  "TimePickerCalendar.info.displayedMessage": "Kohde ei ole varattavissa",
 
   "CalendarLegend.closed": "Ei varattavissa",
   "CalendarLegend.selection": "Varauksesi",