Merge dc23b44 into 66f2dcb

rapidsms/migrations/0002_alter_contact_language.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rapidsms', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contact',
+            name='language',
+            field=models.CharField(help_text=b'The language which this contact prefers to communicate in, as a W3C language tag. If this field is left blank, RapidSMS will default to the value in LANGUAGE_CODE.', max_length=6, blank=True),
+        ),
+    ]

rapidsms/models.py

@@ -105,8 +105,8 @@ class ContactBase(models.Model):
                                 help_text="The language which this contact "
                                 "prefers to communicate in, as a W3C "
                                 "language tag. If this field is left blank, "
-                                "RapidSMS will default to: " +
-                                settings.LANGUAGE_CODE)
+                                "RapidSMS will default to the value in "
+                                "LANGUAGE_CODE.")
 
     class Meta:
         abstract = True