Permalink
Browse files

Merge branch 'master' into 18978

Conflicts:
	docs/releases/1.5.txt
  • Loading branch information...
2 parents 072d5e2 + ce1eb32 commit c718670197277b44d2e45f4ef8122346a8c2e164 @tricoder42 tricoder42 committed Oct 25, 2012
Showing 326 changed files with 7,257 additions and 12,152 deletions.
View
@@ -1,4 +1,8 @@
*.egg-info
*.pot
*.py[co]
+MANIFEST
+dist/
docs/_build/
+tests/coverage_html/
+tests/.coverage
View
@@ -4,3 +4,5 @@ syntax:glob
*.pot
*.py[co]
docs/_build/
+tests/coverage_html/
+tests/.coverage
View
@@ -1,5 +1,5 @@
[main]
-host = https://www.transifex.net
+host = https://www.transifex.com
lang_map = sr@latin:sr_Latn
[django.core]
View
@@ -425,6 +425,7 @@ answer newbie questions, and generally made Django that much better:
phil@produxion.net
phil.h.smith@gmail.com
Gustavo Picon
+ Travis Pinney
Michael Placentra II <someone@michaelplacentra2.net>
plisk
Daniel Poelzleithner <http://poelzi.org/>
@@ -500,6 +501,7 @@ answer newbie questions, and generally made Django that much better:
Wiliam Alves de Souza <wiliamsouza83@gmail.com>
Don Spaulding <donspauldingii@gmail.com>
Calvin Spealman <ironfroggy@gmail.com>
+ Dane Springmeyer
Bjørn Stabell <bjorn@exoweb.net>
Georgi Stanojevski <glisha@gmail.com>
starrynight <cmorgh@gmail.com>
View
@@ -32,3 +32,5 @@ recursive-include django/contrib/gis/tests/geogapp/fixtures *
recursive-include django/contrib/gis/tests/relatedapp/fixtures *
recursive-include django/contrib/sitemaps/templates *
recursive-include django/contrib/sitemaps/tests/templates *
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]
View
@@ -25,7 +25,7 @@ class LazySettings(LazyObject):
The user can manually configure settings prior to using them. Otherwise,
Django uses the settings module pointed to by DJANGO_SETTINGS_MODULE.
"""
- def _setup(self, name):
+ def _setup(self, name=None):
"""
Load the settings module pointed to by the environment variable. This
is used the first time we need any settings at all, if the user has not
@@ -36,11 +36,12 @@ def _setup(self, name):
if not settings_module: # If it's set but is an empty string.
raise KeyError
except KeyError:
+ desc = ("setting %s" % name) if name else "settings"
raise ImproperlyConfigured(
- "Requested setting %s, but settings are not configured. "
+ "Requested %s, but settings are not configured. "
"You must either define the environment variable %s "
"or call settings.configure() before accessing settings."
- % (name, ENVIRONMENT_VARIABLE))
+ % (desc, ENVIRONMENT_VARIABLE))
self._wrapped = Settings(settings_module)
self._configure_logging()
@@ -35,7 +35,7 @@
'%Y-%m-%d', # '2006-10-25'
)
-# these are the separators for non-monetary numbers. For monetary numbers,
+# these are the separators for non-monetary numbers. For monetary numbers,
# the DECIMAL_SEPARATOR is a . (decimal point) and the THOUSAND_SEPARATOR is a
# ' (single quote).
# For details, please refer to http://www.bk.admin.ch/dokumentation/sprachen/04915/05016/index.html?lang=de
Oops, something went wrong.

0 comments on commit c718670

Please sign in to comment.