diff --git a/quiz/templates/correct_answer.html b/quiz/templates/correct_answer.html index 49f7c36..d98a10d 100644 --- a/quiz/templates/correct_answer.html +++ b/quiz/templates/correct_answer.html @@ -1,8 +1,9 @@ +{% load i18n %} {% if previous.answers %} {% if user_was_incorrect %}

- You answered the above question incorrectly + {% trans "You answered the above question incorrectly" %}

{% endif %} @@ -12,14 +13,14 @@ {% if answer.correct %} {{ answer.content }} - This is the correct answer + {% trans "This is the correct answer" %} {% else %} {{ answer.content }} {% if previous.question_type.MCQuestion %} {% if answer.id|add:"0" == previous.previous_answer|add:"0" %} - This was your answer. + {% trans "This was your answer." %} {% endif %} {% endif %} diff --git a/quiz/templates/progress.html b/quiz/templates/progress.html index 34be020..5337c71 100644 --- a/quiz/templates/progress.html +++ b/quiz/templates/progress.html @@ -1,23 +1,24 @@ {% extends "base.html" %} +{% load i18n %} {% load quiz_tags %} -{% block title %} Progress Page {% endblock %} -{% block description %} User Progress Page {% endblock %} +{% block title %} {% trans "Progress Page" %} {% endblock %} +{% block description %} {% trans "User Progress Page" %} {% endblock %} {% block content %} {% if cat_scores %} -

Question Category Scores

{% trans "Question Category Scores" %}

- - - + + + @@ -46,18 +47,18 @@

Previous exam papers

{% trans "Previous exam papers" %}

- Below are the results of exams that you have sat. + {% trans "Below are the results of exams that you have sat." %}

Category	Correctly answererd	Incorrect	{% trans "Category" %}	{% trans "Correctly answererd" %}	{% trans "Incorrect" %}	%

- - - + + + diff --git a/quiz/templates/question.html b/quiz/templates/question.html index 18d4a09..2a95b8f 100644 --- a/quiz/templates/question.html +++ b/quiz/templates/question.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load i18n%} {% load quiz_tags %} @@ -9,7 +10,7 @@ {% if previous.answers %} -

The previous question:

{% trans "The previous question" %}:

{% if previous.previous_outcome %} @@ -18,7 +19,7 @@

{% endif %}

- Your answer was + {% trans "Your answer was" %} {{ previous.previous_outcome|yesno:"correct,incorrect" }} @@ -28,7 +29,7 @@ {% include 'correct_answer.html' %} -

Explanation:

{% trans "Explanation" %}:

@@ -43,12 +44,12 @@ {% if progress %}

-Question {{ progress.0|add:1 }} of {{ progress.1 }} +{% trans "Question" %} {{ progress.0|add:1 }} {% trans "of" %} {{ progress.1 }}

{% endif %}

- Question category: + {% trans "Question category" %}: {{ question.category }}

@@ -70,7 +71,7 @@ Question {{ progress.0|add:1 }} of {{ progress.1 }} {% endfor %} - + {% endif %} diff --git a/quiz/templates/quiz/category_list.html b/quiz/templates/quiz/category_list.html index c58cd05..90ffe0a 100644 --- a/quiz/templates/quiz/category_list.html +++ b/quiz/templates/quiz/category_list.html @@ -1,8 +1,9 @@ {% extends 'base.html' %} -{% block title %}All Quizzes{% endblock %} +{% load i18n %} +{% block title %}{% trans "All Quizzes" %}{% endblock %} {% block content %} -

Category list

{% trans "Category list" %}

Category: {{ quiz.category }}

{% trans "Category" %}: {{ quiz.category }}

You will only get one attempt at this quiz.

{% trans "You will only get one attempt at this quiz" %}.

- Start quiz + {% trans "Start quiz" %}

List of quizzes

{% trans "List of quizzes" %}

Quiz Title	Score	Possible Score	{% trans "Quiz Title" %}	{% trans "Score" %}	{% trans "Possible Score" %}	%

- - - - + + + + @@ -27,7 +28,7 @@ @@ -37,6 +38,6 @@

Title	Category	Exam	Single attempt	{% trans "Title" %}	{% trans "Category" %}	{% trans "Exam" %}	{% trans "Single attempt" %}
{{ quiz.single_attempt }}	- View details + {% trans "View details" %}

{% else %} -

There are no available quizzes.

{% trans "There are no available quizzes" %}.

{% endif %} {% endblock %} diff --git a/quiz/templates/quiz/sitting_detail.html b/quiz/templates/quiz/sitting_detail.html index f8c1238..fe8da8c 100644 --- a/quiz/templates/quiz/sitting_detail.html +++ b/quiz/templates/quiz/sitting_detail.html @@ -1,24 +1,25 @@ {% extends 'base.html' %} +{% load i18n %} {% load quiz_tags %} {% block title %} -Result of {{ sitting.quiz.title }} for {{ sitting.user }} +{% trans "Result of" %} {{ sitting.quiz.title }} {% trans "for" %} {{ sitting.user }} {% endblock %} {% block content %} -

