Changeset 2549

Timestamp:

03/22/06 16:35:14 (3 years ago)

Author:

adrian

Message:

magic-removal: Merged to [2548]

Files:

• django/branches/magic-removal/AUTHORS (modified) (3 diffs)
• django/branches/magic-removal/django/conf/global_settings.py (modified) (3 diffs)
• django/branches/magic-removal/django/conf/locale/de/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/magic-removal/django/conf/locale/de/LC_MESSAGES/django.po (modified) (24 diffs)
• django/branches/magic-removal/django/conf/locale/el (copied) (copied from django/trunk/django/conf/locale/el)
• django/branches/magic-removal/django/conf/locale/el/LC_MESSAGES (copied) (copied from django/trunk/django/conf/locale/el/LC_MESSAGES)
• django/branches/magic-removal/django/conf/locale/el/LC_MESSAGES/django.po (copied) (copied from django/trunk/django/conf/locale/el/LC_MESSAGES/django.po)
• django/branches/magic-removal/django/conf/locale/sl (copied) (copied from django/trunk/django/conf/locale/sl)
• django/branches/magic-removal/django/conf/locale/sl/LC_MESSAGES (copied) (copied from django/trunk/django/conf/locale/sl/LC_MESSAGES)
• django/branches/magic-removal/django/conf/locale/sl/LC_MESSAGES/django.mo (copied) (copied from django/trunk/django/conf/locale/sl/LC_MESSAGES/django.mo)
• django/branches/magic-removal/django/conf/locale/sl/LC_MESSAGES/django.po (copied) (copied from django/trunk/django/conf/locale/sl/LC_MESSAGES/django.po)
• django/branches/magic-removal/django/core/mail.py (modified) (3 diffs)
• django/branches/magic-removal/docs/email.txt (modified) (4 diffs)
• django/branches/magic-removal/docs/generic_views.txt (modified) (2 diffs)
• django/branches/magic-removal/docs/settings.txt (modified) (1 diff)

django/branches/magic-removal/AUTHORS

@@ -57 +57 @@
-    Baishampayan Ghose
-    Espen Grindhaug <http://grindhaug.org/>
-    Gustavo Picon
-    Brant Harris
-    hipertracker@gmail.com
@@ -69 +68 @@
-    Garth Kidd <http://www.deadlybloodyserious.com/>
-    Sune Kirkeby <http://ibofobi.dk/>
+    Bruce Kroeze <http://coderseye.com/>
-    lakin.wecker@gmail.com
-    Stuart Langridge <http://www.kryogenix.org/>
@@ -90 +90 @@
-    pgross@thoughtworks.com
-    phaedo <http://phaedo.cx/>
+    Gustavo Picon
-    Luke Plant <http://lukeplant.me.uk/>
-    plisk

django/branches/magic-removal/django/conf/global_settings.py

@@ -40 +40 @@
-    ('da', _('Danish')),
-    ('de', _('German')),
+    ('el', _('Greek')),
-    ('en', _('English')),
-    ('es', _('Spanish')),
@@ -53 +54 @@
-    ('ru', _('Russian')),
-    ('sk', _('Slovak')),
+    ('sl', _('Slovenian')),
-    ('sr', _('Serbian')),
-    ('sv', _('Swedish')),
@@ -85 +87 @@
-# Host for sending e-mail.
-EMAIL_HOST = 'localhost'
+
+# Optional SMTP authentication information for EMAIL_HOST.
+EMAIL_HOST_USER = ''
+EMAIL_HOST_PASSWORD = ''
-
-# List of strings representing installed apps.

django/branches/magic-removal/django/conf/locale/de/LC_MESSAGES/django.po

