diff options
Diffstat (limited to 'django/views/i18n.py')
| -rw-r--r-- | django/views/i18n.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/django/views/i18n.py b/django/views/i18n.py index b5eb32bda3..0fec6b6c6f 100644 --- a/django/views/i18n.py +++ b/django/views/i18n.py @@ -9,16 +9,16 @@ def set_language(request): """ Redirect to a given url while setting the chosen language in the session or cookie. The url and the language code need to be - specified in the GET paramters. + specified in the GET parameters. """ - lang_code = request.GET['language'] + lang_code = request.GET.get('language', None) next = request.GET.get('next', None) if not next: next = request.META.get('HTTP_REFERER', None) if not next: next = '/' response = http.HttpResponseRedirect(next) - if check_for_language(lang_code): + if lang_code and check_for_language(lang_code): if hasattr(request, 'session'): request.session['django_language'] = lang_code else: @@ -97,7 +97,7 @@ def javascript_catalog(request, domain='djangojs', packages=None): deliver your JavaScript source from Django templates. """ if request.GET: - if request.GET.has_key('language'): + if 'language' in request.GET: if check_for_language(request.GET['language']): activate(request.GET['language']) if packages is None: @@ -136,7 +136,7 @@ def javascript_catalog(request, domain='djangojs', packages=None): t.update(catalog._catalog) src = [LibHead] plural = None - if t.has_key(''): + if '' in t: for l in t[''].split('\n'): if l.startswith('Plural-Forms:'): plural = l.split(':',1)[1].strip() @@ -155,7 +155,7 @@ def javascript_catalog(request, domain='djangojs', packages=None): if type(k) in (str, unicode): csrc.append("catalog['%s'] = '%s';\n" % (javascript_quote(k), javascript_quote(v))) elif type(k) == tuple: - if not pdict.has_key(k[0]): + if k[0] not in pdict: pdict[k[0]] = k[1] else: pdict[k[0]] = max(k[1], pdict[k[0]]) |