Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/django/django
Browse files Browse the repository at this point in the history
  • Loading branch information
@sjl
sjl committed Apr 19, 2011
2 parents b214954 + 077de98 commit bd2ff5e
Show file tree
Hide file tree
Showing 2,622 changed files with 57,411 additions and 50,382 deletions.
3 changes: 2 additions & 1 deletion AUTHORS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ The PRIMARY AUTHORS are (and/or have been):
* Ramiro Morales
* Chris Beaven
* Honza Král
* Idan Gazit

More information on the main contributors to Django can be found in
docs/internals/committers.txt.
Expand Down Expand Up @@ -78,6 +79,7 @@ answer newbie questions, and generally made Django that much better:
Esdras Beleza <linux@esdrasbeleza.com>
Chris Bennett <chrisrbennett@yahoo.com>
James Bennett
Shai Berger <shai@platonix.com>
Julian Bez
Arvis Bickovskis <viestards.lists@gmail.com>
Natalia Bidart <nataliabidart@gmail.com>
Expand Down Expand Up @@ -189,7 +191,6 @@ answer newbie questions, and generally made Django that much better:
gandalf@owca.info
Marc Garcia <marc.garcia@accopensys.com>
Andy Gayton <andy-django@thecablelounge.com>
Idan Gazit
geber@datacollect.com
Baishampayan Ghose
Joshua Ginsberg <jag@flowtheory.net>
Expand Down
3 changes: 3 additions & 0 deletions MANIFEST.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ recursive-include django/contrib/auth/tests/templates *
recursive-include django/contrib/comments/templates *
recursive-include django/contrib/databrowse/templates *
recursive-include django/contrib/formtools/templates *
recursive-include django/contrib/formtools/tests/templates *
recursive-include django/contrib/flatpages/fixtures *
recursive-include django/contrib/flatpages/tests/templates *
recursive-include django/contrib/gis/templates *
recursive-include django/contrib/gis/tests/data *
recursive-include django/contrib/gis/tests/distapp/fixtures *
recursive-include django/contrib/gis/tests/geoapp/fixtures *
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 *
1 change: 1 addition & 0 deletions README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ To run Django's test suite:
docs/internals/contributing.txt, published online at
http://docs.djangoproject.com/en/dev/internals/contributing/#running-the-unit-tests


2 changes: 1 addition & 1 deletion django/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION = (1, 3, 0, 'beta', 1)
VERSION = (1, 3, 0, 'final', 0)

def get_version():
version = '%s.%s' % (VERSION[0], VERSION[1])
Expand Down
4 changes: 2 additions & 2 deletions django/conf/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class BaseSettings(object):
def __setattr__(self, name, value):
if name in ("MEDIA_URL", "STATIC_URL") and value and not value.endswith('/'):
warnings.warn('If set, %s must end with a slash' % name,
PendingDeprecationWarning)
DeprecationWarning)
object.__setattr__(self, name, value)


Expand All @@ -86,7 +86,7 @@ def __init__(self, settings_module):
try:
mod = importlib.import_module(self.SETTINGS_MODULE)
except ImportError, e:
raise ImportError("Could not import settings '%s' (Is it on sys.path? Does it have syntax errors?): %s" % (self.SETTINGS_MODULE, e))
raise ImportError("Could not import settings '%s' (Is it on sys.path?): %s" % (self.SETTINGS_MODULE, e))

