Permalink
Browse files

Merge pull request #1868 from Bouke/tickets/18419

Fixed #18149 -- Changed language codes for Chinese
  • Loading branch information...
2 parents cb2c3ce + c0a2388 commit 859a20560ebd44d917e564d16f3f5f7091c7d823 @aaugustin aaugustin committed Nov 4, 2013
@@ -127,6 +127,8 @@
('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')),
)
@@ -485,6 +485,18 @@
'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',
@@ -1,5 +1,8 @@
# 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.
Binary file not shown.
Oops, something went wrong. Retry.

1 comment on commit 859a205

@Bouke
Bouke commented on 859a205 Nov 5, 2013

The commit refs ticket #18149, but should have been #18419.

Please sign in to comment.