Merge branch 'develop'

CHANGELOG.md

@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.0] - 2024-06-19
+
+### Added
+
+- Add changelog to project
+
+### Changed
+
+- Update Python version to 3.11 from CI
+- Update application packages
+- Update fi/sv/en translations
+- Update Azure CI-settings
+
+### Removed
+
+- Remove obsolete Docker Compose version
+
 ## [1.0.0] - 2024-06-12
 
 * PV-76 Initializing a barebone django project by @sam-hosseini in https://github.com/City-of-Helsinki/parking-permits/pull/1

README.md

@@ -33,8 +33,8 @@ Then you can run docker image with:
 ## Setting up local development environment with PyEnv and VirtualEnvWrapper
 
 ```
-pyenv install -v 3.9.0
-pyenv virtualenv 3.9.0 parking_permits
+pyenv install -v 3.11.9
+pyenv virtualenv 3.11.9 parking_permits
 pyenv local parking_permits
 pyenv virtualenvwrapper
 ```

azure-pipelines-develop.yml

@@ -1,6 +1,8 @@
-# File: parking-permits/azure-pipelines-develop.yml
-
-# Continuous integration (CI) triggers cause a pipeline to run whenever you push 
+#
+# Test pipeline. Run build and deploy for Platta test environments.
+# Pipeline runs different tests e.g. unittest and browser tests.
+#
+# Continuous integration (CI) triggers cause a pipeline to run whenever you push
 # an update to the specified branches or you push specified tags.
 trigger:
   batch: true

azure-pipelines-release.yml

@@ -1,15 +1,17 @@
-# File: parking-permits/azure-pipelines-release.yml
-
+#
+# Release pipeline. Run build and deploy for Platta staging and production environments.
+#
 # Continuous integration (CI) triggers cause a pipeline to run whenever you push
 # an update to the specified branches or you push specified tags.
 trigger:
   batch: true
-  branches:
+  tags:
     include:
-    - main
+    - release-*
   paths:
     exclude:
     - README.md
+    - CHANGELOG.md
 
 # By default, use self-hosted agents
 pool: Default

locale/fi/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-23 11:17+0200\n"
+"POT-Creation-Date: 2024-06-19 11:02+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -168,23 +168,12 @@ msgid "There's already a valid permit for a given vehicle."
 msgstr ""
 "Asiakkaalla on jo voimassa oleva pysäköintitunnus kyseiselle ajoneuvolle."
 
-msgid "Start time cannot be in the past"
-msgstr "Aloitusaika ei voi olla menneisyydessä"
-
-msgid "Temporary vehicle start time has to be after permit start time"
-msgstr ""
-"Tilapäisen ajoneuvon alkamisaika tulee olla tunnuksen alkamisajan jälkeinen"
-
 msgid "Month count exceeds maximum"
 msgstr "Kuukausimäärä ylittää sallitun määrän"
 
 msgid "You already have a valid permit for a given vehicle."
 msgstr "Sinulla on jo voimassa oleva pysäköintitunnus kyseiselle ajoneuvolle."
 
-msgid "Can not have more than 2 temporary vehicles in 365 days from first one."
-msgstr ""
-"Tilapäisten ajoneuvojen lukumäärä on rajoitettu kahteen 365 päivän aikana."
-
 msgid "Permit for a given vehicle already exist."
 msgstr "Kyseisellä ajoneuvolla on jo pysäköintitunnus."
 
@@ -250,6 +239,9 @@ msgstr "Henkilötunnus"
 msgid "Registration number"
 msgstr "Rekisteritunnus"
 
+msgid "Temporary registration number"
+msgstr "Väliaikainen rekisteritunnus"
+
 msgid "Primary address"
 msgstr "Vakituinen osoite"
 
@@ -541,6 +533,9 @@ msgstr "Talpan sisäänkirjautuneen checkoutin url"
 msgid "Talpa receipt_url"
 msgstr "Talpan kuitin url"
 
+msgid "Talpa update card url"
+msgstr "Talpan kortin päivityksen url"
+
 msgid "Talpa last valid purchase time"
 msgstr "Talpan viimeisin voimassa oleva ostoaika"
 
@@ -689,6 +684,14 @@ msgstr ""
 "Ensisijaista ajoneuvoa sisältävää tunnusta ei voida sulkea, koska "
 "toissijainen ajoneuvo löytyy"
 
+msgid "Temporary vehicle start time has to be after permit start time"
+msgstr ""
+"Tilapäisen ajoneuvon alkamisaika tulee olla tunnuksen alkamisajan jälkeinen"
+
+msgid "Can not have more than 2 temporary vehicles in 365 days from first one."
+msgstr ""
+"Tilapäisten ajoneuvojen lukumäärä on rajoitettu kahteen 365 päivän aikana."
+
 msgid "Updated"
 msgstr "Päivitetty"
 
@@ -816,6 +819,9 @@ msgstr "M1G"
 msgid "M2"
 msgstr "M2"
 
+msgid "M2G"
+msgstr "M2G"
+
 msgid "N1"
 msgstr "N1"
 
@@ -837,24 +843,6 @@ msgstr "L3e-A2"
 msgid "L3e-A3"
 msgstr "L3e-A3"
 