# Settings that should be converted into tuples if they're mistakenly entered
# as strings.
Expand Down
28 changes: 13 additions & 15 deletions django/conf/global_settings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
# should be the utf-8 encoded local name for the language.
LANGUAGES = (
('ar', gettext_noop('Arabic')),
('az', gettext_noop('Azerbaijani')),
('bg', gettext_noop('Bulgarian')),
('bn', gettext_noop('Bengali')),
('bs', gettext_noop('Bosnian')),
Expand All @@ -56,6 +57,7 @@
('es', gettext_noop('Spanish')),
('es-ar', gettext_noop('Argentinian Spanish')),
('es-mx', gettext_noop('Mexican Spanish')),
('es-ni', gettext_noop('Nicaraguan Spanish')),
('et', gettext_noop('Estonian')),
('eu', gettext_noop('Basque')),
('fa', gettext_noop('Persian')),
Expand All @@ -82,7 +84,6 @@
('ml', gettext_noop('Malayalam')),
('mn', gettext_noop('Mongolian')),
('nl', gettext_noop('Dutch')),
('no', gettext_noop('Norwegian')),
('nb', gettext_noop('Norwegian Bokmal')),
('nn', gettext_noop('Norwegian Nynorsk')),
('pa', gettext_noop('Punjabi')),
Expand All @@ -102,6 +103,7 @@
('th', gettext_noop('Thai')),
('tr', gettext_noop('Turkish')),
('uk', gettext_noop('Ukrainian')),
('ur', gettext_noop('Urdu')),
('vi', gettext_noop('Vietnamese')),
('zh-cn', gettext_noop('Simplified Chinese')),
('zh-tw', gettext_noop('Traditional Chinese')),
Expand All @@ -121,7 +123,7 @@
USE_L10N = False

# Not-necessarily-technical managers of the site. They get broken link
# notifications and other various e-mails.
# notifications and other various emails.
MANAGERS = ADMINS

# Default content type and charset to use for all HttpResponse objects, if a
Expand All @@ -136,12 +138,12 @@
# E-mail address that error messages come from.
SERVER_EMAIL = 'root@localhost'

# Whether to send broken-link e-mails.
# Whether to send broken-link emails.
SEND_BROKEN_LINK_EMAILS = False

# Database connection info.
# Legacy format
DATABASE_ENGINE = '' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
DATABASE_ENGINE = '' # 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
DATABASE_NAME = '' # Or path to database file if using sqlite3.
DATABASE_USER = '' # Not used with sqlite3.
DATABASE_PASSWORD = '' # Not used with sqlite3.
Expand All @@ -162,10 +164,10 @@
# to a module that defines an EmailBackend class.
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'

# Host for sending e-mail.
# Host for sending email.
EMAIL_HOST = 'localhost'

# Port for sending e-mail.
# Port for sending email.
EMAIL_PORT = 25

# Optional SMTP authentication information for EMAIL_HOST.
Expand Down Expand Up @@ -204,7 +206,7 @@
# Output to use in template system for invalid (e.g. misspelled) variables.
TEMPLATE_STRING_IF_INVALID = ''

# Default e-mail address to use for various automated correspondence from
# Default email address to use for various automated correspondence from
# the site managers.
DEFAULT_FROM_EMAIL = 'webmaster@localhost'

Expand Down Expand Up @@ -459,18 +461,14 @@
# Set to None if you're not using it.
COMMENTS_MODERATORS_GROUP = None

# The group ID that designates the users whose comments should be e-mailed to MANAGERS.
# The group ID that designates the users whose comments should be emailed to MANAGERS.
# Set to None if you're not using it.
COMMENTS_SKETCHY_USERS_GROUP = None

# The system will e-mail MANAGERS the first COMMENTS_FIRST_FEW comments by each
# The system will email MANAGERS the first COMMENTS_FIRST_FEW comments by each
# user. Set this to 0 if you want to disable it.
COMMENTS_FIRST_FEW = 0

# A tuple of IP addresses that have been banned from participating in various
# Django-powered features.
BANNED_IPS = ()

##################
# AUTHENTICATION #
##################
Expand Down Expand Up @@ -503,7 +501,7 @@
############

# Class to use as messges backend
MESSAGE_STORAGE = 'django.contrib.messages.storage.user_messages.LegacyFallbackStorage'
MESSAGE_STORAGE = 'django.contrib.messages.storage.fallback.FallbackStorage'

# Default values of MESSAGE_LEVEL and MESSAGE_TAGS are defined within
# django.contrib.messages to avoid imports in this settings file.
Expand All @@ -528,7 +526,7 @@
}
},
'loggers': {
'django.request':{
'django.request': {
'handlers': ['mail_admins'],
'level': 'ERROR',
'propagate': True,
Expand Down
24 changes: 24 additions & 0 deletions django/conf/locale/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
'name': 'Arabic',
'name_local': u'\u0627\u0644\u0639\u0631\u0628\u064a\u0651\u0629',
},
'az': {
'bidi': True,
'code': 'az',
'name': 'Azerbaijani',
'name_local': u'az\u0259rbaycan dili',
},
'bg': {
'bidi': False,
'code': 'bg',
Expand Down Expand Up @@ -83,6 +89,18 @@
'name': 'Argentinian Spanish',
'name_local': u'espa\xf1ol de Argentina',
},
'es-mx': {
'bidi': False,
'code': 'es-mx',
'name': 'Mexican Spanish',
'name_local': u'espa\xf1ol de Mexico',
},
'es-ni': {
'bidi': False,
'code': 'es-ni',
'name': 'Nicaraguan Spanish',
'name_local': u'espa\xf1ol de Nicaragua',
},
'et': {
'bidi': False,
'code': 'et',
Expand Down Expand Up @@ -359,6 +377,12 @@
'name': 'Ukrainian',
'name_local': u'\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430',
},
'ur': {
'bidi': False,
'code': 'ur',
'name': 'Urdu',
'name_local': u'\u0627\u0631\u062f\u0648',
},
'vi': {
'bidi': False,
'code': 'vi',
Expand Down
Binary file modified django/conf/locale/ar/LC_MESSAGES/django.mo
View file
Binary file not shown.
Loading

0 comments on commit bd2ff5e

Please sign in to comment.