Skip to content

Commit 0f85e4f

Browse files
Fixed translation bug that caused new migrations to be created when settings.LANGUAGE_CODE is changed
1 parent 6960c96 commit 0f85e4f

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

essay/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from __future__ import unicode_literals
22
from django.utils.encoding import python_2_unicode_compatible
3-
from django.utils.translation import ugettext as _
3+
from django.utils.translation import ugettext_lazy as _
44
from quiz.models import Question
55

66

multichoice/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from __future__ import unicode_literals
22
from django.utils.encoding import python_2_unicode_compatible
3-
from django.utils.translation import ugettext as _
3+
from django.utils.translation import ugettext_lazy as _
44
from django.db import models
55
from quiz.models import Question
66

quiz/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from django.core.validators import (
88
MaxValueValidator, validate_comma_separated_integer_list,
99
)
10-
from django.utils.translation import ugettext as _
10+
from django.utils.translation import ugettext_lazy as _
1111
from django.utils.timezone import now
1212
from django.utils.encoding import python_2_unicode_compatible
1313
from django.conf import settings

quiz/tests.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from django.template import Template, Context
1414
from django.test import TestCase
1515
from django.utils.six import StringIO
16+
from django.utils.translation import ugettext_lazy as _
1617

1718
from .models import Category, Quiz, Progress, Sitting, SubCategory
1819
from .views import (anon_session_score, QuizListView, CategoriesListView,
@@ -166,7 +167,7 @@ def test_update_score(self):
166167
self.p1.update_score('hamster', 3, 4)
167168

168169
non_int = self.p1.update_score(question2, '1', 2)
169-
self.assertIn('error', str(non_int))
170+
self.assertIn(_('error'), non_int)
170171

171172
# negative possible score
172173
self.p1.update_score(question2, 0, -1)

true_false/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from __future__ import unicode_literals
22
from django.utils.encoding import python_2_unicode_compatible
3-
from django.utils.translation import ugettext as _
3+
from django.utils.translation import ugettext_lazy as _
44
from django.db import models
55
from quiz.models import Question
66

0 commit comments

Comments
 (0)