Skip to content

Commit dd49269

Browse files
arthurkarthurk
committed
[soc2010/app-loading] merged trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/app-loading@13818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1 parent c9b188c commit dd49269

File tree

470 files changed

+19772
-9387
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

470 files changed

+19772
-9387
lines changed

‎AUTHORS

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ answer newbie questions, and generally made Django that much better:
2929
Gisle Aas <gisle@aas.no>
3030
ajs <adi@sieker.info>
3131
alang@bright-green.com
32-
Alcides Fonseca
3332
Andi Albrecht <albrecht.andi@gmail.com>
3433
Marty Alchin <gulopine@gamemusic.org>
3534
Ahmad Alhashemi <trans@ahmadh.com>
@@ -39,7 +38,6 @@ answer newbie questions, and generally made Django that much better:
3938
AgarFu <heaven@croasanaso.sytes.net>
4039
Dagur Páll Ammendrup <dagurp@gmail.com>
4140
Collin Anderson <cmawebsite@gmail.com>
42-
Nicolas Lara <nicolaslara@gmail.com>
4341
Jeff Anderson <jefferya@programmerq.net>
4442
Marian Andre <django@andre.sk>
4543
Andreas
@@ -85,19 +83,19 @@ answer newbie questions, and generally made Django that much better:
8583
Sean Brant
8684
Andrew Brehaut <http://brehaut.net/blog>
8785
brut.alll@gmail.com
86+
bthomas
8887
btoll@bestweb.net
8988
Jonathan Buchanan <jonathan.buchanan@gmail.com>
9089
Keith Bussell <kbussell@gmail.com>
90+
C8E
9191
Chris Cahoon <chris.cahoon@gmail.com>
9292
Juan Manuel Caicedo <juan.manuel.caicedo@gmail.com>
9393
Trevor Caira <trevor@caira.com>
9494
Brett Cannon <brett@python.org>
9595
Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>
9696
Jeremy Carbaugh <jcarbaugh@gmail.com>
97-
Carl Meyer <carl@dirtcircle.com>
9897
Graham Carlyle <graham.carlyle@maplecroft.net>
9998
Antonio Cavedoni <http://cavedoni.com/>
100-
C8E
10199
cedric@terramater.net
102100
Chris Chamberlin <dja@cdc.msbx.net>
103101
Amit Chakradeo <http://amit.chakradeo.net/>
@@ -110,6 +108,7 @@ answer newbie questions, and generally made Django that much better:
110108
Michal Chruszcz <troll@pld-linux.org>
111109
Can Burak Çilingir <canburak@cs.bilgi.edu.tr>
112110
Ian Clelland <clelland@gmail.com>
111+
Travis Cline <travis.cline@gmail.com>
113112
Russell Cloran <russell@rucus.net>
114113
colin@owlfish.com
115114
crankycoder@gmail.com
@@ -137,6 +136,7 @@ answer newbie questions, and generally made Django that much better:
137136
Rajesh Dhawan <rajesh.dhawan@gmail.com>
138137
Sander Dijkhuis <sander.dijkhuis@gmail.com>
139138
Jordan Dimov <s3x3y1@gmail.com>
139+
Nebojša Dorđević
140140
dne@mayonnaise.net
141141
dready <wil@mojipage.com>
142142
Maximillian Dornseif <md@hudora.de>
@@ -167,14 +167,14 @@ answer newbie questions, and generally made Django that much better:
167167
Liang Feng <hutuworm@gmail.com>
168168
Bill Fenner <fenner@gmail.com>
169169
Stefane Fermgier <sf@fermigier.com>
170-
Afonso Fernández Nogueira <fonzzo.django@gmail.com>
171170
J. Pablo Fernandez <pupeno@pupeno.com>
172171
Maciej Fijalkowski
173172
Ben Firshman <ben@firshman.co.uk>
174173
Matthew Flanagan <http://wadofstuff.blogspot.com>
175174
Eric Floehr <eric@intellovations.com>
176175
Eric Florenzano <floguy@gmail.com>
177176
Vincent Foley <vfoleybourgon@yahoo.ca>
177+
Alcides Fonseca
178178
Rudolph Froger <rfroger@estrate.nl>
179179
Jorge Gajon <gajon@gajon.org>
180180
gandalf@owca.info
@@ -184,11 +184,13 @@ answer newbie questions, and generally made Django that much better:
184184
Idan Gazit
185185
geber@datacollect.com
186186
Baishampayan Ghose
187+
Joshua Ginsberg <jag@flowtheory.net>
187188
Dimitris Glezos <dimitris@glezos.com>
188189
glin@seznam.cz
189190
martin.glueck@gmail.com
190191
Artyom Gnilov <boobsd@gmail.com>
191192
Ben Godfrey <http://aftnn.org>
193+
Andrew Godwin <andrew@aeracode.org>
192194
GomoX <gomo@datafull.com>
193195
Guilherme Mesquita Gondim <semente@taurinus.org>
194196
Mario Gonzalez <gonzalemario@gmail.com>
@@ -220,6 +222,7 @@ answer newbie questions, and generally made Django that much better:
220222
Kieran Holland <http://www.kieranholland.com>
221223
Sung-Jin Hong <serialx.net@gmail.com>
222224
Leo "hylje" Honkanen <sealage@gmail.com>
225+
Matt Hoskins <skaffenuk@googlemail.com>
223226
Tareque Hossain <http://www.codexn.com>
224227
Richard House <Richard.House@i-logue.com>
225228
Robert Rock Howard <http://djangomojo.com/>
@@ -235,6 +238,7 @@ answer newbie questions, and generally made Django that much better:
235238
jcrasta@gmail.com
236239
jdetaeye
237240
jhenry <jhenry@theonion.com>
241+
john@calixto.net
238242
Zak Johnson <zakj@nox.cx>
239243
Nis Jørgensen <nis@superlativ.dk>
240244
Michael Josephson <http://www.sdjournal.com/>
@@ -275,11 +279,11 @@ answer newbie questions, and generally made Django that much better:
275279
kurtiss@meetro.com
276280
Denis Kuzmichyov <kuzmichyov@gmail.com>
277281
Panos Laganakos <panos.laganakos@gmail.com>
278-
Lakin Wecker <lakin@structuredabstraction.com>
279282
Nick Lane <nick.lane.au@gmail.com>
280283
Stuart Langridge <http://www.kryogenix.org/>
281284
Paul Lanier <planier@google.com>
282285
David Larlet <http://david.larlet.fr>
286+
Nicolas Lara <nicolaslara@gmail.com>
283287
Nicola Larosa <nico@teknico.net>
284288
Finn Gruwier Larsen <finn@gruwier.dk>
285289
Lau Bech Lauritzen
@@ -300,7 +304,6 @@ answer newbie questions, and generally made Django that much better:
300304
Simon Litchfield <simon@quo.com.au>
301305
Daniel Lindsley <polarcowz@gmail.com>
302306
Trey Long <trey@ktrl.com>
303-
msaelices <msaelices@gmail.com>
304307
Martin Mahner <http://www.mahner.org/>
305308
Matt McClanahan <http://mmcc.cx/>
306309
Stanislaus Madueke
@@ -313,20 +316,21 @@ answer newbie questions, and generally made Django that much better:
313316
Petr Marhoun <petr.marhoun@gmail.com>
314317
Petar Marić <http://www.petarmaric.com/>
315318
Nuno Mariz <nmariz@gmail.com>
316-
Marijn Vriens <marijn@metronomo.cl>
317319
mark@junklight.com
318320
Orestis Markou <orestis@orestis.gr>
319321
Takashi Matsuo <matsuo.takashi@gmail.com>
320322
Yasushi Masuda <whosaysni@gmail.com>
321323
mattycakes@gmail.com
324+
Glenn Maynard <glenn@zewt.org>
322325
Jason McBrayer <http://www.carcosa.net/jason/>
323326
Kevin McConnell <kevin.mcconnell@gmail.com>
324327
mccutchen@gmail.com
328+
michael.mcewan@gmail.com
325329
Paul McLanahan <paul@mclanahan.net>
326330
Tobias McNulty <http://www.caktusgroup.com/blog>
327331
Zain Memon
328332
Christian Metts
329-
michael.mcewan@gmail.com
333+
Carl Meyer <carl@dirtcircle.com>
330334
michal@plovarna.cz
331335
Slawek Mikula <slawek dot mikula at gmail dot com>
332336
mitakummaa@gmail.com
@@ -336,12 +340,14 @@ answer newbie questions, and generally made Django that much better:
336340
Aljosa Mohorovic <aljosa.mohorovic@gmail.com>
337341
Ramiro Morales <rm0@gmx.net>
338342
Eric Moritz <http://eric.themoritzfamily.com/>
343+
msaelices <msaelices@gmail.com>
344+
Gregor Müllegger <gregor@muellegger.de>
339345
Robin Munn <http://www.geekforgod.com/>
340346
James Murty
341347
msundstr
342348
Robert Myers <myer0052@gmail.com>
349+
Aaron T. Myers <atmyers@gmail.com>
343350
Alexander Myodov <alex@myodov.com>
344-
Nebojša Dorđević
345351
Doug Napoleone <doug@dougma.com>
346352
Gopal Narayanan <gopastro@gmail.com>
347353
Fraser Nevett <mail@nevett.org>
@@ -369,7 +375,6 @@ answer newbie questions, and generally made Django that much better:
369375
phil.h.smith@gmail.com
370376
Gustavo Picon
371377
Michael Placentra II <someone@michaelplacentra2.net>
372-
Luke Plant <http://lukeplant.me.uk/>
373378
plisk
374379
Daniel Poelzleithner <http://poelzi.org/>
375380
polpak@yahoo.com
@@ -400,7 +405,6 @@ answer newbie questions, and generally made Django that much better:
400405
Henrique Romano <onaiort@gmail.com>
401406
Armin Ronacher
402407
Daniel Roseman <http://roseman.org.uk/>
403-
Brian Rosner <brosner@gmail.com>
404408
Rozza <ross.lawley@gmail.com>
405409
Oliver Rutherfurd <http://rutherfurd.net/>
406410
ryankanno
@@ -479,6 +483,7 @@ answer newbie questions, and generally made Django that much better:
479483
George Vilches <gav@thataddress.com>
480484
Vlado <vlado@labath.org>
481485
Zachary Voase <zacharyvoase@gmail.com>
486+
Marijn Vriens <marijn@metronomo.cl>
482487
Milton Waddams
483488
Chris Wagner <cw264701@ohio.edu>
484489
Rick Wagner <rwagner@physics.ucsd.edu>
@@ -487,6 +492,7 @@ answer newbie questions, and generally made Django that much better:
487492
Filip Wasilewski <filip.wasilewski@gmail.com>
488493
Dan Watson <http://theidioteque.net/>
489494
Joel Watts <joel@joelwatts.com>
495+
Lakin Wecker <lakin@structuredabstraction.com>
490496
Chris Wesseling <Chris.Wesseling@cwi.nl>
491497
James Wheare <django@sparemint.com>
492498
Mike Wiacek <mjwiacek@google.com>
@@ -508,8 +514,6 @@ answer newbie questions, and generally made Django that much better:
508514
Gasper Zejn <zejn@kiberpipa.org>
509515
Jarek Zgoda <jarek.zgoda@gmail.com>
510516
Cheng Zhang
511-
Glenn Maynard <glenn@zewt.org>
512-
bthomas
513517

