Skip to content

Commit 85594ca

Browse files
mhietamhieta
committed
Merge branch 'develop'
2 parents 64f815b + 8c8e589 commit 85594ca

File tree

10 files changed

+86
-88
lines changed

10 files changed

+86
-88
lines changed

‎CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.1.0] - 2024-06-19
11+
12+
### Added
13+
14+
- Add changelog to project
15+
16+
### Changed
17+
18+
- Update Python version to 3.11 from CI
19+
- Update application packages
20+
- Update fi/sv/en translations
21+
- Update Azure CI-settings
22+
23+
### Removed
24+
25+
- Remove obsolete Docker Compose version
26+
1027
## [1.0.0] - 2024-06-12
1128

1229
* PV-76 Initializing a barebone django project by @sam-hosseini in https://github.com/City-of-Helsinki/parking-permits/pull/1

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ Then you can run docker image with:
3333
## Setting up local development environment with PyEnv and VirtualEnvWrapper
3434

3535
```
36-
pyenv install -v 3.9.0
37-
pyenv virtualenv 3.9.0 parking_permits
36+
pyenv install -v 3.11.9
37+
pyenv virtualenv 3.11.9 parking_permits
3838
pyenv local parking_permits
3939
pyenv virtualenvwrapper
4040
```

‎azure-pipelines-develop.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
# File: parking-permits/azure-pipelines-develop.yml
2-
3-
# Continuous integration (CI) triggers cause a pipeline to run whenever you push
1+
#
2+
# Test pipeline. Run build and deploy for Platta test environments.
3+
# Pipeline runs different tests e.g. unittest and browser tests.
4+
#
5+
# Continuous integration (CI) triggers cause a pipeline to run whenever you push
46
# an update to the specified branches or you push specified tags.
57
trigger:
68
batch: true

‎azure-pipelines-release.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
# File: parking-permits/azure-pipelines-release.yml
2-
1+
#
2+
# Release pipeline. Run build and deploy for Platta staging and production environments.
3+
#
34
# Continuous integration (CI) triggers cause a pipeline to run whenever you push
45
# an update to the specified branches or you push specified tags.
56
trigger:
67
batch: true
7-
branches:
8+
tags:
89
include:
9-
- main
10+
- release-*
1011
paths:
1112
exclude:
1213
- README.md
14+
- CHANGELOG.md
1315

1416
# By default, use self-hosted agents
1517
pool: Default

‎locale/fi/LC_MESSAGES/django.po‎

Lines changed: 25 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2024-02-23 11:17+0200\n"
11+
"POT-Creation-Date: 2024-06-19 11:02+0300\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -168,23 +168,12 @@ msgid "There's already a valid permit for a given vehicle."
168168
msgstr ""
169169
"Asiakkaalla on jo voimassa oleva pysäköintitunnus kyseiselle ajoneuvolle."
170170

171-
msgid "Start time cannot be in the past"
172-
msgstr "Aloitusaika ei voi olla menneisyydessä"
173-
174-
msgid "Temporary vehicle start time has to be after permit start time"
175-
msgstr ""
176-
"Tilapäisen ajoneuvon alkamisaika tulee olla tunnuksen alkamisajan jälkeinen"
177-
178171
msgid "Month count exceeds maximum"
179172
msgstr "Kuukausimäärä ylittää sallitun määrän"
180173

181174
msgid "You already have a valid permit for a given vehicle."
182175
msgstr "Sinulla on jo voimassa oleva pysäköintitunnus kyseiselle ajoneuvolle."
183176

184-
msgid "Can not have more than 2 temporary vehicles in 365 days from first one."
185-
msgstr ""
186-
"Tilapäisten ajoneuvojen lukumäärä on rajoitettu kahteen 365 päivän aikana."
187-
188177
msgid "Permit for a given vehicle already exist."
189178
msgstr "Kyseisellä ajoneuvolla on jo pysäköintitunnus."
190179

@@ -250,6 +239,9 @@ msgstr "Henkilötunnus"
250239
msgid "Registration number"
251240
msgstr "Rekisteritunnus"
252241

242+
msgid "Temporary registration number"
243+
msgstr "Väliaikainen rekisteritunnus"
244+
253245
msgid "Primary address"
254246
msgstr "Vakituinen osoite"
255247