Quiz title: {{ sitting.quiz.title }}

Category: {{ sitting.quiz.category }}

{% trans "Quiz title" %}: {{ sitting.quiz.title }}

{% trans "Category" %}: {{ sitting.quiz.category }}

User: {{ sitting.user }}

Completed: {{ sitting.end|date }}

Score: {{ sitting.get_percent_correct }}%

{% trans "User" %}: {{ sitting.user }}

{% trans "Completed" %}: {{ sitting.end|date }}

{% trans "Score" %}: {{ sitting.get_percent_correct }}%

- - + + @@ -37,15 +38,15 @@ Result of {{ sitting.quiz.title }} for {{ sitting.user }} diff --git a/quiz/templates/quiz/sitting_list.html b/quiz/templates/quiz/sitting_list.html index e838ee1..915c8a8 100644 --- a/quiz/templates/quiz/sitting_list.html +++ b/quiz/templates/quiz/sitting_list.html @@ -1,18 +1,19 @@ {% extends 'base.html' %} -{% block title %}All Quizzes{% endblock %} +{% load i18n %} +{% block title %}{% trans "All Quizzes" %}{% endblock %} {% block content %} -

List of complete exams

{% trans "List of complete exams" %}

{% if sitting_list %}

Question	User answer	{% trans "Question" %}	{% trans "User answer" %}
{{ question\|answer_choice_to_string:question.user_answer }}	{% if question.id in sitting.get_incorrect_questions %} - incorrect + {% trans "incorrect" %} {% else %} - Correct + {% trans "Correct" %} {% endif %}	{% csrf_token %} - +

- - - - + + + + @@ -24,7 +25,7 @@ - + @@ -38,7 +39,7 @@ @@ -48,6 +49,6 @@

User	Quiz	Completed	Score (%)	{% trans "User" %}	{% trans "Quiz" %}	{% trans "Completed" %}	{% trans "Score" %}(%)

{{ sitting.get_percent_correct }}	- View details + {% trans "View details" %}

{% else %} -

There are no matching quizzes.

{% trans "There are no matching quizzes" %}.

{% endif %} {% endblock %} diff --git a/quiz/templates/result.html b/quiz/templates/result.html index ea202a4..e99e793 100644 --- a/quiz/templates/result.html +++ b/quiz/templates/result.html @@ -1,15 +1,16 @@ {% extends "base.html" %} +{% load i18n %} {% load quiz_tags %} {% block title %} {{ quiz.title}} {% endblock %} -{% block description %} Exam Results for {{ quiz.title }} {% endblock %} +{% block description %} {% trans "Exam Results for" %} {{ quiz.title }} {% endblock %} {% block content %} {% if previous.answers %} -

The previous question:

{% trans "The previous question" %}:

Your answer was @@ -17,7 +18,7 @@

{% include 'correct_answer.html' %} -

Explanation:

{% trans "Explanation" %}:

@@ -28,13 +29,13 @@ {% if max_score %}

Exam results

{% trans "Exam results" %}

- Exam title: + {% trans "Exam title" %}: {{ quiz.title }}

- You answered {{ score }} questions correctly out of {{ max_score }}, giving you {{ percent }} percent correct + {% trans "You answered" %} {{ score }} {% trans "questions correctly out of" %} {{ max_score }}, {% trans "giving you" %} {{ percent }} {% trans "percent correct" %}

{% if quiz.pass_mark %} @@ -44,11 +45,11 @@ {% endif %} -

Review the questions below and try the exam again in the future.

{% trans "Review the questions below and try the exam again in the future"%}.

{% if user.is_authenticated %} -

The result of this exam will be stored in your progress section so you can review and monitor your progression.

{% trans "The result of this exam will be stored in your progress section so you can review and monitor your progression" %}.

{% endif %}

@@ -62,7 +63,7 @@ {% if possible %}

- Your session score is {{ session }} out of a possible {{ possible }} + {% trans "Your session score is" %} {{ session }} {% trans "out of a possible" %} {{ possible }}

@@ -80,10 +81,10 @@ {% correct_answer_for_all question %} {% if question.user_answer %} -

Your answer: {{ question|answer_choice_to_string:question.user_answer }}

{% trans "Your answer" %}: {{ question|answer_choice_to_string:question.user_answer }}

{% endif %} -

Explanation:

{% trans "Explanation" %}:

diff --git a/quiz/templates/single_complete.html b/quiz/templates/single_complete.html index 6856a70..9b016f9 100644 --- a/quiz/templates/single_complete.html +++ b/quiz/templates/single_complete.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load i18n %} {% load quiz_tags %} @@ -9,10 +10,9 @@ {% if user.is_authenticated %} -

