Kleine anpassungen für die Stablität der Seite.

* Methode Bilder zu löschen wurde geändert damit weniger Fehlermeldungen auftreten.
* kleine änderungen für PEP-8 kompatibiltät
* Nicht alle Seiten sind im Menü verankert, hier hat der Teaser-Block Fehler verursacht.
* reCaptcha wird keine IP Adresse übergeben (Das funktioniert leider nicht)
This commit is contained in:
Christian Berg
2015-02-08 11:33:13 +01:00
parent 9c2413a794
commit cb4b15b3c6
53 changed files with 259 additions and 243 deletions

View File

@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: kasu.mahjong_ranking\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-12-14 01:12+0100\n"
"PO-Revision-Date: 2014-12-08 16:18+0100\n"
"POT-Creation-Date: 2015-01-05 19:23+0100\n"
"PO-Revision-Date: 2015-01-04 11:58+0100\n"
"Last-Translator: Christian Berg <xeniac.at@gmail.com>\n"
"Language-Team: Kasu <verein@kasu.at>\n"
"Language: de\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Translated-Using: django-rosetta 0.7.2\n"
"X-Generator: Poedit 1.6.11\n"
"X-Generator: Poedit 1.7.1\n"
#: admin.py:35
msgid "Recalculate"
@@ -39,7 +39,7 @@ msgstr "Nur Spiele während der Veranstaltung sind erlaubt."
msgid "A valid Hanchan needs 4 players"
msgstr "Eine gültige Hanchan braucht 4 Spieler"
#: models.py:84 models.py:611 templates/mahjong_ranking/hanchan_form.html:30
#: models.py:84 models.py:613 templates/mahjong_ranking/hanchan_form.html:30
#: templates/mahjong_ranking/player_dan_score.html:19
#: templates/mahjong_ranking/player_invalid_score.html:18
msgid "Comment"
@@ -61,7 +61,8 @@ msgstr "Nur gültige und bestätigte Hanchans kommen in die Wertung."
msgid "Players"
msgstr "Spieler"
#: models.py:97 templates/mahjong_ranking/player_dan_score.html:15
#: models.py:97 templates/mahjong_ranking/ladderranking_list.html:8
#: templates/mahjong_ranking/player_dan_score.html:15
#: templates/mahjong_ranking/player_invalid_score.html:14
#: templates/mahjong_ranking/player_kyu_score.html:16
#: templates/mahjong_ranking/player_ladder_score.html:15
@@ -132,34 +133,34 @@ msgstr "Turnierwertung"
#: templates/mahjong_ranking/eventranking_list.html:13
#: templates/mahjong_ranking/kyudanranking_list.html:25
#: templates/mahjong_ranking/ladderranking_list.html:13
#: templates/mahjong_ranking/ladderranking_list.html:20
msgid "Rank"
msgstr "Rang"
#: templates/mahjong_ranking/eventranking_list.html:14
#: templates/mahjong_ranking/kyudanranking_list.html:12
#: templates/mahjong_ranking/ladderranking_list.html:14
#: templates/mahjong_ranking/ladderranking_list.html:21
msgid "Avatar"
msgstr "Avatar"
#: templates/mahjong_ranking/eventranking_list.html:15
#: templates/mahjong_ranking/kyudanranking_list.html:15
#: templates/mahjong_ranking/ladderranking_list.html:15
#: templates/mahjong_ranking/ladderranking_list.html:22
msgid "Nickname"
msgstr "Spitzname"
#: templates/mahjong_ranking/eventranking_list.html:16
#: templates/mahjong_ranking/ladderranking_list.html:16
#: templates/mahjong_ranking/ladderranking_list.html:23
msgid "Name"
msgstr "Name"
#: templates/mahjong_ranking/eventranking_list.html:17
#: templates/mahjong_ranking/ladderranking_list.html:17
#: templates/mahjong_ranking/ladderranking_list.html:24
msgid "Average"
msgstr "Durchschnitt"
#: templates/mahjong_ranking/eventranking_list.html:21
#: templates/mahjong_ranking/ladderranking_list.html:21
#: templates/mahjong_ranking/ladderranking_list.html:28
#: templates/mahjong_ranking/player_dan_score.html:16
#: templates/mahjong_ranking/player_invalid_score.html:16
#: templates/mahjong_ranking/player_kyu_score.html:17
@@ -171,37 +172,37 @@ msgstr "Platzierung"
#: templates/mahjong_ranking/hanchan_form.html:28
#: templates/mahjong_ranking/hanchan_list.html:16
#: templates/mahjong_ranking/kyudanranking_list.html:30
#: templates/mahjong_ranking/ladderranking_list.html:22
#: templates/mahjong_ranking/ladderranking_list.html:29
msgid "Score"
msgstr "Punkte"
#: templates/mahjong_ranking/eventranking_list.html:23
#: templates/mahjong_ranking/ladderranking_list.html:23
#: templates/mahjong_ranking/ladderranking_list.html:30
msgid "count"
msgstr "Anzahl"
#: templates/mahjong_ranking/eventranking_list.html:24
#: templates/mahjong_ranking/ladderranking_list.html:24
#: templates/mahjong_ranking/ladderranking_list.html:31
msgid "good"
msgstr "gut"
#: templates/mahjong_ranking/eventranking_list.html:25
#: templates/mahjong_ranking/ladderranking_list.html:25
#: templates/mahjong_ranking/ladderranking_list.html:32
msgid "won"
msgstr "gewonnen"
#: templates/mahjong_ranking/eventranking_list.html:58
#: templates/mahjong_ranking/ladderranking_list.html:70
#: templates/mahjong_ranking/ladderranking_list.html:77
msgid "Ladder Archive"
msgstr "Ladder Archiv"
#: templates/mahjong_ranking/eventranking_list.html:65
#: templates/mahjong_ranking/ladderranking_list.html:64
#: templates/mahjong_ranking/ladderranking_list.html:71
msgid "Latest Events"
msgstr "Letzte Veranstaltungen"
#: templates/mahjong_ranking/eventranking_list.html:72
#: templates/mahjong_ranking/ladderranking_list.html:54
#: templates/mahjong_ranking/ladderranking_list.html:61
msgid "Latest Hanchans"
msgstr "Letzten Hanchans"
@@ -315,7 +316,15 @@ msgstr "Voller Name"
msgid "Games Total"
msgstr "Spiele total"
#: templates/mahjong_ranking/ladderranking_list.html:72
#: templates/mahjong_ranking/ladderranking_list.html:9
msgid "End"
msgstr "Ende"
#: templates/mahjong_ranking/ladderranking_list.html:10
msgid "Participants"
msgstr "Teilnehmer"
#: templates/mahjong_ranking/ladderranking_list.html:79
#: templates/mahjong_ranking/player_ladder_score.html:51
msgid "Season"
msgstr "Saison"

