From 77043beb3285d1bb46534e29853e579044132726 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Tue, 27 Sep 2011 13:14:33 +0200 Subject: [PATCH 1/1] fixes --- apps/quiz/locale/pl/LC_MESSAGES/django.po | 22 ++++++++++------------ apps/quiz/views.py | 3 +-- koedquiz/locale/pl/LC_MESSAGES/django.mo | Bin 560 -> 564 bytes koedquiz/locale/pl/LC_MESSAGES/django.po | 10 ++++++---- koedquiz/templates/home.html | 2 +- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/apps/quiz/locale/pl/LC_MESSAGES/django.po b/apps/quiz/locale/pl/LC_MESSAGES/django.po index 94ad015..903a3fb 100644 --- a/apps/quiz/locale/pl/LC_MESSAGES/django.po +++ b/apps/quiz/locale/pl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quiz 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-26 10:15+0200\n" +"POT-Creation-Date: 2011-09-27 13:14+0200\n" "PO-Revision-Date: 2011-09-26 10:16+0100\n" "Last-Translator: Radek Czajka \n" "Language-Team: LANGUAGE \n" @@ -15,7 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" #: forms.py:9 msgid "Please select an option" @@ -37,19 +38,19 @@ msgstr "rezultat" msgid "results" msgstr "rezultaty" -#: models.py:61 +#: models.py:62 msgid "question" msgstr "pytanie" -#: models.py:62 +#: models.py:63 msgid "questions" msgstr "pytania" -#: models.py:91 +#: models.py:92 msgid "answer" msgstr "odpowiedź" -#: models.py:92 +#: models.py:93 msgid "answers" msgstr "odpowiedzi" @@ -57,18 +58,15 @@ msgstr "odpowiedzi" msgid "Send answer" msgstr "Wyślij odpowiedź" -#: templates/quiz/question_detail.html:33 -#: templates/quiz/result_detail.html:24 +#: templates/quiz/question_detail.html:33 templates/quiz/result_detail.html:24 msgid "Back to last question" msgstr "Wróć do poprzedniego pytania" -#: templates/quiz/question_detail.html:38 -#: templates/quiz/result_detail.html:28 +#: templates/quiz/question_detail.html:38 templates/quiz/result_detail.html:28 msgid "Back to my test" msgstr "Wróć do testu" -#: templates/quiz/question_detail.html:40 -#: templates/quiz/result_detail.html:33 +#: templates/quiz/question_detail.html:40 templates/quiz/result_detail.html:33 msgid "Start from the beginning" msgstr "Zacznij od początku" diff --git a/apps/quiz/views.py b/apps/quiz/views.py index 830798d..18a268f 100644 --- a/apps/quiz/views.py +++ b/apps/quiz/views.py @@ -51,10 +51,9 @@ def result(request, slug=None): cur_index = ticket.index(request.path) if cur_index: previous_url = ticket[cur_index - 1] - else: + elif ticket: valid_url = ticket[-1] - result = get_object_or_404(Quiz.current().result_set, slug=slug) return render(request, "quiz/result_detail.html", locals()) diff --git a/koedquiz/locale/pl/LC_MESSAGES/django.mo b/koedquiz/locale/pl/LC_MESSAGES/django.mo index be99f3b5bb571e7b742d6da01563c6c984c31786..44920cd6e225df4ccd7806b1b0007919c8f65bd9 100644 GIT binary patch delta 99 zcmdnMvV~=WiZwq214AGXA7o@;NCeUXK&;HfzyRdJ0gwv;!6k`BB?=`OsR|{j#U&G? dBiYRr42`V}jVA6^gffjcK6Ynh14%0~0087T5}E)2 delta 95 zcmdnOvVmoSia9p}14AGXA7o@;hy~IDKrGM1zyRbj04Y=uT#{H+qEJ|xSv4^}lHE+f X(7?*jeBypZ7<1!ucSbglv?2olk)07p diff --git a/koedquiz/locale/pl/LC_MESSAGES/django.po b/koedquiz/locale/pl/LC_MESSAGES/django.po index dbc6fe5..0e3fd10 100644 --- a/koedquiz/locale/pl/LC_MESSAGES/django.po +++ b/koedquiz/locale/pl/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-26 10:17+0200\n" -"PO-Revision-Date: 2011-09-26 10:17+0100\n" +"POT-Creation-Date: 2011-09-27 13:12+0200\n" +"PO-Revision-Date: 2011-09-27 13:13+0100\n" "Last-Translator: Radek Czajka \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -18,6 +18,8 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" #: templates/home.html:15 -msgid "Start quiz!" -msgstr "Rozpocznij quiz!" +msgid "Start the test!" +msgstr "Rozpocznij test!" +#~ msgid "Start quiz!" +#~ msgstr "Rozpocznij quiz!" diff --git a/koedquiz/templates/home.html b/koedquiz/templates/home.html index 78dd39a..b4c1d20 100644 --- a/koedquiz/templates/home.html +++ b/koedquiz/templates/home.html @@ -12,6 +12,6 @@ {{ quiz.description|safe }} -{% trans "Start quiz!" %} +{% trans "Start the test!" %} {% endblock %} -- 2.20.1