Changeset 5126

Timestamp:

04/28/07 11:49:21 (2 years ago)

Author:

mtredinnick

Message:

unicode: Merged from trunk up to [5121].

Files:

• django/branches/unicode (modified) (1 prop)
• django/branches/unicode/AUTHORS (modified) (5 diffs)
• django/branches/unicode/django/bin/make-messages.py (modified) (2 diffs)
• django/branches/unicode/django/bin/profiling/gather_profile_stats.py (modified) (1 diff)
• django/branches/unicode/django/conf/locale/el/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/unicode/django/conf/locale/el/LC_MESSAGES/django.po (modified) (2 diffs)
• django/branches/unicode/django/conf/locale/no/LC_MESSAGES/djangojs.mo (modified) (previous)
• django/branches/unicode/django/conf/locale/no/LC_MESSAGES/djangojs.po (modified) (4 diffs)
• django/branches/unicode/django/conf/locale/no/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/unicode/django/conf/locale/no/LC_MESSAGES/django.po (modified) (36 diffs)
• django/branches/unicode/django/conf/urls/defaults.py (modified) (1 diff)
• django/branches/unicode/django/contrib/admin/templatetags/admin_modify.py (modified) (1 diff)
• django/branches/unicode/django/contrib/admin/views/auth.py (modified) (3 diffs)
• django/branches/unicode/django/contrib/admin/views/decorators.py (modified) (4 diffs)
• django/branches/unicode/django/contrib/admin/views/main.py (modified) (10 diffs)
• django/branches/unicode/django/contrib/comments/templatetags/comments.py (modified) (1 diff)
• django/branches/unicode/django/contrib/comments/views/comments.py (modified) (5 diffs)
• django/branches/unicode/django/contrib/localflavor/br/forms.py (modified) (4 diffs)
• django/branches/unicode/django/contrib/localflavor/cl (copied) (copied from django/trunk/django/contrib/localflavor/cl)
• django/branches/unicode/django/contrib/localflavor/cl/forms.py (copied) (copied from django/trunk/django/contrib/localflavor/cl/forms.py)
• django/branches/unicode/django/contrib/localflavor/cl/__init__.py (copied) (copied from django/trunk/django/contrib/localflavor/cl/__init__.py)
• django/branches/unicode/django/contrib/localflavor/is_/forms.py (modified) (5 diffs)
• django/branches/unicode/django/contrib/sitemaps/views.py (modified) (1 diff)
• django/branches/unicode/django/core/cache/backends/simple.py (modified) (1 diff)
• django/branches/unicode/django/core/handlers/modpython.py (modified) (1 diff)
• django/branches/unicode/django/core/handlers/wsgi.py (modified) (1 diff)
• django/branches/unicode/django/core/management.py (modified) (5 diffs)
• django/branches/unicode/django/core/servers/basehttp.py (modified) (3 diffs)
• django/branches/unicode/django/core/urlresolvers.py (modified) (1 diff)
• django/branches/unicode/django/core/validators.py (modified) (3 diffs)
• django/branches/unicode/django/db/backends/mysql_old/base.py (modified) (1 diff)
• django/branches/unicode/django/db/backends/postgresql/base.py (modified) (1 diff)
• django/branches/unicode/django/db/backends/util.py (modified) (1 diff)
• django/branches/unicode/django/db/models/fields/generic.py (modified) (1 diff)
• django/branches/unicode/django/db/models/fields/__init__.py (modified) (12 diffs)
• django/branches/unicode/django/db/models/fields/related.py (modified) (5 diffs)
• django/branches/unicode/django/db/models/loading.py (modified) (1 diff)
• django/branches/unicode/django/db/models/options.py (modified) (2 diffs)
• django/branches/unicode/django/db/transaction.py (modified) (5 diffs)
• django/branches/unicode/django/http/__init__.py (modified) (3 diffs)
• django/branches/unicode/django/middleware/common.py (modified) (1 diff)
• django/branches/unicode/django/newforms/fields.py (modified) (1 diff)
• django/branches/unicode/django/newforms/forms.py (modified) (2 diffs)
• django/branches/unicode/django/newforms/widgets.py (modified) (3 diffs)
• django/branches/unicode/django/oldforms/__init__.py (modified) (1 diff)
• django/branches/unicode/django/template/context.py (modified) (3 diffs)
• django/branches/unicode/django/template/defaulttags.py (modified) (4 diffs)
• django/branches/unicode/django/template/__init__.py (modified) (3 diffs)
• django/branches/unicode/django/utils/datastructures.py (modified) (1 diff)
• django/branches/unicode/django/utils/functional.py (modified) (1 diff)
• django/branches/unicode/django/utils/translation/trans_real.py (modified) (1 diff)
• django/branches/unicode/django/views/i18n.py (modified) (3 diffs)
• django/branches/unicode/docs/authentication.txt (modified) (1 diff)
• django/branches/unicode/docs/db-api.txt (modified) (3 diffs)
• django/branches/unicode/docs/email.txt (modified) (1 diff)
• django/branches/unicode/docs/forms.txt (modified) (3 diffs)
• django/branches/unicode/docs/install.txt (modified) (1 diff)
• django/branches/unicode/docs/settings.txt (modified) (4 diffs)
• django/branches/unicode/tests/modeltests/model_forms/models.py (modified) (8 diffs)
• django/branches/unicode/tests/regressiontests/dispatch/tests/test_saferef.py (modified) (1 diff)
• django/branches/unicode/tests/regressiontests/forms/localflavor.py (modified) (2 diffs)
• django/branches/unicode/tests/regressiontests/forms/tests.py (modified) (3 diffs)
• django/branches/unicode/tests/regressiontests/httpwrappers/tests.py (modified) (4 diffs)
• django/branches/unicode/tests/regressiontests/templates/tests.py (modified) (2 diffs)