@@ -8 +8 @@
-"Project-Id-Version: Django 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-2-02 11:26
+3-20 11:44
-"PO-Revision-Date: 2005-10-08 00:03+0200\n"
-"Last-Translator: Georg Bauer <gb@bofh.ms>\n"
@@ -75 +75 @@
-msgstr "ist �ntlich"
-
-6
+7
-msgid "IP address"
-msgstr "IP-Adresse"
@@ -430 +430 @@
-msgstr "Logeintr�"
-
-1
+0
-msgid "All dates"
-msgstr "Alle Tage"
@@ -571 +571 @@
-msgstr "�derungsgeschichte: %s"
-
-4 contrib/admin/views/doc.py:253
-5 contrib/admin/views/doc.py:261
-2 contrib/admin/views/doc.py:264
+5 contrib/admin/views/doc.py:254
+6 contrib/admin/views/doc.py:262
+3 contrib/admin/views/doc.py:265
-msgid "Integer"
-msgstr "Ganzzahl"
-
-5
+6
-msgid "Boolean (Either True or False)"
-msgstr "Wahrheitswert (Wahr oder Falsch)"
-
-6
+7 contrib/admin/views/doc.py:264
-#, python-format
-msgid "String (up to %(maxlength)s)"
-msgstr "Zeichenkette (bis zu %(maxlength)s Zeichen)"
-
-7
+8
-msgid "Comma-separated integers"
-msgstr "Kommaseparierte Liste von Zahlen"
-
-8
+9
-msgid "Date (without time)"
-msgstr "Datum (ohne Zeit)"
-
-49
+50
-msgid "Date (with time)"
-msgstr "Datum (mit Zeit)"
-
-0
+1
-msgid "E-mail address"
-msgstr "E-mail-Adresse"
-
-1 contrib/admin/views/doc.py:254
+2 contrib/admin/views/doc.py:255
-msgid "File path"
-msgstr "Dateipfad"
-
-2
+3
-msgid "Decimal number"
-msgstr "Dezimalzahl"
-
-8
+9
-msgid "Boolean (Either True, False or None)"
-msgstr "Wahrheitswert (Wahr, Falsch oder Nichts)"
-
-59
+60
-msgid "Relation to parent model"
-msgstr "Beziehung zum �ermodell"
-
-0
+1
-msgid "Phone number"
-msgstr "Telefonnummer"
-
-
-
-
-
-
+
-msgid "Text"
-msgstr "Text"
-
-6
+7
-msgid "Time"
-msgstr "Zeit"
-
-7
+8
-msgid "URL"
-msgstr "URL"
-
-8
+9
-msgid "U.S. state (two uppercase letters)"
-msgstr "U.S. Bundesstaat (zwei Grossbuchstaben)"
-
-69
+70
-msgid "XML text"
-msgstr "XML Text"
@@ -1469 +1465 @@
-
-#: conf/global_settings.py:42
+msgid "Greek"
+msgstr "Griechisch"
+
+#: conf/global_settings.py:43
-msgid "English"
-msgstr "Englisch"
-
-3
+4
-msgid "Spanish"
-msgstr "Spanisch"
-
-4
+5
-msgid "French"
-msgstr "Franz�ch"
-
-5
+6
-msgid "Galician"
-msgstr "Galicisch"
-
-6
+7
-msgid "Icelandic"
-msgstr "Isl�isch"
-
-7
+8
-msgid "Italian"
-msgstr "Italienisch"
-
-8
+9
-msgid "Japanese"
-msgstr "Japanisch"
-
-49
+50
-msgid "Dutch"
-msgstr "Holl�isch"
-
-0
+1
-msgid "Norwegian"
-msgstr "Norwegisch"
-
-1
+2
-msgid "Brazilian"
-msgstr "Brasilianisch"
-
-2
+3
-msgid "Romanian"
-msgstr "Rum�sch"
-
-3
+4
-msgid "Russian"
-msgstr "Russisch"
-
-4
+5
-msgid "Slovak"
-msgstr "Slowakisch"
-
-
+
+
+
+
+
-msgid "Serbian"
-msgstr "Serbisch"
-
-6
+8
-msgid "Swedish"
-msgstr "Schwedisch"
-
-7
+9
-msgid "Simplified Chinese"
-msgstr "Vereinfachtes Chinesisch"
-
-58
+60
-msgid "Traditional Chinese"
-msgstr "Traditionelles Chinesisch"
-
-5 core/meta/fields.py:488
-9
+3 core/meta/fields.py:486
+7
-msgid "This field is required."
-msgstr "Dieses Feld ist zwingend."
@@ -1574 +1578 @@
-msgstr "Bitte eine ganze Zahl zwischen 0 und 32.767 eingeben."
-
-2
+1
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Dieser Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten."
-
-
-
+
+
+
+
-msgstr ""
-"Dieser Wert darf nur Buchstaben, Ziffern, Unterstriche und Schr�triche "
-"enthalten."
-
-4
+3
-msgid "Uppercase letters are not allowed here."
-msgstr "Gro�uchstaben sind hier nicht erlaubt."
-
-8
+7
-msgid "Lowercase letters are not allowed here."
-msgstr "Kleinbuchstaben sind hier nicht erlaubt."
-
-5
+4
-msgid "Enter only digits separated by commas."
-msgstr "Hier sind nur durch Komma getrennte Ziffern erlaubt."
-
-7
+6
-msgid "Enter valid e-mail addresses separated by commas."
-msgstr "Bitte mit Komma getrennte, g� eMail-Adressen eingeben."
-
-1
+0
-msgid "Please enter a valid IP address."
-msgstr "Bitte eine g� IP-Adresse eingeben."
-
-5
+4
-msgid "Empty values are not allowed here."
-msgstr "Dieses Feld darf nicht leer sein."
-
-9
+8
-msgid "Non-numeric characters aren't allowed here."
-msgstr "Nichtnumerische Zeichen sind hier nicht erlaubt."
-
-3
+2
-msgid "This value can't be comprised solely of digits."
-msgstr "Dieser Wert darf nicht nur aus Ziffern bestehen."
-
-8
+7
-msgid "Enter a whole number."
-msgstr "Bitte eine ganze Zahl eingeben."
-
-2
+1
-msgid "Only alphabetical characters are allowed here."
-msgstr "Nur alphabetische Zeichen sind hier erlaubt."
-
-6
+5
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Bitte ein g�s Datum im Format JJJJ-MM-TT eingeben."
-
-30
+29
-msgid "Enter a valid time in HH:MM format."
-msgstr "Bitte eine g� Zeit im Format SS:MM eingeben."
-
-4
+3
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr ""
@@ -1638 +1644 @@
-"eingeben."
-
-8
+7
-msgid "Enter a valid e-mail address."
-msgstr "Bitte eine g� eMail-Adresse eingeben"
-
-50
+49
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
@@ -1650 +1656 @@
-"oder ist defekt."
-
-7
+6
-#, python-format
-msgid "The URL %s does not point to a valid image."
-msgstr "Die URL %s zeigt nicht auf ein g�s Bild."
-
-1
+0
-#, python-format
-msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
@@ -1661 +1667 @@
-"Telefonnummern m�im Format XXX-XXX-XXXX sein. \"%s\" ist ung�"
-
-9
+8
-#, python-format
-msgid "The URL %s does not point to a valid QuickTime video."
-msgstr "Die URL %s zeigt nicht auf ein g�s QuickTime video."
-
-3
+2
-msgid "A valid URL is required."
-msgstr "Eine g� URL ist hier verlangt."
-
-7
+6
-#, python-format
-msgid ""
@@ -1679 +1685 @@
-"%s"
-
-4
+3
-#, python-format
-msgid "Badly formed XML: %s"
-msgstr "Ung�s XML: %s"
-
-4
+3
-#, python-format
-msgid "Invalid URL: %s"
-msgstr "Ung� URL: %s"
-
-8 core/validators.py:210
+7 core/validators.py:209
-#, python-format
-msgid "The URL %s is a broken link."
-msgstr "Die URL %s funktioniert nicht."
-
-6
+5
-msgid "Enter a valid U.S. state abbreviation."
-msgstr "Bitte eine g� Abk� f�en US-Staat eingeben."
-
-1
+0
-#, python-format
-msgid "Watch your mouth! The word %s is not allowed here."
@@ -1705 +1711 @@
-msgstr[1] "Keine Schimpfworte! Die W�r %s sind hier nicht gern gesehen!"
-
-8
+7
-#, python-format
-msgid "This field must match the '%s' field."
-msgstr "Dieses Feld muss zum Feld '%s' passen."
-
-7
+6
-msgid "Please enter something for at least one field."
-msgstr "Bitte mindestens eines der Felder ausf�"
-
-6 core/validators.py:277
+5 core/validators.py:276
-msgid "Please enter both fields or leave them both empty."
-msgstr "Bitte entweder beide Felder ausf� oder beide leer lassen."
-
-4
+3
-#, python-format
-msgid "This field must be given if %(field)s is %(value)s"
@@ -1724 +1730 @@
-"Dieses Feld muss gef�ein, wenn Feld %(field)s den Wert %(value)s hat."
-
-6
+5
-#, python-format
-msgid "This field must be given if %(field)s is not %(value)s"
@@ -1730 +1736 @@
-"Dieses Feld muss gef�ein, wenn Feld %(field)s nicht %(value)s ist."
-
-5
+4
-msgid "Duplicate values are not allowed."
-msgstr "Doppelte Werte sind hier nicht erlaubt."
-
-8
+7
-#, python-format
-msgid "This value must be a power of %s."
-msgstr "Dieser Wert muss eine Potenz von %s sein."
-
-9
+8
-msgid "Please enter a valid decimal number."
-msgstr "Bitte eine g� Dezimalzahl eingeben."
-
-1
+0
-#, python-format
-msgid "Please enter a valid decimal number with at most %s total digit."
@@ -1751 +1757 @@
-msgstr[1] "Bitte eine g� Dezimalzahl mit maximal %s Ziffern eingeben."
-
-4
+3
-#, python-format
-msgid "Please enter a valid decimal number with at most %s decimal place."
@@ -1761 +1767 @@
-"Bitte eine g� Dezimalzahl mit maximal %s Dezimalstellen eingeben."
-
-4
+3
-#, python-format
-msgid "Make sure your uploaded file is at least %s bytes big."
@@ -1768 +1774 @@
-"ist."
-
-5
+4
-#, python-format
-msgid "Make sure your uploaded file is at most %s bytes big."
@@ -1774 +1780 @@
-"Bitte sicherstellen, da�die hochgeladene Datei maximal %s Bytes gross ist."
-
-8
+7
-msgid "The format for this field is wrong."
-msgstr "Das Format f�ses Feld ist falsch."
-
-3
+2
-msgid "This field is invalid."
-msgstr "Dieses Feld ist ung�"
-
-8
+7
-#, python-format
-msgid "Could not retrieve anything from %s."
-msgstr "Konnte nichts von %s empfangen."
-
-1
+0
-#, python-format
-msgid ""
@@ -1793 +1799 @@
-msgstr "Die URL %(url)s lieferte den falschen Content-Type '%(contenttype)s'."
-
-4
+3
-#, python-format
-msgid ""
@@ -1802 +1808 @@
-"beginnt mit \"%(start)s\"."
-
-8
+7
-#, python-format
-msgid ""
@@ -1811 +1817 @@
-"beginnt mit \"%(start)s\"."
-
-3
+2
-#, python-format
-msgid ""
@@ -1820 +1826 @@
-"\"%(start)s\"."
-
-8
+7
-#, python-format
-msgid ""
@@ -1829 +1835 @@
-"\"."
-
-2
+1
-#, python-format
-msgid ""
@@ -1838 +1844 @@
-"Zeile beginnt mit \"%(start)s\"."
-
-7
+6
-#, python-format
-msgid ""
@@ -1875 +1881 @@
-"\", beim Klicken gedr�alten."
-
-8
+6
-msgid "Enter a valid filename."
-msgstr "Bitte einen g�n Dateinamen eingeben"
-
-2
+0
-#, python-format
-msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."

