Skip to content
GitLab
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
e41d0dd8
Commit
e41d0dd8
authored
Dec 07, 2016
by
Joris
Browse files
Add remarks to vacancy
Fix
#171
parent
f9cfc7a4
Changes
5
Hide whitespace changes
Inline
Side-by-side
website/partners/admin.py
View file @
e41d0dd8
...
...
@@ -52,6 +52,9 @@ class VacancyAdmin(admin.ModelAdmin):
(
'Categories'
,
{
'fields'
:
(
'categories'
,
)
}),
(
'Other'
,
{
'fields'
:
(
'remarks'
,
)
})
)
...
...
website/partners/locale/nl/LC_MESSAGES/django.mo
View file @
e41d0dd8
No preview for this file type
website/partners/locale/nl/LC_MESSAGES/django.po
View file @
e41d0dd8
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-12-0
2 13:12
+0100\n"
"PO-Revision-Date: 2016-12-0
2 13:13
+0100\n"
"POT-Creation-Date: 2016-12-0
7 21:29
+0100\n"
"PO-Revision-Date: 2016-12-0
7 21:32
+0100\n"
"Last-Translator: \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 1.8.
1
1\n"
"X-Generator: Poedit 1.8.
7.
1\n"
#: partners/models.py:33
msgid "Enter a valid address"
...
...
@@ -41,44 +41,60 @@ msgstr ""
"Wanneer je een partner aangeeft, zullen de bedrijfsnaam en logo hieronder "
"niet gebruikt worden."
#: partners/models.py:129 partners/templates/partners/partner.html:75
#: partners/templates/partners/vacancies.html:5
#: partners/models.py:115
msgid "not shown on the page"
msgstr "wordt niet getoond op de vacaturepagina"
#: partners/models.py:131 partners/templates/partners/partner.html:77
#: partners/templates/partners/vacancies.html:4
#: partners/templates/partners/vacancies.html:7
msgid "Vacancies"
msgstr "Vacatures"
#: partners/models.py:14
1
#: partners/models.py:14
3
msgid "title"
msgstr "titel"
#: partners/models.py:14
7
#: partners/models.py:14
9
msgid "description"
msgstr "beschrijving"
#: partners/models.py:15
2
#: partners/models.py:15
4
msgid "location"
msgstr "locatie"
#: partners/models.py:15
6
#: partners/models.py:15
8
msgid "start time"
msgstr "starttijd"
#: partners/models.py:1
58
#: partners/models.py:1
60
msgid "end time"
msgstr "eindtijd"
#: partners/models.py:16
0
#: partners/models.py:16
2
msgid "website"
msgstr "website"
#: partners/models.py:16
2
#: partners/models.py:16
4
msgid "published"
msgstr "gepubliceerd"
#: partners/templates/partners/index.html:6
#: partners/templates/partners/index.html:4
#: partners/templates/partners/partner.html:4
msgid "Partners"
msgstr "Partners"
#: partners/templates/partners/index.html:4
#: partners/templates/partners/partner.html:4
#: partners/templates/partners/vacancies.html:4
msgid "Career"
msgstr "Carrière"
#: partners/templates/partners/index.html:8
msgid "Our partners"
msgstr "Onze partners"
#: partners/templates/partners/index.html:
8
#: partners/templates/partners/index.html:
10
msgid ""
"Als studievereniging doen we ontzettend ons best om leuke evenementen en "
"activiteiten te organiseren voor de studenten die lid zijn van Thalia. "
...
...
@@ -106,46 +122,46 @@ msgstr ""
"commissaris externe betrekkingen, die te bereiken is via <a href=\"mailto:"
"samenwerking@thalia.nu\">samenwerking@thalia.nu</a>."
#: partners/templates/partners/index.html:2
5
#: partners/templates/partners/partner.html:3
0
#: partners/templates/partners/index.html:2
7
#: partners/templates/partners/partner.html:3
2
msgid "Main Partner"
msgstr "Hoofdsponsor"
#: partners/templates/partners/index.html:
38
#: partners/templates/partners/index.html:6
4
#: partners/templates/partners/partner.html:
8
9
#: partners/templates/partners/vacancies.html:5
3
#: partners/templates/partners/vacancies.html:
58
#: partners/templates/partners/vacancies.html:
8
9
#: partners/templates/partners/index.html:
40
#: partners/templates/partners/index.html:6
6
#: partners/templates/partners/partner.html:9
1
#: partners/templates/partners/vacancies.html:5
5
#: partners/templates/partners/vacancies.html:
60
#: partners/templates/partners/vacancies.html:9
1
msgid "Learn more"
msgstr "Lees meer"
#: partners/templates/partners/partner.html:1
6
#: partners/templates/partners/partner.html:1
8
#, python-format
msgid "About %(name)s"
msgstr "Over %(name)s"
#: partners/templates/partners/partner.html:5
3
#: partners/templates/partners/partner.html:5
5
msgid "Information"
msgstr "Informatie"
#: partners/templates/partners/partner.html:5
4
#: partners/templates/partners/partner.html:5
6
msgid "Street"
msgstr "Straatnaam"
#: partners/templates/partners/partner.html:5
6
#: partners/templates/partners/partner.html:5
8
msgid "Zip Code"
msgstr "Postcode"
#: partners/templates/partners/partner.html:
58
#: partners/templates/partners/partner.html:
60
msgid "City"
msgstr "Plaatsnaam"
#: partners/templates/partners/partner.html:6
3
#: partners/templates/partners/partner.html:6
5
msgid "Website"
msgstr "Website"
#: partners/templates/partners/vacancies.html:
7
#: partners/templates/partners/vacancies.html:
9
msgid ""
"Je bent student en je hebt het maar krap. De politiek wil de studenten ook "
"al niet een handje toesteken. Gelukkig hebben we bedrijven die bij ons "
...
...
@@ -165,10 +181,10 @@ msgstr ""
"sponsorcommissie via <a href=\"mailto:sponsor@thalia.nu\" target=\"_blank"
"\">sponsor@thalia.nu</a>."
#: partners/templates/partners/vacancies.html:2
2
#: partners/templates/partners/vacancies.html:2
4
msgid "Everything"
msgstr "Alles"
#: partners/templates/partners/vacancies.html:
69
#: partners/templates/partners/vacancies.html:
71
msgid "All vacancies"
msgstr "Alle vacatures"
website/partners/migrations/0007_vacancy_remarks.py
0 → 100644
View file @
e41d0dd8
# -*- coding: utf-8 -*-
# Generated by Django 1.10.3 on 2016-12-07 20:44
from
__future__
import
unicode_literals
from
django.db
import
migrations
import
tinymce.models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'partners'
,
'0006_auto_20161202_1309'
),
]
operations
=
[
migrations
.
AddField
(
model_name
=
'vacancy'
,
name
=
'remarks'
,
field
=
tinymce
.
models
.
HTMLField
(
blank
=
True
,
help_text
=
'not shown on the page'
),
),
]
website/partners/models.py
View file @
e41d0dd8
...
...
@@ -112,6 +112,8 @@ class Vacancy(models.Model):
categories
=
models
.
ManyToManyField
(
VacancyCategory
,
blank
=
True
)
remarks
=
HTMLField
(
blank
=
True
,
help_text
=
_
(
'not shown on the page'
))
def
get_company_name
(
self
):
if
self
.
partner
:
return
self
.
partner
.
name
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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