summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-01-01 21:38:11 +0000
committerJannis Leidel <jannis@leidel.info>2010-01-01 21:38:11 +0000
commit18c31f608f8dec24386941c37c8bfb7cc731d227 (patch)
treef436d23e902b68f38f61d0afa3635d1a1cbed7f9
parent17e191a123cc2593d50f2037d21ae35433c41560 (diff)
Fixed #12220 - Added Serbian Latin to list of languages in global settings. Thanks, Janos Guljas.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--AUTHORS1
-rw-r--r--django/conf/global_settings.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 9ca5753804..9402ef2ae6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -190,6 +190,7 @@ answer newbie questions, and generally made Django that much better:
Simon Greenhill <dev@simon.net.nz>
Owen Griffiths
Espen Grindhaug <http://grindhaug.org/>
+ Janos Guljas
Thomas Güttler <hv@tbz-pariv.de>
Horst Gutmann <zerok@zerokspot.com>
Scot Hacker <shacker@birdhouse.org>
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index e970c12792..e3ba6602cc 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -84,6 +84,7 @@ LANGUAGES = (
('sk', gettext_noop('Slovak')),
('sl', gettext_noop('Slovenian')),
('sr', gettext_noop('Serbian')),
+ ('sr-latn', gettext_noop('Serbian Latin')),
('sv', gettext_noop('Swedish')),
('ta', gettext_noop('Tamil')),
('te', gettext_noop('Telugu')),