adapted for Django 1.9 change for Chinese language code: encode/djang…

…o-rest-framework#2688
infamily · Jan 17, 2016 · 8a17121 · 8a17121
1 parent ecb15f9
commit 8a17121
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/src/apps/core/migrations/0024_auto_20160117_0139.py b/src/apps/core/migrations/0024_auto_20160117_0139.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.1 on 2016-01-17 09:39
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0023_auto_20160115_1150'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='language',
+            name='language_code',
+            field=models.CharField(max_length=8),
+        ),
+    ]
diff --git a/src/apps/core/models/core.py b/src/apps/core/models/core.py
@@ -740,7 +740,7 @@ class Language(models.Model):
     http_accept_language = models.CharField(max_length=255, blank=True,
                                             null=True)
     omegawiki_language_id = models.PositiveIntegerField(null=True, blank=True)
-    language_code = models.CharField(max_length=5)
+    language_code = models.CharField(max_length=8)
 
     def __unicode__(self):
         try:

diff --git a/src/conf/base.py b/src/conf/base.py
@@ -70,7 +70,7 @@
     ('ru', _('Russian')),
 #   ('ja', _('Japanese')),
 #   ('fr', _('French')),
-    ('zh-cn', _('Chinese')),
+    ('zh-hans', _('Chinese')),
 #   ('de', _('German')),
     ('lt', _('Lithuanian')),
 #   ('uk', _('Ukrainian'))

diff --git a/src/locale/zh_CN/LC_MESSAGES/django.mo → src/locale/zh_Hans/LC_MESSAGES/django.mo b/src/locale/zh_CN/LC_MESSAGES/django.mo → src/locale/zh_Hans/LC_MESSAGES/django.mo
diff --git a/src/locale/zh_CN/LC_MESSAGES/django.po → src/locale/zh_Hans/LC_MESSAGES/django.po b/src/locale/zh_CN/LC_MESSAGES/django.po → src/locale/zh_Hans/LC_MESSAGES/django.po