514518
A big THANK YOU goes to:
515519

‎MANIFEST.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ include AUTHORS
33
include INSTALL
44
include LICENSE
55
include MANIFEST.in
6-
include django/utils/simplejson/LICENSE.txt
76
include django/contrib/gis/gdal/LICENSE
87
include django/contrib/gis/geos/LICENSE
8+
include django/dispatch/license.txt
9+
include django/utils/simplejson/LICENSE.txt
910
recursive-include docs *
1011
recursive-include scripts *
11-
recursive-include examples *
1212
recursive-include extras *
1313
recursive-include tests *
1414
recursive-include django/conf/locale *
@@ -20,6 +20,8 @@ recursive-include django/contrib/auth/tests/templates *
2020
recursive-include django/contrib/comments/templates *
2121
recursive-include django/contrib/databrowse/templates *
2222
recursive-include django/contrib/formtools/templates *
23+
recursive-include django/contrib/flatpages/fixtures *
24+
recursive-include django/contrib/flatpages/tests/templates *
2325
recursive-include django/contrib/gis/templates *
2426
recursive-include django/contrib/gis/tests/data *
2527
recursive-include django/contrib/gis/tests/geoapp/fixtures *

‎django/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = (1, 2, 1, 'final', 0)
1+
VERSION = (1, 3, 0, 'alpha', 0)
22

