boulder-oracle-sprint: Merged to [5045]

git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@5047 bcc190cf-cafb-0310-a4f2-bffc1f526a37

AUTHORS

@@ -88,6 +88,7 @@ answer newbie questions, and generally made Django that much better:
     Dirk Eschler <dirk.eschler@gmx.net>
     Marc Fargas <telenieko@telenieko.com>
     favo@exoweb.net
+    Bill Fenner <fenner@gmail.com>
     Matthew Flanagan <http://wadofstuff.blogspot.com>
     Eric Floehr <eric@intellovations.com>
     Jorge Gajon <gajon@gajon.org>
@@ -122,6 +123,7 @@ answer newbie questions, and generally made Django that much better:
     Sune Kirkeby <http://ibofobi.dk/>
     Bastian Kleineidam <calvin@debian.org>
     Cameron Knight (ckknight)
+    Gasper Koren
     Martin Kosír <martin@martinkosir.net>
     Meir Kriheli <http://mksoft.co.il/>
     Bruce Kroeze <http://coderseye.com/>

django/conf/locale/sl/LC_MESSAGES/djangojs.po

@@ -0,0 +1,107 @@
+# Copyright (C) 2007
+# This file is distributed under the same license as the PACKAGE package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: DJANGO-JS\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-12-09 11:51+0100\n"
+"PO-Revision-Date: 2007-03-31 21:29+0100\n"
+"Last-Translator: Gasper Koren <skrat@owca.info>\n"
+"Language-Team: SLOVENIAN <lugos-slo@lugos.si>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-Country: SLOVENIA\n"
+
+#: contrib/admin/media/js/SelectFilter2.js:33
+#, perl-format
+msgid "Available %s"
+msgstr "Možne %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:41
+msgid "Choose all"
+msgstr "Izberi vse"
+
+#: contrib/admin/media/js/SelectFilter2.js:46
+msgid "Add"
+msgstr "Dodaj"
+
+#: contrib/admin/media/js/SelectFilter2.js:48
+msgid "Remove"
+msgstr "Odstrani"
+
+#: contrib/admin/media/js/SelectFilter2.js:53
+#, perl-format
+msgid "Chosen %s"
+msgstr "Izberite %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:54
+msgid "Select your choice(s) and click "
+msgstr "Izberite in kliknite"
+
+#: contrib/admin/media/js/SelectFilter2.js:59
+msgid "Clear all"
+msgstr "Izbriši vse"
+
+#: contrib/admin/media/js/dateparse.js:26
+#: contrib/admin/media/js/calendar.js:24
+msgid "January February March April May June July August September October November December"
+msgstr "Januar Februar Marec April Maj Junij Julij Avgust September Oktober November December"
+
+#: contrib/admin/media/js/dateparse.js:27
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "Nedelja Ponedeljek Torek Sreda Četrtek Petek Sobota"
+
+#: contrib/admin/media/js/calendar.js:25
+msgid "S M T W T F S"
+msgstr "N P T S Č P S"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:45
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80
+msgid "Now"
+msgstr "Sedaj"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:48
+msgid "Clock"
+msgstr "URA"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:77
+msgid "Choose a time"
+msgstr "Izberite čas"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+msgid "Midnight"
+msgstr "Polnoč"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+msgid "6 a.m."
+msgstr "Ob 6h"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+msgid "Noon"
+msgstr "Opoldne"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:168
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:111
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:162
+msgid "Today"
+msgstr "Danes"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:114
+msgid "Calendar"
+msgstr "Koledar"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:160
+msgid "Yesterday"
+msgstr "Včeraj"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:164
+msgid "Tomorrow"
+msgstr "Jutri"
+

django/contrib/syndication/feeds.py

