← Back to branch summary

~ubuntu-branches/ubuntu/quantal/python-django/quantal-security

« back to all changes in this revision

Viewing changes to django/conf/global_settings.py

  • Committer: Bazaar Package Importer
  • Author(s): Jamie Strandboge
  • Date: 2010-10-12 11:34:35 UTC
  • mfrom: (4.4.9 sid)
  • mto: This revision was merged to the branch mainline in revision 30.
  • Revision ID: james.westby@ubuntu.com-20101012113435-5rk3p18nyanuhj6g
* SECURITY UPDATE: XSS in CSRF protections. New upstream release
  - CVE-2010-3082
* debian/patches/01_disable_url_verify_regression_tests.diff:
  - updated to disable another test that fails without internet connection
  - patch based on work by Kai Kasurinen and Krzysztof Klimonda
* debian/control: don't Build-Depends on locales-all, which doesn't exist
  in maverick

Show diffs side-by-side

added added

removed removed

Lines of Context:
django/conf/global_settings.py
54
54
    ('en', gettext_noop('English')),
55
55
    ('en-gb', gettext_noop('British English')),
56
56
    ('es', gettext_noop('Spanish')),
57
 
    ('es-ar', gettext_noop('Argentinean Spanish')),
 
57
    ('es-ar', gettext_noop('Argentinian Spanish')),
58
58
    ('et', gettext_noop('Estonian')),
59
59
    ('eu', gettext_noop('Basque')),
60
60
    ('fa', gettext_noop('Persian')),
78
78
    ('lt', gettext_noop('Lithuanian')),
79
79
    ('lv', gettext_noop('Latvian')),
80
80
    ('mk', gettext_noop('Macedonian')),
 
81
    ('ml', gettext_noop('Malayalam')),
81
82
    ('mn', gettext_noop('Mongolian')),
82
83
    ('nl', gettext_noop('Dutch')),
83
84
    ('no', gettext_noop('Norwegian')),