django/branches/magic-removal/django/core/mail.py

@@ -15 +15 @@
-        MIMEText.__setitem__(self, name, val)
-
-
+, auth_user=settings.EMAIL_HOST_USER, auth_password=settings.EMAIL_HOST_PASSWORD
-    """
-    Easy wrapper for sending a single message to a recipient list. All members
-    of the recipient list will see the other recipients in the 'To' field.
-    """
-
+, auth_user, auth_password
-
-
+, auth_user=settings.EMAIL_HOST_USER, auth_password=settings.EMAIL_HOST_PASSWORD
-    """
-    Given a datatuple of (subject, message, from_email, recipient_list), sends
@@ -28 +28 @@
-
-    If from_email is None, the DEFAULT_FROM_EMAIL setting is used.
+    If auth_user and auth_password are set, they're used to log in.
-    """
-    try:
-        server = smtplib.SMTP(settings.EMAIL_HOST)
+        if auth_user and auth_password:
+            server.login(auth_user, auth_password)
-    except:
-        if fail_silently:
@@ -59 +62 @@
-
-def mail_admins(subject, message, fail_silently=False):
-constant in settings.py
+setting
-    send_mail(settings.EMAIL_SUBJECT_PREFIX + subject, message, settings.SERVER_EMAIL, [a[1] for a in settings.ADMINS], fail_silently)
-
-def mail_managers(subject, message, fail_silently=False):
-constant in settings.py
+setting.
-    send_mail(settings.EMAIL_SUBJECT_PREFIX + subject, message, settings.SERVER_EMAIL, [a[1] for a in settings.MANAGERS], fail_silently)