django/branches/unicode/AUTHORS

@@ -43 +43 @@
-
-    adurdin@gmail.com
+    alang@bright-green.com
-    Daniel Alves Barbosa de Oliveira Vaz <danielvaz@gmail.com>
-    Andreas
@@ -151 +152 @@
-    Petar Marić <http://www.petarmaric.com/>
-    Nuno Mariz <nmariz@gmail.com>
+    marijn@metronomo.cl
-    mark@junklight.com
-    Yasushi Masuda <whosaysni@gmail.com>
@@ -164 +166 @@
-    Robert Myers <myer0052@gmail.com>
-    Nebojša Dorđević
+    Gopal Narayanan <gopastro@gmail.com>
-    Fraser Nevett <mail@nevett.org>
-    Sam Newman <http://www.magpiebrain.com/>
@@ -186 +189 @@
-    remco@diji.biz
-    rhettg@gmail.com
+    Henrique Romano <onaiort@gmail.com>
-    Armin Ronacher
-    Oliver Rutherfurd <http://rutherfurd.net/>
-    Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
+    Vinay Sajip <vinay_sajip@yahoo.co.uk>
-    David Schein
-    scott@staplefish.com
@@ -212 +217 @@
-    Karen Tracey <graybark@bellsouth.net>
-    Makoto Tsuyuki <mtsuyuki@gmail.com>
+    tt@gurgle.no
-    Amit Upadhyay
-    Geert Vanderkelen

django/branches/unicode/django/bin/make-messages.py

@@ -82 +82 @@
-                    open(os.path.join(dirpath, '%s.py' % file), "wb").write(src)
-                    thefile = '%s.py' % file
-
+:1,2
-                        os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile))
-                    (stdin, stdout, stderr) = os.popen3(cmd, 'b')
@@ -104 +104 @@
-                        thefile = '%s.py' % file
-                    if verbose: sys.stdout.write('processing file %s in %s\n' % (file, dirpath))
-
+:1,2
-                        os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile))
-                    (stdin, stdout, stderr) = os.popen3(cmd, 'b')

django/branches/unicode/django/bin/profiling/gather_profile_stats.py

@@ -23 +23 @@
-            continue
-        print "Processing %s" % f
-rofiles.has_key(path)
+ath in profiles
-            profiles[path].add(prof)
-        else:

django/branches/unicode/django/conf/locale/el/LC_MESSAGES/django.po

@@ -11 +11 @@
-"POT-Creation-Date: 2006-05-16 10:13+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-panos laganakos <panos.laganakos@gmail.com
+Orestis Markou <orestis@orestis.gr
-"Language-Team: Greek\n"
-"MIME-Version: 1.0\n"
@@ -165 +165 @@
-"%(text)s"
-msgstr ""
-χρήστη)ες
+user)s
-"\n"
-κείμενο)α
+text)s
-
-#: contrib/comments/models.py:265

django/branches/unicode/django/conf/locale/no/LC_MESSAGES/djangojs.po

