Django

Code

Changeset 5195

Show
Ignore:
Timestamp:
05/11/07 21:36:05 (2 years ago)
Author:
adrian
Message:

newforms-admin: Merged to [5194]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-4961 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-5194

  • django/branches/newforms-admin/AUTHORS

    r4962 r5195  
    4343 
    4444    adurdin@gmail.com 
     45    alang@bright-green.com 
     46    Marty Alchin <gulopine@gamemusic.org> 
    4547    Daniel Alves Barbosa de Oliveira Vaz <danielvaz@gmail.com> 
    4648    Andreas 
    …… 
    4951    ant9000@netwise.it 
    5052    David Ascher <http://ascher.ca/> 
     53    david@kazserve.org 
    5154    Arthur <avandorp@gmail.com> 
     55    axiak@mit.edu 
    5256    Jiri Barton 
    5357    Ned Batchelder <http://www.nedbatchelder.com/> 
    …… 
    6771    ChaosKCW 
    6872    ivan.chelubeev@gmail.com 
     73    Bryan Chow <bryan at verdjn dot com> 
     74    Michal Chruszcz <troll@pld-linux.org> 
    6975    Ian Clelland <clelland@gmail.com> 
    7076    crankycoder@gmail.com 
    …… 
    7985    Alex Dedul 
    8086    deric@monowerks.com 
     87    Max Derkachev <mderk@yandex.ru> 
    8188    dne@mayonnaise.net 
    8289    Maximillian Dornseif <md@hudora.de> 
    …… 
    8491    Andy Dustman <farcepest@gmail.com> 
    8592    Clint Ecker 
     93    enlight 
    8694    Enrico <rico.bl@gmail.com> 
    8795    Ludvig Ericson <ludvig.ericson@gmail.com> 
    …… 
    8997    Marc Fargas <telenieko@telenieko.com> 
    9098    favo@exoweb.net 
     99    Bill Fenner <fenner@gmail.com> 
    91100    Matthew Flanagan <http://wadofstuff.blogspot.com> 
    92101    Eric Floehr <eric@intellovations.com> 
    …… 
    95104    Baishampayan Ghose 
    96105    martin.glueck@gmail.com 
     106    GomoX <gomo@datafull.com> 
    97107    Simon Greenhill <dev@simon.net.nz> 
    98108    Owen Griffiths 
    …… 
    106116    Ian Holsman <http://feh.holsman.net/> 
    107117    Kieran Holland <http://www.kieranholland.com> 
     118    Sung-Jin Hong <serialx.net@gmail.com> 
    108119    Robert Rock Howard <http://djangomojo.com/> 
    109120    Jason Huggins <http://www.jrandolph.com/blog/> 
     121    Hyun Mi Ae 
    110122    Tom Insam 
    111123    Baurzhan Ismagulov <ibr@radix50.net> 
    112124    jcrasta@gmail.com 
     125    Zak Johnson <zakj@nox.cx> 
    113126    Michael Josephson <http://www.sdjournal.com/> 
    114127    jpellerin@gmail.com 
    …… 
    121134    Bastian Kleineidam <calvin@debian.org> 
    122135    Cameron Knight (ckknight) 
     136    Gasper Koren 
     137    Martin Kosír <martin@martinkosir.net> 
    123138    Meir Kriheli <http://mksoft.co.il/> 
    124139    Bruce Kroeze <http://coderseye.com/> 
    …… 
    135150    Waylan Limberg <waylan@gmail.com> 
    136151    limodou 
    137     mattmcc 
     152    Matt McClanahan <http://mmcc.cx/> 
    138153    Martin Maney <http://www.chipy.org/Martin_Maney> 
    139154    masonsimon+django@gmail.com 
    …… 
    141156    Petar Marić <http://www.petarmaric.com/> 
    142157    Nuno Mariz <nmariz@gmail.com> 
     158    marijn@metronomo.cl 
    143159    mark@junklight.com 
    144160    Yasushi Masuda <whosaysni@gmail.com> 
    …… 
    154170    Robert Myers <myer0052@gmail.com> 
    155171    Nebojša Dorđević 
     172    Gopal Narayanan <gopastro@gmail.com> 
    156173    Fraser Nevett <mail@nevett.org> 
    157174    Sam Newman <http://www.magpiebrain.com/> 
    …… 
    169186    plisk 
    170187    Daniel Poelzleithner <http://poelzi.org/> 
     188    polpak@yahoo.com 
    171189    J. Rademaker 
    172190    Michael Radziej <mir@noris.de> 
    173191    ramiro 
     192    Massimiliano Ravelli <massimiliano.ravelli@gmail.com> 
    174193    Brian Ray <http://brianray.chipy.org/> 
    175194    remco@diji.biz 
    176195    rhettg@gmail.com 
     196    Henrique Romano <onaiort@gmail.com> 
     197    Armin Ronacher 
    177198    Oliver Rutherfurd <http://rutherfurd.net/> 
    178199    Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/> 
     200    Vinay Sajip <vinay_sajip@yahoo.co.uk> 
    179201    David Schein 
    180202    scott@staplefish.com 
    …… 
    200222    Karen Tracey <graybark@bellsouth.net> 
    201223    Makoto Tsuyuki <mtsuyuki@gmail.com> 
     224    tt@gurgle.no 
    202225    Amit Upadhyay 
    203226    Geert Vanderkelen 
    …… 
    207230    Dan Watson <http://theidioteque.net/> 
    208231    Chris Wesseling <Chris.Wesseling@cwi.nl> 
     232    charly.wilhelm@gmail.com 
    209233    Rachel Willmer <http://www.willmer.com/kb/> 
    210234    Gary Wilson <gary.wilson@gmail.com> 

  • django/branches/newforms-admin/django/bin/make-messages.py

    r4750 r5195  
    8282                    open(os.path.join(dirpath, '%s.py' % file), "wb").write(src) 
    8383                    thefile = '%s.py' % file 
    84                     cmd = 'xgettext %s -d %s -L Perl --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy --from-code UTF-8 -o - "%s"' % ( 
     84                    cmd = 'xgettext %s -d %s -L Perl --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % ( 
    8585                        os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile)) 
    8686                    (stdin, stdout, stderr) = os.popen3(cmd, 'b') 
    …… 
    104104                        thefile = '%s.py' % file 
    105105                    if verbose: sys.stdout.write('processing file %s in %s\n' % (file, dirpath)) 
    106                     cmd = 'xgettext %s -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy --from-code UTF-8 -o - "%s"' % ( 
     106                    cmd = 'xgettext %s -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % ( 
    107107                        os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile)) 
    108108                    (stdin, stdout, stderr) = os.popen3(cmd, 'b') 

  • django/branches/newforms-admin/django/bin/profiling/gather_profile_stats.py

    r4265 r5195  
    2323            continue 
    2424        print "Processing %s" % f 
    25         if profiles.has_key(path): 
     25        if path in profiles: 
    2626            profiles[path].add(prof) 
    2727        else: 

  • django/branches/newforms-admin/django/conf/global_settings.py

    r4824 r5195  
    5656    ('it', gettext_noop('Italian')), 
    5757    ('ja', gettext_noop('Japanese')), 
     58    ('ko', gettext_noop('Korean')), 
    5859    ('kn', gettext_noop('Kannada')), 
    5960    ('lv', gettext_noop('Latvian')), 
    …… 
    119120EMAIL_HOST_USER = '' 
    120121EMAIL_HOST_PASSWORD = '' 
     122EMAIL_USE_TLS = False 
    121123 
    122124# List of strings representing installed apps. 
    …… 
    312314AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',) 
    313315 
     316LOGIN_URL = '/accounts/login/' 
     317 
     318LOGOUT_URL = '/accounts/logout/' 
     319 
     320LOGIN_REDIRECT_URL = '/accounts/profile/' 
     321 
    314322########### 
    315323# TESTING # 

  • django/branches/newforms-admin/django/conf/locale/de/LC_MESSAGES/django.po

    r4617 r5195  
    77"Project-Id-Version: Django 1.0\n" 
    88"Report-Msgid-Bugs-To: \n" 
    9 "POT-Creation-Date: 2007-02-05 02:56+0100\n" 
     9"POT-Creation-Date: 2007-04-09 22:42+0200\n" 
    1010"PO-Revision-Date: 2007-02-05 03:19+0100\n" 
    11 "Last-Translator: Dirk Eschler <dirk.eschler@gmx.net>\n" 
     11"Last-Translator: Jannis Leidel <jl@websushi.org>\n" 
     12"La