Django

Code

Changeset 4024

Show
Ignore:
Timestamp:
11/06/06 15:11:49 (2 years ago)
Author:
jkocherhans
Message:

Merged to [3519]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/generic-auth/AUTHORS

    r3174 r4024  
    1717Wilson Miner <http://www.wilsonminer.com/>, who designed Django's admin 
    1818interface, pretty error pages, official Web site (djangoproject.com) and has 
    19 made many other contributions. 
     19made many other contributions. He makes us look good. 
     20 
     21Malcolm Tredinnick <http://www.pointy-stick.com/blog/>, who has made 
     22significant contributions to all levels of the framework, from its database 
     23layer to template system and documentation. 
    2024 
    2125Georg "Hugo" Bauer <http://hugo.muensterland.org/>, who added 
    2226internationalization support, manages i18n contributions and has made a ton 
    2327of excellent tweaks, feature additions and bug fixes. 
     28 
     29Luke Plant <http://lukeplant.me.uk/>, who has contributed many excellent 
     30improvements, including database-level improvements, the CSRF middleware and 
     31unit tests. 
     32 
     33Russell Keith-Magee <freakboy@iinet.net.au>, who has contributed many excellent 
     34improvements, including refactoring of the Django ORM code and unit tests. 
    2435 
    2536Robert Wittams <http://robert.wittams.com/>, who majorly refactored the Django 
    …… 
    5566    Alex Dedul 
    5667    deric@monowerks.com 
     68    dne@mayonnaise.net 
    5769    Jeremy Dunck <http://dunck.us/> 
    5870    Clint Ecker 
    5971    gandalf@owca.info 
    6072    Baishampayan Ghose 
     73    martin.glueck@gmail.com 
     74    Simon Greenhill <dev@simon.net.nz> 
    6175    Espen Grindhaug <http://grindhaug.org/> 
    6276    Brant Harris 
    …… 
    7084    jpellerin@gmail.com 
    7185    junzhang.jn@gmail.com 
    72     Russell Keith-Magee <freakboy@iinet.net.au> 
    7386    Garth Kidd <http://www.deadlybloodyserious.com/> 
     87    kilian <kilian.cavalotti@lip6.fr> 
    7488    Sune Kirkeby <http://ibofobi.dk/> 
    7589    Cameron Knight (ckknight) 
    …… 
    97111    Neal Norwitz <nnorwitz@google.com> 
    98112    oggie rob <oz.robharvey@gmail.com> 
     113    Jay Parlar <parlar@gmail.com> 
    99114    pgross@thoughtworks.com 
    100115    phaedo <http://phaedo.cx/> 
    …… 
    117132    Tom Insam 
    118133    Joe Topjian <http://joe.terrarum.net/geek/code/python/django/> 
    119     Malcolm Tredinnick 
    120134    Amit Upadhyay 
    121135    Geert Vanderkelen 

  • django/branches/generic-auth/django/bin/compile-messages.py

    r2352 r4024  
    33import os 
    44import sys 
    5 import getopt 
    65 
    76def compile_messages(): 

  • django/branches/generic-auth/django/bin/make-messages.py

    r2352 r4024  
    11#!/usr/bin/env python 
     2 
     3# Need to ensure that the i18n framework is enabled 
     4from django.conf import settings 
     5settings.configure(USE_I18N = True) 
    26 
    37from django.utils.translation import templatize 

  • django/branches/generic-auth/django/conf/global_settings.py

    r3055 r4024  
    22# pointed-to by the DJANGO_SETTINGS_MODULE environment variable. 
    33 
    4 from django.utils.translation import gettext_lazy as _ 
     4# This is defined here as a do-nothing function because we can't import 
     5# django.utils.translation -- that module depends on the settings. 
     6gettext_noop = lambda s: s 
    57 
    68#################### 
    …… 
    3537# should be the utf-8 encoded local name for the language. 
    3638LANGUAGES = ( 
    37     ('bn', _('Bengali')), 
    38     ('cs', _('Czech')), 
    39     ('cy', _('Welsh')), 
    40     ('da', _('Danish')), 
    41     ('de', _('German')), 
    42     ('el', _('Greek')), 
    43     ('en', _('English')), 
    44     ('es', _('Spanish')), 
    45     ('es_AR', _('Argentinean Spanish')), 
    46     ('fr', _('French')), 
    47     ('gl', _('Galician')), 
    48     ('hu', _('Hungarian')), 
    49     ('he', _('Hebrew')), 
    50     ('is', _('Icelandic')), 
    51     ('it', _('Italian')), 
    52     ('ja', _('Japanese')), 
    53     ('nl', _('Dutch')), 
    54     ('no', _('Norwegian')), 
    55     ('pt-br', _('Brazilian')), 
    56     ('ro', _('Romanian')), 
    57     ('ru', _('Russian')), 
    58     ('sk', _('Slovak')), 
    59     ('sl', _('Slovenian')), 
    60     ('sr', _('Serbian')), 
    61     ('sv', _('Swedish')), 
    62     ('uk', _('Ukrainian')), 
    63     ('zh-cn', _('Simplified Chinese')), 
    64     ('zh-tw', _('Traditional Chinese')), 
     39    ('ar', gettext_noop('Arabic')), 
     40    ('bn', gettext_noop('Bengali')), 
     41    ('cs', gettext_noop('Czech')), 
     42    ('cy', gettext_noop('Welsh')), 
     43    ('da', gettext_noop('Danish')), 
     44    ('de', gettext_noop('German')), 
     45    ('el', gettext_noop('Greek')), 
     46    ('en', gettext_noop('English')), 
     47    ('es', gettext_noop('Spanish')), 
     48    ('es_AR', gettext_noop('Argentinean Spanish')), 
     49    ('fr', gettext_noop('French')), 
     50    ('gl', gettext_noop('Galician')), 
     51    ('hu', gettext_noop('Hungarian')), 
     52    ('he', gettext_noop('Hebrew')), 
     53    ('is', gettext_noop('Icelandic')), 
     54    ('it', gettext_noop('Italian')), 
     55    ('ja', gettext_noop('Japanese')), 
     56    ('nl', gettext_noop('Dutch')), 
     57    ('no', gettext_noop('Norwegian')), 
     58    ('pt-br', gettext_noop('Brazilian')), 
     59    ('ro', gettext_noop('Romanian')), 
     60    ('ru', gettext_noop('Russian')), 
     61    ('sk', gettext_noop('Slovak')), 
     62    ('sl', gettext_noop('Slovenian')), 
     63    ('sr', gettext_noop('Serbian')), 
     64    ('sv', gettext_noop('Swedish')), 
     65    ('ta', gettext_noop('Tamil')), 
     66    ('uk', gettext_noop('Ukrainian')), 
     67    ('zh-cn', gettext_noop('Simplified Chinese')), 
     68    ('zh-tw', gettext_noop('Traditional Chinese')), 
    6569) 
    6670 
    6771# Languages using BiDi (right-to-left) layout 
    68 LANGUAGES_BIDI = ("he",) 
     72LANGUAGES_BIDI = ("he", "ar") 
     73 
     74# If you set this to False, Django will make some optimizations so as not 
     75# to load the internationalization machinery. 
     76USE_I18N = True 
    6977 
    7078# Not-necessarily-technical managers of the site. They get broken link 
    …… 
    282290# Django-powered features. 
    283291BANNED_IPS = () 
     292 
     293################## 
     294# AUTHENTICATION # 
     295################## 
     296 
     297AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',) 

  • django/branches/generic-auth/django/conf/__init__.py

    r3113 r4024  
    88 
    99import os 
    10 import sys 
    1110from django.conf import global_settings 
    1211 
    …… 
    117116    Holder for user configured settings. 
    118117    """ 
    119     # SETTINGS_MODULE does not really make sense in the manually configured 
     118    # SETTINGS_MODULE doesn't make much sense in the manually configured 
    120119    # (standalone) case. 
    121120    SETTINGS_MODULE = None 
    …… 
    136135settings = LazySettings() 
    137136 
    138 # install the translation machinery so that it is available 
    139 from django.utils import translation 
    140 translation.install() 
     137# This function replaces itself with django.utils.translation.gettext() the 
     138# first time it's run. This is necessary because the import of 
     139# django.utils.translation requires a working settings module, and loading it 
     140# from within this file would cause a circular import. 
     141def first_time_gettext(*args): 
     142    from django.utils.translation import gettext 
     143    __builtins__['_'] = gettext 
     144    return gettext(*args) 
     145 
     146__builtins__['_'] = first_time_gettext 

  • django/branches/generic-auth/django/conf/locale/es_AR/LC_MESSAGES/djangojs.po

    r2976 r4024  
    99"Project-Id-Version: Django JavaScript 1.0\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2005-12-09 11:51+0100\n" 
     11"POT-Creation-Date: 2006-06-19 12:15-0300\n" 
    1212"PO-Revision-Date: 2006-05-16 10:20-0300\n" 
    1313"Last-Translator: Ramiro Morales <rm0@gmx.net>\n" 
    …… 
    2323#: contrib/admin/media/js/SelectFilter2.js:41 
    2424msgid "Choose all" 
    25 msgstr "Selecciona todos" 
     25msgstr "Seleccionar todos" 
    2626 
    2727#: contrib/admin/media/js/SelectFilter2.js:46 
    …… 
    4444#: contrib/admin/media/js/SelectFilter2.js:59 
    4545msgid "Clear all" 
    46 msgstr "Elimina todos" 
     46msgstr "Eliminar todos" 
    4747 
    48 #: contrib/admin/media/js/dateparse.js:26 
     48#: contrib/admin/media/js/dateparse.js:32 
    4949#: contrib/admin/media/js/calendar.js:24 
    5050msgid "" 
    …… 
    5555"Noviembre Diciembre" 
    5656 
    57 #: contrib/admin/media/js/dateparse.js:27 
     57#: contrib/admin/media/js/dateparse.js:33 
    5858msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday" 
    5959msgstr "Domingo Lunes Martes Mi�oles Jueves Viernes S�do" 
    …… 
    6363msgstr "D L M M J V S" 
    6464 
     65#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34 
     66#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72 
     67msgid "Show" 
     68msgstr "Mostrar" 
     69 
     70#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63 
     71msgid "Hide" 
     72msgstr "Ocultar" 
     73 
    6574#: contrib/admin/media/js/admin/DateTimeShortcuts.js:45 
    66 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:80 
     75#: contrib/admin/media/js/admin/DateTimeShortcuts.js:89 
    6776msgid "Now" 
    6877msgstr "Ahora" 
    …… 
    7281msgstr "Reloj" 
    7382 
    74 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:77 
     83#: contrib/admin/media/js/admin/DateTimeShortcuts.js:86 
    7584msgid "Choose a time" 
    7685msgstr "Elija una hora" 
    7786 
    78 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:81 
     87#: contrib/admin/media/js/admin/DateTimeShortcuts.js:90 
    7988msgid "Midnight" 
    8089msgstr "Medianoche" 
    8190 
    82 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:82 
     91#: contrib/admin/media/js/admin/DateTimeShortcuts.js:91 
    8392msgid "6 a.m." 
    8493msgstr "6 a.m." 
    8594 
    86 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:83 
     95#: contrib/admin/media/js/admin/DateTimeShortcuts.js:92 
    8796msgid "Noon" 
    8897msgstr "Mediod� 
    8998 
    90 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:87 
    91 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:168 
     99#: contrib/admin/media/js/admin/DateTimeShortcuts.js:96 
     100#: contrib/admin/media/js/admin/DateTimeShortcuts.js:187 
    92101msgid "Cancel" 
    93102msgstr "Cancelar" 
    94103 
    95 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:111 
    96 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:162 
     104#: contrib/admin/media/js/admin/DateTimeShortcuts.js:120 
     105#: contrib/admin/media/js/admin/DateTimeShortcuts.js:181 
    97106msgid "Today" 
    98107msgstr "Hoy" 
    99108 
    100 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:114 
     109#: contrib/admin/media/js/admin/DateTimeShortcuts.js:123 
    101110msgid "Calendar" 
    102111msgstr "Calendario" 
    103112 
    104 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:160 
     113#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179 
    105114msgid "Yesterday" 
    106115msgstr "Ayer" 
    107116 
    108 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:164 
     117#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183 
    109118msgid "Tomorrow" 
    110119msgstr "Ma�" 

  • django/branches/generic-auth/django/conf/locale/es_AR/LC_MESSAGES/django.po

    r2976 r4024  
    99"Project-Id-Version: django\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2006-05-16 09:26-0300\n" 
     11"POT-Creation-Date: 2006-06-19 11:19-0300\n" 
    1212"PO-Revision-Date: 2006-05-16 10:05-0300\n" 
    1313"Last-Translator: Ramiro Morales <rm0@gmx.net>\n" 
    14 "Language-Team: Spanish <en@li.org>\n" 
     14"Language-Team: Spanish <es@li.org>\n" 
    1515"MIME-Version: 1.0\n" 
    1616"Content-Ty