diff options
| author | Jannis Leidel <jannis@leidel.info> | 2010-01-17 23:10:23 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2010-01-17 23:10:23 +0000 |
| commit | 3a417736bc28cdf2432e30e8d035de252fddd4ec (patch) | |
| tree | db43a6202c7cc3fc9a3e7ca630b1b52d9255888d /django | |
| parent | d1e7fdea3fe3e4dd28301151ef4e83fe2a2d0a1c (diff) | |
[1.1.X] Fixed #12230 - Updated utils.translation.to_locale to support the special sr_Latn locale. Thanks to Janos Guljas.
Backport of r12056.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12251 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/utils/translation/trans_real.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index 48ed7cc885..6e7fb8cf50 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -40,6 +40,9 @@ def to_locale(language, to_lower=False): if to_lower: return language[:p].lower()+'_'+language[p+1:].lower() else: + # Get correct locale for sr-latn + if len(language[p+1:]) > 2: + return language[:p].lower()+'_'+language[p+1].upper()+language[p+2:].lower() return language[:p].lower()+'_'+language[p+1:].upper() else: return language.lower() |