@@ -70,6 +70,7 @@ class Feed(object):
 
         feed = self.feed_type(
             title = self.__get_dynamic_attr('title', obj),
+            subtitle = self.__get_dynamic_attr('subtitle', obj),
             link = link,
             description = self.__get_dynamic_attr('description', obj),
             language = settings.LANGUAGE_CODE.decode(),

django/core/mail.py

@@ -42,10 +42,6 @@ def send_mail(subject, message, from_email, recipient_list, fail_silently=False,
     If auth_user is None, the EMAIL_HOST_USER setting is used.
     If auth_password is None, the EMAIL_HOST_PASSWORD setting is used.
     """
-    if auth_user is None:
-        auth_user = settings.EMAIL_HOST_USER
-    if auth_password is None:
-        auth_password = settings.EMAIL_HOST_PASSWORD
     return send_mass_mail([[subject, message, from_email, recipient_list]], fail_silently, auth_user, auth_password)
 
 def send_mass_mail(datatuple, fail_silently=False, auth_user=None, auth_password=None):

django/db/backends/mysql/introspection.py

@@ -85,7 +85,7 @@ DATA_TYPES_REVERSE = {
     FIELD_TYPE.LONG: 'IntegerField',
     FIELD_TYPE.LONGLONG: 'IntegerField',
     FIELD_TYPE.SHORT: 'IntegerField',
-    FIELD_TYPE.STRING: 'TextField',
+    FIELD_TYPE.STRING: 'CharField',
     FIELD_TYPE.TIMESTAMP: 'DateTimeField',
     FIELD_TYPE.TINY: 'IntegerField',
     FIELD_TYPE.TINY_BLOB: 'TextField',

django/middleware/common.py

@@ -66,8 +66,10 @@ class CommonMiddleware(object):
                 path = request.get_full_path()
                 if referer and not _is_ignorable_404(path) and (is_internal or '?' not in referer):
                     ua = request.META.get('HTTP_USER_AGENT', '<none>')
+                    ip = request.META.get('REMOTE_ADDR', '<none>')
                     mail_managers("Broken %slink on %s" % ((is_internal and 'INTERNAL ' or ''), domain),
-                        "Referrer: %s\nRequested URL: %s\nUser agent: %s\n" % (referer, request.get_full_path(), ua))
+                        "Referrer: %s\nRequested URL: %s\nUser agent: %s\nIP address: %s\n" \
+                                  % (referer, request.get_full_path(), ua, ip))
                 return response
 
         # Use ETags, if requested.

docs/add_ons.txt

@@ -24,7 +24,7 @@ admin
 The automatic Django administrative interface. For more information, see
 `Tutorial 2`_.
 
-.. _Tutorial 2: ../tutorial2/
+.. _Tutorial 2: ../tutorial02/
 
 auth
 ====

docs/api_stability.txt

@@ -101,7 +101,7 @@ change:
 .. _caching: ../cache/
 .. _custom template tags and libraries: ../templates_python/
 .. _database lookup: ../db_api/
-.. _django-admin utility: ../django_admin/
+.. _django-admin utility: ../django-admin/
 .. _fastcgi integration: ../fastcgi/
 .. _flatpages: ../flatpages/
 .. _generic views: ../generic_views/

docs/databases.txt

@@ -69,9 +69,12 @@ For now, InnoDB is probably your best choice.
 MySQLdb
 -------
 
-`MySQLdb`_ is the Python interface to MySQL. 1.2.1 is the first version that
+`MySQLdb`_ is the Python interface to MySQL. Version 1.2.1p2 or later is
-has support for MySQL 4.1 and newer. If you are trying to use an older version
+required for full MySQL support in Django. Earlier versions will not work with
-of MySQL, then 1.2.0 *might* work for you.
+the ``mysql`` backend.
+
+If you are trying to use an older version of MySQL and the ``mysql_old``
+backend, then 1.2.0 *might* work for you.
 
 .. _MySQLdb: http://sourceforge.net/projects/mysql-python
 

docs/django-admin.txt

@@ -61,7 +61,7 @@ Prints the admin-index template snippet for the given appnames.
 Use admin-index template snippets if you want to customize the look and feel of
 your admin's index page. See `Tutorial 2`_ for more information.
 
-.. _Tutorial 2: ../tutorial2/
+.. _Tutorial 2: ../tutorial02/
 
 createcachetable [tablename]
 ----------------------------

docs/faq.txt

@@ -278,7 +278,7 @@ How do I get started?
 
 .. _`Download the code`: http://www.djangoproject.com/download/
 .. _`installation guide`: ../install/
-.. _tutorial:  ../tutorial1/
+.. _tutorial:  ../tutorial01/
 .. _documentation: ../
 .. _ask questions: http://www.djangoproject.com/community/
 

docs/legacy_databases.txt

@@ -9,7 +9,7 @@ utilities to automate as much of this process as possible.
 This document assumes you know the Django basics, as covered in the
 `official tutorial`_.
 
-.. _official tutorial: ../tutorial1/
+.. _official tutorial: ../tutorial01/
 
 Give Django your database parameters
 ====================================
@@ -52,7 +52,7 @@ Once you've cleaned up your models, name the file ``models.py`` and put it in
 the Python package that holds your app. Then add the app to your
 ``INSTALLED_APPS`` setting.
 
-.. _django-admin.py documentation: ../django_admin/
+.. _django-admin.py documentation: ../django-admin/
 
 Install the core Django tables
 ==============================

docs/model-api.txt

@@ -1924,7 +1924,7 @@ order in which they're executed. The only thing you can assume is that, by the
 time your custom data files are executed, all the database tables already will
 have been created.
 
-.. _`manage.py documentation`: ../django_admin/#sqlcustom-appname-appname
+.. _`manage.py documentation`: ../django-admin/#sqlcustom-appname-appname
 
 Database-backend-specific SQL data
 ----------------------------------

docs/overview.txt

@@ -297,5 +297,5 @@ The next obvious steps are for you to `download Django`_, read `the tutorial`_
 and join `the community`_. Thanks for your interest!
 
 .. _download Django: http://www.djangoproject.com/download/
-.. _the tutorial: http://www.djangoproject.com/documentation/tutorial1/
+.. _the tutorial: http://www.djangoproject.com/documentation/tutorial01/
 .. _the community: http://www.djangoproject.com/community/

docs/settings.txt

@@ -59,7 +59,7 @@ Use the ``--settings`` command-line argument to specify the settings manually::
 
     django-admin.py runserver --settings=mysite.settings
 
-.. _django-admin.py: ../django_admin/
+.. _django-admin.py: ../django-admin/
 
 On the server (mod_python)
 --------------------------
@@ -102,7 +102,7 @@ between the current settings file and Django's default settings.
 
 For more, see the `diffsettings documentation`_.
 
-.. _diffsettings documentation: ../django_admin/#diffsettings
+.. _diffsettings documentation: ../django-admin/#diffsettings
 
 Using settings in Python code
 =============================
@@ -462,7 +462,7 @@ A tuple of strings designating all applications that are enabled in this Django
 installation. Each string should be a full Python path to a Python package that
 contains a Django application, as created by `django-admin.py startapp`_.
 
-.. _django-admin.py startapp: ../django_admin/#startapp-appname
+.. _django-admin.py startapp: ../django-admin/#startapp-appname
 
 INTERNAL_IPS
 ------------

docs/templates_python.txt

@@ -1020,7 +1020,7 @@ The ``takes_context`` parameter defaults to ``False``. When it's set to *True*,
 the tag is passed the context object, as in this example. That's the only
 difference between this case and the previous ``inclusion_tag`` example.
 
-.. _tutorials: ../tutorial1/#creating-models
+.. _tutorials: ../tutorial01/#creating-models
 
 Setting a variable in the context
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

docs/testing.txt

@@ -404,7 +404,7 @@ In this example, any JSON fixture called ``mammals``, and any fixture
 named ``birds`` will be installed. See the documentation on 
 `loading fixtures`_ for more details on defining and installing fixtures.
 
-.. _`loading fixtures`: ../django_admin/#loaddata-fixture-fixture
+.. _`loading fixtures`: ../django-admin/#loaddata-fixture-fixture
 
 This flush/load procedure is repeated for each test in the test case, so you 
 can be certain that the outcome of a test will not be affected by 

docs/tutorial01.txt

@@ -124,7 +124,7 @@ It worked!
 
     Full docs for the development server are at `django-admin documentation`_.
 
-.. _django-admin documentation: ../django_admin/
+.. _django-admin documentation: ../django-admin/
 
 Database setup
 --------------
@@ -400,7 +400,7 @@ as you like, and it will only ever create the tables that don't exist.
 Read the `django-admin.py documentation`_ for full information on what the
 ``manage.py`` utility can do.
 
-.. _django-admin.py documentation: ../django_admin/
+.. _django-admin.py documentation: ../django-admin/
 
 Playing with the API
 ====================
@@ -578,4 +578,4 @@ When you're comfortable with the API, read `part 2 of this tutorial`_ to get
 Django's automatic admin working.
 
 .. _Database API reference: ../db_api/
-.. _part 2 of this tutorial: ../tutorial2/
+.. _part 2 of this tutorial: ../tutorial02/

docs/tutorial02.txt

@@ -5,7 +5,7 @@ Writing your first Django app, part 2
 This tutorial begins where `Tutorial 1`_ left off. We're continuing the Web-poll
 application and will focus on Django's automatically-generated admin site.
 
-.. _Tutorial 1: ../tutorial1/
+.. _Tutorial 1: ../tutorial01/
 
 .. admonition:: Philosophy
 
@@ -434,4 +434,4 @@ When you're comfortable with the admin site, read `part 3 of this tutorial`_ to
 start working on public poll views.
 
 .. _Django admin CSS guide: ../admin_css/
-.. _part 3 of this tutorial: ../tutorial3/
+.. _part 3 of this tutorial: ../tutorial03/

docs/tutorial03.txt

@@ -5,7 +5,7 @@ Writing your first Django app, part 3
 This tutorial begins where `Tutorial 2`_ left off. We're continuing the Web-poll
 application and will focus on creating the public interface -- "views."
 
-.. _Tutorial 2: ../tutorial2/
+.. _Tutorial 2: ../tutorial02/
 
 Philosophy
 ==========
@@ -463,4 +463,4 @@ All the poll app cares about is its relative URLs, not its absolute URLs.
 When you're comfortable with writing views, read `part 4 of this tutorial`_ to
 learn about simple form processing and generic views.
 
-.. _part 4 of this tutorial: ../tutorial4/
+.. _part 4 of this tutorial: ../tutorial04/

docs/tutorial04.txt

@@ -256,4 +256,4 @@ installments:
     * Advanced admin features: Permissions
     * Advanced admin features: Custom JavaScript
 
-.. _Tutorial 3: ../tutorial3/
+.. _Tutorial 3: ../tutorial03/