Fixed #6409 -- Unbreak compound locale name parsing (e.g. zh-cn).
commit156f1b3f57a1233dc1e43e4df8a157c4cb2f476b
authormtredinnick <mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37>
Wed, 6 Feb 2008 01:04:30 +0000 (6 01:04 +0000)
committermtredinnick <mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37>
Wed, 6 Feb 2008 01:04:30 +0000 (6 01:04 +0000)
treea64a2b8ae2d0dfa4edf43974326c2c6536dad028
parent291a905a212f39da134873f238e5da138579c9bb
Fixed #6409 -- Unbreak compound locale name parsing (e.g. zh-cn).

This was inadvertently broken back in [6608]. Slightly backwards-incompatible:
people specifying "es_AR" in their LANGUAGES list will need to change that to
"es-ar". Thanks, simonb and Ramiro Morales for making the effort to fix this.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
django/conf/global_settings.py
django/utils/translation/trans_real.py
tests/regressiontests/i18n/misc.py