-msgid "L3e-A1E"
-msgstr "L3e-A1E"
-
-msgid "L3e-A2E"
-msgstr "L3e-A2E"
-
-msgid "L3e-A3E"
-msgstr "L3e-A3E"
-
-msgid "L3e-A1T"
-msgstr "L3e-A1T"
-
-msgid "L3e-A2T"
-msgstr "L3e-A2T"
-
-msgid "L3e-A3T"
-msgstr "L3e-A3T"
-
 msgid "L4e"
 msgstr "L4e"
 
@@ -969,8 +957,8 @@ msgstr "Sinulle on luotu pysäköintitunnus"
 msgid "Your parking permit information has been updated"
 msgstr "Pysäköintitunnuksen tiedot on päivitetty"
 
-msgid "Your order will end"
-msgstr "Tilauksesi päättyy"
+msgid "Your order has ended"
+msgstr "Tilauksesi päättyi"
 
 msgid "Your parking permit has been extended"
 msgstr "Pysäköintitunnuksesi voimassaoloaikaa on pidennetty"
@@ -1014,6 +1002,9 @@ msgstr "Ajoneuvo %(registration_number)s on liikennekäytöstäpoistettu"
 msgid "Vehicle's %(registration_number)s weight exceeds maximum allowed limit"
 msgstr "Ajoneuvon %(registration_number)s paino ylittää sallitun maksimirajan"
 
+msgid "This person has a non-disclosure statement"
+msgstr "Tällä henkilöllä on tietojenluovutuskielto"
+
 msgid "The person has no driving licence"
 msgstr "Henkilölle ei löydy ajokorttia"
 
@@ -1098,8 +1089,8 @@ msgstr ""
 "Pysäköintitunnus on sähköinen ja pysäköinninvalvonta tunnistaa voimassa "
 "olevan tunnuksen ajoneuvosi rekisterinumeron perusteella."
 
-msgid "Your parking permit validity period will end at"
-msgstr "Pysäköintitunnuksesi voimassaoloaika päättyy"
+msgid "Your parking permit validity period has ended at"
+msgstr "Pysäköintitunnuksesi voimassaoloaika päättyi"
 
 msgid ""
 "If you want to continue permit usage, you will need to make a new order."
@@ -1161,6 +1152,3 @@ msgid ""
 "A low-emission vehicle parking benefit has been removed from the vehicle."
 msgstr ""
 "Ohessa ajoneuvo, jolta on poistettu vähäpäästöisen auton pysäköintietuus."
-
-msgid "This person has a non-disclosure statement"
-msgstr "Tällä henkilöllä on tietojenluovutuskielto"

locale/sv/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-23 11:23+0200\n"
+"POT-Creation-Date: 2024-06-19 11:02+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -165,22 +165,12 @@ msgstr "Meddelandet hittades inte"
 msgid "There's already a valid permit for a given vehicle."
 msgstr "Kunden har redan ett giltigt tillstånd för ett visst fordon"
 
-msgid "Start time cannot be in the past"
-msgstr "Starttiden kan inte ligga i det förflutna"
-
-msgid "Temporary vehicle start time has to be after permit start time"
-msgstr "Tillfällig starttid för fordon måste vara efter tillståndets starttid"
-
 msgid "Month count exceeds maximum"
 msgstr "Antalet månader överstiger gränsen"
 
 msgid "You already have a valid permit for a given vehicle."
 msgstr "Du har redan ett giltigt tillstånd för ett visst fordon"
 
-msgid "Can not have more than 2 temporary vehicles in 365 days from first one."
-msgstr ""
-"Kan inte ha mer än 2 tillfälliga fordon under 365 dagar från det första."
-
 msgid "Permit for a given vehicle already exist."
 msgstr "Tillstånd för ett givet fordon finns redan."
 
@@ -245,6 +235,9 @@ msgstr "Personnummer"
 msgid "Registration number"
 msgstr "Registreringsnummer"
 
+msgid "Temporary registration number"
+msgstr "Tillfällig registreringsnummer"
+
 msgid "Primary address"
 msgstr "Permanent adress"
 
@@ -536,6 +529,9 @@ msgstr "Talpa inloggad checkout url"
 msgid "Talpa receipt_url"
 msgstr "Talpa kvitto url"
 
+msgid "Talpa update card url"
+msgstr "Talpa uppdatera kort-url"
+
 msgid "Talpa last valid purchase time"
 msgstr "Talpa senaste giltiga köptid"
 
@@ -684,6 +680,13 @@ msgstr ""
 "Ett ID som innehåller ett primärt fordon kan inte stängas eftersom ett "
 "sekundärt fordon hittas."
 
+msgid "Temporary vehicle start time has to be after permit start time"
+msgstr "Tillfällig starttid för fordon måste vara efter tillståndets starttid"
+
+msgid "Can not have more than 2 temporary vehicles in 365 days from first one."
+msgstr ""
+"Kan inte ha mer än 2 tillfälliga fordon under 365 dagar från det första."
+
 msgid "Updated"
 msgstr "Uppdaterad"
 