@@ -541,6 +533,9 @@ msgstr "Talpan sisäänkirjautuneen checkoutin url"
541533
msgid "Talpa receipt_url"
542534
msgstr "Talpan kuitin url"
543535

536+
msgid "Talpa update card url"
537+
msgstr "Talpan kortin päivityksen url"
538+
544539
msgid "Talpa last valid purchase time"
545540
msgstr "Talpan viimeisin voimassa oleva ostoaika"
546541

@@ -689,6 +684,14 @@ msgstr ""
689684
"Ensisijaista ajoneuvoa sisältävää tunnusta ei voida sulkea, koska "
690685
"toissijainen ajoneuvo löytyy"
691686

687+
msgid "Temporary vehicle start time has to be after permit start time"
688+
msgstr ""
689+
"Tilapäisen ajoneuvon alkamisaika tulee olla tunnuksen alkamisajan jälkeinen"
690+
691+
msgid "Can not have more than 2 temporary vehicles in 365 days from first one."
692+
msgstr ""
693+
"Tilapäisten ajoneuvojen lukumäärä on rajoitettu kahteen 365 päivän aikana."
694+
692695
msgid "Updated"
693696
msgstr "Päivitetty"
694697

@@ -816,6 +819,9 @@ msgstr "M1G"
816819
msgid "M2"
817820
msgstr "M2"
818821

822+
msgid "M2G"
823+
msgstr "M2G"
824+
819825
msgid "N1"
820826
msgstr "N1"
821827

@@ -837,24 +843,6 @@ msgstr "L3e-A2"
837843
msgid "L3e-A3"
838844
msgstr "L3e-A3"
839845

840-
msgid "L3e-A1E"
841-
msgstr "L3e-A1E"
842-
843-
msgid "L3e-A2E"
844-
msgstr "L3e-A2E"
845-
846-
msgid "L3e-A3E"
847-
msgstr "L3e-A3E"
848-
849-
msgid "L3e-A1T"
850-
msgstr "L3e-A1T"
851-
852-
msgid "L3e-A2T"
853-
msgstr "L3e-A2T"
854-
855-
msgid "L3e-A3T"
856-
msgstr "L3e-A3T"
857-
858846
msgid "L4e"
859847
msgstr "L4e"
860848

@@ -969,8 +957,8 @@ msgstr "Sinulle on luotu pysäköintitunnus"
969957
msgid "Your parking permit information has been updated"
970958
msgstr "Pysäköintitunnuksen tiedot on päivitetty"
971959

972-
msgid "Your order will end"
973-
msgstr "Tilauksesi päättyy"
960+
msgid "Your order has ended"
961+
msgstr "Tilauksesi päättyi"
974962

975963
msgid "Your parking permit has been extended"
976964
msgstr "Pysäköintitunnuksesi voimassaoloaikaa on pidennetty"
@@ -1014,6 +1002,9 @@ msgstr "Ajoneuvo %(registration_number)s on liikennekäytöstäpoistettu"
10141002
msgid "Vehicle's %(registration_number)s weight exceeds maximum allowed limit"
10151003
msgstr "Ajoneuvon %(registration_number)s paino ylittää sallitun maksimirajan"
10161004

1005+
msgid "This person has a non-disclosure statement"
1006+
msgstr "Tällä henkilöllä on tietojenluovutuskielto"
1007+
10171008
msgid "The person has no driving licence"
10181009
msgstr "Henkilölle ei löydy ajokorttia"
10191010

@@ -1098,8 +1089,8 @@ msgstr ""
10981089
"Pysäköintitunnus on sähköinen ja pysäköinninvalvonta tunnistaa voimassa "
10991090
"olevan tunnuksen ajoneuvosi rekisterinumeron perusteella."
11001091

1101-
msgid "Your parking permit validity period will end at"
1102-
msgstr "Pysäköintitunnuksesi voimassaoloaika päättyy"
1092+
msgid "Your parking permit validity period has ended at"
1093+
msgstr "Pysäköintitunnuksesi voimassaoloaika päättyi"
11031094

11041095
msgid ""
11051096
"If you want to continue permit usage, you will need to make a new order."
@@ -1161,6 +1152,3 @@ msgid ""
11611152
"A low-emission vehicle parking benefit has been removed from the vehicle."
11621153
msgstr ""
11631154
"Ohessa ajoneuvo, jolta on poistettu vähäpäästöisen auton pysäköintietuus."
1164-
1165-
msgid "This person has a non-disclosure statement"
1166-
msgstr "Tällä henkilöllä on tietojenluovutuskielto"