33
def get_version():
44
version = '%s.%s' % (VERSION[0], VERSION[1])

‎django/conf/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,12 @@ def __init__(self, settings_module):
103103
self.INSTALLED_APPS = new_installed_apps
104104

105105
if hasattr(time, 'tzset') and getattr(self, 'TIME_ZONE'):
106+
# When we can, attempt to validate the timezone. If we can't find
107+
# this file, no check happens and it's harmless.
108+
zoneinfo_root = '/usr/share/zoneinfo'
109+
if (os.path.exists(zoneinfo_root) and not
110+
os.path.exists(os.path.join(zoneinfo_root, *(self.TIME_ZONE.split('/'))))):
111+
raise ValueError("Incorrect timezone setting: %s" % self.TIME_ZONE)
106112
# Move the time zone info into os.environ. See ticket #2315 for why
107113
# we don't do this unconditionally (breaks Windows).
108114
os.environ['TZ'] = self.TIME_ZONE

‎django/conf/global_settings.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
('en', gettext_noop('English')),
5555
('en-gb', gettext_noop('British English')),
5656
('es', gettext_noop('Spanish')),
57-
('es-ar', gettext_noop('Argentinean Spanish')),
57+
('es-ar', gettext_noop('Argentinian Spanish')),
5858
('et', gettext_noop('Estonian')),
5959
('eu', gettext_noop('Basque')),
6060
('fa', gettext_noop('Persian')),
@@ -78,6 +78,7 @@
7878
('lt', gettext_noop('Lithuanian')),
7979
('lv', gettext_noop('Latvian')),
8080
('mk', gettext_noop('Macedonian')),
81+
('ml', gettext_noop('Malayalam')),
8182
('mn', gettext_noop('Mongolian')),
8283
('nl', gettext_noop('Dutch')),
8384
('no', gettext_noop('Norwegian')),
@@ -372,8 +373,8 @@
372373
# Boolean that sets whether to add thousand separator when formatting numbers
373374
USE_THOUSAND_SEPARATOR = False
374375

375-
# Number of digits that will be togheter, when spliting them by THOUSAND_SEPARATOR
376-
# 0 means no grouping, 3 means splitting by thousands...
376+
# Number of digits that will be together, when spliting them by
377+
# THOUSAND_SEPARATOR. 0 means no grouping, 3 means splitting by thousands...
377378
NUMBER_GROUPING = 0
378379

379380
# Thousand separator symbol

‎django/conf/locale/ca/LC_MESSAGES/django.mo

9.25 KB
Binary file not shown.

0 commit comments

Comments
 (0)