summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-01-17 22:08:47 +0000
committerJannis Leidel <jannis@leidel.info>2010-01-17 22:08:47 +0000
commitfe4d3f89e4fad2b852c5f38a3daa0e03dc29ea1d (patch)
tree03d88235ebde5333803c66796662179eb1e784a8
parent2986dc7b280cda9440594519ec21b96cd35fcb81 (diff)
[1.1.X] Fixed #12220 - Added Serbian Latin to list of languages in global settings. Thanks, Janos Guljas.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12235 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 60d374850b..c4eec0c02f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -186,6 +186,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 99fc72e468..c4120fce9c 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')),