‎locale/sv/LC_MESSAGES/django.po‎

Lines changed: 26 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2024-02-23 11:23+0200\n"
11+
"POT-Creation-Date: 2024-06-19 11:02+0300\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,22 +165,12 @@ msgstr "Meddelandet hittades inte"
165165
msgid "There's already a valid permit for a given vehicle."
166166
msgstr "Kunden har redan ett giltigt tillstånd för ett visst fordon"
167167

168-
msgid "Start time cannot be in the past"
169-
msgstr "Starttiden kan inte ligga i det förflutna"
170-
171-
msgid "Temporary vehicle start time has to be after permit start time"
172-
msgstr "Tillfällig starttid för fordon måste vara efter tillståndets starttid"
173-
174168
msgid "Month count exceeds maximum"
175169
msgstr "Antalet månader överstiger gränsen"
176170

177171
msgid "You already have a valid permit for a given vehicle."
178172
msgstr "Du har redan ett giltigt tillstånd för ett visst fordon"
179173

180-
msgid "Can not have more than 2 temporary vehicles in 365 days from first one."
181-
msgstr ""
182-
"Kan inte ha mer än 2 tillfälliga fordon under 365 dagar från det första."
183-
184174
msgid "Permit for a given vehicle already exist."
185175
msgstr "Tillstånd för ett givet fordon finns redan."
186176

@@ -245,6 +235,9 @@ msgstr "Personnummer"
245235
msgid "Registration number"
246236
msgstr "Registreringsnummer"
247237

238+
msgid "Temporary registration number"
239+
msgstr "Tillfällig registreringsnummer"
240+
248241
msgid "Primary address"
249242
msgstr "Permanent adress"
250243

@@ -536,6 +529,9 @@ msgstr "Talpa inloggad checkout url"
536529
msgid "Talpa receipt_url"
537530
msgstr "Talpa kvitto url"
538531

532+
msgid "Talpa update card url"
533+
msgstr "Talpa uppdatera kort-url"
534+
539535
msgid "Talpa last valid purchase time"
540536
msgstr "Talpa senaste giltiga köptid"
541537

@@ -684,6 +680,13 @@ msgstr ""
684680
"Ett ID som innehåller ett primärt fordon kan inte stängas eftersom ett "
685681
"sekundärt fordon hittas."
686682

683+
msgid "Temporary vehicle start time has to be after permit start time"
684+
msgstr "Tillfällig starttid för fordon måste vara efter tillståndets starttid"
685+
686+
msgid "Can not have more than 2 temporary vehicles in 365 days from first one."
687+
msgstr ""
688+
"Kan inte ha mer än 2 tillfälliga fordon under 365 dagar från det första."
689+
687690
msgid "Updated"
688691
msgstr "Uppdaterad"
689692

@@ -698,7 +701,8 @@ msgstr "Event typ"
698701

699702
#, python-format
700703
msgid "Permit extension #%(ext_request_id)s created by admin"
701-
msgstr "Begäran om förlängning av tillstånd #%(ext_request_id)s skapad av admin"
704+
msgstr ""
705+
"Begäran om förlängning av tillstånd #%(ext_request_id)s skapad av admin"
702706

703707
#, python-format
704708
msgid "Permit extension #%(ext_request_id)s created by customer"
@@ -813,6 +817,9 @@ msgstr "M1G"
813817
msgid "M2"
814818
msgstr "M2"
815819

820+
msgid "M2G"
821+
msgstr "M2G"
822+
816823
msgid "N1"
817824
msgstr "N1"
818825

@@ -834,24 +841,6 @@ msgstr "L3e-A2"
834841
msgid "L3e-A3"
835842
msgstr "L3e-A3"
836843

837-
msgid "L3e-A1E"
838-
msgstr "L3e-A1E"
839-
840-
msgid "L3e-A2E"
841-
msgstr "L3e-A2E"
842-
843-
msgid "L3e-A3E"
844-
msgstr "L3e-A3E"
845-
846-
msgid "L3e-A1T"
847-
msgstr "L3e-A1T"
848-
849-
msgid "L3e-A2T"
850-
msgstr "L3e-A2T"
851-
852-
msgid "L3e-A3T"
853-
msgstr "L3e-A3T"
854-
855844
msgid "L4e"
856845
msgstr "L4e"
857846