@@ -1 @@
-SOME DESCRIPTIVE TITLE.
+translation of djangojs.po to
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
@@ -6 +6 @@
-msgid ""
-msgstr ""
-PACKAGE VERSION
+djangojs
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-09 11:51+0100\n"
-YEAR-MO-DA HO:MI+ZONE
-Espen Grindhaug <espen.grindhaug@gmail.com>
-no
+2007-04-27 06:51+0200
+
+ <en@li.org>
-"MIME-Version: 1.0\n"
-utf
+UTF
-"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
-
-#: contrib/admin/media/js/SelectFilter2.js:33
@@ -22 +23 @@
-
-#: contrib/admin/media/js/SelectFilter2.js:41
-#, fuzzy
-msgid "Choose all"
-msgstr "Velg alle"
@@ -117 +117 @@
-msgid "Tomorrow"
-msgstr "I morgen"
+

django/branches/unicode/django/conf/locale/no/LC_MESSAGES/django.po

@@ -1 @@
-SOME DESCRIPTIVE TITLE.
+translation of django.po to
-# Copyright (C) 2005 and beyond
-# This file is distributed under the same license as the PACKAGE package.
@@ -7 +7 @@
-msgid ""
-msgstr ""
-PACKAGE VERSION
+django
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 10:12+0200\n"
-YEAR-MO-DA HO:MI+ZONE
-Espen Grndhaug <espen@grindhaug.org>
-Norwegian
+2007-04-27 06:48+0200
+
+ <en@li.org>
-"MIME-Version: 1.0\n"
-utf
+UTF
-"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
-
-#: contrib/comments/models.py:67 contrib/comments/models.py:166
-#, fuzzy
-msgid "object ID"
-Vis 
+
-
-#: contrib/comments/models.py:68
-msgid "headline"
-
+overskrift
-
-#: contrib/comments/models.py:69 contrib/comments/models.py:90
-#: contrib/comments/models.py:167
-#, fuzzy
-msgid "comment"
-innhold
+kommentar
-
-#: contrib/comments/models.py:70
-msgid "rating #1"
-
+rangering #1 
-
-#: contrib/comments/models.py:71
-msgid "rating #2"
-
+rangering #2
-
-#: contrib/comments/models.py:72
-msgid "rating #3"
-
+rangering #3
-
-#: contrib/comments/models.py:73
-msgid "rating #4"
-
+rangering #4
-
-#: contrib/comments/models.py:74
-msgid "rating #5"
-
+rangering #5
-
-#: contrib/comments/models.py:75
-msgid "rating #6"
-
+rangering #6
-
-#: contrib/comments/models.py:76
-msgid "rating #7"
-
+rangering #7
-
-#: contrib/comments/models.py:77
-msgid "rating #8"
-
+rangering #8
-
-#: contrib/comments/models.py:82
-msgid "is valid rating"
-
+er gyldig rangering
-
-#: contrib/comments/models.py:83 contrib/comments/models.py:169
-msgid "date/time submitted"
-
+dato/tid for innsendelse
-
-#: contrib/comments/models.py:84 contrib/comments/models.py:170
-msgid "is public"
-
+er tilgjengelig for alle
-
-#: contrib/comments/models.py:85 contrib/admin/views/doc.py:289
@@ -82 +81 @@
-#: contrib/comments/models.py:86
-msgid "is removed"
-
+er fjernet
-
-#: contrib/comments/models.py:86
@@ -88 +87 @@
-"Check this box if the comment is inappropriate. A \"This comment has been "
-"removed\" message will be displayed instead."
-
+Aktiver denne avkryssningsboksen hvis kommentaren er upasende. Beskjeden \"Denne kommentaren er blitt fjernet\" vil bli vist istedet.
-
-#: contrib/comments/models.py:91
-#, fuzzy
-msgid "comments"
-innhold
+kommentarer
-
-#: contrib/comments/models.py:131 contrib/comments/models.py:207
-#, fuzzy
-msgid "Content object"
- type
+objekt
-
-#: contrib/comments/models.py:159
@@ -109 +106 @@
-"http://%(domain)s%(url)s"
-msgstr ""
+"Sendt av %(user)s på %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
-
-#: contrib/comments/models.py:168
-#, fuzzy
-msgid "person's name"
-for
+personens 
-
-#: contrib/comments/models.py:171
-#, fuzzy
-msgid "ip address"
-msgstr "IP adresse"
@@ -122 +122 @@
-#: contrib/comments/models.py:173
-msgid "approved by staff"
-
+godkjent av moderator
-
-#: contrib/comments/models.py:176
-#, fuzzy
-msgid "free comment"
-tillat kommentare
+åpen kommenta
-
-#: contrib/comments/models.py:177
-#, fuzzy
-msgid "free comments"
-tillat
+åpne
-
-#: contrib/comments/models.py:233
-msgid "score"
-
+poeng
-
-#: contrib/comments/models.py:234
-#, fuzzy
-msgid "score date"
-utløps
+poeng 
-
-#: contrib/comments/models.py:237
-msgid "karma score"
-
+karma poeng
-
-#: contrib/comments/models.py:238
-msgid "karma scores"
-
+karma poeng
-
-#: contrib/comments/models.py:242
-#, python-format
-msgid "%(score)d rating by %(user)s"
-
+%(score)d rangering av %(user)s
-
-#: contrib/comments/models.py:258
-fuzzy, 
+
-msgid ""
-"This comment was flagged by %(user)s:\n"
@@ -163 +160 @@
-"%(text)s"
-msgstr ""
-skrevet med lite omtanke
+flagget av %(user)s
-"\n"
-"%(text)s"
-
-#: contrib/comments/models.py:265
-#, fuzzy
-msgid "flag date"
-tside
+gg dato
-
-#: contrib/comments/models.py:268
-#, fuzzy
-msgid "user flag"
-Bruker
+brukerflag
-
-#: contrib/comments/models.py:269
-#, fuzzy
-msgid "user flags"
-Brukere
+brukerflag
-
-#: contrib/comments/models.py:273
-#, python-format
-msgid "Flag by %r"
-
+Flagg med %r
-
-#: contrib/comments/models.py:278
-#, fuzzy
-msgid "deletion date"
-sesjon data
+fjernet dato
-
-#: contrib/comments/models.py:280
-msgid "moderator deletion"
-
+fjernet av  moderator
-
-#: contrib/comments/models.py:281
-msgid "moderator deletions"
-
+fjernet av moderator
-
-#: contrib/comments/models.py:285
-#, python-format
-msgid "Moderator deletion by %r"
-
+Fjernet av moderator med %r
-
-#: contrib/comments/views/karma.py:19
@@ -215 +208 @@
-#: contrib/comments/views/karma.py:25
-msgid "No voting for yourself"
-
+på deg 
-
-#: contrib/comments/views/comments.py:28
-
-
-
-
+
+
-
-#: contrib/comments/views/comments.py:112
-fuzzy, 
+
-msgid ""
-"This comment was posted by a user who has posted fewer than %(count)s "
@@ -247 +238 @@
-
-#: contrib/comments/views/comments.py:117
-fuzzy, 
+
-msgid ""
-"This comment was posted by a sketchy user:\n"
@@ -253 +244 @@
-"%(text)s"
-msgstr ""
-med lite omtanke
+av en upålitelig bruker
-"\n"
-"%(text)s"
@@ -282 +273 @@
-#: contrib/comments/views/comments.py:321
-msgid "The comment form didn't provide either 'preview' or 'post'"
-
-
+
-
-#: contrib/comments/templates/comments/form.html:6
@@ -297 +287 @@
-
-#: contrib/comments/templates/comments/form.html:6
-#, fuzzy
-msgid "Forgotten your password?"
-Endre passord
+Har du glemt passordet ditt ?
-
-#: contrib/comments/templates/comments/form.html:8
@@ -324 +313 @@
-#: contrib/comments/templates/comments/form.html:12
-msgid "Ratings"
-
+Rangeringer
-
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Required"
-
+Påkrevd
-
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Optional"
-
+Valgfri
-
-#: contrib/comments/templates/comments/form.html:23
-msgid "Post a photo"
-
+Send et foto
-
-#: contrib/comments/templates/comments/form.html:27
-#: contrib/comments/templates/comments/freeform.html:5
-#, fuzzy
-msgid "Comment:"
-tillat kommentarer
+Kommentar:
-
-#: contrib/comments/templates/comments/form.html:32
-#: contrib/comments/templates/comments/freeform.html:9
-#, fuzzy
-msgid "Preview comment"
-tillat kommentare
+Forhåndvis kommenta
-
-#: contrib/comments/templates/comments/freeform.html:4
-#, fuzzy
-msgid "Your name:"
-brukernavn
+Ditt navn:
-
-#: contrib/admin/filterspecs.py:40
@@ -417 +403 @@
-#: contrib/admin/models.py:21
-msgid "action flag"
- 
+
-
-#: contrib/admin/models.py:22
@@ -425 +411 @@
-#: contrib/admin/models.py:25
-msgid "log entry"
-notis
+post
-
-#: contrib/admin/models.py:26
-msgid "log entries"
-innlegg
+poster
-
-#: contrib/admin/templatetags/admin_list.py:228
@@ -441 +427 @@
-"sensitive."
-msgstr ""
-ær snill å angi korrekt brukernavn og passord. La merke til
-
+ennligst angi korrekt brukernavn og passord. Merk
+t
-
-#: contrib/admin/views/decorators.py:23
@@ -453 +439 @@
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-
-
-
+
-
-#: contrib/admin/views/decorators.py:68
@@ -462 +446 @@
-"cookies, reload this page, and try again."
-msgstr ""
-
-
-
+
+
-
-#: contrib/admin/views/decorators.py:82
@@ -501 +484 @@
-#, python-format
-msgid "Added %s."
-gt
+
-
-#: contrib/admin/views/main.py:336 contrib/admin/views/main.py:338
@@ -529 +512 @@
-#: contrib/admin/views/main.py:354
-#, python-format
-
-
+
-msgstr "%(name)s \"%(obj)s\" ble endret. Du kan endre det igjen under."
-
@@ -743 +725 @@
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr ""
-vær
-mail, og vil
+oppståt
+post, og vi
-
-#: contrib/admin/templates/admin/404.html:4
@@ -910 +892 @@
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-å bruke tid på internett siden i 
+at du valgte å bruke kvalitetstid på nettstedet i
-
-#: contrib/admin/templates/registration/logged_out.html:10
@@ -955 +937 @@
-#: contrib/admin/templates/registration/password_reset_email.html:2
-msgid "You're receiving this e-mail because you requested a password reset"
-
-
+
-
-#: contrib/admin/templates/registration/password_reset_email.html:3
@@ -1003 +984 @@
-"your computer is \"internal\").</p>\n"
-msgstr ""
+"\n"
+"<p class=\"help\">For å installere bokmerker, dra linken til verktøylinja\n"
+"for bokmerker, eller høyreklikk og legg til i bokmerker. Nå kan du du velge\n"
+"bokmerket fra hvilken som helst side på nettstedet. Noen av disse\n"
+"bokmerkene krever at datamaskinen du bruker er markert som \"intern\"\n"
+"(kontakt din systemadministrator hvis du er usikker på om maskinen din er \"intern\").</p>\n"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:19
@@ -1034 +1021 @@
-#: contrib/admin/templates/admin_doc/bookmarklets.html:26
-msgid "Jumps to the admin page for pages that represent a single object."
-
-
+
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:28
@@ -1070 +1056 @@
-"events/search/'."
-msgstr ""
-nne burde vær
+tte burde vært
-"nyheter/les/"
-
@@ -1082 +1068 @@
-"'http://'."
-msgstr ""
-nn
+tt
-"internettadresse som starter med 'http://'"
-
@@ -1094 +1080 @@
-
-#: contrib/flatpages/models.py:8
-
-
-
-
+
+
-
-#: contrib/flatpages/models.py:9
@@ -1187 +1171 @@
-#: contrib/auth/models.py:59
-msgid "Use '[algo]$[salt]$[hexdigest]'"
-
+Bruk '[algo]$[salt]$[hexdigest]'
-
-#: contrib/auth/models.py:60
@@ -1257 +1241 @@
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
-
+Din nettleser ser ikkeut til å støtte informasjonskapsler (cookies). Informasjonskapsler er påkrevd for å logge inn.
-
-#: contrib/contenttypes/models.py:25
@@ -1699 +1683 @@
-#, python-format
-msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-
-
+
-
-#: core/validators.py:167
@@ -1785 +1768 @@
-#, python-format
-msgid "Please enter a valid decimal number with at most %s total digit."
-
-
+
-msgstr[0] "Skriv inn et desimal tall med maksimum %s total antall tall."
-msgstr[1] "Skriv inn et desimal tall med maksimum %s total antall tall."
@@ -1793 +1775 @@
-#, python-format
-msgid "Please enter a valid decimal number with at most %s decimal place."
-
-
+
-msgstr[0] "Skriv inn et desimal tall med maksimum %s tall bak komma. "
-msgstr[1] "Skriv inn et desimal tall med maksimum %s tall bak komma. "
@@ -1801 +1782 @@
-#, python-format
-msgid "Make sure your uploaded file is at least %s bytes big."
-
-
+
-
-#: core/validators.py:363
-#, python-format
-msgid "Make sure your uploaded file is at most %s bytes big."
-
-
+
-
-#: core/validators.py:376
@@ -1825 +1804 @@
-#: core/validators.py:429
-#, python-format
-
-
+
-msgstr ""
-"Internettadressen %(url)s returnerte en ikke godkjent Content-Type '%"
@@ -1927 +1905 @@
-
-#: db/models/fields/related.py:581
-
-
-
-
+
+
-
-#: db/models/fields/related.py:625
-#, python-format
-msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-
-
+
-msgstr[0] "Skriv inn gyldige %(self)s ID-er. Verdien %(value)r er ikke gyldig."
-msgstr[1] "Skriv inn gyldige %(self)s ID-er. Verdiene %(value)r er ikke gyldige."

