From 122426e7453ed638a0c5be7e8b925adcddea3889 Mon Sep 17 00:00:00 2001 From: Robin Munn Date: Fri, 8 Dec 2006 15:10:09 +0000 Subject: [PATCH] sqlalchemy: Merged revisions 4054 to 4185 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/sqlalchemy@4186 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- AUTHORS | 2 + django/conf/locale/de/LC_MESSAGES/django.mo | Bin 37729 -> 38123 bytes django/conf/locale/de/LC_MESSAGES/django.po | 222 +-- django/conf/locale/el/LC_MESSAGES/django.mo | Bin 8187 -> 15668 bytes django/conf/locale/el/LC_MESSAGES/django.po | 264 ++-- django/conf/locale/el/LC_MESSAGES/djangojs.mo | Bin 0 -> 1810 bytes django/conf/locale/el/LC_MESSAGES/djangojs.po | 109 ++ .../conf/locale/es_AR/LC_MESSAGES/django.mo | Bin 36332 -> 37293 bytes .../conf/locale/es_AR/LC_MESSAGES/django.po | 258 ++-- .../conf/locale/es_AR/LC_MESSAGES/djangojs.mo | Bin 1566 -> 1576 bytes .../conf/locale/es_AR/LC_MESSAGES/djangojs.po | 34 +- django/conf/project_template/urls.py | 2 +- .../admin/media/js/admin/DateTimeShortcuts.js | 10 +- django/contrib/admin/media/js/core.js | 8 + .../admin/templates/admin/search_form.html | 2 +- django/contrib/admin/views/main.py | 14 +- django/contrib/contenttypes/management.py | 11 +- django/contrib/formtools/__init__.py | 0 django/contrib/formtools/preview.py | 160 +++ .../formtools/templates/formtools/form.html | 15 + .../templates/formtools/preview.html | 36 + django/contrib/sitemaps/__init__.py | 2 +- django/contrib/sitemaps/templates/sitemap.xml | 2 +- .../sitemaps/templates/sitemap_index.xml | 2 +- django/core/handlers/base.py | 6 +- django/core/handlers/wsgi.py | 8 +- django/core/mail.py | 8 +- django/core/servers/fastcgi.py | 2 + django/core/xheaders.py | 2 +- django/db/__init__.py | 2 +- django/db/models/fields/__init__.py | 13 +- django/http/__init__.py | 2 +- django/middleware/gzip.py | 1 + django/newforms/__init__.py | 13 +- django/newforms/fields.py | 81 +- django/newforms/forms.py | 202 ++- django/newforms/models.py | 13 + django/newforms/util.py | 19 +- django/newforms/widgets.py | 183 ++- django/template/__init__.py | 6 +- django/views/generic/list_detail.py | 2 +- docs/add_ons.txt | 17 + docs/newforms.txt | 79 ++ docs/sessions.txt | 2 +- docs/settings.txt | 2 +- docs/sitemaps.txt | 19 +- docs/templates.txt | 2 +- docs/templates_python.txt | 2 +- docs/testing.txt | 4 +- setup.py | 10 +- tests/regressiontests/forms/tests.py | 1202 +++++++++++++++-- tests/regressiontests/templates/tests.py | 18 +- 52 files changed, 2416 insertions(+), 657 deletions(-) create mode 100644 django/conf/locale/el/LC_MESSAGES/djangojs.mo create mode 100644 django/conf/locale/el/LC_MESSAGES/djangojs.po create mode 100644 django/contrib/formtools/__init__.py create mode 100644 django/contrib/formtools/preview.py create mode 100644 django/contrib/formtools/templates/formtools/form.html create mode 100644 django/contrib/formtools/templates/formtools/preview.html create mode 100644 django/newforms/models.py create mode 100644 docs/newforms.txt diff --git a/AUTHORS b/AUTHORS index b291f22400..dbbf6e7bad 100644 --- a/AUTHORS +++ b/AUTHORS @@ -51,6 +51,7 @@ answer newbie questions, and generally made Django that much better: Jiri Barton Ned Batchelder Shannon -jj Behrens + Esdras Beleza James Bennett Paul Bissex Simon Blanchard @@ -150,6 +151,7 @@ answer newbie questions, and generally made Django that much better: SmileyChris sopel Thomas Steinacher + nowell strite Radek Švarz Swaroop C H Aaron Swartz diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index aef68099d31c60505f1b2b69b9eb48d6ac10ef9f..0dd2b26dffc7c8e4bc0a14d28bfbac0b71a81be4 100644 GIT binary patch delta 10124 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 M3WL0{D;xOy8%&=EaR2}S delta 9903 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�k!6OQwBMdL=Sh*87?>K_vs zL_YC2F^l%%vW|KUVhu5l#*KIayWtk%I`x|N)aMd0)cfjZ;(jVBwecYy zBK|{EAXIh}Im9EPIkA$sNT@tPjP=xb0lB^-(UW+Jw(?j7+Y*bZFTn9cBkC$)g#KFm zyDa6vD0^_Uwf)~mnWb%0Qy%rFiH1ZC@~cEo9k8W8?Qc=rG zVl;7(lb$8o5QB*hL~-%9bq)Ae;sANPZOi<}c{@2)VDrkjz}G! z@&EcCKQ1exk29#8h}?{o;?f!Cdo`2Dpnd{soXYKGU+V|98x1Z|^ oZ+F<-aNnZ*h4qVq7ga2(Fgv8E^P\n" "MIME-Version: 1.0\n" @@ -452,7 +452,7 @@ msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." msgstr "" -"Es sieht danach aus, das der Browser keine Cookies akzeptiert. Bitte im " +"Es sieht danach aus, dass der Browser keine Cookies akzeptiert. Bitte im " "Browser Cookies aktivieren und diese Seite neu laden." #: contrib/admin/views/decorators.py:83 @@ -470,13 +470,13 @@ msgstr "" msgid "Site administration" msgstr "Website Verwaltung" -#: contrib/admin/views/main.py:257 contrib/admin/views/auth.py:17 +#: contrib/admin/views/main.py:257 contrib/admin/views/auth.py:18 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefgt." #: contrib/admin/views/main.py:261 contrib/admin/views/main.py:347 -#: contrib/admin/views/auth.py:22 +#: contrib/admin/views/auth.py:23 msgid "You may edit it again below." msgstr "Das Element kann jetzt weiter gendert werden." @@ -496,7 +496,7 @@ msgid "Added %s." msgstr "%s hinzugefgt." #: contrib/admin/views/main.py:335 contrib/admin/views/main.py:337 -#: contrib/admin/views/main.py:339 +#: contrib/admin/views/main.py:339 db/models/manipulators.py:306 msgid "and" msgstr "und" @@ -702,7 +702,7 @@ msgstr "XML Text" msgid "%s does not appear to be a urlpattern object" msgstr "%s ist scheinbar kein urlpattern Objekt" -#: contrib/admin/views/auth.py:28 +#: contrib/admin/views/auth.py:29 msgid "Add user" msgstr "Benutzer zufgen" @@ -861,10 +861,6 @@ msgstr "Keine vorhanden" msgid "Add %(name)s" msgstr "%(name)s zufgen" -#: contrib/admin/templates/admin/login.html:22 -msgid "Have you forgotten your password?" -msgstr "Haben Sie ihr Passwort vergessen?" - #: contrib/admin/templates/admin/base.html:25 msgid "Welcome," msgstr "Willkommen," @@ -891,7 +887,7 @@ msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -"Sind Sie sicher, das Sie %(object_name)s \"%(escaped_object)s\" lschen " +"Sind Sie sicher, dass Sie %(object_name)s \"%(escaped_object)s\" lschen " "wollen? Es werden zustzlich die folgenden abhngigen Daten mit gelscht:" #: contrib/admin/templates/admin/delete_confirmation.html:26 @@ -1061,7 +1057,7 @@ msgid "" "password twice so we can verify you typed it in correctly." msgstr "" "Bitte geben Sie aus Sicherheitsgrnden erst Ihr altes Kennwort und darunter " -"dann zweimal (um sicherzustellen, das Sie es korrekt eingegeben haben) das " +"dann zweimal (um sicherzustellen, dass Sie es korrekt eingegeben haben) das " "neue Kennwort ein." #: contrib/admin/templates/registration/password_change_form.html:17 @@ -1087,7 +1083,7 @@ msgstr "Sie erhalten diese Mail, weil Sie ein neues Kennwort" #: contrib/admin/templates/registration/password_reset_email.html:3 #, python-format msgid "for your user account at %(site_name)s" -msgstr "fr ihren Benutzer bei %(site_name)s angefordert haben." +msgstr "fr Ihren Benutzer bei %(site_name)s angefordert haben." #: contrib/admin/templates/registration/password_reset_email.html:5 #, python-format @@ -1104,7 +1100,7 @@ msgstr "Ihr Benutzername, falls Sie ihn vergessen haben:" #: contrib/admin/templates/registration/password_reset_email.html:13 msgid "Thanks for using our site!" -msgstr "Vielen Dank, das Sie unsere Seiten benutzen!" +msgstr "Vielen Dank, dass Sie unsere Seiten benutzen!" #: contrib/admin/templates/registration/password_reset_email.html:15 #, python-format @@ -1367,7 +1363,7 @@ msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -"Bestimmt, das dieser Benutzer alle Berechtigungen hat, ohne diese einzeln " +"Bestimmt, dass dieser Benutzer alle Berechtigungen hat, ohne diese einzeln " "zuweisen zu mssen." #: contrib/auth/models.py:98 @@ -1414,10 +1410,18 @@ msgstr "Wichtige Daten" msgid "Groups" msgstr "Gruppen" -#: contrib/auth/models.py:256 +#: contrib/auth/models.py:258 msgid "message" msgstr "Mitteilung" +#: contrib/auth/forms.py:16 +msgid "The two password fields didn't match." +msgstr "Die zwei Passwrter sind nicht gleich." + +#: contrib/auth/forms.py:24 +msgid "A user with that username already exists." +msgstr "Ein Benutzer mit diesem Namen existiert bereits." + #: contrib/auth/forms.py:52 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " @@ -1432,10 +1436,10 @@ msgstr "Dieser Benutzer ist inaktiv." #: contrib/auth/forms.py:84 msgid "" -"That e-mail address doesn't have an associated user acount. Are you sure " +"That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" -"Die Email-Adresse hat keinen Benutzer zugeordnet. Sicher, das die Adresse " +"Die Email-Adresse hat keinen Benutzer zugeordnet. Sicher, dass die Adresse " "hier angemeldet ist?" #: contrib/auth/forms.py:116 @@ -1783,58 +1787,62 @@ msgid "Norwegian" msgstr "Norwegisch" #: conf/global_settings.py:59 +msgid "Polish" +msgstr "Polnisch" + +#: conf/global_settings.py:60 msgid "Brazilian" msgstr "Brasilianisch" -#: conf/global_settings.py:60 +#: conf/global_settings.py:61 msgid "Romanian" msgstr "Rumnisch" -#: conf/global_settings.py:61 +#: conf/global_settings.py:62 msgid "Russian" msgstr "Russisch" -#: conf/global_settings.py:62 +#: conf/global_settings.py:63 msgid "Slovak" msgstr "Slowakisch" -#: conf/global_settings.py:63 +#: conf/global_settings.py:64 msgid "Slovenian" msgstr "Slowenisch" -#: conf/global_settings.py:64 +#: conf/global_settings.py:65 msgid "Serbian" msgstr "Serbisch" -#: conf/global_settings.py:65 +#: conf/global_settings.py:66 msgid "Swedish" msgstr "Schwedisch" -#: conf/global_settings.py:66 +#: conf/global_settings.py:67 msgid "Tamil" msgstr "Tamilisch" -#: conf/global_settings.py:67 +#: conf/global_settings.py:68 msgid "Turkish" msgstr "Trkisch" -#: conf/global_settings.py:68 +#: conf/global_settings.py:69 msgid "Ukrainian" msgstr "Ukrainisch" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Simplified Chinese" msgstr "Vereinfachtes Chinesisch" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Traditional Chinese" msgstr "Traditionelles Chinesisch" -#: core/validators.py:63 +#: core/validators.py:64 msgid "This value must contain only letters, numbers and underscores." msgstr "Dieser Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten." -#: core/validators.py:67 +#: core/validators.py:68 msgid "" "This value must contain only letters, numbers, underscores, dashes or " "slashes." @@ -1842,85 +1850,85 @@ msgstr "" "Dieser Wert darf nur Buchstaben, Ziffern, Unterstriche und Schrgstriche " "enthalten." -#: core/validators.py:71 +#: core/validators.py:72 msgid "This value must contain only letters, numbers, underscores or hyphens." msgstr "" "Dieser Wert darf nur Buchstaben, Ziffern, Unterstriche und Bindestriche " "enthalten." -#: core/validators.py:75 +#: core/validators.py:76 msgid "Uppercase letters are not allowed here." msgstr "Grobuchstaben sind hier nicht erlaubt." -#: core/validators.py:79 +#: core/validators.py:80 msgid "Lowercase letters are not allowed here." msgstr "Kleinbuchstaben sind hier nicht erlaubt." -#: core/validators.py:86 +#: core/validators.py:87 msgid "Enter only digits separated by commas." msgstr "Hier sind nur durch Komma getrennte Ziffern erlaubt." -#: core/validators.py:98 +#: core/validators.py:99 msgid "Enter valid e-mail addresses separated by commas." msgstr "Bitte mit Komma getrennte, gltige eMail-Adressen eingeben." -#: core/validators.py:102 +#: core/validators.py:103 msgid "Please enter a valid IP address." msgstr "Bitte eine gltige IP-Adresse eingeben." -#: core/validators.py:106 +#: core/validators.py:107 msgid "Empty values are not allowed here." msgstr "Dieses Feld darf nicht leer sein." -#: core/validators.py:110 +#: core/validators.py:111 msgid "Non-numeric characters aren't allowed here." msgstr "Nichtnumerische Zeichen sind hier nicht erlaubt." -#: core/validators.py:114 +#: core/validators.py:115 msgid "This value can't be comprised solely of digits." msgstr "Dieser Wert darf nicht nur aus Ziffern bestehen." -#: core/validators.py:119 +#: core/validators.py:120 msgid "Enter a whole number." msgstr "Bitte eine ganze Zahl eingeben." -#: core/validators.py:123 +#: core/validators.py:124 msgid "Only alphabetical characters are allowed here." msgstr "Nur alphabetische Zeichen sind hier erlaubt." -#: core/validators.py:138 +#: core/validators.py:139 msgid "Year must be 1900 or later." msgstr "Das Jahr muss 1900 oder spter sein." -#: core/validators.py:142 +#: core/validators.py:143 #, python-format msgid "Invalid date: %s." msgstr "Ungltiges Datum: %s" -#: core/validators.py:146 db/models/fields/__init__.py:415 +#: core/validators.py:147 db/models/fields/__init__.py:424 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Bitte ein gltiges Datum im Format JJJJ-MM-TT eingeben." -#: core/validators.py:151 +#: core/validators.py:152 msgid "Enter a valid time in HH:MM format." msgstr "Bitte eine gltige Zeit im Format SS:MM eingeben." -#: core/validators.py:155 db/models/fields/__init__.py:477 +#: core/validators.py:156 db/models/fields/__init__.py:488 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "" "Bitte eine gltige Datums- und Zeitangabe im Format JJJJ-MM-TT SS:MM " "eingeben." -#: core/validators.py:160 +#: core/validators.py:161 msgid "Enter a valid e-mail address." msgstr "Bitte eine gltige eMail-Adresse eingeben" -#: core/validators.py:172 core/validators.py:401 forms/__init__.py:661 +#: core/validators.py:173 core/validators.py:442 forms/__init__.py:667 msgid "No file was submitted. Check the encoding type on the form." msgstr "" "Es wurde keine Datei geschickt. Eventuell ist das Formular-Encoding falsch." -#: core/validators.py:176 +#: core/validators.py:177 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -1928,27 +1936,27 @@ msgstr "" "Bitte ein Bild hochladen. Die Datei, die hochgeladen wurde, ist kein Bild " "oder ist defekt." -#: core/validators.py:183 +#: core/validators.py:184 #, python-format msgid "The URL %s does not point to a valid image." msgstr "Die URL %s zeigt nicht auf ein gltiges Bild." -#: core/validators.py:187 +#: core/validators.py:188 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" "Telefonnummern mssen im Format XXX-XXX-XXXX sein. \"%s\" ist ungltig." -#: core/validators.py:195 +#: core/validators.py:196 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "Die URL %s zeigt nicht auf ein gltiges QuickTime video." -#: core/validators.py:199 +#: core/validators.py:200 msgid "A valid URL is required." msgstr "Eine gltige URL ist hier verlangt." -#: core/validators.py:213 +#: core/validators.py:214 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -1957,71 +1965,83 @@ msgstr "" "Bitte gltiges HTML eingeben. Fehler sind:\n" "%s" -#: core/validators.py:220 +#: core/validators.py:221 #, python-format msgid "Badly formed XML: %s" msgstr "Ungltiges XML: %s" -#: core/validators.py:230 +#: core/validators.py:238 #, python-format msgid "Invalid URL: %s" msgstr "Ungltige URL: %s" -#: core/validators.py:234 core/validators.py:236 +#: core/validators.py:243 core/validators.py:245 #, python-format msgid "The URL %s is a broken link." msgstr "Die URL %s funktioniert nicht." -#: core/validators.py:242 +#: core/validators.py:251 msgid "Enter a valid U.S. state abbreviation." msgstr "Bitte eine gltige Abkrzung fr einen US-Staat eingeben." -#: core/validators.py:256 +#: core/validators.py:265 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "Keine Schimpfworte! Das Wort %s ist hier nicht gern gesehen!" msgstr[1] "Keine Schimpfworte! Die Wrter %s sind hier nicht gern gesehen!" -#: core/validators.py:263 +#: core/validators.py:272 #, python-format msgid "This field must match the '%s' field." msgstr "Dieses Feld muss zum Feld '%s' passen." -#: core/validators.py:282 +#: core/validators.py:291 msgid "Please enter something for at least one field." msgstr "Bitte mindestens eines der Felder ausfllen." -#: core/validators.py:291 core/validators.py:302 +#: core/validators.py:300 core/validators.py:311 msgid "Please enter both fields or leave them both empty." msgstr "Bitte entweder beide Felder ausfllen, oder beide leer lassen." -#: core/validators.py:309 +#: core/validators.py:318 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "" "Dieses Feld muss gefllt sein, wenn Feld %(field)s den Wert %(value)s hat." -#: core/validators.py:321 +#: core/validators.py:330 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "" "Dieses Feld muss gefllt sein, wenn Feld %(field)s nicht %(value)s ist." -#: core/validators.py:340 +#: core/validators.py:349 msgid "Duplicate values are not allowed." msgstr "Doppelte Werte sind hier nicht erlaubt." -#: core/validators.py:363 +#: core/validators.py:364 +msgid "This value must be between %s and %s." +msgstr "Dieser Wert muss zwischen %s und %s sein." + +#: core/validators.py:366 +msgid "This value must be at least %s." +msgstr "Dieser Wert muss mindestens %s sein." + +#: core/validators.py:368 +msgid "This value must be no more than %s." +msgstr "Dieser Wert darf maximal %s sein." + +#: core/validators.py:404 #, python-format msgid "This value must be a power of %s." msgstr "Dieser Wert muss eine Potenz von %s sein." -#: core/validators.py:374 +#: core/validators.py:415 msgid "Please enter a valid decimal number." msgstr "Bitte eine gltige Dezimalzahl eingeben." -#: core/validators.py:378 +#: core/validators.py:419 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -2029,7 +2049,7 @@ msgid_plural "" msgstr[0] "Bitte eine gltige Dezimalzahl mit maximal %s Ziffer eingeben." msgstr[1] "Bitte eine gltige Dezimalzahl mit maximal %s Ziffern eingeben." -#: core/validators.py:381 +#: core/validators.py:422 #, python-format msgid "" "Please enter a valid decimal number with a whole part of at most %s digit." @@ -2038,7 +2058,7 @@ msgid_plural "" msgstr[0] "Bitte eine gltige Dezimalzahl mit maximal %s Ziffer eingeben." msgstr[1] "Bitte eine gltige Dezimalzahl mit maximal %s Ziffern eingeben." -#: core/validators.py:384 +#: core/validators.py:425 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -2048,39 +2068,39 @@ msgstr[0] "" msgstr[1] "" "Bitte eine gltige Dezimalzahl mit maximal %s Dezimalstellen eingeben." -#: core/validators.py:394 +#: core/validators.py:435 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "" "Bitte sicherstellen, da die hochgeladene Datei mindestens %s Bytes gross " "ist." -#: core/validators.py:395 +#: core/validators.py:436 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "" "Bitte sicherstellen, da die hochgeladene Datei maximal %s Bytes gross ist." -#: core/validators.py:412 +#: core/validators.py:453 msgid "The format for this field is wrong." msgstr "Das Format fr dieses Feld ist falsch." -#: core/validators.py:427 +#: core/validators.py:468 msgid "This field is invalid." msgstr "Dieses Feld ist ungltig." -#: core/validators.py:463 +#: core/validators.py:504 #, python-format msgid "Could not retrieve anything from %s." msgstr "Konnte nichts von %s empfangen." -#: core/validators.py:466 +#: core/validators.py:507 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "Die URL %(url)s lieferte den falschen Content-Type '%(contenttype)s'." -#: core/validators.py:499 +#: core/validators.py:540 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " @@ -2089,7 +2109,7 @@ msgstr "" "Bitte das ungeschlossene %(tag)s Tag in Zeile %(line)s schlieen. Die Zeile " "beginnt mit \"%(start)s\"." -#: core/validators.py:503 +#: core/validators.py:544 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " @@ -2098,7 +2118,7 @@ msgstr "" "In Zeile %(line)s ist Text, der nicht in dem Kontext erlaubt ist. Die Zeile " "beginnt mit \"%(start)s\"." -#: core/validators.py:508 +#: core/validators.py:549 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" @@ -2107,7 +2127,7 @@ msgstr "" "Das Attribute %(attr)s in Zeile %(line)s ist ungltig. Die Zeile beginnt mit " "\"%(start)s\"." -#: core/validators.py:513 +#: core/validators.py:554 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" @@ -2116,7 +2136,7 @@ msgstr "" "<%(tag)s> in Zeile %(line)s ist ungltig. Die Zeile beginnt mit \"%(start)s" "\"." -#: core/validators.py:517 +#: core/validators.py:558 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " @@ -2125,7 +2145,7 @@ msgstr "" "Ein Tag in Zeile %(line)s hat eines oder mehrere Pflichtattribute nicht. Die " "Zeile beginnt mit \"%(start)s\"." -#: core/validators.py:522 +#: core/validators.py:563 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " @@ -2149,37 +2169,37 @@ msgstr "%(verbose_name)s wurde erfolgreich aktualisiert." msgid "The %(verbose_name)s was deleted." msgstr "%(verbose_name)s wurde gelscht" -#: db/models/manipulators.py:302 +#: db/models/manipulators.py:305 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "" "Ein '%(object)s' in dieser '%(type)s' existiert bereits fr dieses '%(field)" "s'." -#: db/models/fields/__init__.py:40 +#: db/models/fields/__init__.py:41 #, python-format msgid "%(optname)s with this %(fieldname)s already exists." msgstr "Ein '%(optname)s' mit diesem '%(fieldname)s' existiert bereits." -#: db/models/fields/__init__.py:114 db/models/fields/__init__.py:265 -#: db/models/fields/__init__.py:551 db/models/fields/__init__.py:562 -#: forms/__init__.py:346 +#: db/models/fields/__init__.py:115 db/models/fields/__init__.py:266 +#: db/models/fields/__init__.py:569 db/models/fields/__init__.py:580 +#: forms/__init__.py:352 msgid "This field is required." msgstr "Dieses Feld ist zwingend." -#: db/models/fields/__init__.py:340 +#: db/models/fields/__init__.py:349 msgid "This value must be an integer." msgstr "Dieser Wert muss eine Ganzzahl sein." -#: db/models/fields/__init__.py:372 +#: db/models/fields/__init__.py:381 msgid "This value must be either True or False." msgstr "Dieser Wert muss wahr oder falsch sein." -#: db/models/fields/__init__.py:388 +#: db/models/fields/__init__.py:397 msgid "This field cannot be null." msgstr "Dieses Feld darf nicht leer sein." -#: db/models/fields/__init__.py:571 +#: db/models/fields/__init__.py:589 msgid "Enter a valid filename." msgstr "Bitte einen gltigen Dateinamen eingeben" @@ -2209,36 +2229,36 @@ msgstr[0] "" msgstr[1] "" "Bitte gltige IDs fr %(self)s eingeben. Die Werte %(value)r sind ungltig." -#: forms/__init__.py:381 +#: forms/__init__.py:387 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." -msgstr[0] "Bitte sicherstellen, das der Text weniger als %s Zeichen hat." -msgstr[1] "Bitte sicherstellen, das der Text weniger als %s Zeichen hat." +msgstr[0] "Bitte sicherstellen, dass der Text weniger als %s Zeichen hat." +msgstr[1] "Bitte sicherstellen, dass der Text weniger als %s Zeichen hat." -#: forms/__init__.py:386 +#: forms/__init__.py:392 msgid "Line breaks are not allowed here." msgstr "Zeilenumbrche sind hier nicht erlaubt." -#: forms/__init__.py:487 forms/__init__.py:560 forms/__init__.py:599 +#: forms/__init__.py:493 forms/__init__.py:566 forms/__init__.py:605 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "" "Bitte eine gltige Auswahl treffen; '%(data)s' ist nicht in %(choices)s." -#: forms/__init__.py:663 +#: forms/__init__.py:669 msgid "The submitted file is empty." msgstr "Die ausgewhlte Datei ist leer." -#: forms/__init__.py:719 +#: forms/__init__.py:725 msgid "Enter a whole number between -32,768 and 32,767." msgstr "Bitte eine ganze Zahl zwischen -32.768 und 32.767 eingeben." -#: forms/__init__.py:729 +#: forms/__init__.py:735 msgid "Enter a positive number." msgstr "Bitte eine ganze, positive Zahl eingeben." -#: forms/__init__.py:739 +#: forms/__init__.py:745 msgid "Enter a whole number between 0 and 32,767." msgstr "Bitte eine ganze Zahl zwischen 0 und 32.767 eingeben." diff --git a/django/conf/locale/el/LC_MESSAGES/django.mo b/django/conf/locale/el/LC_MESSAGES/django.mo index 1c95d6b5d96d31469d7322c5f7a8fe0cca3c8b25..4a7d8e41f0dc284ebbe17c274f756adb542238c8 100644 GIT binary patch literal 15668 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 diff --git a/django/conf/locale/el/LC_MESSAGES/django.po b/django/conf/locale/el/LC_MESSAGES/django.po index 173b300d04..06099eb9da 100644 --- a/django/conf/locale/el/LC_MESSAGES/django.po +++ b/django/conf/locale/el/LC_MESSAGES/django.po @@ -107,6 +107,11 @@ msgid "" "\n" "http://%(domain)s%(url)s" msgstr "" +"Σχόλιο από τον/την %(user)s την %(date)s\n" +"\n" +"%(comment)s\n" +"\n" +"http://%(domain)s%(url)s" #: contrib/comments/models.py:168 msgid "person's name" @@ -141,11 +146,11 @@ msgstr "ημερομηνία βαθμολογίας" #: contrib/comments/models.py:237 #, fuzzy msgid "karma score" -msgstr "βαθμολογία" +msgstr "karma" #: contrib/comments/models.py:238 msgid "karma scores" -msgstr "" +msgstr "karma" #: contrib/comments/models.py:242 #, python-format @@ -159,7 +164,7 @@ msgid "" "\n" "%(text)s" msgstr "" -"Αυτο το σχόλιο σημειώθει απο %(χρήστη)ες\n" +"Αυτο το σχόλιο σημειώθηκε απο %(χρήστη)ες\n" "\n" "%(κείμενο)α" @@ -245,7 +250,7 @@ msgstr "" #: contrib/comments/views/comments.py:193 #: contrib/comments/views/comments.py:284 msgid "One or more of the required fields wasn't submitted" -msgstr "Ένα ή περισσότερα από τα απαιτούμενα πεδία δεν υποβλίθει" +msgstr "Ένα ή περισσότερα από τα απαιτούμενα πεδία δεν υπεβλήθει" #: contrib/comments/views/comments.py:197 #: contrib/comments/views/comments.py:286 @@ -268,7 +273,7 @@ msgstr "" #: contrib/comments/templates/comments/form.html:8 #: contrib/admin/templates/admin/login.html:17 msgid "Username:" -msgstr "" +msgstr "Όνομα χρήστη:" #: contrib/comments/templates/comments/form.html:6 #: contrib/admin/templates/admin/login.html:20 @@ -298,21 +303,21 @@ msgstr "Ξεχάσατε τον κωδικό σας;" #: contrib/admin/templates/admin_doc/index.html:4 #: contrib/admin/templates/admin_doc/model_index.html:5 msgid "Log out" -msgstr "" +msgstr "Αποσύνδεση" #: contrib/comments/templates/comments/form.html:12 msgid "Ratings" -msgstr "" +msgstr "Βαθμολογίες" #: contrib/comments/templates/comments/form.html:12 #: contrib/comments/templates/comments/form.html:23 msgid "Required" -msgstr "" +msgstr "Απαραίτητο" #: contrib/comments/templates/comments/form.html:12 #: contrib/comments/templates/comments/form.html:23 msgid "Optional" -msgstr "" +msgstr "Προαιρετικό" #: contrib/comments/templates/comments/form.html:23 msgid "Post a photo" @@ -326,11 +331,11 @@ msgstr "Σχόλιο:" #: contrib/comments/templates/comments/form.html:32 #: contrib/comments/templates/comments/freeform.html:9 msgid "Preview comment" -msgstr "" +msgstr "Προεπισκόπηση σχολίου" #: contrib/comments/templates/comments/freeform.html:4 msgid "Your name:" -msgstr "" +msgstr "Το όνομα σας:" #: contrib/admin/filterspecs.py:40 #, python-format @@ -338,15 +343,17 @@ msgid "" "