@@ -698,7 +701,8 @@ msgstr "Event typ"
 
 #, python-format
 msgid "Permit extension #%(ext_request_id)s created by admin"
-msgstr "Begäran om förlängning av tillstånd #%(ext_request_id)s skapad av admin"
+msgstr ""
+"Begäran om förlängning av tillstånd #%(ext_request_id)s skapad av admin"
 
 #, python-format
 msgid "Permit extension #%(ext_request_id)s created by customer"
@@ -813,6 +817,9 @@ msgstr "M1G"
 msgid "M2"
 msgstr "M2"
 
+msgid "M2G"
+msgstr "M2G"
+
 msgid "N1"
 msgstr "N1"
 
@@ -834,24 +841,6 @@ msgstr "L3e-A2"
 msgid "L3e-A3"
 msgstr "L3e-A3"
 
-msgid "L3e-A1E"
-msgstr "L3e-A1E"
-
-msgid "L3e-A2E"
-msgstr "L3e-A2E"
-
-msgid "L3e-A3E"
-msgstr "L3e-A3E"
-
-msgid "L3e-A1T"
-msgstr "L3e-A1T"
-
-msgid "L3e-A2T"
-msgstr "L3e-A2T"
-
-msgid "L3e-A3T"
-msgstr "L3e-A3T"
-
 msgid "L4e"
 msgstr "L4e"
 
@@ -966,8 +955,8 @@ msgstr "Nytt parkeringstillstånd har skapats åt dig"
 msgid "Your parking permit information has been updated"
 msgstr "Parkeringtillståndet informationen har uppdaterats"
 
-msgid "Your order will end"
-msgstr "Ditt parkeringstillstånd kommer att avslutas"
+msgid "Your order has ended"
+msgstr "Din beställning har avslutats"
 
 msgid "Your parking permit has been extended"
 msgstr "Ditt parkeringstillstånd har förlängts"
@@ -1013,6 +1002,9 @@ msgid "Vehicle's %(registration_number)s weight exceeds maximum allowed limit"
 msgstr ""
 "Fordonets %(registration_number)s vikt överstiger den högsta tillåtna gränsen"
 
+msgid "This person has a non-disclosure statement"
+msgstr "Denna person har ett sekretessavtal"
+
 msgid "The person has no driving licence"
 msgstr "Personen har inget körkort"
 
@@ -1098,8 +1090,8 @@ msgstr ""
 "identifiera tillståndets giltighet baserat på ditt fordons "
 "registreringsnummer."
 
-msgid "Your parking permit validity period will end at"
-msgstr "Ditt parkeringstillstånds giltighetstid slutar "
+msgid "Your parking permit validity period has ended at"
+msgstr "Din parkeringstillstånds giltighetsperiod har slutat vid"
 
 msgid ""
 "If you want to continue permit usage, you will need to make a new order."
@@ -1165,6 +1157,3 @@ msgid ""
 msgstr ""
 "En förmån för fordonsparkering med låga utsläpp har tagits bort från "
 "fordonet."
-
-msgid "This person has a non-disclosure statement"
-msgstr "Denna person har ett sekretessavtal"

parking_permits/services/mail.py

@@ -31,7 +31,7 @@ class PermitEmailType:
     % (SUBJECT_PREFIX, _("New parking permit has been created for you")),
     PermitEmailType.UPDATED: "%s: %s"
     % (SUBJECT_PREFIX, _("Your parking permit information has been updated")),
-    PermitEmailType.ENDED: "%s: %s" % (SUBJECT_PREFIX, _("Your order will end")),
+    PermitEmailType.ENDED: "%s: %s" % (SUBJECT_PREFIX, _("Your order has ended")),
     PermitEmailType.EXTENDED: "%s: %s"
     % (SUBJECT_PREFIX, _("Your parking permit has been extended")),
     PermitEmailType.TEMP_VEHICLE_ACTIVATED: "%s: %s"

parking_permits/templates/emails/permit_ended.html

@@ -1,11 +1,11 @@
 {% extends "emails/base.html" %}
 {% load i18n %}
 
-{% block title %}{% translate "Your order will end" %}{% endblock %}
+{% block title %}{% translate "Your order has ended" %}{% endblock %}
 
 {% block content %}
     <p>
-        {% translate "Your parking permit validity period will end at" %} {{ permit.end_time|date:"j.n.Y, H:i" }}.
+        {% translate "Your parking permit validity period has ended at" %} {{ permit.end_time|date:"j.n.Y, H:i" }}.
         {% translate "If you want to continue permit usage, you will need to make a new order." %}
     </p>
     {% include "emails/_permit_info.html" %}

requirements-dev.txt

@@ -12,7 +12,7 @@ click==8.1.7
     # via pip-tools
 distlib==0.3.8
     # via virtualenv
-filelock==3.14.0
+filelock==3.15.1
     # via virtualenv
 identify==2.5.36
     # via pre-commit

requirements-test.txt

@@ -75,5 +75,5 @@ six==1.16.0
     # via python-dateutil
 typing-extensions==4.12.2
     # via pytest-factoryboy
-urllib3==2.2.1
+urllib3==2.2.2
     # via requests