@@ -966,8 +955,8 @@ msgstr "Nytt parkeringstillstånd har skapats åt dig"
966955
msgid "Your parking permit information has been updated"
967956
msgstr "Parkeringtillståndet informationen har uppdaterats"
968957

969-
msgid "Your order will end"
970-
msgstr "Ditt parkeringstillstånd kommer att avslutas"
958+
msgid "Your order has ended"
959+
msgstr "Din beställning har avslutats"
971960

972961
msgid "Your parking permit has been extended"
973962
msgstr "Ditt parkeringstillstånd har förlängts"
@@ -1013,6 +1002,9 @@ msgid "Vehicle's %(registration_number)s weight exceeds maximum allowed limit"
10131002
msgstr ""
10141003
"Fordonets %(registration_number)s vikt överstiger den högsta tillåtna gränsen"
10151004

1005+
msgid "This person has a non-disclosure statement"
1006+
msgstr "Denna person har ett sekretessavtal"
1007+
10161008
msgid "The person has no driving licence"
10171009
msgstr "Personen har inget körkort"
10181010

@@ -1098,8 +1090,8 @@ msgstr ""
10981090
"identifiera tillståndets giltighet baserat på ditt fordons "
10991091
"registreringsnummer."
11001092

1101-
msgid "Your parking permit validity period will end at"
1102-
msgstr "Ditt parkeringstillstånds giltighetstid slutar "
1093+
msgid "Your parking permit validity period has ended at"
1094+
msgstr "Din parkeringstillstånds giltighetsperiod har slutat vid"
11031095

11041096
msgid ""
11051097
"If you want to continue permit usage, you will need to make a new order."
@@ -1165,6 +1157,3 @@ msgid ""
11651157
msgstr ""
11661158
"En förmån för fordonsparkering med låga utsläpp har tagits bort från "
11671159
"fordonet."
1168-
1169-
msgid "This person has a non-disclosure statement"
1170-
msgstr "Denna person har ett sekretessavtal"

‎parking_permits/services/mail.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class PermitEmailType:
3131
% (SUBJECT_PREFIX, _("New parking permit has been created for you")),
3232
PermitEmailType.UPDATED: "%s: %s"
3333
% (SUBJECT_PREFIX, _("Your parking permit information has been updated")),
34-
PermitEmailType.ENDED: "%s: %s" % (SUBJECT_PREFIX, _("Your order will end")),
34+
PermitEmailType.ENDED: "%s: %s" % (SUBJECT_PREFIX, _("Your order has ended")),
3535
PermitEmailType.EXTENDED: "%s: %s"
3636
% (SUBJECT_PREFIX, _("Your parking permit has been extended")),
3737
PermitEmailType.TEMP_VEHICLE_ACTIVATED: "%s: %s"

‎parking_permits/templates/emails/permit_ended.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{% extends "emails/base.html" %}
22
{% load i18n %}
33

4-
{% block title %}{% translate "Your order will end" %}{% endblock %}
4+
{% block title %}{% translate "Your order has ended" %}{% endblock %}
55

66
{% block content %}
77
<p>
8-
{% translate "Your parking permit validity period will end at" %} {{ permit.end_time|date:"j.n.Y, H:i" }}.
8+
{% translate "Your parking permit validity period has ended at" %} {{ permit.end_time|date:"j.n.Y, H:i" }}.
99
{% translate "If you want to continue permit usage, you will need to make a new order." %}
1010
</p>
1111
{% include "emails/_permit_info.html" %}

‎requirements-dev.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ click==8.1.7
1212
# via pip-tools
1313
distlib==0.3.8
1414
# via virtualenv
15-
filelock==3.14.0
15+
filelock==3.15.1
1616
# via virtualenv
1717
identify==2.5.36
1818
# via pre-commit

‎requirements-test.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,5 @@ six==1.16.0
7575
# via python-dateutil
7676
typing-extensions==4.12.2
7777
# via pytest-factoryboy
78-
urllib3==2.2.1
78+
urllib3==2.2.2
7979
# via requests

0 commit comments

Comments
 (0)