django/branches/unicode/django/conf/urls/defaults.py

@@ -12 +12 @@
-    for t in args:
-        if isinstance(t, (list, tuple)):
-
-
-
+
+
+
+
-    return pattern_list
-

django/branches/unicode/django/contrib/admin/templatetags/admin_modify.py

@@ -75 +75 @@
-
-    def get_nodelist(cls, klass):
-not cls.nodelists.has_key(klass)
+klass not in cls.nodelists
-            try:
-                field_class_name = klass.__name__

django/branches/unicode/django/contrib/admin/views/auth.py

@@ -18 +18 @@
-            new_user = manipulator.save(new_data)
-            msg = _('The %(name)s "%(obj)s" was added successfully.') % {'name': 'user', 'obj': new_user}
-request.POST.has_key("_addanother")
+"_addanother" in request.POST
-                request.user.message_set.create(message=msg)
-                return HttpResponseRedirect(request.path)
@@ -30 +30 @@
-        'title': _('Add user'),
-        'form': form,
-request.REQUEST.has_key('_popup')
+'_popup' in request.REQUEST
-        'add': True,
-        'change': False,
@@ -64 +64 @@
-        'title': _('Change password: %s') % escape(user.username),
-        'form': form,
-request.REQUEST.has_key('_popup')
+'_popup' in request.REQUEST
-        'add': True,
-        'change': False,

