Verified Commit a456066a authored by Thom Wiggers's avatar Thom Wiggers Committed by Sébastiaan Versteeg

Clarify address specification

Should include house number after street name

fix
parent a5efa510
This diff was suppressed by a .gitattributes entry.
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-31 00:27+0100\n"
"PO-Revision-Date: 2018-10-31 00:27+0100\n"
"POT-Creation-Date: 2018-10-31 19:21+0100\n"
"PO-Revision-Date: 2018-10-31 19:20+0100\n"
"Last-Translator: Thom Wiggers <thom@thomwiggers.nl>\n"
"Language-Team: \n"
"Language: nl\n"
......@@ -167,8 +167,8 @@ msgid "The year this member started studying."
msgstr "Het jaar waarop dit lid begon met studeren."
#: models.py
msgid "Include the house number"
msgstr "Inclusief huisnummer"
msgid "please use the format <street> <number>"
msgstr "specificeer als <straat> <nummer>"
#: models.py
msgid "Street and house number"
......
# Generated by Django 2.0.9 on 2018-10-31 18:15
import django.core.validators
from django.db import migrations, models
class Migration(migrations.Migration):
replaces = [('members', '0027_auto_20181024_2000'), ('members', '0028_auto_20181031_1915')]
dependencies = [
('members', '0026_auto_20181003_1906'),
]
operations = [
migrations.AlterField(
model_name='profile',
name='address_street',
field=models.CharField(max_length=100, null=True, validators=[django.core.validators.RegexValidator(message='Include the house number after the street name', regex='^.+ \\d+.*')], verbose_name='Street and house number'),
),
migrations.AlterField(
model_name='profile',
name='address_street',
field=models.CharField(max_length=100, null=True, validators=[django.core.validators.RegexValidator(message='please use the format <street> <number>', regex='^.+ \\d+.*')], verbose_name='Street and house number'),
),
]
......@@ -238,7 +238,7 @@ class Profile(models.Model):
max_length=100,
validators=[validators.RegexValidator(
regex=r'^.+ \d+.*',
message=_('Include the house number'),
message=_('please use the format <street> <number>'),
)],
verbose_name=_('Street and house number'),
null=True,
......
This diff was suppressed by a .gitattributes entry.
......@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-10 12:55+0200\n"
"PO-Revision-Date: 2018-10-10 12:56+0200\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"POT-Creation-Date: 2018-10-31 19:22+0100\n"
"PO-Revision-Date: 2018-10-31 19:20+0100\n"
"Last-Translator: Thom Wiggers <thom@thomwiggers.nl>\n"
"Language-Team: \n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.1.1\n"
"X-Generator: Poedit 2.2\n"
#: admin.py
msgid "Application information"
......@@ -221,8 +221,8 @@ msgid "starting year"
msgstr "startjaar"
#: models.py
msgid "include the house number"
msgstr "inclusief huisnummer"
msgid "please use the format <street> <number>"
msgstr "specificeer als <straat> <nummer>"
#: models.py
msgid "street and house number"
......@@ -798,6 +798,16 @@ msgstr ""
msgid "Membership information"
msgstr "Lidmaatschapsinformatie"
#: templates/registrations/renewal.html
#, python-format
msgid "Membership of type %(type)s starting %(since)s"
msgstr "Lidmaatschap van type %(type)s sinds %(since)s"
#: templates/registrations/renewal.html
#, python-format
msgid "Membership of type %(type)s from %(since)s to %(until)s"
msgstr "Lidmaatschap van type %(type)s van %(since)s tot %(until)s"
#: templates/registrations/renewal.html
msgid "since"
msgstr "sinds"
......@@ -879,7 +889,3 @@ msgstr "%s succesvol afgekeurd."
#, python-format
msgid "Could not reject %s."
msgstr "%s kon niet worden afgekeurd."
#: tests/test_views.py
msgid "Member"
msgstr "Lid"
# Generated by Django 2.0.9 on 2018-10-31 18:12
import django.core.validators
from django.db import migrations, models
class Migration(migrations.Migration):
replaces = [('registrations', '0012_auto_20181024_2004'), ('registrations', '0013_auto_20181031_1911')]
dependencies = [
('registrations', '0011_auto_20180928_1409'),
]
operations = [
migrations.AlterField(
model_name='registration',
name='address_street',
field=models.CharField(max_length=100, validators=[django.core.validators.RegexValidator(message='please use the format <street> <number>', regex='^.+ \\d+.*')], verbose_name='street and house number'),
),
]
......@@ -200,7 +200,7 @@ class Registration(Entry):
max_length=100,
validators=[validators.RegexValidator(
regex=r'^.+ \d+.*',
message=_('include the house number'),
message=_('please use the format <street> <number>'),
)],
verbose_name=_('street and house number'),
blank=False,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment