Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AKPlanning
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Aaron -
AKPlanning
Commits
9f38321a
Commit
9f38321a
authored
5 years ago
by
Benjamin Hättasch
Browse files
Options
Downloads
Patches
Plain Diff
Add presentation of AK field to AK model
parent
8c5ca3af
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
AKModel/locale/de_DE/LC_MESSAGES/django.po
+44
-36
44 additions, 36 deletions
AKModel/locale/de_DE/LC_MESSAGES/django.po
AKModel/migrations/0015_ak_present_field.py
+18
-0
18 additions, 0 deletions
AKModel/migrations/0015_ak_present_field.py
AKModel/models.py
+2
-0
2 additions, 0 deletions
AKModel/models.py
with
64 additions
and
36 deletions
AKModel/locale/de_DE/LC_MESSAGES/django.po
+
44
−
36
View file @
9f38321a
...
...
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-10-18 1
1
:0
9
+0000\n"
"POT-Creation-Date: 2019-10-18 1
3
:0
1
+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
...
...
@@ -11,13 +11,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: availability.py:38 models.py:20 models.py:40 models.py:104 models.py:15
0
#: models.py:18
1
models.py:20
6
#: availability.py:38 models.py:20 models.py:40 models.py:104 models.py:15
2
#: models.py:18
3
models.py:20
8
msgid "Event"
msgstr "Event"
#: availability.py:39 models.py:41 models.py:105 models.py:15
1
models.py:18
2
#: models.py:20
7
#: availability.py:39 models.py:41 models.py:105 models.py:15
3
models.py:18
4
#: models.py:20
9
msgid "Associated event"
msgstr "Zugehöriges Event"
...
...
@@ -29,7 +29,7 @@ msgstr "Person"
msgid "Person whose availability this is"
msgstr "Person deren Verfügbarkeit hier abgebildet wird"
#: availability.py:56 models.py:18
5
models.py:20
0
#: availability.py:56 models.py:18
7
models.py:20
2
msgid "Room"
msgstr "Raum"
...
...
@@ -37,7 +37,7 @@ msgstr "Raum"
msgid "Room whose availability this is"
msgstr "Raum dessen Verfügbarkeit hier abgebildet wird"
#: availability.py:65 models.py:15
4
models.py:
199
#: availability.py:65 models.py:15
6
models.py:
201
msgid "AK"
msgstr "AK"
...
...
@@ -55,16 +55,16 @@ msgstr "AK Kategorie"
msgid "AK Category whose availability this is"
msgstr "AK Kategorie dessen Verfügbarkeit hier abgebildet wird"
#: availability.py:23
4
#: availability.py:23
5
msgid "Availability"
msgstr "Verfügbarkeit"
#: availability.py:23
5
#: availability.py:23
6
msgid "Availabilities"
msgstr "Verfügbarkeiten"
#: models.py:9 models.py:58 models.py:73 models.py:88 models.py:102
#: models.py:119 models.py:17
4
#: models.py:119 models.py:17
6
msgid "Name"
msgstr "Name"
...
...
@@ -275,110 +275,118 @@ msgid "Intends to submit a resolution"
msgstr "Beabsichtigt eine Resolution einzureichen"
#: models.py:138
msgid "Present this AK"
msgstr "AK Präsentieren"
#: models.py:138
msgid "Present results of this AK"
msgstr "Die Ergebnisse dieses AKs vorstellen"
#: models.py:140
msgid "Requirements"
msgstr "Anforderungen"
#: models.py:1
39
#: models.py:1
41
msgid "AK's Requirements"
msgstr "Anforderungen des AKs"
#: models.py:14
1
#: models.py:14
3
msgid "Conflicting AKs"
msgstr "AK Konflikte"
#: models.py:14
2
#: models.py:14
4
msgid "AKs that conflict and thus must not take place at the same time"
msgstr ""
"AKs, die Konflikte haben und deshalb nicht gleichzeitig stattfinden dürfen"
#: models.py:14
3
#: models.py:14
5
msgid "Prerequisite AKs"
msgstr "Vorausgesetzte AKs"
#: models.py:14
4
#: models.py:14
6
msgid "AKs that should precede this AK in the schedule"
msgstr "AKS die im AK Plan vor diesem AK stattfinden müssen"
#: models.py:14
6
#: models.py:14
8
msgid "Internal Notes"
msgstr "Interne Notizen"
#: models.py:14
6
#: models.py:14
8
msgid "Notes to organizers"
msgstr "Notizen an die Organisator*innen"
#: models.py:1
48
#: models.py:1
50
msgid "Interest"
msgstr "Interesse"
#: models.py:1
48
#: models.py:1
50
msgid "Expected number of people"
msgstr "Erwartete Personenzahl"
#: models.py:15
5
#: models.py:15
7
msgid "AKs"
msgstr "AKs"
#: models.py:17
4
#: models.py:17
6
msgid "Name or number of the room"
msgstr "Name oder Nummer des Raums"
#: models.py:17
5
#: models.py:17
7
msgid "Building"
msgstr "Gebäude"
#: models.py:17
6
#: models.py:17
8
msgid "Name or number of the building"
msgstr "Name oder Nummer des Gebäudes"
#: models.py:17
7
#: models.py:17
9
msgid "Capacity"
msgstr "Kapazität"
#: models.py:17
7
#: models.py:17
9
msgid "Maximum number of people"
msgstr "Maximale Personenzahl"
#: models.py:1
7
8
#: models.py:18
0
msgid "Properties"
msgstr "Eigenschaften"
#: models.py:1
79
#: models.py:1
81
msgid "AK requirements fulfilled by the room"
msgstr "AK Anforderungen, die dieser Raum erfüllt"
#: models.py:18
6
#: models.py:18
8
msgid "Rooms"
msgstr "Räume"
#: models.py:
199
#: models.py:
201
msgid "AK being mapped"
msgstr "AK, der zugeordnet wird"
#: models.py:20
1
#: models.py:20
3
msgid "Room the AK will take place in"
msgstr "Raum in dem der AK stattfindet"
#: models.py:20
2
#: models.py:20
4
msgid "Slot Begin"
msgstr "Beginn des Slots"
#: models.py:20
2
#: models.py:20
4
msgid "Time and date the slot begins"
msgstr "Zeit und Datum zu der der AK beginnt"
#: models.py:20
3
#: models.py:20
5
msgid "Duration"
msgstr "Dauer"
#: models.py:20
4
#: models.py:20
6
msgid "Length in hours"
msgstr "Länge in Stunden"
#: models.py:21
0
#: models.py:21
2
msgid "AK Slot"
msgstr "AK Slot"
#: models.py:21
1
#: models.py:21
3
msgid "AK Slots"
msgstr "AK Slot"
This diff is collapsed.
Click to expand it.
AKModel/migrations/0015_ak_present_field.py
0 → 100644
+
18
−
0
View file @
9f38321a
# Generated by Django 2.2.6 on 2019-10-18 12:55
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'
AKModel
'
,
'
0014_akcategory
'
),
]
operations
=
[
migrations
.
AddField
(
model_name
=
'
ak
'
,
name
=
'
present
'
,
field
=
models
.
BooleanField
(
help_text
=
'
Present results of this AK
'
,
null
=
True
,
verbose_name
=
'
Present this AK
'
),
),
]
This diff is collapsed.
Click to expand it.
AKModel/models.py
+
2
−
0
View file @
9f38321a
...
...
@@ -135,6 +135,8 @@ class AK(models.Model):
reso
=
models
.
BooleanField
(
verbose_name
=
_
(
'
Resolution Intention
'
),
default
=
False
,
help_text
=
_
(
'
Intends to submit a resolution
'
))
present
=
models
.
BooleanField
(
verbose_name
=
_
(
"
Present this AK
"
),
null
=
True
,
help_text
=
_
(
"
Present results of this AK
"
))
requirements
=
models
.
ManyToManyField
(
to
=
AKRequirement
,
blank
=
True
,
verbose_name
=
_
(
'
Requirements
'
),
help_text
=
_
(
"
AK
'
s Requirements
"
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment