p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed more stray tabs in Python files. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Karen Tracey 2010-02-27 16:30:27 +00:00
parent 41c30f2fb8
commit 9fab1467c7
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/conf/locale/da/formats.py
View File

@ -11,15 +11,15 @@ SHORT_DATE_FORMAT = 'd.m.Y'
SHORT_DATETIME_FORMAT = 'd.m.Y H:i' SHORT_DATETIME_FORMAT = 'd.m.Y H:i'
FIRST_DAY_OF_WEEK = 1 FIRST_DAY_OF_WEEK = 1
DATE_INPUT_FORMATS = ( DATE_INPUT_FORMATS = (
'%d.%m.%Y', # '25.10.2006' '%d.%m.%Y', # '25.10.2006'
) )
TIME_INPUT_FORMATS = ( TIME_INPUT_FORMATS = (
'%H:%M:%S', # '14:30:59' '%H:%M:%S', # '14:30:59'
'%H:%M', # '14:30' '%H:%M', # '14:30'
) )
DATETIME_INPUT_FORMATS = ( DATETIME_INPUT_FORMATS = (
'%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59' '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59'
'%d.%m.%Y %H:%M', # '25.10.2006 14:30' '%d.%m.%Y %H:%M', # '25.10.2006 14:30'
) )
DECIMAL_SEPARATOR = ',' DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = '.' THOUSAND_SEPARATOR = '.'

2
django/template/defaulttags.py
View File

@ -595,7 +595,7 @@ def firstof(parser, token):
{% filter force_escape %} {% filter force_escape %}
{% firstof var1 var2 var3 "fallback value" %} {% firstof var1 var2 var3 "fallback value" %}
{% endfilter %} {% endfilter %}
""" """
bits = token.split_contents()[1:] bits = token.split_contents()[1:]

14
tests/modeltests/proxy_models/models.py
View File

@ -98,18 +98,18 @@ class UserProxyProxy(UserProxy):
# We can still use `select_related()` to include related models in our querysets. # We can still use `select_related()` to include related models in our querysets.
class Country(models.Model): class Country(models.Model):
name = models.CharField(max_length=50) name = models.CharField(max_length=50)
class State(models.Model): class State(models.Model):
name = models.CharField(max_length=50) name = models.CharField(max_length=50)
country = models.ForeignKey(Country) country = models.ForeignKey(Country)
def __unicode__(self): def __unicode__(self):
return self.name return self.name
class StateProxy(State): class StateProxy(State):
class Meta: class Meta:
proxy = True proxy = True
# Proxy models still works with filters (on related fields) # Proxy models still works with filters (on related fields)
# and select_related, even when mixed with model inheritance # and select_related, even when mixed with model inheritance