Commit 03ec3219 authored by Andrew Godwin's avatar Andrew Godwin
Browse files

Merge branch 'master' into schema-alteration 

Conflicts:
	django/db/backends/mysql/introspection.py
	django/db/backends/oracle/creation.py
	django/db/backends/postgresql_psycopg2/creation.py
	django/db/models/base.py
	django/db/models/loading.py
parents 3a6580e4 29a09b36

AUTHORS

+3 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ answer newbie questions, and generally made Django that much better: 
    Clint Ecker

    Nick Efford <nick@efford.org>

    Marc Egli <frog32@me.com>

    Matt Deacalion Stevens <matt@dirtymonkey.co.uk>

    eibaan@gmail.com

    David Eklund

    Julia Elman
@@ -530,6 +531,7 @@ answer newbie questions, and generally made Django that much better: 
    Leo Shklovskii

    jason.sidabras@gmail.com

    Mikołaj Siedlarek <mikolaj.siedlarek@gmail.com>

    Karol Sikora <elektrrrus@gmail.com>

    Brenton Simpson <http://theillustratedlife.com>

    Jozko Skrablin <jozko.skrablin@gmail.com>

    Ben Slavin <benjamin.slavin@gmail.com>
@@ -542,6 +544,7 @@ answer newbie questions, and generally made Django that much better: 
    George Song <george@damacy.net>

    sopel

    Leo Soto <leo.soto@gmail.com>

    Thomas Sorrel

    Wiliam Alves de Souza <wiliamsouza83@gmail.com>

    Don Spaulding <donspauldingii@gmail.com>

    Calvin Spealman <ironfroggy@gmail.com>

django/conf/global_settings.py

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ EMAIL_PORT = 25 
EMAIL_HOST_USER = ''

EMAIL_HOST_PASSWORD = ''

EMAIL_USE_TLS = False

EMAIL_USE_SSL = False



# List of strings representing installed apps.

INSTALLED_APPS = ()

django/conf/locale/__init__.py

+4 −4
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ LANG_INFO = { 
        'bidi': False,

        'code': 'lt',

        'name': 'Lithuanian',

        'name_local': 'Lithuanian',

        'name_local': 'Lietuviškai',

    },

    'lv': {

        'bidi': False,
@@ -399,7 +399,7 @@ LANG_INFO = { 
        'bidi': False,

        'code': 'sq',

        'name': 'Albanian',

        'name_local': 'Albanian',

        'name_local': 'shqip',

    },

    'sr': {

        'bidi': False,
@@ -441,7 +441,7 @@ LANG_INFO = { 
        'bidi': False,

        'code': 'th',

        'name': 'Thai',

        'name_local': 'Thai',

        'name_local': 'ภาษาไทย',

    },

    'tr': {

        'bidi': False,
@@ -477,7 +477,7 @@ LANG_INFO = { 
        'bidi': False,

        'code': 'vi',

        'name': 'Vietnamese',

        'name_local': 'Vietnamese',

        'name_local': 'Tiếng Việt',

    },

    'zh-cn': {

        'bidi': False,

django/conf/locale/en/LC_MESSAGES/django.po

+13 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ msgid "" 
msgstr ""

"Project-Id-Version: Django\n"

"Report-Msgid-Bugs-To: \n"

"POT-Creation-Date: 2013-05-25 14:27+0200\n"

"POT-Creation-Date: 2013-06-11 18:44+0200\n"

"PO-Revision-Date: 2010-05-13 15:35+0200\n"

"Last-Translator: Django team\n"

"Language-Team: English <en@li.org>\n"
@@ -699,11 +699,22 @@ msgstr "" 
msgid "Enter a list of values."

msgstr ""



#: forms/forms.py:158

#. Translators: This is the default suffix added to form field labels

#: forms/forms.py:90

msgid ":"

msgstr ""



#: forms/forms.py:159

#, python-format

msgid "(Hidden field %(name)s) %(error)s"

msgstr ""



#. Translators: If found as last label character, these punctuation

#. characters will prevent the default label_suffix to be appended to the label

#: forms/forms.py:525

msgid ":?.!"

msgstr ""



#: forms/formsets.py:310

#, python-format

msgid "Please submit %d or fewer forms."

django/contrib/admin/helpers.py

+5 −3
Original line number Diff line number Diff line
@@ -266,10 +266,12 @@ class InlineAdminForm(AdminForm): 
            yield InlineFieldset(self.formset, self.form, name,

                self.readonly_fields, model_admin=self.model_admin, **options)



    def has_auto_field(self):

        if self.form._meta.model._meta.has_auto_field:

    def needs_explicit_pk_field(self):

        # Auto fields are editable (oddly), so need to check for auto or non-editable pk

        if self.form._meta.model._meta.has_auto_field or not self.form._meta.model._meta.pk.editable:

            return True

        # Also search any parents for an auto field.

        # Also search any parents for an auto field. (The pk info is propagated to child

        # models so that does not need to be checked in parents.)

        for parent in self.form._meta.model._meta.get_parent_list():

            if parent._meta.has_auto_field:

                return True