By %s:

\n" "
    \n" msgstr "" +"

    Από %s:

    \n" +"
      \n" #: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88 #: contrib/admin/filterspecs.py:143 msgid "All" -msgstr "" +msgstr "Όλα" #: contrib/admin/filterspecs.py:109 msgid "Any date" -msgstr "" +msgstr "Όλες οι ημερομηνίες" #: contrib/admin/filterspecs.py:110 msgid "Today" @@ -354,7 +361,7 @@ msgstr "Σήμερα" #: contrib/admin/filterspecs.py:113 msgid "Past 7 days" -msgstr "" +msgstr "Τις προηγούμενες 7 ημέρες" #: contrib/admin/filterspecs.py:115 msgid "This month" @@ -374,7 +381,7 @@ msgstr "Όχι" #: contrib/admin/filterspecs.py:150 msgid "Unknown" -msgstr "’γνωστο" +msgstr "Άγνωστο" #: contrib/admin/models.py:16 msgid "action time" @@ -441,7 +448,7 @@ msgstr "" #: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." -msgstr "Τα ονόματα των Χρηστών δεν μπορόυν να περιέχουν τον χαρακτήρα '@'." +msgstr "Τα ονόματα των χρηστών δεν μπορόυν να περιέχουν τον χαρακτήρα '@'." #: contrib/admin/views/decorators.py:84 #, python-format @@ -452,16 +459,16 @@ msgstr "" #: contrib/admin/views/main.py:226 msgid "Site administration" -msgstr "Διαχείριση του Διαδυκτιακού χώρου" +msgstr "Διαχείριση του Διαδικτυακού χώρου" #: contrib/admin/views/main.py:260 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." -msgstr "" +msgstr "Το %(name)s \"%(obj)s\" αποθηκεύτηκε επιτυχώς." #: contrib/admin/views/main.py:264 contrib/admin/views/main.py:348 msgid "You may edit it again below." -msgstr "" +msgstr "Μπορείτε να το επεξεργαστείτε ξανα παρακάτω." #: contrib/admin/views/main.py:272 contrib/admin/views/main.py:357 #, python-format @@ -471,12 +478,12 @@ msgstr "Μπορείτε να προσθέσετε ακόμα ένα %s απο #: contrib/admin/views/main.py:290 #, python-format msgid "Add %s" -msgstr "" +msgstr "Προσθήκη %s" #: contrib/admin/views/main.py:336 #, python-format msgid "Added %s." -msgstr "" +msgstr "Προστέθηκε %s." #: contrib/admin/views/main.py:336 contrib/admin/views/main.py:338 #: contrib/admin/views/main.py:340 @@ -486,32 +493,33 @@ msgstr "και" #: contrib/admin/views/main.py:338 #, python-format msgid "Changed %s." -msgstr "" +msgstr "Επεξεργάσθηκε %s." #: contrib/admin/views/main.py:340 #, python-format msgid "Deleted %s." -msgstr "" +msgstr "Διεγράφη %s." #: contrib/admin/views/main.py:343 msgid "No fields changed." -msgstr "" +msgstr "Κανένα πεδίο δεν άλλαξε." #: contrib/admin/views/main.py:346 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." -msgstr "" +msgstr "Το %(name)s \"%(obj)s\" επεξεργάσθηκε επιτυχώς." #: contrib/admin/views/main.py:354 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" +"Το %(name)s \"%(obj)s\" αποθηκεύθηκε επιτυχώς. Μπορείτε να το επεξεργαστείτε πάλι παρακάτω." #: contrib/admin/views/main.py:392 #, python-format msgid "Change %s" -msgstr "" +msgstr "Αλλαγή %s" #: contrib/admin/views/main.py:470 #, python-format @@ -535,17 +543,17 @@ msgstr "Είστε σίγουρος;" #: contrib/admin/views/main.py:533 #, python-format msgid "Change history: %s" -msgstr "" +msgstr "Ιστορικό Αλλαγών: %s" #: contrib/admin/views/main.py:565 #, python-format msgid "Select %s" -msgstr "" +msgstr "Επιλογή %s" #: contrib/admin/views/main.py:565 #, python-format msgid "Select %s to change" -msgstr "" +msgstr "Επιλέξτε %s προς αλλαγή" #: contrib/admin/views/doc.py:277 contrib/admin/views/doc.py:286 #: contrib/admin/views/doc.py:288 contrib/admin/views/doc.py:294 @@ -555,7 +563,7 @@ msgstr "Ακέραιος" #: contrib/admin/views/doc.py:278 msgid "Boolean (Either True or False)" -msgstr "Boolean (Είτε Αλήθεια ή Ψέμα)" +msgstr "Boolean (Είτε Αληθές ή Ψέυδές)" #: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:296 #, python-format @@ -580,7 +588,7 @@ msgstr "Ηλεκτρονική διεύθυνση" #: contrib/admin/views/doc.py:284 contrib/admin/views/doc.py:287 msgid "File path" -msgstr "" +msgstr "Τοποθεσία Αρχείου" #: contrib/admin/views/doc.py:285 msgid "Decimal number" @@ -592,7 +600,7 @@ msgstr "" #: contrib/admin/views/doc.py:292 msgid "Relation to parent model" -msgstr "" +msgstr "Σχέση με το γονεϊκό μοντέλο" #: contrib/admin/views/doc.py:293 msgid "Phone number" @@ -627,7 +635,7 @@ msgstr "" #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" -msgstr "" +msgstr "Τεκμηρίωση" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:5 @@ -667,11 +675,11 @@ msgstr "Home" #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/change_form.html:20 msgid "History" -msgstr "" +msgstr "Ιστορικό" #: contrib/admin/templates/admin/object_history.html:18 msgid "Date/time" -msgstr "" +msgstr "Ημερομηνία/Ώρα" #: contrib/admin/templates/admin/object_history.html:19 msgid "User" @@ -679,7 +687,7 @@ msgstr "Χρήστης" #: contrib/admin/templates/admin/object_history.html:20 msgid "Action" -msgstr "" +msgstr "Δράση" #: contrib/admin/templates/admin/object_history.html:26 msgid "DATE_WITH_TIME_FULL" @@ -697,19 +705,19 @@ msgstr "Διαχειριστής ιστοσελίδας Django" #: contrib/admin/templates/admin/base_site.html:7 msgid "Django administration" -msgstr "" +msgstr "Διαχείριση Django" #: contrib/admin/templates/admin/500.html:4 msgid "Server error" -msgstr "" +msgstr "Σφάλμα Διακομιστή" #: contrib/admin/templates/admin/500.html:6 msgid "Server error (500)" -msgstr "" +msgstr "Σφάλμα Διακομιστή (500)" #: contrib/admin/templates/admin/500.html:9 msgid "Server Error (500)" -msgstr "" +msgstr "Σφάλμα Διακομιστή (500)" #: contrib/admin/templates/admin/500.html:10 msgid "" @@ -720,7 +728,7 @@ msgstr "" #: contrib/admin/templates/admin/404.html:4 #: contrib/admin/templates/admin/404.html:8 msgid "Page not found" -msgstr "" +msgstr "Η σελίδα δε βρέθηκε." #: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." @@ -729,24 +737,24 @@ msgstr "" #: contrib/admin/templates/admin/index.html:17 #, python-format msgid "Models available in the %(name)s application." -msgstr "" +msgstr "Διαθέσιμα μοντέλα στην εφαρμογή %(name)s." #: contrib/admin/templates/admin/index.html:28 #: contrib/admin/templates/admin/change_form.html:15 msgid "Add" -msgstr "" +msgstr "Προσθήκη" #: contrib/admin/templates/admin/index.html:34 msgid "Change" -msgstr "" +msgstr "Επεξεργασία" #: contrib/admin/templates/admin/index.html:44 msgid "You don't have permission to edit anything." -msgstr "" +msgstr "Δεν έχετε άδεια να επεξεργαστείτε τίποτα." #: contrib/admin/templates/admin/index.html:52 msgid "Recent Actions" -msgstr "" +msgstr "Πρόσφατες Πράξεις" #: contrib/admin/templates/admin/index.html:53 msgid "My Actions" @@ -754,16 +762,16 @@ msgstr "Οι πράξεις μου" #: contrib/admin/templates/admin/index.html:57 msgid "None available" -msgstr "" +msgstr "Κανένα διαθέσιμο" #: contrib/admin/templates/admin/change_list.html:11 #, python-format msgid "Add %(name)s" -msgstr "" +msgstr "Προσθήκη %(name)s" #: contrib/admin/templates/admin/login.html:22 msgid "Have you forgotten your password?" -msgstr "" +msgstr "Ξεχάσατε τον κωδικό σας; " #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," @@ -772,7 +780,7 @@ msgstr "Καλωσήρθατε," #: contrib/admin/templates/admin/delete_confirmation.html:9 #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" -msgstr "" +msgstr "Διαγραφή" #: contrib/admin/templates/admin/delete_confirmation.html:14 #, python-format @@ -800,37 +808,37 @@ msgstr "" #: contrib/admin/templates/admin/search_form.html:8 msgid "Go" -msgstr "" +msgstr "Πήγαινε" #: contrib/admin/templates/admin/change_form.html:21 msgid "View on site" -msgstr "" +msgstr "Προβολή στην ιστοσελίδα" #: contrib/admin/templates/admin/change_form.html:30 msgid "Please correct the error below." msgid_plural "Please correct the errors below." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Παρακαλώ διορθώστε το παρακάτω λάθος." +msgstr[1] "Παρακαλώ διορθώστε τα παρακάτω λάθη." #: contrib/admin/templates/admin/change_form.html:48 msgid "Ordering" -msgstr "" +msgstr "Σειρά" #: contrib/admin/templates/admin/change_form.html:51 msgid "Order:" -msgstr "" +msgstr "Σειρά:" #: contrib/admin/templates/admin/submit_line.html:4 msgid "Save as new" -msgstr "" +msgstr "Αποθήκευση καινούριου" #: contrib/admin/templates/admin/submit_line.html:5 msgid "Save and add another" -msgstr "" +msgstr "Αποθήκευση και προσθήκη καινούριου." #: contrib/admin/templates/admin/submit_line.html:6 msgid "Save and continue editing" -msgstr "" +msgstr "Αποθήκευση και συνέχεια επεξεργασίας" #: contrib/admin/templates/admin/submit_line.html:7 msgid "Save" @@ -841,12 +849,12 @@ msgstr "Αποθήκευση" #: contrib/admin/templates/registration/password_change_form.html:6 #: contrib/admin/templates/registration/password_change_form.html:10 msgid "Password change" -msgstr "" +msgstr "Αλλαγή Κωδικού" #: contrib/admin/templates/registration/password_change_done.html:6 #: contrib/admin/templates/registration/password_change_done.html:10 msgid "Password change successful" -msgstr "" +msgstr "Αλλαγή κωδικού επιτυχής" #: contrib/admin/templates/registration/password_change_done.html:12 msgid "Your password was changed." @@ -857,7 +865,7 @@ msgstr "Ο κωδίκός σας άλλαξε." #: contrib/admin/templates/registration/password_reset_form.html:10 #: contrib/admin/templates/registration/password_reset_done.html:4 msgid "Password reset" -msgstr "" +msgstr "Επαναφορά κωδικού" #: contrib/admin/templates/registration/password_reset_form.html:12 msgid "" @@ -867,11 +875,11 @@ msgstr "" #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "E-mail address:" -msgstr "" +msgstr "E-mail διεύθυνση:" #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "Reset my password" -msgstr "" +msgstr "Επαναφορά του κωδικού μου" #: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." @@ -880,7 +888,7 @@ msgstr "" #: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" -msgstr "" +msgstr "Εισαγωγή ξανά" #: contrib/admin/templates/registration/password_reset_done.html:6 #: contrib/admin/templates/registration/password_reset_done.html:10 @@ -909,11 +917,11 @@ msgstr "Νέος κωδικός:" #: contrib/admin/templates/registration/password_change_form.html:21 msgid "Confirm password:" -msgstr "" +msgstr "Επιβεβαίωση κωδικού" #: contrib/admin/templates/registration/password_change_form.html:23 msgid "Change my password" -msgstr "" +msgstr "Αλλαγή του κωδικού μου" #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" @@ -1003,19 +1011,19 @@ msgstr "" #: contrib/admin/templates/widget/date_time.html:3 msgid "Date:" -msgstr "" +msgstr "Ημ/νία:" #: contrib/admin/templates/widget/date_time.html:4 msgid "Time:" -msgstr "" +msgstr "     Ώρα:" #: contrib/admin/templates/widget/file.html:2 msgid "Currently:" -msgstr "" +msgstr "Τρέχον:" #: contrib/admin/templates/widget/file.html:3 msgid "Change:" -msgstr "" +msgstr "Αλλαγή:" #: contrib/redirects/models.py:7 msgid "redirect from" @@ -1271,192 +1279,192 @@ msgstr "P" #: utils/dates.py:6 msgid "Monday" -msgstr "" +msgstr "Δευτέρα" #: utils/dates.py:6 msgid "Tuesday" -msgstr "" +msgstr "Τρίτη" #: utils/dates.py:6 msgid "Wednesday" -msgstr "" +msgstr "Τετάρτη" #: utils/dates.py:6 msgid "Thursday" -msgstr "" +msgstr "Πέμπτη" #: utils/dates.py:6 msgid "Friday" -msgstr "" +msgstr "Παρασκευή" #: utils/dates.py:7 msgid "Saturday" -msgstr "" +msgstr "Σάββατο" #: utils/dates.py:7 msgid "Sunday" -msgstr "" +msgstr "Κυριακή" #: utils/dates.py:14 msgid "January" -msgstr "" +msgstr "Ιανουάριος" #: utils/dates.py:14 msgid "February" -msgstr "" +msgstr "Φεβρουάριος" #: utils/dates.py:14 utils/dates.py:27 msgid "March" -msgstr "" +msgstr "Μάρτιος" #: utils/dates.py:14 utils/dates.py:27 msgid "April" -msgstr "" +msgstr "Απρίλιος" #: utils/dates.py:14 utils/dates.py:27 msgid "May" -msgstr "" +msgstr "Μάιος" #: utils/dates.py:14 utils/dates.py:27 msgid "June" -msgstr "" +msgstr "Ιούνιος" #: utils/dates.py:15 utils/dates.py:27 msgid "July" -msgstr "" +msgstr "Ιούλιος" #: utils/dates.py:15 msgid "August" -msgstr "" +msgstr "Αύγουστος" #: utils/dates.py:15 msgid "September" -msgstr "" +msgstr "Σεπτέμβριος" #: utils/dates.py:15 msgid "October" -msgstr "" +msgstr "Οκτώβριος" #: utils/dates.py:15 msgid "November" -msgstr "" +msgstr "Νοέμβριος" #: utils/dates.py:16 msgid "December" -msgstr "" +msgstr "Δεκέμβριος" #: utils/dates.py:19 #, fuzzy msgid "jan" -msgstr "και" +msgstr "Ιαν" #: utils/dates.py:19 msgid "feb" -msgstr "" +msgstr "Φεβ" #: utils/dates.py:19 msgid "mar" -msgstr "" +msgstr "Μάρ" #: utils/dates.py:19 msgid "apr" -msgstr "" +msgstr "Απρ" #: utils/dates.py:19 msgid "may" -msgstr "" +msgstr "Μάι" #: utils/dates.py:19 msgid "jun" -msgstr "" +msgstr "Ιούν" #: utils/dates.py:20 msgid "jul" -msgstr "" +msgstr "Ιούλ" #: utils/dates.py:20 msgid "aug" -msgstr "" +msgstr "Αύγ" #: utils/dates.py:20 msgid "sep" -msgstr "" +msgstr "Σεπ" #: utils/dates.py:20 msgid "oct" -msgstr "" +msgstr "Οκτ" #: utils/dates.py:20 msgid "nov" -msgstr "" +msgstr "Νοέ" #: utils/dates.py:20 msgid "dec" -msgstr "" +msgstr "Δεκ" #: utils/dates.py:27 msgid "Jan." -msgstr "" +msgstr "Ιάν." #: utils/dates.py:27 msgid "Feb." -msgstr "" +msgstr "Φεβ." #: utils/dates.py:28 msgid "Aug." -msgstr "" +msgstr "Αύγ." #: utils/dates.py:28 msgid "Sept." -msgstr "" +msgstr "Σεπτ." #: utils/dates.py:28 msgid "Oct." -msgstr "" +msgstr "Οκτ." #: utils/dates.py:28 msgid "Nov." -msgstr "" +msgstr "Νοέ." #: utils/dates.py:28 msgid "Dec." -msgstr "" +msgstr "Δεκ." #: utils/timesince.py:12 msgid "year" msgid_plural "years" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "χρόνος" +msgstr[1] "χρόνια" #: utils/timesince.py:13 msgid "month" msgid_plural "months" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "μήνας" +msgstr[1] "μήνες" #: utils/timesince.py:14 msgid "week" msgid_plural "weeks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "εβδομάδα" +msgstr[1] "εβδομάδες" #: utils/timesince.py:15 msgid "day" msgid_plural "days" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ημέρα" +msgstr[1] "ημέρες" #: utils/timesince.py:16 msgid "hour" msgid_plural "hours" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ώρα" +msgstr[1] "ώρες" #: utils/timesince.py:17 msgid "minute" msgid_plural "minutes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "λεπτό" +msgstr[1] "λεπτά" #: conf/global_settings.py:37 msgid "Bengali" @@ -1630,7 +1638,7 @@ msgstr "" #: core/validators.py:136 msgid "Enter a valid e-mail address." -msgstr "" +msgstr "Εισάγετε ένα σωστό e-mail." #: core/validators.py:148 msgid "" @@ -1745,12 +1753,12 @@ msgstr[1] "" #: core/validators.py:362 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." -msgstr "Σιγουρευτείτε ότι το αρχείου που ανεβάζετε είναι %s bytes τουλάχιστον." +msgstr "Σιγουρευτείτε ότι το αρχείο που ανεβάζετε είναι %s bytes τουλάχιστον." #: core/validators.py:363 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." -msgstr "" +msgstr "Σιγουρευτείτε ότι το αρχείο που ανεβάζετε έχει μέγεθος μέχρι %s bytes." #: core/validators.py:376 msgid "The format for this field is wrong." @@ -1827,7 +1835,7 @@ msgstr "" #: db/models/fields/__init__.py:542 db/models/fields/__init__.py:553 #: forms/__init__.py:346 msgid "This field is required." -msgstr "" +msgstr "Αυτό το πεδίο είναι απαραίτητο" #: db/models/fields/__init__.py:337 msgid "This value must be an integer." @@ -1836,12 +1844,12 @@ msgstr "" #: db/models/fields/__init__.py:369 #, fuzzy msgid "This value must be either True or False." -msgstr "Boolean (Είτε Αλήθεια ή Ψέμα)" +msgstr "Boolean (Είτε Αληθές ή Ψευδές)" #: db/models/fields/__init__.py:385 #, fuzzy msgid "This field cannot be null." -msgstr "Αυτό το πεδίο είναι άκυρο" +msgstr "Αυτό το πεδίο δεν μπορεί να είναι κενό (null)" #: db/models/fields/__init__.py:562 msgid "Enter a valid filename." @@ -1850,7 +1858,7 @@ msgstr "Εισάγετε ένα έγκυρο όνομα αρχείου" #: db/models/fields/related.py:43 #, python-format msgid "Please enter a valid %s." -msgstr "" +msgstr "Παρακαλώ εισάγετε ένα/μία έγκυρο/η %s" #: db/models/fields/related.py:579 #, fuzzy diff --git a/django/conf/locale/el/LC_MESSAGES/djangojs.mo b/django/conf/locale/el/LC_MESSAGES/djangojs.mo new file mode 100644 index 0000000000000000000000000000000000000000..7d43b315fe3e5985cdbcc02df9692d09ca67bce3 GIT binary patch literal 1810 zcmZ9K&u<$=6vqcBl$zh+mnu!32a!oHnJ7qu8`65{JopVlP?mTC=+W zOB_OyHUfo8ky4>Xtq7zl2S|exq7Ww`XCyRx;=qMJ011iSI3UFLt=CP<*t4H`Z{DwY zGrxBoxXdt~!F&$$7tAA=AK!xy#$VtA;4Sbz@Ne*8@E`C&@X)>O{Vwnk$cMoM_yTwc z?2g$B-Vb>Id>1?elK0q|Rp;(rfPz8^q}w+(XeXRrtS1Ee_5!6C@S!ZD@I z`l_z$NiMi=)#Po-jy62$L@u@ziVM=&t~t(53nvh&!3X51iWYgH%qq{;m1Xn1Xz;GRHY91~^`W=iLaUKzbyelVzv9Dpdm& zsRooqJ4N9K3JX?p+uxe26tbU}o-d<~VdZ{+oW@|;I4hNBxlV=;XZzmCp3L#Hxsl>v zVJI;o>#p*RyjQWx#@j)~GfHlTCx#0pqfbfU!^!9uzRd9MRO*D0?lw}d@pL+KB7HoS zPNiUIjK~R#g2#5}bJ-CiUoiT!{8S;6A3XkEVJMe4BRtPn(P*JO>Aw;9V@A)u9hEUAm63Byw`@6;4DT7W`~==!IGNNtNv4;=PxM|mt$)-v zbxUtDy`Z;r6XFV#TY5+D(F4<8V6{P}dOMuc>)6?2`l4=y7f9Lh+SV)jr*KAZ@bD7! zO{Oo0ld#=}-@3lZ^&H$k)w}!pjc}H7>0Nj=qfCoY_9oo7P{B?(7fx}cjQzffE7)TC z3JiBq`vv_S8DllY^$oqD*Qlhs)mO;|DPpVna1u7Fs4G@rzq7mo-_H>^-f4@s4d=19 zPSL|@go{!xqcM{ZR?s3!9Xo!B=FEhb?o?ev@&B`0K)tQIl}ukn#A#Hti!`&;n2u@_ zDOM;2)7Lv4o)0gg5v$OW6E1L(>jkc_NBb(L`8a72+nA*qMo23vr1K67?by=nk8xsYU)2Xc@`Y@N2>eZ)O=! WuKlWTKr|NS=pEDF;6-eNQ|v!q(zE~o literal 0 HcmV?d00001 diff --git a/django/conf/locale/el/LC_MESSAGES/djangojs.po b/django/conf/locale/el/LC_MESSAGES/djangojs.po new file mode 100644 index 0000000000..545f9f8601 --- /dev/null +++ b/django/conf/locale/el/LC_MESSAGES/djangojs.po @@ -0,0 +1,109 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2006 and beyond. +# This file is distributed under the same license as the Django package. +# Orestis Markou , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-12-09 11:51+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Orestis Markou \n" +"Language-Team: Greek\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: contrib/admin/media/js/SelectFilter2.js:33 +#, perl-format +msgid "Available %s" +msgstr "Διαθέσιμο %s" + +#: contrib/admin/media/js/SelectFilter2.js:41 +msgid "Choose all" +msgstr "Επιλογή Όλων" + +#: contrib/admin/media/js/SelectFilter2.js:46 +msgid "Add" +msgstr "Προσθήκη" + +#: contrib/admin/media/js/SelectFilter2.js:48 +msgid "Remove" +msgstr "Αφαίρεση" + +#: contrib/admin/media/js/SelectFilter2.js:53 +#, perl-format +msgid "Chosen %s" +msgstr "Επιλεχθέντα %s" + +#: contrib/admin/media/js/SelectFilter2.js:54 +msgid "Select your choice(s) and click " +msgstr "Επιλέξτε και κάντε κλικ." + +#: contrib/admin/media/js/SelectFilter2.js:59 +msgid "Clear all" +msgstr "Καθαρισμός όλων" + +#: 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 "Ιανουάριος Φεβρουάριος Μάρτιος Απρίλιος Μάιος Ιούνιος Ιούλιος Αύγουστος Σεπτέμβριος Οκτώβριος Νοέμβριος " +"Δεκέμβριος" + +#: contrib/admin/media/js/dateparse.js:27 +msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday" +msgstr "Κυριακή Δευτέρα Τρίτη Τετάρτη Πέμπτη Παρασκευή Σάββατο" + +#: contrib/admin/media/js/calendar.js:25 +msgid "S M T W T F S" +msgstr "Κ Δ Τ Τ Π Π Σ" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:45 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80 +msgid "Now" +msgstr "Τώρα" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:48 +msgid "Clock" +msgstr "Ρολόι" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:77 +msgid "Choose a time" +msgstr "Διαλέξτε ώρα" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81 +msgid "Midnight" +msgstr "Μεσάνυχτα" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82 +msgid "6 a.m." +msgstr "6 π.μ." + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83 +msgid "Noon" +msgstr "Μεσημέρι" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:168 +msgid "Cancel" +msgstr "Άκυρο" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:111 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:162 +msgid "Today" +msgstr "Σήμερα" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:114 +msgid "Calendar" +msgstr "Ημερολόγιο" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:160 +msgid "Yesterday" +msgstr "Χθες" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:164 +msgid "Tomorrow" +msgstr "Αύριο" diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.mo b/django/conf/locale/es_AR/LC_MESSAGES/django.mo index dd96bf99ce46511f5c5a467c9ce959df052271c3..a247bb23858e243def5ce0c0b5f50e08980e4ebe 100644 GIT binary patch delta 10711 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 delta 9813 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\n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -165,10 +165,18 @@ msgstr "Fechas importantes" msgid "Groups" msgstr "Grupos" -#: contrib/auth/models.py:256 +#: contrib/auth/models.py:258 msgid "message" msgstr "mensaje" +#: contrib/auth/forms.py:16 +msgid "The two password fields didn't match." +msgstr "Los dos campos de contraseas no coinciden entre si." + +#: contrib/auth/forms.py:24 +msgid "A user with that username already exists." +msgstr "Ya existe un usuario con ese nombre." + #: contrib/auth/forms.py:52 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " @@ -189,6 +197,24 @@ msgstr "" msgid "This account is inactive." msgstr "Esta cuenta est inactiva" +#: contrib/auth/forms.py:84 +msgid "" +"That e-mail address doesn't have an associated user account. Are you sure " +"you've registered?" +msgstr "" +"Esa direccin de e-mail no est asociada a ninguna cuenta de usuario. Est " +"seguro de que ya se ha registrado?" + +#: contrib/auth/forms.py:116 +msgid "The two 'new password' fields didn't match." +msgstr "Los dos campos 'nueva contrasea' no coinciden entre si." + +#: contrib/auth/forms.py:123 +msgid "Your old password was entered incorrectly. Please enter it again." +msgstr "" +"La antigua contrasea ingresada es incorrecta. Por favor ingrsela " +"nuevamente." + #: contrib/redirects/models.py:7 msgid "redirect from" msgstr "redirigir desde" @@ -754,13 +780,13 @@ msgstr "" msgid "Site administration" msgstr "Sitio administrativo" -#: contrib/admin/views/main.py:257 contrib/admin/views/auth.py:14 +#: contrib/admin/views/main.py:257 contrib/admin/views/auth.py:18 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." -msgstr "Se agreg con xito el %(name)s \"%(obj)s\"." +msgstr "Se agreg con xito %(name)s \"%(obj)s\"." #: contrib/admin/views/main.py:261 contrib/admin/views/main.py:347 -#: contrib/admin/views/auth.py:19 +#: contrib/admin/views/auth.py:23 msgid "You may edit it again below." msgstr "Puede modificarlo nuevamente abajo." @@ -780,7 +806,7 @@ msgid "Added %s." msgstr "Agregado %s." #: contrib/admin/views/main.py:335 contrib/admin/views/main.py:337 -#: contrib/admin/views/main.py:339 +#: contrib/admin/views/main.py:339 db/models/manipulators.py:306 msgid "and" msgstr "y" @@ -801,15 +827,14 @@ msgstr "No ha modificado ning #: contrib/admin/views/main.py:345 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." -msgstr "Se modific con xito el %(name)s \"%(obj)s." +msgstr "Se modific con xito %(name)s \"%(obj)s." #: contrib/admin/views/main.py:353 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -"Se agreg con xito el %(name)s \"%(obj)s. Puede modificarlo nuevamente " -"abajo." +"Se agreg con xito %(name)s \"%(obj)s. Puede modificarlo nuevamente abajo." #: contrib/admin/views/main.py:391 #, python-format @@ -829,7 +854,7 @@ msgstr "Uno o m #: contrib/admin/views/main.py:511 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Se elimin con xito el %(name)s \"%(obj)s\"." +msgstr "Se elimin con xito %(name)s \"%(obj)s\"." #: contrib/admin/views/main.py:514 msgid "Are you sure?" @@ -850,7 +875,7 @@ msgstr "Seleccione %s" msgid "Select %s to change" msgstr "Seleccione %s a modificar" -#: contrib/admin/views/main.py:756 +#: contrib/admin/views/main.py:758 msgid "Database error" msgstr "Error de base de datos" @@ -977,12 +1002,12 @@ msgstr "Estado de los EEUU (dos letras may msgid "XML text" msgstr "Texto XML" -#: contrib/admin/views/doc.py:339 +#: contrib/admin/views/doc.py:343 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s no parece ser un objeto urlpattern" -#: contrib/admin/views/auth.py:25 +#: contrib/admin/views/auth.py:29 msgid "Add user" msgstr "Agregar usuario" @@ -1181,10 +1206,6 @@ msgstr "P msgid "We're sorry, but the requested page could not be found." msgstr "Lo sentimos, pero no se encuentra la pgina solicitada." -#: contrib/admin/templates/admin/login.html:22 -msgid "Have you forgotten your password?" -msgstr "Ha olvidado su contrasea?" - #: contrib/admin/templates/admin/filters.html:4 msgid "Filter" msgstr "Filtrar" @@ -1726,123 +1747,134 @@ msgid "Argentinean Spanish" msgstr "Espaol Argentino" #: conf/global_settings.py:49 +msgid "Finnish" +msgstr "Finlands" + +#: conf/global_settings.py:50 msgid "French" msgstr "Francs" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Galician" msgstr "Gallego" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Hungarian" msgstr "Hngaro" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Hebrew" msgstr "Hebreo" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Icelandic" msgstr "Islands" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Italian" msgstr "Italiano" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Japanese" msgstr "Japons" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Dutch" msgstr "Holands" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Norwegian" msgstr "Noruego" -#: conf/global_settings.py:58 +#: conf/global_settings.py:59 +msgid "Polish" +msgstr "Polaco" + +#: conf/global_settings.py:60 msgid "Brazilian" msgstr "Brasileo" -#: conf/global_settings.py:59 +#: conf/global_settings.py:61 msgid "Romanian" msgstr "Rumano" -#: conf/global_settings.py:60 +#: conf/global_settings.py:62 msgid "Russian" msgstr "Ruso" -#: conf/global_settings.py:61 +#: conf/global_settings.py:63 msgid "Slovak" msgstr "Eslovaco" -#: conf/global_settings.py:62 +#: conf/global_settings.py:64 msgid "Slovenian" msgstr "Esloveno" -#: conf/global_settings.py:63 +#: conf/global_settings.py:65 msgid "Serbian" msgstr "Serbio" -#: conf/global_settings.py:64 +#: conf/global_settings.py:66 msgid "Swedish" msgstr "Sueco" -#: conf/global_settings.py:65 +#: conf/global_settings.py:67 msgid "Tamil" msgstr "Tamil" -#: conf/global_settings.py:66 +#: conf/global_settings.py:68 +msgid "Turkish" +msgstr "Turco" + +#: conf/global_settings.py:69 msgid "Ukrainian" msgstr "Ucraniano" -#: conf/global_settings.py:67 +#: conf/global_settings.py:70 msgid "Simplified Chinese" msgstr "Chino simplificado" -#: conf/global_settings.py:68 +#: conf/global_settings.py:71 msgid "Traditional Chinese" msgstr "Chino tradicional" -#: db/models/manipulators.py:302 +#: db/models/manipulators.py:305 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." -msgstr "" -"Ya existen %(object)s con este %(type)s para el %(field)s especificado." +msgstr "Ya existe un(a) %(object)s con este/a %(type)s para %(field)s." -#: db/models/fields/__init__.py:40 +#: db/models/fields/__init__.py:41 #, python-format msgid "%(optname)s with this %(fieldname)s already exists." msgstr "Ya existe %(optname)s con este %(fieldname)s." -#: db/models/fields/__init__.py:114 db/models/fields/__init__.py:265 -#: db/models/fields/__init__.py:551 db/models/fields/__init__.py:562 -#: forms/__init__.py:346 +#: db/models/fields/__init__.py:115 db/models/fields/__init__.py:266 +#: db/models/fields/__init__.py:569 db/models/fields/__init__.py:580 +#: forms/__init__.py:347 msgid "This field is required." msgstr "Este campo es obligatorio." -#: db/models/fields/__init__.py:340 +#: db/models/fields/__init__.py:349 msgid "This value must be an integer." msgstr "Este valor debe ser un nmero entero." -#: db/models/fields/__init__.py:372 +#: db/models/fields/__init__.py:381 msgid "This value must be either True or False." msgstr "Este valor debe ser True o False." -#: db/models/fields/__init__.py:388 +#: db/models/fields/__init__.py:397 msgid "This field cannot be null." msgstr "Este campo no puede ser nulo." -#: db/models/fields/__init__.py:415 core/validators.py:127 +#: db/models/fields/__init__.py:424 core/validators.py:146 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Introduzca una fecha vlida en formato AAAA-MM-DD." -#: db/models/fields/__init__.py:477 core/validators.py:135 +#: db/models/fields/__init__.py:488 core/validators.py:155 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "Introduzca una fecha/hora vlida en formato YYYY-MM-DD HH:MM." -#: db/models/fields/__init__.py:571 +#: db/models/fields/__init__.py:589 msgid "Enter a valid filename." msgstr "Introduzca un nombre de achivo vlido" @@ -1859,7 +1891,8 @@ msgstr " Separe m msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" -"Pulse \"Control\", o \"Command\" en un Mac, para seleccionar ms de uno." +"Mantenga presionada \"Control\" (\"Command\" en un Mac) para seleccionar ms " +"de uno." #: db/models/fields/related.py:664 #, python-format @@ -1873,42 +1906,42 @@ msgstr[1] "" "Por favor, introduzca IDs de %(self)s vlidos. Los valores %(value)r no son " "vlidos." -#: forms/__init__.py:381 +#: forms/__init__.py:382 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "Asegrese de que su texto tiene menos de %s carcter." msgstr[1] "Asegrese de que su texto tiene menos de %s caracteres." -#: forms/__init__.py:386 +#: forms/__init__.py:387 msgid "Line breaks are not allowed here." msgstr "No se permiten saltos de lnea." -#: forms/__init__.py:487 forms/__init__.py:560 forms/__init__.py:599 +#: forms/__init__.py:488 forms/__init__.py:561 forms/__init__.py:600 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "Seleccione una opcin vlida; '%(data)s' no est en %(choices)s." -#: forms/__init__.py:661 core/validators.py:151 core/validators.py:379 +#: forms/__init__.py:662 core/validators.py:172 core/validators.py:401 msgid "No file was submitted. Check the encoding type on the form." msgstr "" "No se envi un archivo. Verifique el tipo de codificacin en el formulario." -#: forms/__init__.py:663 +#: forms/__init__.py:664 msgid "The submitted file is empty." msgstr "El archivo enviado est vaco." -#: forms/__init__.py:719 +#: forms/__init__.py:720 msgid "Enter a whole number between -32,768 and 32,767." -msgstr "Introduzca un nmero entero entre -32,768 y 32,767." +msgstr "Introduzca un nmero entero entre -32.768 y 32.767." -#: forms/__init__.py:729 +#: forms/__init__.py:730 msgid "Enter a positive number." msgstr "Introduzca un nmero positivo." -#: forms/__init__.py:739 +#: forms/__init__.py:740 msgid "Enter a whole number between 0 and 32,767." -msgstr "Introduzca un nmero entero entre 0 y 32,767." +msgstr "Introduzca un nmero entero entre 0 y 32.767." #: core/validators.py:63 msgid "This value must contain only letters, numbers and underscores." @@ -1919,8 +1952,13 @@ msgid "" "This value must contain only letters, numbers, underscores, dashes or " "slashes." msgstr "" -"Este valor debe contener slo letras, nmeros, guiones bajos, barras (/) o " -"slashes." +"Este valor debe contener slo letras, nmeros, guiones bajos, guiones o " +"barras (/)" + +#: core/validators.py:71 +msgid "This value must contain only letters, numbers, underscores or hyphens." +msgstr "" +"Este valor debe contener slo letras, nmeros, guiones bajos o guiones." #: core/validators.py:75 msgid "Uppercase letters are not allowed here." @@ -1962,15 +2000,24 @@ msgstr "Introduzca un n msgid "Only alphabetical characters are allowed here." msgstr "Slo se admiten caracteres alfabticos." -#: core/validators.py:131 +#: core/validators.py:138 +msgid "Year must be 1900 or later." +msgstr "El ao debe ser 1900 o posterior." + +#: core/validators.py:142 +#, python-format +msgid "Invalid date: %s." +msgstr "Fecha no vlida: %s." + +#: core/validators.py:151 msgid "Enter a valid time in HH:MM format." msgstr "Introduzca una hora vlida en formato HH:MM." -#: core/validators.py:139 +#: core/validators.py:160 msgid "Enter a valid e-mail address." msgstr "Introduzca una direccin de correo electrnico vlida" -#: core/validators.py:155 +#: core/validators.py:176 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -1978,28 +2025,28 @@ msgstr "" "Enve una imagen vlida. El archivo que ha enviado no era una imagen o se " "trataba de una imagen corrupta." -#: core/validators.py:162 +#: core/validators.py:183 #, python-format msgid "The URL %s does not point to a valid image." msgstr "La URL %s no apunta a una imagen vlida." -#: core/validators.py:166 +#: core/validators.py:187 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" -"Los nmeros de telfono deben guardar el formato XXX-XXX-XXXX format. \"%s\" " -"no es vlido." +"Los nmeros telefnicos deben respetar el formato XXX-XXX-XXXX. \"%s\" no es " +"vlido." -#: core/validators.py:174 +#: core/validators.py:195 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "La URL %s no apunta a un vdeo QuickTime vlido." -#: core/validators.py:178 +#: core/validators.py:199 msgid "A valid URL is required." msgstr "Se precisa una URL vlida." -#: core/validators.py:192 +#: core/validators.py:213 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -2008,69 +2055,69 @@ msgstr "" "Se precisa HTML vlido. Los errores especficos son:\n" "%s" -#: core/validators.py:199 +#: core/validators.py:220 #, python-format msgid "Badly formed XML: %s" msgstr "XML mal formado: %s" -#: core/validators.py:209 +#: core/validators.py:230 #, python-format msgid "Invalid URL: %s" msgstr "URL no vlida: %s" -#: core/validators.py:213 core/validators.py:215 +#: core/validators.py:234 core/validators.py:236 #, python-format msgid "The URL %s is a broken link." msgstr "La URL %s es un enlace roto." -#: core/validators.py:221 +#: core/validators.py:242 msgid "Enter a valid U.S. state abbreviation." msgstr "Introduzca una abreviatura vlida de estado de los EEUU." -#: core/validators.py:236 +#: core/validators.py:256 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "Vigila tu boca! Aqu no admitimos la palabra %s." msgstr[1] "Vigila tu boca! Aqu no admitimos las palabras %s." -#: core/validators.py:243 +#: core/validators.py:263 #, python-format msgid "This field must match the '%s' field." msgstr "Este campo debe concordar con el campo '%s'." -#: core/validators.py:262 +#: core/validators.py:282 msgid "Please enter something for at least one field." msgstr "Por favor, introduzca algo en al menos un campo." -#: core/validators.py:271 core/validators.py:282 +#: core/validators.py:291 core/validators.py:302 msgid "Please enter both fields or leave them both empty." msgstr "Por favor, rellene ambos campos o deje ambos vacos." -#: core/validators.py:289 +#: core/validators.py:309 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "Se debe proporcionar este campo si %(field)s es %(value)s" -#: core/validators.py:301 +#: core/validators.py:321 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "Se debe proporcionar este campo si %(field)s no es %(value)s" -#: core/validators.py:320 +#: core/validators.py:340 msgid "Duplicate values are not allowed." msgstr "No se admiten valores duplicados." -#: core/validators.py:343 +#: core/validators.py:363 #, python-format msgid "This value must be a power of %s." msgstr "Este valor debe ser una potencia de %s." -#: core/validators.py:354 +#: core/validators.py:374 msgid "Please enter a valid decimal number." msgstr "Por favor, introduzca un nmero decimal vlido." -#: core/validators.py:356 +#: core/validators.py:378 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -2082,7 +2129,7 @@ msgstr[1] "" "Por favor, introduzca un nmero decimal vlido con un maximo de %s dgitos " "en total." -#: core/validators.py:359 +#: core/validators.py:381 #, python-format msgid "" "Please enter a valid decimal number with a whole part of at most %s digit." @@ -2095,7 +2142,7 @@ msgstr[1] "" "Por favor, introduzca un nmero decimal vlido con un mximo de %s dgitos " "enteros." -#: core/validators.py:362 +#: core/validators.py:384 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -2107,30 +2154,30 @@ msgstr[1] "" "Por favor, introduzca un nmero decimal vlido con un mximo de %s " "posiciones decimales." -#: core/validators.py:372 +#: core/validators.py:394 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "Asegrese de que el archivo que enva tiene al menos %s bytes." -#: core/validators.py:373 +#: core/validators.py:395 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "Asegrese de que el archivo que enva tiene como mximo %s bytes." -#: core/validators.py:390 +#: core/validators.py:412 msgid "The format for this field is wrong." msgstr "El formato de este campo es incorrecto." -#: core/validators.py:405 +#: core/validators.py:427 msgid "This field is invalid." msgstr "Este campo no es vlido." -#: core/validators.py:441 +#: core/validators.py:463 #, python-format msgid "Could not retrieve anything from %s." msgstr "No pude obtener nada de %s." -#: core/validators.py:444 +#: core/validators.py:466 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." @@ -2138,7 +2185,7 @@ msgstr "" "La URL %(url)s devolvi la cabecera Content-Type '%(contenttype)s', que no " "es vlida." -#: core/validators.py:477 +#: core/validators.py:499 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " @@ -2147,7 +2194,7 @@ msgstr "" "Por favor, cierre la etiqueta %(tag)s de la lnea %(line)s. (La lnea " "empieza por \"%(start)s\".)" -#: core/validators.py:481 +#: core/validators.py:503 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " @@ -2156,7 +2203,7 @@ msgstr "" "Parte del texto que comienza en la lnea %(line)s no est permitido en ese " "contexto. (La lnea empieza por \"%(start)s\".)" -#: core/validators.py:486 +#: core/validators.py:508 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" @@ -2165,7 +2212,7 @@ msgstr "" "El \"%(attr)s\" de la lnea %(line)s no es un atributo vlido. (La lnea " "empieza por \"%(start)s\".)" -#: core/validators.py:491 +#: core/validators.py:513 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" @@ -2174,7 +2221,7 @@ msgstr "" "La \"<%(tag)s>\" de la lnea %(line)s no es una etiqueta vlida. (La lnea " "empieza por \"%(start)s\".)" -#: core/validators.py:495 +#: core/validators.py:517 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " @@ -2183,7 +2230,7 @@ msgstr "" "A una etiqueta de la lnea %(line)s le faltan uno o ms atributos " "requeridos. (La lnea empieza por \"%(start)s\".)" -#: core/validators.py:500 +#: core/validators.py:522 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " @@ -2199,17 +2246,20 @@ msgstr "si,no,tal vez" #: views/generic/create_update.py:43 #, python-format msgid "The %(verbose_name)s was created successfully." -msgstr "Se cre con xito el %(verbose_name)." +msgstr "Se cre con xito %(verbose_name)." #: views/generic/create_update.py:117 #, python-format msgid "The %(verbose_name)s was updated successfully." -msgstr "Se actualiz con xito el %(verbose_name)s." +msgstr "Se actualiz con xito %(verbose_name)s." #: views/generic/create_update.py:184 #, python-format msgid "The %(verbose_name)s was deleted." -msgstr "Se elimin el %(verbose_name)s." +msgstr "Se elimin %(verbose_name)s." + +#~ msgid "Have you forgotten your password?" +#~ msgstr "Ha olvidado su contrasea?" #~ msgid "%(content_type_name)s" #~ msgstr "tipos de contenido" diff --git a/django/conf/locale/es_AR/LC_MESSAGES/djangojs.mo b/django/conf/locale/es_AR/LC_MESSAGES/djangojs.mo index f24c9a12d0149e5c95d6f13e2fb1e178d2bbfb80..3f89e3e33f3c15436125e413b284b2b7026ce415 100644 GIT binary patch delta 161 zcmbQovw~-X4P$IL0|SE+D+2=;kgfvK96-7iNCOc=ACx}@Nb>^ubAhxzkX{X>*@5(J zAZ-Gq9|LJ-AT7bhzyL%HGC+a_NGori$>`3+WvOdqs$ghpWnj7a6>|>b^u^MJGpkX{3%*@5&$ zAZ-GqZvts%AkD|dzyL%HLO_BANK0;>$>`3+Wu|LrsbFYiWoWwj6>|pkxY#ERM diff --git a/django/conf/locale/es_AR/LC_MESSAGES/djangojs.po b/django/conf/locale/es_AR/LC_MESSAGES/djangojs.po index 49d3856d3c..1865de9450 100644 --- a/django/conf/locale/es_AR/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/es_AR/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Django JavaScript 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-19 12:15-0300\n" +"POT-Creation-Date: 2006-09-25 15:09-0300\n" "PO-Revision-Date: 2006-05-16 10:20-0300\n" "Last-Translator: Ramiro Morales \n" "MIME-Version: 1.0\n" @@ -39,7 +39,7 @@ msgstr "%s elegidos" #: contrib/admin/media/js/SelectFilter2.js:54 msgid "Select your choice(s) and click " -msgstr "Haga sus elecciones y haga click en " +msgstr "Seleccione los items a agregar y haga click en " #: contrib/admin/media/js/SelectFilter2.js:59 msgid "Clear all" @@ -51,7 +51,7 @@ msgid "" "January February March April May June July August September October November " "December" msgstr "" -"Enero Febrero Marzo Abril Mayo Junio Julio Agosto Septiembre Octubre " +"Enero Febrero Marzo Abril Mayo Junio Julio Agosto Setiembre Octubre " "Noviembre Diciembre" #: contrib/admin/media/js/dateparse.js:33 @@ -71,49 +71,49 @@ msgstr "Mostrar" msgid "Hide" msgstr "Ocultar" -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:45 -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81 msgid "Now" msgstr "Ahora" -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:48 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51 msgid "Clock" msgstr "Reloj" -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:86 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78 msgid "Choose a time" msgstr "Elija una hora" -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82 msgid "Midnight" msgstr "Medianoche" -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83 msgid "6 a.m." msgstr "6 a.m." -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:92 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84 msgid "Noon" msgstr "Medioda" -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:96 -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:187 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183 msgid "Cancel" msgstr "Cancelar" -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:120 -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:181 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177 msgid "Today" msgstr "Hoy" -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:123 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132 msgid "Calendar" msgstr "Calendario" -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175 msgid "Yesterday" msgstr "Ayer" -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179 msgid "Tomorrow" msgstr "Maana" diff --git a/django/conf/project_template/urls.py b/django/conf/project_template/urls.py index 4483014173..402dd6536b 100644 --- a/django/conf/project_template/urls.py +++ b/django/conf/project_template/urls.py @@ -2,7 +2,7 @@ from django.conf.urls.defaults import * urlpatterns = patterns('', # Example: - # (r'^{{ project_name }}/', include('{{ project_name }}.apps.foo.urls.foo')), + # (r'^{{ project_name }}/', include('{{ project_name }}.foo.urls')), # Uncomment this for admin: # (r'^admin/', include('django.contrib.admin.urls')), diff --git a/django/contrib/admin/media/js/admin/DateTimeShortcuts.js b/django/contrib/admin/media/js/admin/DateTimeShortcuts.js index 77c536b865..b1504fc819 100644 --- a/django/contrib/admin/media/js/admin/DateTimeShortcuts.js +++ b/django/contrib/admin/media/js/admin/DateTimeShortcuts.js @@ -44,7 +44,7 @@ var DateTimeShortcuts = { var shortcuts_span = document.createElement('span'); inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling); var now_link = document.createElement('a'); - now_link.setAttribute('href', "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().getHourMinute());"); + now_link.setAttribute('href', "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().getHourMinuteSecond());"); now_link.appendChild(document.createTextNode(gettext('Now'))); var clock_link = document.createElement('a'); clock_link.setAttribute('href', 'javascript:DateTimeShortcuts.openClock(' + num + ');'); @@ -80,10 +80,10 @@ var DateTimeShortcuts = { quickElement('h2', clock_box, gettext('Choose a time')); time_list = quickElement('ul', clock_box, ''); time_list.className = 'timelist'; - quickElement("a", quickElement("li", time_list, ""), gettext("Now"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().getHourMinute());") - quickElement("a", quickElement("li", time_list, ""), gettext("Midnight"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '00:00');") - quickElement("a", quickElement("li", time_list, ""), gettext("6 a.m."), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '06:00');") - quickElement("a", quickElement("li", time_list, ""), gettext("Noon"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '12:00');") + quickElement("a", quickElement("li", time_list, ""), gettext("Now"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().getHourMinuteSecond());") + quickElement("a", quickElement("li", time_list, ""), gettext("Midnight"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '00:00:00');") + quickElement("a", quickElement("li", time_list, ""), gettext("6 a.m."), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '06:00:00');") + quickElement("a", quickElement("li", time_list, ""), gettext("Noon"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '12:00:00');") cancel_p = quickElement('p', clock_box, ''); cancel_p.className = 'calendar-cancel'; diff --git a/django/contrib/admin/media/js/core.js b/django/contrib/admin/media/js/core.js index d35bd29c1c..a17ac8a4d2 100644 --- a/django/contrib/admin/media/js/core.js +++ b/django/contrib/admin/media/js/core.js @@ -119,6 +119,10 @@ Date.prototype.getTwoDigitMinute = function() { return (this.getMinutes() < 10) ? '0' + this.getMinutes() : this.getMinutes(); } +Date.prototype.getTwoDigitSecond = function() { + return (this.getSeconds() < 10) ? '0' + this.getSeconds() : this.getSeconds(); +} + Date.prototype.getISODate = function() { return this.getCorrectYear() + '-' + this.getTwoDigitMonth() + '-' + this.getTwoDigitDate(); } @@ -127,6 +131,10 @@ Date.prototype.getHourMinute = function() { return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute(); } +Date.prototype.getHourMinuteSecond = function() { + return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute() + ':' + this.getTwoDigitSecond(); +} + // ---------------------------------------------------------------------------- // String object extensions // ---------------------------------------------------------------------------- diff --git a/django/contrib/admin/templates/admin/search_form.html b/django/contrib/admin/templates/admin/search_form.html index d9126c3ec5..445cca3089 100644 --- a/django/contrib/admin/templates/admin/search_form.html +++ b/django/contrib/admin/templates/admin/search_form.html @@ -7,7 +7,7 @@ {% if show_result_count %} - {% blocktrans count cl.result_count as counter %}1 result{% plural %}{{ counter }} results{% endblocktrans %} ({% blocktrans with cl.full_result_count as full_result_count %}{{ full_result_count }} total{% endblocktrans %}) + {% blocktrans count cl.result_count as counter %}1 result{% plural %}{{ counter }} results{% endblocktrans %} ({% blocktrans with cl.full_result_count as full_result_count %}{{ full_result_count }} total{% endblocktrans %}) {% endif %} {% for pair in cl.params.items %} {% ifnotequal pair.0 search_var %}{% endifnotequal %} diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index 324841a669..c9cff0e374 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -226,7 +226,7 @@ index = staff_member_required(never_cache(index)) def add_stage(request, app_label, model_name, show_delete=False, form_url='', post_url=None, post_url_continue='../%s/', object_id_override=None): model = models.get_model(app_label, model_name) if model is None: - raise Http404, "App %r, model %r, not found" % (app_label, model_name) + raise Http404("App %r, model %r, not found" % (app_label, model_name)) opts = model._meta if not request.user.has_perm(app_label + '.' + opts.get_add_permission()): @@ -302,7 +302,7 @@ def change_stage(request, app_label, model_name, object_id): model = models.get_model(app_label, model_name) object_id = unquote(object_id) if model is None: - raise Http404, "App %r, model %r, not found" % (app_label, model_name) + raise Http404("App %r, model %r, not found" % (app_label, model_name)) opts = model._meta if not request.user.has_perm(app_label + '.' + opts.get_change_permission()): @@ -313,8 +313,8 @@ def change_stage(request, app_label, model_name, object_id): try: manipulator = model.ChangeManipulator(object_id) - except ObjectDoesNotExist: - raise Http404 + except model.DoesNotExist: + raise Http404('%s object with primary key %r does not exist' % (model_name, escape(object_id))) if request.POST: new_data = request.POST.copy() @@ -490,7 +490,7 @@ def delete_stage(request, app_label, model_name, object_id): model = models.get_model(app_label, model_name) object_id = unquote(object_id) if model is None: - raise Http404, "App %r, model %r, not found" % (app_label, model_name) + raise Http404("App %r, model %r, not found" % (app_label, model_name)) opts = model._meta if not request.user.has_perm(app_label + '.' + opts.get_delete_permission()): raise PermissionDenied @@ -527,7 +527,7 @@ def history(request, app_label, model_name, object_id): model = models.get_model(app_label, model_name) object_id = unquote(object_id) if model is None: - raise Http404, "App %r, model %r, not found" % (app_label, model_name) + raise Http404("App %r, model %r, not found" % (app_label, model_name)) action_list = LogEntry.objects.filter(object_id=object_id, content_type__id__exact=ContentType.objects.get_for_model(model).id).select_related().order_by('action_time') # If no history was found, see whether this object even exists. @@ -743,7 +743,7 @@ class ChangeList(object): def change_list(request, app_label, model_name): model = models.get_model(app_label, model_name) if model is None: - raise Http404, "App %r, model %r, not found" % (app_label, model_name) + raise Http404("App %r, model %r, not found" % (app_label, model_name)) if not request.user.has_perm(app_label + '.' + model._meta.get_change_permission()): raise PermissionDenied try: diff --git a/django/contrib/contenttypes/management.py b/django/contrib/contenttypes/management.py index de3a685477..f492f54303 100644 --- a/django/contrib/contenttypes/management.py +++ b/django/contrib/contenttypes/management.py @@ -3,9 +3,9 @@ Creates content types for all installed models. """ from django.dispatch import dispatcher -from django.db.models import get_models, signals +from django.db.models import get_apps, get_models, signals -def create_contenttypes(app, created_models, verbosity): +def create_contenttypes(app, created_models, verbosity=2): from django.contrib.contenttypes.models import ContentType app_models = get_models(app) if not app_models: @@ -22,4 +22,11 @@ def create_contenttypes(app, created_models, verbosity): if verbosity >= 2: print "Adding content type '%s | %s'" % (ct.app_label, ct.model) +def create_all_contenttypes(verbosity=2): + for app in get_apps(): + create_contenttypes(app, None, verbosity) + dispatcher.connect(create_contenttypes, signal=signals.post_syncdb) + +if __name__ == "__main__": + create_all_contenttypes() diff --git a/django/contrib/formtools/__init__.py b/django/contrib/formtools/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/django/contrib/formtools/preview.py b/django/contrib/formtools/preview.py new file mode 100644 index 0000000000..9a9371b5f8 --- /dev/null +++ b/django/contrib/formtools/preview.py @@ -0,0 +1,160 @@ +""" +Formtools Preview application. + +This is an abstraction of the following workflow: + + "Display an HTML form, force a preview, then do something with the submission." + +Given a django.newforms.Form object that you define, this takes care of the +following: + + * Displays the form as HTML on a Web page. + * Validates the form data once it's submitted via POST. + * If it's valid, displays a preview page. + * If it's not valid, redisplays the form with error messages. + * At the preview page, if the preview confirmation button is pressed, calls + a hook that you define -- a done() method. + +The framework enforces the required preview by passing a shared-secret hash to +the preview page. If somebody tweaks the form parameters on the preview page, +the form submission will fail the hash comparison test. + +Usage +===== + +Subclass FormPreview and define a done() method: + + def done(self, request, clean_data): + # ... + +This method takes an HttpRequest object and a dictionary of the form data after +it has been validated and cleaned. It should return an HttpResponseRedirect. + +Then, just instantiate your FormPreview subclass by passing it a Form class, +and pass that to your URLconf, like so: + + (r'^post/$', MyFormPreview(MyForm)), + +The FormPreview class has a few other hooks. See the docstrings in the source +code below. + +The framework also uses two templates: 'formtools/preview.html' and +'formtools/form.html'. You can override these by setting 'preview_template' and +'form_template' attributes on your FormPreview subclass. See +django/contrib/formtools/templates for the default templates. +""" + +from django.conf import settings +from django.core.exceptions import ImproperlyConfigured +from django.http import Http404 +from django.shortcuts import render_to_response +import cPickle as pickle +import md5 + +AUTO_ID = 'formtools_%s' # Each form here uses this as its auto_id parameter. + +class FormPreview(object): + preview_template = 'formtools/preview.html' + form_template = 'formtools/form.html' + + # METHODS SUBCLASSES SHOULDN'T OVERRIDE ################################### + + def __init__(self, form): + # form should be a Form class, not an instance. + self.form, self.state = form, {} + + def __call__(self, request, *args, **kwargs): + stage = {'1': 'preview', '2': 'post'}.get(request.POST.get(self.unused_name('stage')), 'preview') + self.parse_params(*args, **kwargs) + try: + method = getattr(self, stage + '_' + request.method.lower()) + except AttributeError: + raise Http404 + return method(request) + + def unused_name(self, name): + """ + Given a first-choice name, adds an underscore to the name until it + reaches a name that isn't claimed by any field in the form. + + This is calculated rather than being hard-coded so that no field names + are off-limits for use in the form. + """ + while 1: + try: + f = self.form.fields[name] + except KeyError: + break # This field name isn't being used by the form. + name += '_' + return name + + def preview_get(self, request): + "Displays the form" + f = self.form(auto_id=AUTO_ID) + return render_to_response(self.form_template, {'form': f, 'stage_field': self.unused_name('stage'), 'state': self.state}) + + def preview_post(self, request): + "Validates the POST data. If valid, displays the preview page. Else, redisplays form." + f = self.form(request.POST, auto_id=AUTO_ID) + context = {'form': f, 'stage_field': self.unused_name('stage'), 'state': self.state} + if f.is_valid(): + context['hash_field'] = self.unused_name('hash') + context['hash_value'] = self.security_hash(request, f) + return render_to_response(self.preview_template, context) + else: + return render_to_response(self.form_template, context) + + def post_post(self, request): + "Validates the POST data. If valid, calls done(). Else, redisplays form." + f = self.form(request.POST, auto_id=AUTO_ID) + if f.is_valid(): + if self.security_hash(request, f) != request.POST.get(self.unused_name('hash')): + return self.failed_hash(request) # Security hash failed. + return self.done(request, f.clean_data) + else: + return render_to_response(self.form_template, {'form': f, 'stage_field': self.unused_name('stage'), 'state': self.state}) + + # METHODS SUBCLASSES MIGHT OVERRIDE IF APPROPRIATE ######################## + + def parse_params(self, *args, **kwargs): + """ + Given captured args and kwargs from the URLconf, saves something in + self.state and/or raises Http404 if necessary. + + For example, this URLconf captures a user_id variable: + + (r'^contact/(?P\d{1,6})/$', MyFormPreview(MyForm)), + + In this case, the kwargs variable in parse_params would be + {'user_id': 32} for a request to '/contact/32/'. You can use that + user_id to make sure it's a valid user and/or save it for later, for + use in done(). + """ + pass + + def security_hash(self, request, form): + """ + Calculates the security hash for the given Form instance. + + This creates a list of the form field names/values in a deterministic + order, pickles the result with the SECRET_KEY setting and takes an md5 + hash of that. + + Subclasses may want to take into account request-specific information + such as the IP address. + """ + data = [(bf.name, bf.data) for bf in form] + [settings.SECRET_KEY] + # Use HIGHEST_PROTOCOL because it's the most efficient. It requires + # Python 2.3, but Django requires 2.3 anyway, so that's OK. + pickled = pickle.dumps(data, protocol=pickle.HIGHEST_PROTOCOL) + return md5.new(pickled).hexdigest() + + def failed_hash(self, request): + "Returns an HttpResponse in the case of an invalid security hash." + return self.preview_post(request) + + # METHODS SUBCLASSES MUST OVERRIDE ######################################## + + def done(self, request, clean_data): + "Does something with the clean_data and returns an HttpResponseRedirect." + raise NotImplementedError('You must define a done() method on your %s subclass.' % self.__class__.__name__) diff --git a/django/contrib/formtools/templates/formtools/form.html b/django/contrib/formtools/templates/formtools/form.html new file mode 100644 index 0000000000..90da8b2b2b --- /dev/null +++ b/django/contrib/formtools/templates/formtools/form.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} + +{% block content %} + +{% if form.errors %}

      Please correct the following errors

      {% else %}

      Submit

      {% endif %} + +
      + +{{ form }} +
      + +

      +
      + +{% endblock %} diff --git a/django/contrib/formtools/templates/formtools/preview.html b/django/contrib/formtools/templates/formtools/preview.html new file mode 100644 index 0000000000..c7955d46e1 --- /dev/null +++ b/django/contrib/formtools/templates/formtools/preview.html @@ -0,0 +1,36 @@ +{% extends "base.html" %} + +{% block content %} + +

      Preview your submission

      + + +{% for field in form %} + + + + +{% endfor %} +
      {{ field.verbose_name }}:{{ field.data|escape }}
      + +

      Security hash: {{ hash_value }}

      + +
      +{% for field in form %}{{ field.as_hidden }} +{% endfor %} + + +

      +
      + +

      Or edit it again

      + +
      + +{{ form }} +
      + +

      +
      + +{% endblock %} diff --git a/django/contrib/sitemaps/__init__.py b/django/contrib/sitemaps/__init__.py index 2c76e13c22..44ede4460a 100644 --- a/django/contrib/sitemaps/__init__.py +++ b/django/contrib/sitemaps/__init__.py @@ -29,7 +29,7 @@ def ping_google(sitemap_url=None, ping_url=PING_URL): from django.contrib.sites.models import Site current_site = Site.objects.get_current() - url = "%s%s" % (current_site.domain, sitemap) + url = "%s%s" % (current_site.domain, sitemap_url) params = urllib.urlencode({'sitemap':url}) urllib.urlopen("%s?%s" % (ping_url, params)) diff --git a/django/contrib/sitemaps/templates/sitemap.xml b/django/contrib/sitemaps/templates/sitemap.xml index ad24c045d4..16d9a0bbe0 100644 --- a/django/contrib/sitemaps/templates/sitemap.xml +++ b/django/contrib/sitemaps/templates/sitemap.xml @@ -1,5 +1,5 @@ - + {% spaceless %} {% for url in urlset %} diff --git a/django/contrib/sitemaps/templates/sitemap_index.xml b/django/contrib/sitemaps/templates/sitemap_index.xml index c89b192ecc..a2bcce85dc 100644 --- a/django/contrib/sitemaps/templates/sitemap_index.xml +++ b/django/contrib/sitemaps/templates/sitemap_index.xml @@ -1,4 +1,4 @@ - + {% for location in sitemaps %}{{ location|escape }}{% endfor %} diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py index c1403ea4fa..85473a6353 100644 --- a/django/core/handlers/base.py +++ b/django/core/handlers/base.py @@ -84,7 +84,11 @@ class BaseHandler(object): # Complain if the view returned None (a common error). if response is None: - raise ValueError, "The view %s.%s didn't return an HttpResponse object." % (callback.__module__, callback.func_name) + try: + view_name = callback.func_name # If it's a function + except AttributeError: + view_name = callback.__class__.__name__ + '.__call__' # If it's a class + raise ValueError, "The view %s.%s didn't return an HttpResponse object." % (callback.__module__, view_name) return response except http.Http404, e: diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py index 2998bd31f6..71cfecd9a0 100644 --- a/django/core/handlers/wsgi.py +++ b/django/core/handlers/wsgi.py @@ -62,7 +62,7 @@ def safe_copyfileobj(fsrc, fdst, length=16*1024, size=0): data in the body. """ if not size: - return copyfileobj(fsrc, fdst, length) + return while size > 0: buf = fsrc.read(min(length, size)) if not buf: @@ -157,7 +157,11 @@ class WSGIRequest(http.HttpRequest): return self._raw_post_data except AttributeError: buf = StringIO() - content_length = int(self.environ['CONTENT_LENGTH']) + try: + # CONTENT_LENGTH might be absent if POST doesn't have content at all (lighttpd) + content_length = int(self.environ.get('CONTENT_LENGTH', 0)) + except ValueError: # if CONTENT_LENGTH was empty string or not an integer + content_length = 0 safe_copyfileobj(self.environ['wsgi.input'], buf, size=content_length) self._raw_post_data = buf.getvalue() buf.close() diff --git a/django/core/mail.py b/django/core/mail.py index d1e5d0aa55..a5af6e610f 100644 --- a/django/core/mail.py +++ b/django/core/mail.py @@ -8,6 +8,8 @@ import socket import time import random +DNS_NAME = socket.getfqdn() # Cache the hostname + class BadHeaderError(ValueError): pass @@ -53,7 +55,11 @@ def send_mass_mail(datatuple, fail_silently=False, auth_user=settings.EMAIL_HOST msg['From'] = from_email msg['To'] = ', '.join(recipient_list) msg['Date'] = rfc822.formatdate() - msg['Message-ID'] = "<%d.%d@%s>" % (time.time(), random.getrandbits(64), socket.getfqdn()) + try: + random_bits = str(random.getrandbits(64)) + except AttributeError: # Python 2.3 doesn't have random.getrandbits(). + random_bits = ''.join([random.choice('1234567890') for i in range(19)]) + msg['Message-ID'] = "<%d.%s@%s>" % (time.time(), random_bits, DNS_NAME) try: server.sendmail(from_email, recipient_list, msg.as_string()) num_sent += 1 diff --git a/django/core/servers/fastcgi.py b/django/core/servers/fastcgi.py index fccb7bf087..649dd6942d 100644 --- a/django/core/servers/fastcgi.py +++ b/django/core/servers/fastcgi.py @@ -118,6 +118,8 @@ def runfastcgi(argset=[], **kwargs): else: return fastcgi_help("ERROR: Implementation must be one of prefork or thread.") + wsgi_opts['debug'] = False # Turn off flup tracebacks + # Prep up and go from django.core.handlers.wsgi import WSGIHandler diff --git a/django/core/xheaders.py b/django/core/xheaders.py index 69f6115839..3beb930158 100644 --- a/django/core/xheaders.py +++ b/django/core/xheaders.py @@ -17,6 +17,6 @@ def populate_xheaders(request, response, model, object_id): or if the request is from a logged in staff member. """ from django.conf import settings - if request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS or (request.user.is_authenticated() and request.user.is_staff): + if request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS or (hasattr(request, 'user') and request.user.is_authenticated() and request.user.is_staff): response['X-Object-Type'] = "%s.%s" % (model._meta.app_label, model._meta.object_name.lower()) response['X-Object-Id'] = str(object_id) diff --git a/django/db/__init__.py b/django/db/__init__.py index e5b4d32e0b..4176b5aa79 100644 --- a/django/db/__init__.py +++ b/django/db/__init__.py @@ -18,7 +18,7 @@ except ImportError, e: available_backends = [f for f in os.listdir(backend_dir) if not f.startswith('_') and not f.startswith('.') and not f.endswith('.py') and not f.endswith('.pyc')] available_backends.sort() if settings.DATABASE_ENGINE not in available_backends: - raise ImproperlyConfigured, "%r isn't an available database backend. vailable options are: %s" % \ + raise ImproperlyConfigured, "%r isn't an available database backend. Available options are: %s" % \ (settings.DATABASE_ENGINE, ", ".join(map(repr, available_backends))) else: raise # If there's some other error, this must be an error in Django itself. diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index bc1eaf0a6a..8e8d68aad5 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -457,9 +457,7 @@ class DateField(Field): def get_db_prep_save(self, value): # Casts dates into string format for entry into database. - if isinstance(value, datetime.datetime): - value = value.date().strftime('%Y-%m-%d') - elif isinstance(value, datetime.date): + if value is not None: value = value.strftime('%Y-%m-%d') return Field.get_db_prep_save(self, value) @@ -489,19 +487,12 @@ class DateTimeField(DateField): def get_db_prep_save(self, value): # Casts dates into string format for entry into database. - if isinstance(value, datetime.datetime): + if value is not None: # MySQL will throw a warning if microseconds are given, because it # doesn't support microseconds. if settings.DATABASE_ENGINE == 'mysql' and hasattr(value, 'microsecond'): value = value.replace(microsecond=0) value = str(value) - elif isinstance(value, datetime.date): - # MySQL will throw a warning if microseconds are given, because it - # doesn't support microseconds. - if settings.DATABASE_ENGINE == 'mysql' and hasattr(value, 'microsecond'): - value = datetime.datetime(value.year, value.month, value.day, microsecond=0) - value = str(value) - return Field.get_db_prep_save(self, value) def get_db_prep_lookup(self, lookup_type, value): diff --git a/django/http/__init__.py b/django/http/__init__.py index bb0e973aae..48f10329fd 100644 --- a/django/http/__init__.py +++ b/django/http/__init__.py @@ -208,7 +208,7 @@ class HttpResponse(object): if path is not None: self.cookies[key]['path'] = path if domain is not None: - self.cookies[key]['domain'] = path + self.cookies[key]['domain'] = domain self.cookies[key]['expires'] = 0 self.cookies[key]['max-age'] = 0 diff --git a/django/middleware/gzip.py b/django/middleware/gzip.py index 7d860abdb1..a7c74481d0 100644 --- a/django/middleware/gzip.py +++ b/django/middleware/gzip.py @@ -25,4 +25,5 @@ class GZipMiddleware(object): response.content = compress_string(response.content) response['Content-Encoding'] = 'gzip' + response['Content-Length'] = str(len(response.content)) return response diff --git a/django/newforms/__init__.py b/django/newforms/__init__.py index 2a472d7b39..a445a21bfb 100644 --- a/django/newforms/__init__.py +++ b/django/newforms/__init__.py @@ -14,15 +14,4 @@ from util import ValidationError from widgets import * from fields import * from forms import Form - -########################## -# DATABASE API SHORTCUTS # -########################## - -def form_for_model(model): - "Returns a Form instance for the given Django model class." - raise NotImplementedError - -def form_for_fields(field_list): - "Returns a Form instance for the given list of Django database field instances." - raise NotImplementedError +from models import * diff --git a/django/newforms/fields.py b/django/newforms/fields.py index 54089cb3c3..fada75fe5d 100644 --- a/django/newforms/fields.py +++ b/django/newforms/fields.py @@ -2,7 +2,8 @@ Field classes """ -from util import ValidationError, DEFAULT_ENCODING +from django.utils.translation import gettext +from util import ValidationError, smart_unicode from widgets import TextInput, CheckboxInput, Select, SelectMultiple import datetime import re @@ -28,6 +29,9 @@ except NameError: class Field(object): widget = TextInput # Default widget to use when rendering this type of Field. + # Tracks each time a Field instance is created. Used to retain order. + creation_counter = 0 + def __init__(self, required=True, widget=None): self.required = required widget = widget or self.widget @@ -35,6 +39,10 @@ class Field(object): widget = widget() self.widget = widget + # Increase the creation counter, and save our local copy. + self.creation_counter = Field.creation_counter + Field.creation_counter += 1 + def clean(self, value): """ Validates the given value and returns its "cleaned" value as an @@ -43,7 +51,7 @@ class Field(object): Raises ValidationError for any errors. """ if self.required and value in EMPTY_VALUES: - raise ValidationError(u'This field is required.') + raise ValidationError(gettext(u'This field is required.')) return value class CharField(Field): @@ -55,14 +63,11 @@ class CharField(Field): "Validates max_length and min_length. Returns a Unicode object." Field.clean(self, value) if value in EMPTY_VALUES: value = u'' - if not isinstance(value, basestring): - value = unicode(str(value), DEFAULT_ENCODING) - elif not isinstance(value, unicode): - value = unicode(value, DEFAULT_ENCODING) + value = smart_unicode(value) if self.max_length is not None and len(value) > self.max_length: - raise ValidationError(u'Ensure this value has at most %d characters.' % self.max_length) + raise ValidationError(gettext(u'Ensure this value has at most %d characters.') % self.max_length) if self.min_length is not None and len(value) < self.min_length: - raise ValidationError(u'Ensure this value has at least %d characters.' % self.min_length) + raise ValidationError(gettext(u'Ensure this value has at least %d characters.') % self.min_length) return value class IntegerField(Field): @@ -72,10 +77,12 @@ class IntegerField(Field): of int(). """ super(IntegerField, self).clean(value) + if not self.required and value in EMPTY_VALUES: + return u'' try: return int(value) except (ValueError, TypeError): - raise ValidationError(u'Enter a whole number.') + raise ValidationError(gettext(u'Enter a whole number.')) DEFAULT_DATE_INPUT_FORMATS = ( '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06' @@ -107,7 +114,7 @@ class DateField(Field): return datetime.date(*time.strptime(value, format)[:3]) except ValueError: continue - raise ValidationError(u'Enter a valid date.') + raise ValidationError(gettext(u'Enter a valid date.')) DEFAULT_DATETIME_INPUT_FORMATS = ( '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59' @@ -143,7 +150,7 @@ class DateTimeField(Field): return datetime.datetime(*time.strptime(value, format)[:6]) except ValueError: continue - raise ValidationError(u'Enter a valid date/time.') + raise ValidationError(gettext(u'Enter a valid date/time.')) class RegexField(Field): def __init__(self, regex, error_message=None, required=True, widget=None): @@ -156,7 +163,7 @@ class RegexField(Field): if isinstance(regex, basestring): regex = re.compile(regex) self.regex = regex - self.error_message = error_message or u'Enter a valid value.' + self.error_message = error_message or gettext(u'Enter a valid value.') def clean(self, value): """ @@ -165,10 +172,9 @@ class RegexField(Field): """ Field.clean(self, value) if value in EMPTY_VALUES: value = u'' - if not isinstance(value, basestring): - value = unicode(str(value), DEFAULT_ENCODING) - elif not isinstance(value, unicode): - value = unicode(value, DEFAULT_ENCODING) + value = smart_unicode(value) + if not self.required and value == u'': + return value if not self.regex.search(value): raise ValidationError(self.error_message) return value @@ -180,7 +186,7 @@ email_re = re.compile( class EmailField(RegexField): def __init__(self, required=True, widget=None): - RegexField.__init__(self, email_re, u'Enter a valid e-mail address.', required, widget) + RegexField.__init__(self, email_re, gettext(u'Enter a valid e-mail address.'), required, widget) url_re = re.compile( r'^https?://' # http:// or https:// @@ -198,7 +204,7 @@ except ImportError: class URLField(RegexField): def __init__(self, required=True, verify_exists=False, widget=None, validator_user_agent=URL_VALIDATOR_USER_AGENT): - RegexField.__init__(self, url_re, u'Enter a valid URL.', required, widget) + RegexField.__init__(self, url_re, gettext(u'Enter a valid URL.'), required, widget) self.verify_exists = verify_exists self.user_agent = validator_user_agent @@ -215,12 +221,12 @@ class URLField(RegexField): "User-Agent": self.user_agent, } try: - req = urllib2.Request(field_data, None, headers) + req = urllib2.Request(value, None, headers) u = urllib2.urlopen(req) except ValueError: - raise ValidationError(u'Enter a valid URL.') + raise ValidationError(gettext(u'Enter a valid URL.')) except: # urllib2.URLError, httplib.InvalidURL, etc. - raise ValidationError(u'This URL appears to be a broken link.') + raise ValidationError(gettext(u'This URL appears to be a broken link.')) return value class BooleanField(Field): @@ -244,13 +250,12 @@ class ChoiceField(Field): """ value = Field.clean(self, value) if value in EMPTY_VALUES: value = u'' - if not isinstance(value, basestring): - value = unicode(str(value), DEFAULT_ENCODING) - elif not isinstance(value, unicode): - value = unicode(value, DEFAULT_ENCODING) + value = smart_unicode(value) + if not self.required and value == u'': + return value valid_values = set([str(k) for k, v in self.choices]) if value not in valid_values: - raise ValidationError(u'Select a valid choice. %s is not one of the available choices.' % value) + raise ValidationError(gettext(u'Select a valid choice. %s is not one of the available choices.') % value) return value class MultipleChoiceField(ChoiceField): @@ -261,27 +266,31 @@ class MultipleChoiceField(ChoiceField): """ Validates that the input is a list or tuple. """ - if not isinstance(value, (list, tuple)): - raise ValidationError(u'Enter a list of values.') if self.required and not value: - raise ValidationError(u'This field is required.') + raise ValidationError(gettext(u'This field is required.')) + elif not self.required and not value: + return [] + if not isinstance(value, (list, tuple)): + raise ValidationError(gettext(u'Enter a list of values.')) new_value = [] for val in value: - if not isinstance(val, basestring): - value = unicode(str(val), DEFAULT_ENCODING) - elif not isinstance(val, unicode): - value = unicode(val, DEFAULT_ENCODING) - new_value.append(value) + val = smart_unicode(val) + new_value.append(val) # Validate that each value in the value list is in self.choices. - valid_values = set([k for k, v in self.choices]) + valid_values = set([smart_unicode(k) for k, v in self.choices]) for val in new_value: if val not in valid_values: - raise ValidationError(u'Select a valid choice. %s is not one of the available choices.' % val) + raise ValidationError(gettext(u'Select a valid choice. %s is not one of the available choices.') % val) return new_value class ComboField(Field): def __init__(self, fields=(), required=True, widget=None): Field.__init__(self, required, widget) + # Set 'required' to False on the individual fields, because the + # required validation will be handled by ComboField, not by those + # individual fields. + for f in fields: + f.required = False self.fields = fields def clean(self, value): diff --git a/django/newforms/forms.py b/django/newforms/forms.py index e490d0d5f9..e0b3d500b5 100644 --- a/django/newforms/forms.py +++ b/django/newforms/forms.py @@ -2,9 +2,11 @@ Form classes """ +from django.utils.datastructures import SortedDict +from django.utils.html import escape from fields import Field -from widgets import TextInput, Textarea -from util import ErrorDict, ErrorList, ValidationError +from widgets import TextInput, Textarea, HiddenInput +from util import StrAndUnicode, ErrorDict, ErrorList, ValidationError NON_FIELD_ERRORS = '__all__' @@ -13,22 +15,35 @@ def pretty_name(name): name = name[0].upper() + name[1:] return name.replace('_', ' ') +class SortedDictFromList(SortedDict): + "A dictionary that keeps its keys in the order in which they're inserted." + # This is different than django.utils.datastructures.SortedDict, because + # this takes a list/tuple as the argument to __init__(). + def __init__(self, data=None): + if data is None: data = [] + self.keyOrder = [d[0] for d in data] + dict.__init__(self, dict(data)) + class DeclarativeFieldsMetaclass(type): "Metaclass that converts Field attributes to a dictionary called 'fields'." def __new__(cls, name, bases, attrs): - attrs['fields'] = dict([(name, attrs.pop(name)) for name, obj in attrs.items() if isinstance(obj, Field)]) + fields = [(name, attrs.pop(name)) for name, obj in attrs.items() if isinstance(obj, Field)] + fields.sort(lambda x, y: cmp(x[1].creation_counter, y[1].creation_counter)) + attrs['fields'] = SortedDictFromList(fields) return type.__new__(cls, name, bases, attrs) -class Form(object): +class Form(StrAndUnicode): "A collection of Fields, plus their associated data." __metaclass__ = DeclarativeFieldsMetaclass - def __init__(self, data=None): # TODO: prefix stuff + def __init__(self, data=None, auto_id=False): # TODO: prefix stuff + self.ignore_errors = data is None self.data = data or {} + self.auto_id = auto_id self.clean_data = None # Stores the data after clean() has been called. self.__errors = None # Stores the errors after clean() has been called. - def __str__(self): + def __unicode__(self): return self.as_table() def __iter__(self): @@ -43,62 +58,66 @@ class Form(object): raise KeyError('Key %r not found in Form' % name) return BoundField(self, field, name) - def clean(self): - if self.__errors is None: - self.full_clean() - return self.clean_data - - def errors(self): + def _errors(self): "Returns an ErrorDict for self.data" if self.__errors is None: self.full_clean() return self.__errors + errors = property(_errors) def is_valid(self): """ - Returns True if the form has no errors. Otherwise, False. This exists - solely for convenience, so client code can use positive logic rather - than confusing negative logic ("if not form.errors()"). + Returns True if the form has no errors. Otherwise, False. If errors are + being ignored, returns False. """ - return not bool(self.errors()) + return not self.ignore_errors and not bool(self.errors) + + def _html_output(self, normal_row, error_row, row_ender, errors_on_separate_row): + "Helper function for outputting HTML. Used by as_table(), as_ul(), as_p()." + top_errors = self.non_field_errors() # Errors that should be displayed above all fields. + output, hidden_fields = [], [] + for name, field in self.fields.items(): + bf = BoundField(self, field, name) + bf_errors = bf.errors # Cache in local variable. + if bf.is_hidden: + if bf_errors: + top_errors.extend(['(Hidden field %s) %s' % (name, e) for e in bf_errors]) + hidden_fields.append(unicode(bf)) + else: + if errors_on_separate_row and bf_errors: + output.append(error_row % bf_errors) + output.append(normal_row % {'errors': bf_errors, 'label': bf.label_tag(escape(bf.verbose_name+':')), 'field': bf}) + if top_errors: + output.insert(0, error_row % top_errors) + if hidden_fields: # Insert any hidden fields in the last row. + str_hidden = u''.join(hidden_fields) + if output: + last_row = output[-1] + # Chop off the trailing row_ender (e.g. '') and insert the hidden fields. + output[-1] = last_row[:-len(row_ender)] + str_hidden + row_ender + else: # If there aren't any rows in the output, just append the hidden fields. + output.append(str_hidden) + return u'\n'.join(output) def as_table(self): - "Returns this form rendered as an HTML ." - output = u'\n'.join(['' % (pretty_name(name), BoundField(self, field, name)) for name, field in self.fields.items()]) - return '
      %s:%s
      \n%s\n
      ' % output + "Returns this form rendered as HTML s -- excluding the
      ." + return self._html_output(u'%(label)s%(field)s', u'%s', '', True) def as_ul(self): - "Returns this form rendered as an HTML
        ." - output = u'\n'.join(['
      • %s: %s
        • ' % (pretty_name(name), BoundField(self, field, name)) for name, field in self.fields.items()]) - return '
          \n%s\n
        ' % output + "Returns this form rendered as HTML
      • s -- excluding the
          ." + return self._html_output(u'
        • %(errors)s%(label)s %(field)s
          • ', u'
        • %s
          • ', '', False) - def as_table_with_errors(self): - "Returns this form rendered as an HTML , with errors." - output = [] - if self.errors().get(NON_FIELD_ERRORS): - # Errors not corresponding to a particular field are displayed at the top. - output.append('' % '\n'.join(['
        • %s
          • ' % e for e in self.errors()[NON_FIELD_ERRORS]])) - for name, field in self.fields.items(): - bf = BoundField(self, field, name) - if bf.errors: - output.append('' % '\n'.join(['
        • %s
          • ' % e for e in bf.errors])) - output.append('' % (pretty_name(name), bf)) - return '
            %s
            %s
          %s:%s
          \n%s\n
          ' % '\n'.join(output) + def as_p(self): + "Returns this form rendered as HTML

          s." + return self._html_output(u'

          %(label)s %(field)s

          ', u'

          %s

          ', '

          ', True) - def as_ul_with_errors(self): - "Returns this form rendered as an HTML
            , with errors." - output = [] - if self.errors().get(NON_FIELD_ERRORS): - # Errors not corresponding to a particular field are displayed at the top. - output.append('
            • %s
            • ' % '\n'.join(['
          • %s
            • ' % e for e in self.errors()[NON_FIELD_ERRORS]])) - for name, field in self.fields.items(): - bf = BoundField(self, field, name) - line = '
          • ' - if bf.errors: - line += '
              %s
            ' % '\n'.join(['
          • %s
            • ' % e for e in bf.errors]) - line += '%s: %s' % (pretty_name(name), bf) - output.append(line) - return '
              \n%s\n
            ' % '\n'.join(output) + def non_field_errors(self): + """ + Returns an ErrorList of errors that aren't associated with a particular + field -- i.e., from Form.clean(). Returns an empty ErrorList if there + are none. + """ + return self.errors.get(NON_FIELD_ERRORS, ErrorList()) def full_clean(self): """ @@ -106,8 +125,14 @@ class Form(object): """ self.clean_data = {} errors = ErrorDict() + if self.ignore_errors: # Stop further processing. + self.__errors = errors + return for name, field in self.fields.items(): - value = self.data.get(name, None) + # value_from_datadict() gets the data from the dictionary. + # Each widget type knows how to retrieve its own data, because some + # widgets split data over several HTML fields. + value = field.widget.value_from_datadict(self.data, name) try: value = field.clean(value) self.clean_data[name] = value @@ -127,36 +152,45 @@ class Form(object): def clean(self): """ Hook for doing any extra form-wide cleaning after Field.clean() been - called on every field. + called on every field. Any ValidationError raised by this method will + not be associated with a particular field; it will have a special-case + association with the field named '__all__'. """ return self.clean_data -class BoundField(object): +class BoundField(StrAndUnicode): "A Field plus data" def __init__(self, form, field, name): - self._form = form - self._field = field - self._name = name + self.form = form + self.field = field + self.name = name - def __str__(self): + def __unicode__(self): "Renders this field as an HTML widget." # Use the 'widget' attribute on the field to determine which type # of HTML widget to use. - return self.as_widget(self._field.widget) + value = self.as_widget(self.field.widget) + if not isinstance(value, basestring): + # Some Widget render() methods -- notably RadioSelect -- return a + # "special" object rather than a string. Call the __str__() on that + # object to get its rendered value. + value = value.__str__() + return value def _errors(self): """ Returns an ErrorList for this field. Returns an empty ErrorList if there are none. """ - try: - return self._form.errors()[self._name] - except KeyError: - return ErrorList() + return self.form.errors.get(self.name, ErrorList()) errors = property(_errors) def as_widget(self, widget, attrs=None): - return widget.render(self._name, self._form.data.get(self._name, None), attrs=attrs) + attrs = attrs or {} + auto_id = self.auto_id + if auto_id and not attrs.has_key('id') and not widget.attrs.has_key('id'): + attrs['id'] = auto_id + return widget.render(self.name, self.data, attrs=attrs) def as_text(self, attrs=None): """ @@ -167,3 +201,49 @@ class BoundField(object): def as_textarea(self, attrs=None): "Returns a string of HTML for representing this as a ' % (flatatt(final_attrs), escape(value)) + value = smart_unicode(value) + final_attrs = self.build_attrs(attrs, name=name) + return u'%s' % (flatatt(final_attrs), escape(value)) class CheckboxInput(Widget): + def __init__(self, attrs=None, check_test=bool): + # check_test is a callable that takes a value and returns True + # if the checkbox should be checked for that value. + self.attrs = attrs or {} + self.check_test = check_test + def render(self, name, value, attrs=None): - final_attrs = dict(self.attrs, type='checkbox', name=name) - if attrs: - final_attrs.update(attrs) - if value: final_attrs['checked'] = 'checked' - return u'' % flatatt(final_attrs) + final_attrs = self.build_attrs(attrs, type='checkbox', name=name) + try: + result = self.check_test(value) + except: # Silently catch exceptions + result = False + if result: + final_attrs['checked'] = 'checked' + if value not in ('', True, False, None): + final_attrs['value'] = smart_unicode(value) # Only add the 'value' attribute if a value is non-empty. + return u'' % flatatt(final_attrs) class Select(Widget): def __init__(self, attrs=None, choices=()): @@ -75,14 +117,13 @@ class Select(Widget): def render(self, name, value, attrs=None, choices=()): if value is None: value = '' - final_attrs = dict(self.attrs, name=name) - if attrs: - final_attrs.update(attrs) - output = [u'') return u'\n'.join(output) @@ -95,19 +136,87 @@ class SelectMultiple(Widget): def render(self, name, value, attrs=None, choices=()): if value is None: value = [] - final_attrs = dict(self.attrs, name=name) - if attrs: - final_attrs.update(attrs) - output = [u'' % flatatt(final_attrs)] + str_values = set([smart_unicode(v) for v in value]) # Normalize to strings. for option_value, option_label in chain(self.choices, choices): - selected_html = (str(option_value) in str_values) and ' selected="selected"' or '' - output.append(u'' % (escape(option_value), selected_html, escape(option_label))) + option_value = smart_unicode(option_value) + selected_html = (option_value in str_values) and ' selected="selected"' or '' + output.append(u'' % (escape(option_value), selected_html, escape(smart_unicode(option_label)))) output.append(u'') return u'\n'.join(output) -class RadioSelect(Widget): - pass +class RadioInput(StrAndUnicode): + "An object used by RadioFieldRenderer that represents a single ." + def __init__(self, name, value, attrs, choice, index): + self.name, self.value = name, value + self.attrs = attrs + self.choice_value, self.choice_label = choice + self.index = index -class CheckboxSelectMultiple(Widget): - pass + def __unicode__(self): + return u'' % (self.tag(), self.choice_label) + + def is_checked(self): + return self.value == smart_unicode(self.choice_value) + + def tag(self): + if self.attrs.has_key('id'): + self.attrs['id'] = '%s_%s' % (self.attrs['id'], self.index) + final_attrs = dict(self.attrs, type='radio', name=self.name, value=self.choice_value) + if self.is_checked(): + final_attrs['checked'] = 'checked' + return u'' % flatatt(final_attrs) + +class RadioFieldRenderer(StrAndUnicode): + "An object used by RadioSelect to enable customization of radio widgets." + def __init__(self, name, value, attrs, choices): + self.name, self.value, self.attrs = name, value, attrs + self.choices = choices + + def __iter__(self): + for i, choice in enumerate(self.choices): + yield RadioInput(self.name, self.value, self.attrs.copy(), choice, i) + + def __unicode__(self): + "Outputs a
              for this set of radio fields." + return u'
                \n%s\n
              ' % u'\n'.join([u'
            • %s
              • ' % w for w in self]) + +class RadioSelect(Select): + def render(self, name, value, attrs=None, choices=()): + "Returns a RadioFieldRenderer instance rather than a Unicode string." + if value is None: value = '' + str_value = smart_unicode(value) # Normalize to string. + attrs = attrs or {} + return RadioFieldRenderer(name, str_value, attrs, list(chain(self.choices, choices))) + + def id_for_label(self, id_): + # RadioSelect is represented by multiple fields, + # each of which has a distinct ID. The IDs are made distinct by a "_X" + # suffix, where X is the zero-based index of the radio field. Thus, + # the label for a RadioSelect should reference the first one ('_0'). + if id_: + id_ += '_0' + return id_ + id_for_label = classmethod(id_for_label) + +class CheckboxSelectMultiple(SelectMultiple): + def render(self, name, value, attrs=None, choices=()): + if value is None: value = [] + final_attrs = self.build_attrs(attrs, name=name) + output = [u'
                '] + str_values = set([smart_unicode(v) for v in value]) # Normalize to strings. + cb = CheckboxInput(final_attrs, check_test=lambda value: value in str_values) + for option_value, option_label in chain(self.choices, choices): + option_value = smart_unicode(option_value) + rendered_cb = cb.render(name, option_value) + output.append(u'
                • ' % (rendered_cb, escape(smart_unicode(option_label)))) + output.append(u'
              ') + return u'\n'.join(output) + + def id_for_label(self, id_): + # See the comment for RadioSelect.id_for_label() + if id_: + id_ += '_0' + return id_ + id_for_label = classmethod(id_for_label) diff --git a/django/template/__init__.py b/django/template/__init__.py index 5affafeba9..7718801684 100644 --- a/django/template/__init__.py +++ b/django/template/__init__.py @@ -742,7 +742,11 @@ class VariableNode(Node): def encode_output(self, output): # Check type so that we don't run str() on a Unicode object if not isinstance(output, basestring): - return str(output) + try: + return str(output) + except UnicodeEncodeError: + # If __str__() returns a Unicode object, convert it to bytestring. + return unicode(output).encode(settings.DEFAULT_CHARSET) elif isinstance(output, unicode): return output.encode(settings.DEFAULT_CHARSET) else: diff --git a/django/views/generic/list_detail.py b/django/views/generic/list_detail.py index bd0f17c56a..1836ce4a9f 100644 --- a/django/views/generic/list_detail.py +++ b/django/views/generic/list_detail.py @@ -84,7 +84,7 @@ def object_detail(request, queryset, object_id=None, slug=None, context_processors=None, template_object_name='object', mimetype=None): """ - Generic list of objects. + Generic detail of an object. Templates: ``/_detail.html`` Context: diff --git a/docs/add_ons.txt b/docs/add_ons.txt index a0377700d7..58c01c4fc0 100644 --- a/docs/add_ons.txt +++ b/docs/add_ons.txt @@ -48,6 +48,23 @@ See the `csrf documentation`_. .. _csrf documentation: http://www.djangoproject.com/documentation/csrf/ +formtools +========= + +**New in Django development version** + +A set of high-level abstractions for Django forms (django.newforms). + +django.contrib.formtools.preview +-------------------------------- + +An abstraction of the following workflow: + +"Display an HTML form, force a preview, then do something with the submission." + +Full documentation for this feature does not yet exist, but you can read the +code and docstrings in ``django/contrib/formtools/preview.py`` for a start. + humanize ======== diff --git a/docs/newforms.txt b/docs/newforms.txt new file mode 100644 index 0000000000..9bfbc75ee7 --- /dev/null +++ b/docs/newforms.txt @@ -0,0 +1,79 @@ +==================== +The newforms library +==================== + +``django.newforms`` is a new replacement for ``django.forms``, the old Django +form/manipulator/validation framework. This document explains how to use this +new form library. + +Migration plan +============== + +``django.newforms`` currently is only available in the Django development version +-- i.e., it's not available in the Django 0.95 release. For the next Django +release, our plan is to do the following: + + * Move the current ``django.forms`` to ``django.oldforms``. This will allow + for an eased migration of form code. You'll just have to change your + import statements:: + + from django import forms # old + from django import oldforms as forms # new + + * Move the current ``django.newforms`` to ``django.forms``. + + * We will remove ``django.oldforms`` in the release *after* the next Django + release -- the release that comes after the release in which we're + creating ``django.oldforms``. + +With this in mind, we recommend you use the following import statement when +using ``django.newforms``:: + + from django import newforms as forms + +This way, your code can refer to the ``forms`` module, and when +``django.newforms`` is renamed to ``django.forms``, you'll only have to change +your ``import`` statements. + +If you prefer "``import *``" syntax, you can do the following:: + + from django.newforms import * + +This will import all fields, widgets, form classes and other various utilities +into your local namespace. Some people find this convenient; others find it +too messy. The choice is yours. + +Overview +======== + +As the ``django.forms`` system before it, ``django.newforms`` is intended to +handle HTML form display, validation and redisplay. It's what you use if you +want to perform server-side validation for an HTML form. + +The library deals with these concepts: + + * **Widget** -- A class that corresponds to an HTML form widget, e.g. + ```` or ``' >>> w.render('msg', '', attrs={'class': 'special'}) u'' +>>> w.render('msg', 'ŠĐĆŽćžšđ', attrs={'class': 'fun'}) +u'' + # CheckboxInput Widget ######################################################## >>> w = CheckboxInput() >>> w.render('is_cool', '') u'' +>>> w.render('is_cool', None) +u'' >>> w.render('is_cool', False) u'' >>> w.render('is_cool', True) u'' + +Using any value that's not in ('', None, False, True) will check the checkbox +and set the 'value' attribute. +>>> w.render('is_cool', 'foo') +u'' + >>> w.render('is_cool', False, attrs={'class': 'pretty'}) u'' @@ -155,6 +189,29 @@ u'' >>> w.render('is_cool', '', attrs={'class': 'special'}) u'' +You can pass 'check_test' to the constructor. This is a callable that takes the +value and returns True if the box should be checked. +>>> w = CheckboxInput(check_test=lambda value: value.startswith('hello')) +>>> w.render('greeting', '') +u'' +>>> w.render('greeting', 'hello') +u'' +>>> w.render('greeting', 'hello there') +u'' +>>> w.render('greeting', 'hello & goodbye') +u'' + +A subtlety: If the 'check_test' argument cannot handle a value and raises any +exception during its __call__, then the exception will be swallowed and the box +will not be checked. In this example, the 'check_test' assumes the value has a +startswith() method, which fails for the values True, False and None. +>>> w.render('greeting', True) +u'' +>>> w.render('greeting', False) +u'' +>>> w.render('greeting', None) +u'' + # Select Widget ############################################################### >>> w = Select() @@ -236,6 +293,9 @@ If 'choices' is passed to both the constructor and render(), then they'll both b +>>> w.render('email', 'ŠĐĆŽćžšđ', choices=[('ŠĐĆŽćžšđ', 'ŠĐabcĆŽćžšđ'), ('ćžšđ', 'abcćžšđ')]) +u'' + # SelectMultiple Widget ####################################################### >>> w = SelectMultiple() @@ -340,8 +400,264 @@ If 'choices' is passed to both the constructor and render(), then they'll both b +>>> w.render('nums', ['ŠĐĆŽćžšđ'], choices=[('ŠĐĆŽćžšđ', 'ŠĐabcĆŽćžšđ'), ('ćžšđ', 'abcćžšđ')]) +u'' + +# RadioSelect Widget ########################################################## + +>>> w = RadioSelect() +>>> print w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))) +
                +
                • +
                • +
                • +
                • +
              + +If the value is None, none of the options are checked: +>>> print w.render('beatle', None, choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))) +
                +
                • +
                • +
                • +
                • +
              + +If the value corresponds to a label (but not to an option value), none of the options are checked: +>>> print w.render('beatle', 'John', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))) +
                +
                • +
                • +
                • +
                • +
              + +The value is compared to its str(): +>>> print w.render('num', 2, choices=[('1', '1'), ('2', '2'), ('3', '3')]) +
                +
                • +
                • +
                • +
              +>>> print w.render('num', '2', choices=[(1, 1), (2, 2), (3, 3)]) +
                +
                • +
                • +
                • +
              +>>> print w.render('num', 2, choices=[(1, 1), (2, 2), (3, 3)]) +
                +
                • +
                • +
                • +
              + +The 'choices' argument can be any iterable: +>>> def get_choices(): +... for i in range(5): +... yield (i, i) +>>> print w.render('num', 2, choices=get_choices()) +
                +
                • +
                • +
                • +
                • +
                • +
              + +You can also pass 'choices' to the constructor: +>>> w = RadioSelect(choices=[(1, 1), (2, 2), (3, 3)]) +>>> print w.render('num', 2) +
                +
                • +
                • +
                • +
              + +If 'choices' is passed to both the constructor and render(), then they'll both be in the output: +>>> print w.render('num', 2, choices=[(4, 4), (5, 5)]) +
                +
                • +
                • +
                • +
                • +
                • +
              + +The render() method returns a RadioFieldRenderer object, whose str() is a
                . +You can manipulate that object directly to customize the way the RadioSelect +is rendered. +>>> w = RadioSelect() +>>> r = w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))) +>>> for inp in r: +... print inp + + + + +>>> for inp in r: +... print '%s
                ' % inp +
                +
                +
                +
                +>>> for inp in r: +... print '

                %s %s

                ' % (inp.tag(), inp.choice_label) +

                John

                +

                Paul

                +

                George

                +

                Ringo

                +>>> for inp in r: +... print '%s %s %s %s %s' % (inp.name, inp.value, inp.choice_value, inp.choice_label, inp.is_checked()) +beatle J J John True +beatle J P Paul False +beatle J G George False +beatle J R Ringo False + +# CheckboxSelectMultiple Widget ############################################### + +>>> w = CheckboxSelectMultiple() +>>> print w.render('beatles', ['J'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))) +
                  +
                  • +
                  • +
                  • +
                  • +
                +>>> print w.render('beatles', ['J', 'P'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))) +
                  +
                  • +
                  • +
                  • +
                  • +
                +>>> print w.render('beatles', ['J', 'P', 'R'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))) +
                  +
                  • +
                  • +
                  • +
                  • +
                + +If the value is None, none of the options are selected: +>>> print w.render('beatles', None, choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))) +
                  +
                  • +
                  • +
                  • +
                  • +
                + +If the value corresponds to a label (but not to an option value), none of the options are selected: +>>> print w.render('beatles', ['John'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))) +
                  +
                  • +
                  • +
                  • +
                  • +
                + +If multiple values are given, but some of them are not valid, the valid ones are selected: +>>> print w.render('beatles', ['J', 'G', 'foo'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))) +
                  +
                  • +
                  • +
                  • +
                  • +
                + +The value is compared to its str(): +>>> print w.render('nums', [2], choices=[('1', '1'), ('2', '2'), ('3', '3')]) +
                  +
                  • +
                  • +
                  • +
                +>>> print w.render('nums', ['2'], choices=[(1, 1), (2, 2), (3, 3)]) +
                  +
                  • +
                  • +
                  • +
                +>>> print w.render('nums', [2], choices=[(1, 1), (2, 2), (3, 3)]) +
                  +
                  • +
                  • +
                  • +
                + +The 'choices' argument can be any iterable: +>>> def get_choices(): +... for i in range(5): +... yield (i, i) +>>> print w.render('nums', [2], choices=get_choices()) +
                  +
                  • +
                  • +
                  • +
                  • +
                  • +
                + +You can also pass 'choices' to the constructor: +>>> w = CheckboxSelectMultiple(choices=[(1, 1), (2, 2), (3, 3)]) +>>> print w.render('nums', [2]) +
                  +
                  • +
                  • +
                  • +
                + +If 'choices' is passed to both the constructor and render(), then they'll both be in the output: +>>> print w.render('nums', [2], choices=[(4, 4), (5, 5)]) +
                  +
                  • +
                  • +
                  • +
                  • +
                  • +
                + +>>> w.render('nums', ['ŠĐĆŽćžšđ'], choices=[('ŠĐĆŽćžšđ', 'ŠĐabcĆŽćžšđ'), ('ćžšđ', 'abcćžšđ')]) +u'
                  \n
                  • \n
                  • \n
                  • \n
                  • \n
                  • \n
                ' + +########## +# Fields # +########## + +Each Field class does some sort of validation. Each Field has a clean() method, +which either raises django.newforms.ValidationError or returns the "clean" +data -- usually a Unicode object, but, in some rare cases, a list. + +Each Field's __init__() takes at least these parameters: + required -- Boolean that specifies whether the field is required. + True by default. + widget -- A Widget class, or instance of a Widget class, that should be + used for this Field when displaying it. Each Field has a default + Widget that it'll use if you don't specify this. In most cases, + the default widget is TextInput. + +Other than that, the Field subclasses have class-specific options for +__init__(). For example, CharField has a max_length option. + # CharField ################################################################### +>>> f = CharField() +>>> f.clean(1) +u'1' +>>> f.clean('hello') +u'hello' +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean([1, 2, 3]) +u'[1, 2, 3]' + >>> f = CharField(required=False) >>> f.clean(1) u'1' @@ -349,13 +665,13 @@ u'1' u'hello' >>> f.clean(None) u'' +>>> f.clean('') +u'' >>> f.clean([1, 2, 3]) u'[1, 2, 3]' CharField accepts an optional max_length parameter: >>> f = CharField(max_length=10, required=False) ->>> f.clean('') -u'' >>> f.clean('12345') u'12345' >>> f.clean('1234567890') @@ -383,6 +699,40 @@ u'1234567890a' # IntegerField ################################################################ >>> f = IntegerField() +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean('1') +1 +>>> isinstance(f.clean('1'), int) +True +>>> f.clean('23') +23 +>>> f.clean('a') +Traceback (most recent call last): +... +ValidationError: [u'Enter a whole number.'] +>>> f.clean('1 ') +1 +>>> f.clean(' 1') +1 +>>> f.clean(' 1 ') +1 +>>> f.clean('1a') +Traceback (most recent call last): +... +ValidationError: [u'Enter a whole number.'] + +>>> f = IntegerField(required=False) +>>> f.clean('') +u'' +>>> f.clean(None) +u'' >>> f.clean('1') 1 >>> isinstance(f.clean('1'), int) @@ -546,6 +896,14 @@ Traceback (most recent call last): ... ValidationError: [u'Enter a valid date/time.'] +>>> f = DateTimeField(required=False) +>>> f.clean(None) +>>> repr(f.clean(None)) +'None' +>>> f.clean('') +>>> repr(f.clean('')) +'None' + # RegexField ################################################################## >>> f = RegexField('^\d[A-F]\d$') @@ -565,6 +923,22 @@ ValidationError: [u'Enter a valid value.'] Traceback (most recent call last): ... ValidationError: [u'Enter a valid value.'] +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] + +>>> f = RegexField('^\d[A-F]\d$', required=False) +>>> f.clean('2A2') +u'2A2' +>>> f.clean('3F3') +u'3F3' +>>> f.clean('3G3') +Traceback (most recent call last): +... +ValidationError: [u'Enter a valid value.'] +>>> f.clean('') +u'' Alternatively, RegexField can take a compiled regular expression: >>> f = RegexField(re.compile('^\d[A-F]\d$')) @@ -601,6 +975,34 @@ ValidationError: [u'Enter a four-digit number.'] # EmailField ################################################################## >>> f = EmailField() +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean('person@example.com') +u'person@example.com' +>>> f.clean('foo') +Traceback (most recent call last): +... +ValidationError: [u'Enter a valid e-mail address.'] +>>> f.clean('foo@') +Traceback (most recent call last): +... +ValidationError: [u'Enter a valid e-mail address.'] +>>> f.clean('foo@bar') +Traceback (most recent call last): +... +ValidationError: [u'Enter a valid e-mail address.'] + +>>> f = EmailField(required=False) +>>> f.clean('') +u'' +>>> f.clean(None) +u'' >>> f.clean('person@example.com') u'person@example.com' >>> f.clean('foo') @@ -619,6 +1021,48 @@ ValidationError: [u'Enter a valid e-mail address.'] # URLField ################################################################## >>> f = URLField() +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean('http://example.com') +u'http://example.com' +>>> f.clean('http://www.example.com') +u'http://www.example.com' +>>> f.clean('foo') +Traceback (most recent call last): +... +ValidationError: [u'Enter a valid URL.'] +>>> f.clean('example.com') +Traceback (most recent call last): +... +ValidationError: [u'Enter a valid URL.'] +>>> f.clean('http://') +Traceback (most recent call last): +... +ValidationError: [u'Enter a valid URL.'] +>>> f.clean('http://example') +Traceback (most recent call last): +... +ValidationError: [u'Enter a valid URL.'] +>>> f.clean('http://example.') +Traceback (most recent call last): +... +ValidationError: [u'Enter a valid URL.'] +>>> f.clean('http://.com') +Traceback (most recent call last): +... +ValidationError: [u'Enter a valid URL.'] + +>>> f = URLField(required=False) +>>> f.clean('') +u'' +>>> f.clean(None) +u'' >>> f.clean('http://example.com') u'http://example.com' >>> f.clean('http://www.example.com') @@ -669,6 +1113,30 @@ ValidationError: [u'This URL appears to be a broken link.'] # BooleanField ################################################################ >>> f = BooleanField() +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean(True) +True +>>> f.clean(False) +False +>>> f.clean(1) +True +>>> f.clean(0) +False +>>> f.clean('Django rocks') +True + +>>> f = BooleanField(required=False) +>>> f.clean('') +False +>>> f.clean(None) +False >>> f.clean(True) True >>> f.clean(False) @@ -683,18 +1151,32 @@ True # ChoiceField ################################################################# >>> f = ChoiceField(choices=[('1', '1'), ('2', '2')]) ->>> f.clean(1) -u'1' ->>> f.clean('1') -u'1' ->>> f.clean(None) -Traceback (most recent call last): -... -ValidationError: [u'This field is required.'] >>> f.clean('') Traceback (most recent call last): ... ValidationError: [u'This field is required.'] +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean(1) +u'1' +>>> f.clean('1') +u'1' +>>> f.clean('3') +Traceback (most recent call last): +... +ValidationError: [u'Select a valid choice. 3 is not one of the available choices.'] + +>>> f = ChoiceField(choices=[('1', '1'), ('2', '2')], required=False) +>>> f.clean('') +u'' +>>> f.clean(None) +u'' +>>> f.clean(1) +u'1' +>>> f.clean('1') +u'1' >>> f.clean('3') Traceback (most recent call last): ... @@ -711,6 +1193,14 @@ ValidationError: [u'Select a valid choice. John is not one of the available choi # MultipleChoiceField ######################################################### >>> f = MultipleChoiceField(choices=[('1', '1'), ('2', '2')]) +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] >>> f.clean([1]) [u'1'] >>> f.clean(['1']) @@ -738,10 +1228,38 @@ Traceback (most recent call last): ... ValidationError: [u'Select a valid choice. 3 is not one of the available choices.'] +>>> f = MultipleChoiceField(choices=[('1', '1'), ('2', '2')], required=False) +>>> f.clean('') +[] +>>> f.clean(None) +[] +>>> f.clean([1]) +[u'1'] +>>> f.clean(['1']) +[u'1'] +>>> f.clean(['1', '2']) +[u'1', u'2'] +>>> f.clean([1, '2']) +[u'1', u'2'] +>>> f.clean((1, '2')) +[u'1', u'2'] +>>> f.clean('hello') +Traceback (most recent call last): +... +ValidationError: [u'Enter a list of values.'] +>>> f.clean([]) +[] +>>> f.clean(()) +[] +>>> f.clean(['3']) +Traceback (most recent call last): +... +ValidationError: [u'Select a valid choice. 3 is not one of the available choices.'] + # ComboField ################################################################## ComboField takes a list of fields that should be used to validate a value, -in that order: +in that order. >>> f = ComboField(fields=[CharField(max_length=20), EmailField()]) >>> f.clean('test@example.com') u'test@example.com' @@ -762,57 +1280,48 @@ Traceback (most recent call last): ... ValidationError: [u'This field is required.'] +>>> f = ComboField(fields=[CharField(max_length=20), EmailField()], required=False) +>>> f.clean('test@example.com') +u'test@example.com' +>>> f.clean('longemailaddress@example.com') +Traceback (most recent call last): +... +ValidationError: [u'Ensure this value has at most 20 characters.'] +>>> f.clean('not an e-mail') +Traceback (most recent call last): +... +ValidationError: [u'Enter a valid e-mail address.'] +>>> f.clean('') +u'' +>>> f.clean(None) +u'' + +######### +# Forms # +######### + +A Form is a collection of Fields. It knows how to validate a set of data and it +knows how to render itself in a couple of default ways (e.g., an HTML table). +You can pass it data in __init__(), as a dictionary. + # Form ######################################################################## >>> class Person(Form): ... first_name = CharField() ... last_name = CharField() ... birthday = DateField() ->>> p = Person() ->>> print p - - - - -
                First name:
                Last name:
                Birthday:
                ->>> print p.as_table() - - - - -
                First name:
                Last name:
                Birthday:
                ->>> print p.as_ul() -
                  -
                • First name:
                  • -
                • Last name:
                  • -
                • Birthday:
                  • -
                ->>> print p.as_table_with_errors() - - - - - - - -
                • This field is required.
                First name:
                • This field is required.
                Last name:
                • This field is required.
                Birthday:
                ->>> print p.as_ul_with_errors() -
                  -
                  • This field is required.
                  First name:
                  • -
                  • This field is required.
                  Last name:
                  • -
                  • This field is required.
                  Birthday:
                  • -
                +Pass a dictionary to a Form's __init__(). >>> p = Person({'first_name': u'John', 'last_name': u'Lennon', 'birthday': u'1940-10-9'}) ->>> p.errors() +>>> p.errors {} >>> p.is_valid() True ->>> p.errors().as_ul() +>>> p.errors.as_ul() u'' ->>> p.errors().as_text() +>>> p.errors.as_text() u'' ->>> p.clean() +>>> p.clean_data {'first_name': u'John', 'last_name': u'Lennon', 'birthday': datetime.date(1940, 10, 9)} >>> print p['first_name'] @@ -825,27 +1334,96 @@ u'' +>>> for boundfield in p: +... print boundfield.verbose_name, boundfield.data +First name John +Last name Lennon +Birthday 1940-10-9 >>> print p - -
                First name:
                Last name:
                Birthday:
                + +Empty dictionaries are valid, too. +>>> p = Person({}) +>>> p.errors +{'first_name': [u'This field is required.'], 'last_name': [u'This field is required.'], 'birthday': [u'This field is required.']} +>>> p.is_valid() +False +>>> print p +
                • This field is required.
                +First name: +
                • This field is required.
                +Last name: +
                • This field is required.
                +Birthday: +>>> print p.as_table() +
                • This field is required.
                +First name: +
                • This field is required.
                +Last name: +
                • This field is required.
                +Birthday: +>>> print p.as_ul() +
                • This field is required.
                First name:
                • +
                • This field is required.
                Last name:
                • +
                • This field is required.
                Birthday:
                • +>>> print p.as_p() +

                • This field is required.

                +

                First name:

                +

                • This field is required.

                +

                Last name:

                +

                • This field is required.

                +

                Birthday:

                + +If you don't pass any values to the Form's __init__(), or if you pass None, +the Form won't do any validation. Form.errors will be an empty dictionary *but* +Form.is_valid() will return False. +>>> p = Person() +>>> p.errors +{} +>>> p.is_valid() +False +>>> print p +First name: +Last name: +Birthday: +>>> print p.as_table() +First name: +Last name: +Birthday: +>>> print p.as_ul() +
              • First name:
                • +
              • Last name:
                • +
              • Birthday:
                • +>>> print p.as_p() +

                First name:

                +

                Last name:

                +

                Birthday:

                + +Unicode values are handled properly. +>>> p = Person({'first_name': u'John', 'last_name': u'\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111', 'birthday': '1940-10-9'}) +>>> p.as_table() +u'First name:\nLast name:\nBirthday:' +>>> p.as_ul() +u'
              • First name:
                • \n
              • Last name:
                • \n
              • Birthday:
                • ' +>>> p.as_p() +u'

                First name:

                \n

                Last name:

                \n

                Birthday:

                ' >>> p = Person({'last_name': u'Lennon'}) ->>> p.errors() +>>> p.errors {'first_name': [u'This field is required.'], 'birthday': [u'This field is required.']} >>> p.is_valid() False ->>> p.errors().as_ul() +>>> p.errors.as_ul() u'
                • first_name
                  • This field is required.
                • birthday
                  • This field is required.
                ' ->>> print p.errors().as_text() +>>> print p.errors.as_text() * first_name * This field is required. * birthday * This field is required. ->>> p.clean() ->>> repr(p.clean()) +>>> p.clean_data +>>> repr(p.clean_data) 'None' >>> p['first_name'].errors [u'This field is required.'] @@ -862,6 +1440,60 @@ u'* This field is required.' >>> print p['birthday'] +"auto_id" tells the Form to add an "id" attribute to each form element. +If it's a string that contains '%s', Django will use that as a format string +into which the field's name will be inserted. It will also put a