Commit 859a2056 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Merge pull request #1868 from Bouke/tickets/18419 

Fixed #18149 -- Changed language codes for Chinese
parents cb2c3ce1 c0a2388a

django/conf/global_settings.py

+2 −0
Original line number Diff line number Diff line
@@ -127,6 +127,8 @@ LANGUAGES = ( 
    ('ur', gettext_noop('Urdu')),

    ('vi', gettext_noop('Vietnamese')),

    ('zh-cn', gettext_noop('Simplified Chinese')),

    ('zh-hans', gettext_noop('Simplified Chinese')),

    ('zh-hant', gettext_noop('Traditional Chinese')),

    ('zh-tw', gettext_noop('Traditional Chinese')),

)

django/conf/locale/__init__.py

+12 −0
Original line number Diff line number Diff line
@@ -485,6 +485,18 @@ LANG_INFO = { 
        'name': 'Simplified Chinese',

        'name_local': '简体中文',

    },

    'zh-hans': {

        'bidi': False,

        'code': 'zh-hans',

        'name': 'Simplified Chinese',

        'name_local': '简体中文',

    },

    'zh-hant': {

        'bidi': False,

        'code': 'zh-hant',

        'name': 'Traditional Chinese',

        'name_local': '繁體中文',

    },

    'zh-tw': {

        'bidi': False,

        'code': 'zh-tw',

django/conf/locale/zh_CN/LC_MESSAGES/django.po

+3 −0
Original line number Diff line number Diff line 
# This file is distributed under the same license as the Django package.

#

# This is the *old* Simplified Chinese translation of Django

# For future updates please use the translation in the "zh_Hans" directory.

#

# Translators:

# Jannis Leidel <jannis@leidel.info>, 2011.

# Kevin Shi <leiarix@gmail.com>, 2012.

django/conf/locale/zh_Hans/LC_MESSAGES/django.mo

0 → 100644
+16.7 KiB

File added.

No diff preview for this file type.

View file

django/conf/locale/zh_Hans/LC_MESSAGES/django.po

0 → 100644
+1224 −0

File added.

Preview size limit exceeded, changes collapsed.