django/branches/unicode/django/contrib/admin/views/decorators.py

@@ -13 +13 @@
-def _display_login_form(request, error_message=''):
-    request.session.set_test_cookie()
-request.POST.has_key('post_data')
+'post_data' in request.POST
-        # User has failed login BUT has previously saved post data.
-        post_data = request.POST['post_data']
@@ -49 +49 @@
-        if request.user.is_authenticated() and request.user.is_staff:
-            # The user is valid. Continue to the admin page.
-request.POST.has_key('post_data')
+'post_data' in request.POST
-                # User must have re-authenticated through a different window
-                # or tab.
@@ -58 +58 @@
-
-        # If this isn't already the login page, display it.
-not request.POST.has_key(LOGIN_FORM_KEY)
+LOGIN_FORM_KEY not in request.POST
-            if request.POST:
-                message = _("Please log in again, because your session has expired. Don't worry: Your submission has been saved.")
@@ -91 +91 @@
-                login(request, user)
-                # TODO: set last_login with an event.
-request.POST.has_key('post_data')
+'post_data' in request.POST
-                    post_data = _decode_post_data(request.POST['post_data'])
-not post_data.has_key(LOGIN_FORM_KEY)
+LOGIN_FORM_KEY not in post_data
-                        # overwrite request.POST with the saved post_data, and continue
-                        request.POST = post_data

django/branches/unicode/django/contrib/admin/views/main.py

@@ -258 +258 @@
-            # Here, we distinguish between different save types by checking for
-            # the presence of keys in request.POST.
-request.POST.has_key("_continue")
+"_continue" in request.POST
-                request.user.message_set.create(message=msg + ' ' + _("You may edit it again below."))
-request.POST.has_key("_popup")
+"_popup" in request.POST
-                    post_url_continue += "?_popup=1"
-                return HttpResponseRedirect(post_url_continue % pk_value)