View File

@@ -164,7 +164,9 @@ class Hanchan(models.Model):
# _('For a Hanchan exactly 4 players are needed.'))
if not self.event_id:
raise ValidationError(_("Hanchan has no event"))
elif self.start and self.start > timezone.now():
elif not self.start:
raise ValidationError(_("Hanchan has no start time set"))
elif self.start > timezone.now():
raise ValidationError(_("It's not allowed to enter future games."))
elif not (self.event.start <= self.start <= self.event.end):
raise ValidationError(_("Only games during the event are allowed"))
@@ -509,7 +511,9 @@ class LadderSeason(models.Model):
"""
return reverse('mahjong-ladder', kwargs={'season': self.pk})
@property
def participants(self):
return self.ladderranking_set.filter(placement__isnull=False).count()
def recalculate(self):
logger.info(u'Recalculate LadderSeason %s', self.name)

View File

@@ -3,6 +3,13 @@
{% block teaser %}
<h2>Mahjong Ranking - {{season.name}}</h2>
<div id="teaser_text">
<ul class="info">
<li class="date">{% trans 'Start' %}: {{season.start}}</li>
<li class="date">{% trans 'End' %}: {{season.end}}</li>
<li class="user">{% trans 'Participants' %}: {{season.participants}}</li>
</ul>
</div>
{% endblock %}
{% block maincontent %}
@@ -76,4 +83,4 @@
{% endfor %}
</select>
</form>
{% endblock %}
{% endblock %}