django/branches/magic-removal/docs/email.txt

@@ -27 +27 @@
-``django.core.mail.send_mail``. Here's its definition::
-
-
+
+
+
-
-
-default
+
+are required
-
-    * ``subject``: A string.
@@ -41 +43 @@
-      an ``smtplib.SMTPException``. See the `smtplib docs`_ for a list of
-      possible exceptions, all of which are subclasses of ``SMTPException``.
+    * ``auth_user``: **New in Django development version.** The optional
+      username to use to authenticate to the SMTP server. If this isn't
+      provided, Django will use the value of the ``EMAIL_HOST_USER`` setting.
+    * ``auth_password``: **New in Django development version.** The optional
+      password to use to authenticate to the SMTP server. If this isn't
+      provided, Django will use the value of the ``EMAIL_HOST_PASSWORD``
+      setting.
-
-.. _smtplib docs: http://www.python.org/doc/current/lib/module-smtplib.html
@@ -50 +59 @@
-Here's the definition::
-
-
+
+
-
-``datatuple`` is a tuple in which each element is in this format::
@@ -56 +66 @@
-    (subject, message, from_email, recipient_list)
-
-
+
+
+
-
-Each separate element of ``datatuple`` results in a separate e-mail message.

django/branches/magic-removal/docs/generic_views.txt

@@ -258 +258 @@
-    dictionary to indicate the name of the slug field.
-
-r
+'re
-    pattern an ``object_id`` field.
-
@@ -291 +291 @@
-    Takes the following optional arguments:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    Has the following template context:

django/branches/magic-removal/docs/settings.txt

@@ -334 +334 @@
-
-The host to use for sending e-mail.
+
+EMAIL_HOST_PASSWORD
+-------------------
+
+Default: ``''`` (Empty string)
+
+**New in Django development version.**
+
+Username to use for the SMTP server defined in ``EMAIL_HOST``. If empty,
+Django won't attempt authentication.
+
+See also ``EMAIL_HOST_USER``.
+
+EMAIL_HOST_USER
+---------------
+
+Default: ``''`` (Empty string)
+
+**New in Django development version.**
+
+Username to use for the SMTP server defined in ``EMAIL_HOST``. If empty,
+Django won't attempt authentication.
+
+See also ``EMAIL_HOST_PASSWORD``.
-
-EMAIL_SUBJECT_PREFIX