Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
a8c149c4
Commit
a8c149c4
authored
Sep 18, 2017
by
Bram in 't Zandt
Browse files
Header fields in event export are now being translated.
parent
c2c38d9e
Changes
3
Hide whitespace changes
Inline
Side-by-side
website/events/admin_views.py
View file @
a8c149c4
...
...
@@ -56,60 +56,61 @@ def change_registration(request, event_id, action=None):
@
staff_member_required
@
permission_required
(
'events.change_event'
)
@
organiser_only
def
export
(
request
,
event_id
):
event
=
get_object_or_404
(
Event
,
pk
=
event_id
)
extra_fields
=
event
.
registrationinformationfield_set
.
all
()
registrations
=
event
.
registration_set
.
all
()
header_fields
=
(
[
'n
ame'
,
'e
mail'
,
'p
aid'
,
'p
resent'
,
's
tatus'
,
'p
hone number'
]
+
[
_
(
'N
ame'
)
,
_
(
'E
mail'
)
,
_
(
'P
aid'
)
,
_
(
'P
resent'
)
,
_
(
'S
tatus'
)
,
_
(
'P
hone number'
)
]
+
[
field
.
name
for
field
in
extra_fields
]
+
[
'd
ate'
,
'd
ate cancelled'
])
[
_
(
'D
ate'
)
,
_
(
'D
ate cancelled'
)
])
rows
=
[]
if
event
.
price
==
0
:
header_fields
.
remove
(
'p
aid'
)
header_fields
.
remove
(
_
(
'P
aid'
)
)
for
i
,
registration
in
enumerate
(
registrations
):
if
registration
.
member
:
name
=
registration
.
member
.
get_full_name
()
else
:
name
=
registration
.
name
status
=
pgettext_lazy
(
'registration status'
,
'registered'
)
status
=
pgettext_lazy
(
'registration status'
,
'registered'
).
capitalize
()
cancelled
=
None
if
registration
.
date_cancelled
:
if
registration
.
is_late_cancellation
():
status
=
pgettext_lazy
(
'registration status'
,
'late cancellation'
)
'late cancellation'
)
.
capitalize
()
else
:
status
=
pgettext_lazy
(
'registration status'
,
'cancelled'
)
status
=
pgettext_lazy
(
'registration status'
,
'cancelled'
).
capitalize
()
cancelled
=
timezone
.
localtime
(
registration
.
date_cancelled
)
elif
registration
.
queue_position
:
status
=
pgettext_lazy
(
'registration status'
,
'waiting'
)
data
=
{
'n
ame'
:
name
,
'd
ate'
:
timezone
.
localtime
(
registration
.
date
).
strftime
(
"%Y-%m-%d %H:%m"
),
'p
resent'
:
_
(
'Yes'
)
if
registration
.
present
else
''
,
'p
hone number'
:
(
registration
.
member
.
phone_number
if
registration
.
member
else
''
),
'e
mail'
:
(
registration
.
member
.
user
.
email
if
registration
.
member
else
''
),
's
tatus'
:
status
,
'd
ate cancelled'
:
cancelled
,
_
(
'N
ame'
)
:
name
,
_
(
'D
ate'
)
:
timezone
.
localtime
(
registration
.
date
).
strftime
(
"%Y-%m-%d %H:%m"
),
_
(
'P
resent'
)
:
_
(
'Yes'
)
if
registration
.
present
else
''
,
_
(
'P
hone number'
)
:
(
registration
.
member
.
phone_number
if
registration
.
member
else
''
),
_
(
'E
mail'
)
:
(
registration
.
member
.
user
.
email
if
registration
.
member
else
''
),
_
(
'S
tatus'
)
:
status
,
_
(
'D
ate cancelled'
)
:
cancelled
,
}
if
event
.
price
>
0
:
if
registration
.
payment
==
Registration
.
PAYMENT_CASH
:
data
[
'p
aid'
]
=
_
(
'Cash'
)
elif
registration
.
payment
==
Registration
.
PAYMENT_CARD
:
data
[
'p
aid'
]
=
_
(
'
Card
'
)
if
registration
.
payment
==
'cash_payment'
:
data
[
_
(
'P
aid'
)
]
=
_
(
'Cash'
)
elif
registration
.
payment
==
'pin_payment'
:
data
[
_
(
'P
aid'
)
]
=
_
(
'
Pin
'
)
else
:
data
[
'p
aid'
]
=
_
(
'No'
)
data
[
_
(
'P
aid'
)
]
=
_
(
'No'
)
data
.
update
({
field
[
'field'
].
name
:
field
[
'value'
]
for
field
in
registration
.
information_fields
})
...
...
@@ -121,9 +122,10 @@ def export(request, event_id):
rows
=
sorted
(
rows
,
key
=
lambda
row
:
(
row
[
'status'
]
==
pgettext_lazy
(
'registration status'
,
'late cancellation'
),
row
[
'date'
]),
(
row
[
_
(
'Status'
)]
==
pgettext_lazy
(
'registration status'
,
'late cancellation'
).
capitalize
(),
row
[
_
(
'Date'
)]),
reverse
=
True
,
)
...
...
website/events/locale/nl/LC_MESSAGES/django.mo
View file @
a8c149c4
No preview for this file type
website/events/locale/nl/LC_MESSAGES/django.po
View file @
a8c149c4
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-2
3
1
3:33
+0200\n"
"PO-Revision-Date: 2017-09-2
3
1
3:35
+0200\n"
"POT-Creation-Date: 2017-09-2
7
1
9:58
+0200\n"
"PO-Revision-Date: 2017-09-2
7
1
9:59
+0200\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
...
...
@@ -16,7 +16,7 @@ msgstr ""
"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.0.
4
\n"
"X-Generator: Poedit 2.0.
3
\n"
#: admin.py:86
msgid "Event Date"
...
...
@@ -42,39 +42,72 @@ msgstr "Publiceer geselecteerde evenementen"
msgid "Unpublish selected events"
msgstr "Publicatie van geselecteerde evenementen ongedaan maken"
#: admin_views.py:65 admin_views.py:94
msgid "Name"
msgstr "Naam"
#: admin_views.py:65 admin_views.py:101
msgid "Email"
msgstr "E-mail"
#: admin_views.py:65 admin_views.py:72 admin_views.py:109 admin_views.py:111
#: admin_views.py:113
msgid "Paid"
msgstr "Betaald"
#: admin_views.py:65 admin_views.py:97
msgid "Present"
msgstr "Aanwezig"
#: admin_views.py:66 admin_views.py:104 admin_views.py:125
msgid "Status"
msgstr "Status"
#: admin_views.py:66 admin_views.py:98
msgid "Phone number"
msgstr "Telefoonnummer"
#: admin_views.py:68 admin_views.py:95 admin_views.py:128
msgid "Date"
msgstr "Datum"
#: admin_views.py:68 admin_views.py:105
msgid "Date cancelled"
msgstr "Afmelddatum"
#: admin_views.py:79
msgctxt "registration status"
msgid "registered"
msgstr "aangemeld"
#: admin_views.py:85 admin_views.py:12
5
#: admin_views.py:85 admin_views.py:12
7
msgctxt "registration status"
msgid "late cancellation"
msgstr "te laat afgemeld"
#: admin_views.py:8
7
#: admin_views.py:8
8
msgctxt "registration status"
msgid "cancelled"
msgstr "afgemeld"
#: admin_views.py:9
1
#: admin_views.py:9
2
msgctxt "registration status"
msgid "waiting"
msgstr "wachtend"
#: admin_views.py:9
6
#: admin_views.py:9
7
msgid "Yes"
msgstr "Ja"
#: admin_views.py:10
8
#: admin_views.py:10
9
msgid "Cash"
msgstr "Contant"
#: admin_views.py:11
0
msgid "
Card
"
#: admin_views.py:11
1
msgid "
Pin
"
msgstr "Pin"
#: admin_views.py:11
2
#: admin_views.py:11
3
msgid "No"
msgstr "Nee"
...
...
@@ -690,7 +723,7 @@ msgstr "Je afmelding was succesvol."
msgid "Registration successfully saved."
msgstr "Je afmelding is succesvol opgeslagen."
#~ msgid "
Pin
"
#~ msgid "
Card
"
#~ msgstr "Pin"
#~ msgid "You may not register"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment