digitales
/
kompass
4
1
Fork 1
Code Issues 45 Pull Requests 2 Packages Projects Releases Wiki Activity

Merge pull request #71 from Schlabonski/translations-new

Browse Source 
fix some translations and settings
v1-0-stable
Christian Merten 9 years ago committed by GitHub
parent 20ca28819e 6990ca8d04
commit 69b053c8d1
6 changed files with 69 additions and 46 deletions
Show Stats Download Patch File Download Diff File

4
jdav_web/jdav_web/settings.py
Unescape Escape View File

@ -123,9 +123,9 @@ AUTH_PASSWORD_VALIDATORS = [
# Internationalization # Internationalization
# https://docs.djangoproject.com/en/1.10/topics/i18n/ # https://docs.djangoproject.com/en/1.10/topics/i18n/
LANGUAGE_CODE = 'en-us' LANGUAGE_CODE = 'de-de'
TIME_ZONE = 'UTC' TIME_ZONE = 'Europe/Berlin'
USE_I18N = True USE_I18N = True

2
jdav_web/locale/de/LC_MESSAGES/django.po
Unescape Escape View File

@ -40,7 +40,7 @@ msgstr "Abmelden"
#: templates/admin/base.html:58 #: templates/admin/base.html:58
msgid "Home" msgid "Home"
msgstr "Home" msgstr "Start"
#: templates/admin/base_site.html:5 templates/admin/base_site.html:9 #: templates/admin/base_site.html:5 templates/admin/base_site.html:9
msgid "JDAV LB Administration" msgid "JDAV LB Administration"

6
jdav_web/mailer/locale/de/LC_MESSAGES/django.po
Unescape Escape View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-05 10:06+0000\n" "POT-Creation-Date: 2017-07-05 10:46+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -89,7 +89,9 @@ msgstr "Kann Mails verschicken"
#: mailer/models.py:123 #: mailer/models.py:123
msgid "" msgid ""
"Either a group, a memberlist or at least one member is required as recipient" "Either a group, a memberlist or at least one member is required as recipient"
msgstr "Es muss entweder eine Gruppe, eine Teilnehmerliste oder mindestens ein Teilnehmer als Empfänger ausgewählt werden." msgstr ""
"Es muss entweder eine Gruppe, eine Teilnehmerliste oder mindestens ein "
"Teilnehmer als Empfänger ausgewählt werden."
#: mailer/models.py:131 #: mailer/models.py:131
msgid "file" msgid "file"

8
jdav_web/members/admin.py
Unescape Escape View File

@ -10,7 +10,7 @@ from wsgiref.util import FileWrapper
from django import forms from django import forms
from django.contrib import admin from django.contrib import admin
from django.contrib.admin import DateFieldListFilter from django.contrib.admin import DateFieldListFilter
from django.utils.translation import ugettext_lazy as translate from django.utils.translation import ugettext_lazy as _
from django.db.models import TextField, ManyToManyField, ForeignKey from django.db.models import TextField, ManyToManyField, ForeignKey
from django.forms import Textarea, RadioSelect, TypedChoiceField from django.forms import Textarea, RadioSelect, TypedChoiceField
from django.shortcuts import render from django.shortcuts import render
@ -54,10 +54,12 @@ class ActivityCategoryAdmin(admin.ModelAdmin):
class MemberListAdminForm(forms.ModelForm): class MemberListAdminForm(forms.ModelForm):
difficulty = TypedChoiceField(MemberList.difficulty_choices, difficulty = TypedChoiceField(MemberList.difficulty_choices,
widget=RadioSelect, widget=RadioSelect,
coerce=int) coerce=int,
label=_('Difficulty'))
tour_type = TypedChoiceField(MemberList.tour_type_choices, tour_type = TypedChoiceField(MemberList.tour_type_choices,
widget=RadioSelect, widget=RadioSelect,
coerce=int) coerce=int,
label=_('Tour type'))
class Meta: class Meta:
model = MemberList model = MemberList

70
jdav_web/members/locale/de/LC_MESSAGES/django.po
Unescape Escape View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-05 10:06+0000\n" "POT-Creation-Date: 2017-07-05 10:46+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,19 +18,28 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: members/admin.py:58
msgid "Difficulty"
msgstr "Schwierigkeit"
#: members/admin.py:62
msgid "Tour type"
msgstr "Art der Tour"
#: members/apps.py:7 members/models.py:103 #: members/apps.py:7 members/models.py:103
msgid "members" msgid "members"
msgstr "Teilnehmer" msgstr "Teilnehmer"
#: members/models.py:16 #: members/models.py:16
msgid "Name" msgid "Name"
msgstr "" msgstr "Name"
#: members/models.py:17 #: members/models.py:17
msgid "Description" msgid "Description"
msgstr "" msgstr "Beschreibung"
#: members/models.py:23 members/templates/members/change_member.html:9 #: members/models.py:23 members/models.py:119
#: members/templates/members/change_member.html:9
msgid "Activity" msgid "Activity"
msgstr "Aktivität" msgstr "Aktivität"
@ -102,7 +111,7 @@ msgstr "Warteliste"
msgid "registration form" msgid "registration form"
msgstr "Anmeldeformular" msgstr "Anmeldeformular"
#: members/models.py:99 #: members/models.py:99 members/models.py:183
msgid "Group" msgid "Group"
msgstr "Gruppe" msgstr "Gruppe"
@ -118,72 +127,72 @@ msgstr "Ort"
msgid "Destination (optional)" msgid "Destination (optional)"
msgstr "Ziel (optional)" msgstr "Ziel (optional)"
#: members/models.py:124 members/models.py:179
msgid "Date"
msgstr "Datum"
#: members/models.py:125 #: members/models.py:125
msgid "End (optional)" msgid "End (optional)"
msgstr "Ende" msgstr "Ende"
#: members/models.py:132 #: members/models.py:127
msgid "Art der Tour" msgid "Groups"
msgstr "Art der Tour" msgstr "Gruppen"
#: members/models.py:135 #: members/models.py:135
msgid "Categories"
msgstr "Kategorien"
#: members/models.py:136
msgid "easy" msgid "easy"
msgstr "leicht" msgstr "leicht"
#: members/models.py:135 #: members/models.py:136
msgid "medium" msgid "medium"
msgstr "mittel" msgstr "mittel"
#: members/models.py:135 #: members/models.py:136
msgid "hard" msgid "hard"
msgstr "schwer" msgstr "schwer"
#: members/models.py:136 #: members/models.py:145
msgid "Difficulty"
msgstr "Schwierigkeit"
#: members/models.py:144
msgid "Memberlist" msgid "Memberlist"
msgstr "Teilnehmerliste" msgstr "Teilnehmerliste"
#: members/models.py:145 #: members/models.py:146
msgid "Memberlists" msgid "Memberlists"
msgstr "Teilnehmerlisten" msgstr "Teilnehmerlisten"
#: members/models.py:160 members/models.py:165 members/models.py:210 #: members/models.py:161 members/models.py:169 members/models.py:214
#: members/models.py:214 #: members/models.py:221
msgid "Member" msgid "Member"
msgstr "Teilnehmer" msgstr "Teilnehmer"
#: members/models.py:162 #: members/models.py:163
msgid "Comment" msgid "Comment"
msgstr "Kommentar" msgstr "Kommentar"
#: members/models.py:166 members/models.py:215 #: members/models.py:170 members/models.py:222
msgid "Members" msgid "Members"
msgstr "Teilnehmer" msgstr "Teilnehmer"
#: members/models.py:175 #: members/models.py:180
msgid "Date"
msgstr "Datum"
#: members/models.py:176
msgid "Location" msgid "Location"
msgstr "Ort" msgstr "Ort"
#: members/models.py:177 #: members/models.py:181
msgid "Topic" msgid "Topic"
msgstr "Thema" msgstr "Thema"
#: members/models.py:201 #: members/models.py:205
msgid "Jugendleiter" msgid "Jugendleiter"
msgstr "Jugendleiter" msgstr "Jugendleiter"
#: members/models.py:204 #: members/models.py:208
msgid "Klettertreff" msgid "Klettertreff"
msgstr "Klettertreff" msgstr "Klettertreff"
#: members/models.py:205 #: members/models.py:209
msgid "Klettertreffs" msgid "Klettertreffs"
msgstr "Klettertreffs" msgstr "Klettertreffs"
@ -199,6 +208,9 @@ msgstr "Fähigkeiten:"
msgid "Skill level" msgid "Skill level"
msgstr "Fähigkeitsniveau" msgstr "Fähigkeitsniveau"
#~ msgid "Art der Tour"
#~ msgstr "Art der Tour"
#~ msgid "Listname" #~ msgid "Listname"
#~ msgstr "Name der Liste" #~ msgstr "Name der Liste"

25
jdav_web/members/models.py
Unescape Escape View File

@ -116,25 +116,26 @@ class Member(models.Model):
class MemberList(models.Model): class MemberList(models.Model):
"""Lets the user create a list of members in pdf format. """ """Lets the user create a list of members in pdf format. """
name = models.CharField(verbose_name='Activity', default='', name = models.CharField(verbose_name=_('Activity'), default='',
max_length=50) max_length=50)
place = models.CharField(verbose_name=_('Place'), default='', max_length=50) place = models.CharField(verbose_name=_('Place'), default='', max_length=50)
destination = models.CharField(verbose_name=_('Destination (optional)'), destination = models.CharField(verbose_name=_('Destination (optional)'),
default='', max_length=50, blank=True) default='', max_length=50, blank=True)
date = models.DateField(default=datetime.today) date = models.DateField(default=datetime.today, verbose_name=_('Date'))
end = models.DateField(verbose_name=_('End (optional)'), blank=True, default=datetime.today) end = models.DateField(verbose_name=_('End (optional)'), blank=True, default=datetime.today)
# comment = models.TextField(_('Comments'), default='', blank=True) # comment = models.TextField(_('Comments'), default='', blank=True)
groups = models.ManyToManyField(Group) groups = models.ManyToManyField(Group, verbose_name=_('Groups'))
jugendleiter = models.ManyToManyField(Member) jugendleiter = models.ManyToManyField(Member)
tour_type_choices = ((GEMEINSCHAFTS_TOUR, 'Gemeinschaftstour'), tour_type_choices = ((GEMEINSCHAFTS_TOUR, 'Gemeinschaftstour'),
(FUEHRUNGS_TOUR, 'Führungstour'), (FUEHRUNGS_TOUR, 'Führungstour'),
(AUSBILDUNGS_TOUR, 'Ausbildung')) (AUSBILDUNGS_TOUR, 'Ausbildung'))
tour_type = models.IntegerField(verbose_name=_('Art der Tour'), # verbose_name is overriden by form, label is set in admin.py
choices=tour_type_choices) tour_type = models.IntegerField(choices=tour_type_choices)
activity = models.ManyToManyField(ActivityCategory, default=None) activity = models.ManyToManyField(ActivityCategory, default=None,
verbose_name=_('Categories'))
difficulty_choices = [(1, _('easy')), (2, _('medium')), (3, _('hard'))] difficulty_choices = [(1, _('easy')), (2, _('medium')), (3, _('hard'))]
difficulty = models.IntegerField(verbose_name=_('Difficulty'), # verbose_name is overriden by form, label is set in admin.py
choices=difficulty_choices) difficulty = models.IntegerField(choices=difficulty_choices)
def __str__(self): def __str__(self):
"""String represenation""" """String represenation"""
@ -161,6 +162,9 @@ class MemberOnList(models.Model):
memberlist = models.ForeignKey(MemberList) memberlist = models.ForeignKey(MemberList)
comments = models.TextField(_('Comment'), default='', blank=True) comments = models.TextField(_('Comment'), default='', blank=True)
def __str__(self):
return str(self.member)
class Meta: class Meta:
verbose_name = _('Member') verbose_name = _('Member')
verbose_name_plural = _('Members') verbose_name_plural = _('Members')
@ -176,7 +180,7 @@ class Klettertreff(models.Model):
location = models.CharField(_('Location'), default='', max_length=60) location = models.CharField(_('Location'), default='', max_length=60)
topic = models.CharField(_('Topic'), default='', max_length=60) topic = models.CharField(_('Topic'), default='', max_length=60)
jugendleiter = models.ManyToManyField(Member) jugendleiter = models.ManyToManyField(Member)
group = models.ForeignKey(Group, default='') group = models.ForeignKey(Group, default='', verbose_name=_('Group'))
def __str__(self): def __str__(self):
return self.location + ' ' + self.date.strftime('%d.%m.%Y') return self.location + ' ' + self.date.strftime('%d.%m.%Y')
@ -210,6 +214,9 @@ class KlettertreffAttendee(models.Model):
member = models.ForeignKey(Member, verbose_name=_('Member')) member = models.ForeignKey(Member, verbose_name=_('Member'))
klettertreff = models.ForeignKey(Klettertreff) klettertreff = models.ForeignKey(Klettertreff)
def __str__(self):
return str(self.member)
class Meta: class Meta:
verbose_name = _('Member') verbose_name = _('Member')
verbose_name_plural = _('Members') verbose_name_plural = _('Members')

Write Preview
Loading…
Cancel
Save