From ea2bd06d587e9c81c267a870347b67cda30d881c Mon Sep 17 00:00:00 2001 From: erichhasl Date: Wed, 5 Jul 2017 12:21:16 +0200 Subject: [PATCH 1/3] replace home with start --- jdav_web/locale/de/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdav_web/locale/de/LC_MESSAGES/django.po b/jdav_web/locale/de/LC_MESSAGES/django.po index 9b147e0..a8bf069 100644 --- a/jdav_web/locale/de/LC_MESSAGES/django.po +++ b/jdav_web/locale/de/LC_MESSAGES/django.po @@ -40,7 +40,7 @@ msgstr "Abmelden" #: templates/admin/base.html:58 msgid "Home" -msgstr "Home" +msgstr "Start" #: templates/admin/base_site.html:5 templates/admin/base_site.html:9 msgid "JDAV LB Administration" From 793d3b2d25d3af01a74b5d1a76092aa73777ce2a Mon Sep 17 00:00:00 2001 From: erichhasl Date: Wed, 5 Jul 2017 12:48:45 +0200 Subject: [PATCH 2/3] fix some translations --- .../mailer/locale/de/LC_MESSAGES/django.po | 6 +- jdav_web/members/admin.py | 8 ++- .../members/locale/de/LC_MESSAGES/django.po | 70 +++++++++++-------- jdav_web/members/models.py | 25 ++++--- 4 files changed, 66 insertions(+), 43 deletions(-) diff --git a/jdav_web/mailer/locale/de/LC_MESSAGES/django.po b/jdav_web/mailer/locale/de/LC_MESSAGES/django.po index 339c137..41c88d9 100644 --- a/jdav_web/mailer/locale/de/LC_MESSAGES/django.po +++ b/jdav_web/mailer/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -89,7 +89,9 @@ msgstr "Kann Mails verschicken" #: mailer/models.py:123 msgid "" "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 msgid "file" diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py index 1d34c92..aa58008 100644 --- a/jdav_web/members/admin.py +++ b/jdav_web/members/admin.py @@ -10,7 +10,7 @@ from wsgiref.util import FileWrapper from django import forms from django.contrib import admin 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.forms import Textarea, RadioSelect, TypedChoiceField from django.shortcuts import render @@ -54,10 +54,12 @@ class ActivityCategoryAdmin(admin.ModelAdmin): class MemberListAdminForm(forms.ModelForm): difficulty = TypedChoiceField(MemberList.difficulty_choices, widget=RadioSelect, - coerce=int) + coerce=int, + label=_('Difficulty')) tour_type = TypedChoiceField(MemberList.tour_type_choices, widget=RadioSelect, - coerce=int) + coerce=int, + label=_('Tour type')) class Meta: model = MemberList diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po index 5e169b4..eeccf59 100644 --- a/jdav_web/members/locale/de/LC_MESSAGES/django.po +++ b/jdav_web/members/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,19 +18,28 @@ msgstr "" "Content-Transfer-Encoding: 8bit\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 msgid "members" msgstr "Teilnehmer" #: members/models.py:16 msgid "Name" -msgstr "" +msgstr "Name" #: members/models.py:17 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" msgstr "Aktivität" @@ -102,7 +111,7 @@ msgstr "Warteliste" msgid "registration form" msgstr "Anmeldeformular" -#: members/models.py:99 +#: members/models.py:99 members/models.py:183 msgid "Group" msgstr "Gruppe" @@ -118,72 +127,72 @@ msgstr "Ort" msgid "Destination (optional)" msgstr "Ziel (optional)" +#: members/models.py:124 members/models.py:179 +msgid "Date" +msgstr "Datum" + #: members/models.py:125 msgid "End (optional)" msgstr "Ende" -#: members/models.py:132 -msgid "Art der Tour" -msgstr "Art der Tour" +#: members/models.py:127 +msgid "Groups" +msgstr "Gruppen" #: members/models.py:135 +msgid "Categories" +msgstr "Kategorien" + +#: members/models.py:136 msgid "easy" msgstr "leicht" -#: members/models.py:135 +#: members/models.py:136 msgid "medium" msgstr "mittel" -#: members/models.py:135 +#: members/models.py:136 msgid "hard" msgstr "schwer" -#: members/models.py:136 -msgid "Difficulty" -msgstr "Schwierigkeit" - -#: members/models.py:144 +#: members/models.py:145 msgid "Memberlist" msgstr "Teilnehmerliste" -#: members/models.py:145 +#: members/models.py:146 msgid "Memberlists" msgstr "Teilnehmerlisten" -#: members/models.py:160 members/models.py:165 members/models.py:210 -#: members/models.py:214 +#: members/models.py:161 members/models.py:169 members/models.py:214 +#: members/models.py:221 msgid "Member" msgstr "Teilnehmer" -#: members/models.py:162 +#: members/models.py:163 msgid "Comment" msgstr "Kommentar" -#: members/models.py:166 members/models.py:215 +#: members/models.py:170 members/models.py:222 msgid "Members" msgstr "Teilnehmer" -#: members/models.py:175 -msgid "Date" -msgstr "Datum" - -#: members/models.py:176 +#: members/models.py:180 msgid "Location" msgstr "Ort" -#: members/models.py:177 +#: members/models.py:181 msgid "Topic" msgstr "Thema" -#: members/models.py:201 +#: members/models.py:205 msgid "Jugendleiter" msgstr "Jugendleiter" -#: members/models.py:204 +#: members/models.py:208 msgid "Klettertreff" msgstr "Klettertreff" -#: members/models.py:205 +#: members/models.py:209 msgid "Klettertreffs" msgstr "Klettertreffs" @@ -199,6 +208,9 @@ msgstr "Fähigkeiten:" msgid "Skill level" msgstr "Fähigkeitsniveau" +#~ msgid "Art der Tour" +#~ msgstr "Art der Tour" + #~ msgid "Listname" #~ msgstr "Name der Liste" diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py index 44e6be3..6a08f0e 100644 --- a/jdav_web/members/models.py +++ b/jdav_web/members/models.py @@ -116,25 +116,26 @@ class Member(models.Model): class MemberList(models.Model): """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) place = models.CharField(verbose_name=_('Place'), default='', max_length=50) destination = models.CharField(verbose_name=_('Destination (optional)'), 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) # comment = models.TextField(_('Comments'), default='', blank=True) - groups = models.ManyToManyField(Group) + groups = models.ManyToManyField(Group, verbose_name=_('Groups')) jugendleiter = models.ManyToManyField(Member) tour_type_choices = ((GEMEINSCHAFTS_TOUR, 'Gemeinschaftstour'), (FUEHRUNGS_TOUR, 'Führungstour'), (AUSBILDUNGS_TOUR, 'Ausbildung')) - tour_type = models.IntegerField(verbose_name=_('Art der Tour'), - choices=tour_type_choices) - activity = models.ManyToManyField(ActivityCategory, default=None) + # verbose_name is overriden by form, label is set in admin.py + tour_type = models.IntegerField(choices=tour_type_choices) + activity = models.ManyToManyField(ActivityCategory, default=None, + verbose_name=_('Categories')) difficulty_choices = [(1, _('easy')), (2, _('medium')), (3, _('hard'))] - difficulty = models.IntegerField(verbose_name=_('Difficulty'), - choices=difficulty_choices) + # verbose_name is overriden by form, label is set in admin.py + difficulty = models.IntegerField(choices=difficulty_choices) def __str__(self): """String represenation""" @@ -161,6 +162,9 @@ class MemberOnList(models.Model): memberlist = models.ForeignKey(MemberList) comments = models.TextField(_('Comment'), default='', blank=True) + def __str__(self): + return str(self.member) + class Meta: verbose_name = _('Member') verbose_name_plural = _('Members') @@ -176,7 +180,7 @@ class Klettertreff(models.Model): location = models.CharField(_('Location'), default='', max_length=60) topic = models.CharField(_('Topic'), default='', max_length=60) jugendleiter = models.ManyToManyField(Member) - group = models.ForeignKey(Group, default='') + group = models.ForeignKey(Group, default='', verbose_name=_('Group')) def __str__(self): return self.location + ' ' + self.date.strftime('%d.%m.%Y') @@ -210,6 +214,9 @@ class KlettertreffAttendee(models.Model): member = models.ForeignKey(Member, verbose_name=_('Member')) klettertreff = models.ForeignKey(Klettertreff) + def __str__(self): + return str(self.member) + class Meta: verbose_name = _('Member') verbose_name_plural = _('Members') From 6990ca8d04c450f0b1af3a8f957fdfec48f3699c Mon Sep 17 00:00:00 2001 From: erichhasl Date: Wed, 5 Jul 2017 12:52:21 +0200 Subject: [PATCH 3/3] change default language and time zone --- jdav_web/jdav_web/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdav_web/jdav_web/settings.py b/jdav_web/jdav_web/settings.py index 7405a65..fe4f7e4 100644 --- a/jdav_web/jdav_web/settings.py +++ b/jdav_web/jdav_web/settings.py @@ -123,9 +123,9 @@ AUTH_PASSWORD_VALIDATORS = [ # Internationalization # 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