You have already sat this exam and only one sitting is permitted.

{% trans "You have already sat this exam and only one sitting is permitted" %}.

{% else %} -

This exam is only accessible to signed in users.

{% trans "This exam is only accessible to signed in users" %}.

{% endif %} - {% endblock %} diff --git a/quiz/templates/view_quiz_category.html b/quiz/templates/view_quiz_category.html index 067cbbb..29aeda6 100644 --- a/quiz/templates/view_quiz_category.html +++ b/quiz/templates/view_quiz_category.html @@ -1,8 +1,9 @@ {% extends 'base.html' %} -{% block title %}Quizzes related to {{ category.category }}{% endblock %} +{% load i18n %} +{% block title %}{% trans "Quizzes related to" %} {{ category.category }}{% endblock %} {% block content %} -

Quizzes in the {{ category.category }} category

{% trans "Quizzes in the" %} {{ category.category }} {% trans "category" %}

{% with object_list as quizzes %} {% if quizzes %} @@ -16,7 +17,7 @@ {% endfor %} {% else %} -

There are no quizzes

{% trans "There are no quizzes" %}

{% endif %} {% endwith %} {% endblock %} diff --git a/true_false/locale/ru/LC_MESSAGES/django.mo b/true_false/locale/ru/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..002a75ca190d36341511d0167295d4c7f9af1045 GIT binary patch literal 914 zcmaJ+!EVz)5M7`MDJKLRISdCHO1r5Y3RG@fY7(bJ*hxs;N^o=2O={}eVZEt9^gzl5 z)LuYv1ik>Ns#FQ7CHw(e{{RPmf-AF4Q9!B~>1p21yf-uZ$f^imc8Bs!gT9_F;>9RxwaRgWryvuUnFn@zVAYeK4qcv#799n*uupIHQ zKUr2B9vs_FswJe($lXkE|?{?b> z^Kr{2^TrGesCg~As%xgH!{{g| zs$DU49qxbzD987#ng7!&m{W=#IkbYV!RF?`f*NfMJvw^wV>1~dKcz3^uH2Ic>5lv= z`$T?Bx8$MRPq)$?Wcw3xZB=Ob)dFNYicjzxX%p7DhV& literal 0 HcmV?d00001 diff --git a/true_false/locale/ru/LC_MESSAGES/django.po b/true_false/locale/ru/LC_MESSAGES/django.po new file mode 100644 index 0000000..8087300 --- /dev/null +++ b/true_false/locale/ru/LC_MESSAGES/django.po @@ -0,0 +1,36 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-10-01 17:56+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: models.py:9 +msgid "Tick this if the question is true. Leave it blank for false." +msgstr "ÐÑÐ¼ÐµÑÑÑÐµ, ÐµÑÐ»Ð¸ Ð¾ÑÐ²ÐµÑ Ð½Ð° Ð²Ð¾Ð¿ÑÐ¾Ñ 'ÐÐ°'. ÐÑÑÐ°Ð²ÑÑÐµ Ð¿ÑÑÑÑÐ¼, ÐµÑÐ»Ð¸ Ð¾ÑÐ²ÐµÑ 'ÐÐµÑ'" + +#: models.py:12 +msgid "Correct" +msgstr "ÐÑÐ°Ð²Ð»ÑÐ½Ð¾" + +#: models.py:40 +msgid "True/False Question" +msgstr "ÐÐ¾Ð¿ÑÐ¾Ñ Ñ Ð¾ÑÐ²ÐµÑÐ¾Ð¼ ÐÐ°/ÐÐµÑ" + +#: models.py:41 +msgid "True/False Questions" +msgstr "ÐÐ¾Ð¿ÑÐ¾ÑÑ Ñ Ð¾ÑÐ²ÐµÑÐ¾Ð¼ ÐÐ°/ÐÐµÑ" diff --git a/true_false/models.py b/true_false/models.py index da79d6e..5b9c531 100644 --- a/true_false/models.py +++ b/true_false/models.py @@ -1,3 +1,4 @@ +from django.utils.translation import ugettext as _ from django.db import models from quiz.models import Question @@ -5,9 +6,10 @@ from quiz.models import Question class TF_Question(Question): correct = models.BooleanField(blank=False, default=False, - help_text="Tick this if the question " - "is true. Leave it blank for" - " false.") + help_text=_("Tick this if the question " + "is true. Leave it blank for" + " false."), + verbose_name=_("Correct")) def check_if_correct(self, guess): if guess == "True": @@ -35,6 +37,6 @@ class TF_Question(Question): return str(guess) class Meta: - verbose_name = "True/False Question" - verbose_name_plural = "True/False Questions" + verbose_name = _("True/False Question") + verbose_name_plural = _("True/False Questions") ordering = ['category'] -- 2.39.5