Merge pull request saxix#8 from webthusiast/master

take transalations into account

Author: saxix

concurrency/tests/contrib_admin.py

@@ -10,6 +10,7 @@
 from concurrency import forms
 from concurrency.forms import ConcurrentForm, VersionWidget, VersionFieldSigner
 from concurrency.tests import TestModel0, TestModel1
+from django.utils.translation import ugettext as _
 
 INSTALLED_APPS = (
     'django.contrib.auth',
@@ -141,7 +142,7 @@ def test_conflict(self):
         self.assertIn('original', response.context, response)
         self.assertTrue(response.context['adminform'].form.errors,
                         response.context['adminform'].form.errors)
-        self.assertIn('Record Modified',
+        self.assertIn(_('Record Modified'),
                       str(response.context['adminform'].form.errors),
                       response.context['adminform'].form.errors)
 

concurrency/tests/forms.py

@@ -8,6 +8,7 @@
 from concurrency.forms import ConcurrentForm, VersionField, VersionFieldSigner, VersionWidget
 from concurrency.tests import TestModel0, TestIssue3Model
 from django.test.testcases import SimpleTestCase
+from django.utils.translation import ugettext as _
 
 
 class DummySigner():
@@ -129,7 +130,7 @@ def test_save(self):
         form = Form(data, instance=obj)
         obj_copy.save() # save
         self.assertFalse(form.is_valid())
-        self.assertIn('Record Modified', form.non_field_errors())
+        self.assertIn(_('Record Modified'), form.non_field_errors())
 
     def test_is_valid(self):
         obj, __ = TestIssue3Model.objects.get_or_create(username='aaa')