Django

Code

Changeset 1255

Show
Ignore:
Timestamp:
11/15/05 18:12:31 (3 years ago)
Author:
rjwittams
Message:

Merged to trunk r1253

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1223 r1255  
    3838    ('cs', _('Czech')), 
    3939    ('cy', _('Welsh')), 
     40    ('da', _('Danish')), 
    4041    ('de', _('German')), 
    4142    ('en', _('English')), 

  • django/branches/new-admin/django/conf/locale/bn/LC_MESSAGES/django.po

    r1246 r1255  
    10741074 
    10751075#: conf/global_settings.py:40 
     1076#, fuzzy 
     1077msgid "Danish" 
     1078msgstr "স্প্যানিশ" 
     1079 
     1080#: conf/global_settings.py:40 
    10761081msgid "German" 
    10771082msgstr "জার্মান" 

  • django/branches/new-admin/django/conf/locale/cs/LC_MESSAGES/django.po

    r1246 r1255  
    10811081 
    10821082#: conf/global_settings.py:40 
     1083#, fuzzy 
     1084msgid "Danish" 
     1085msgstr "Španělsky" 
     1086 
     1087#: conf/global_settings.py:40 
    10831088msgid "German" 
    10841089msgstr "Německy" 

  • django/branches/new-admin/django/conf/locale/cy/LC_MESSAGES/django.po

    r1246 r1255  
    10771077 
    10781078#: conf/global_settings.py:40 
     1079#, fuzzy 
     1080msgid "Danish" 
     1081msgstr "Spaeneg" 
     1082 
     1083#: conf/global_settings.py:40 
    10791084msgid "German" 
    10801085msgstr "Almaeneg" 

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

    r1248 r1255  
    13241324 
    13251325#: conf/global_settings.py:40 
     1326msgid "Danish" 
     1327msgstr "D�sch" 
     1328 
     1329#: conf/global_settings.py:40 
    13261330msgid "German" 
    13271331msgstr "Deutsch" 

  • django/branches/new-admin/django/conf/locale/en/LC_MESSAGES/django.po

    r1246 r1255  
    10431043 
    10441044#: conf/global_settings.py:40 
     1045msgid "Danish" 
     1046msgstr "" 
     1047 
     1048#: conf/global_settings.py:40 
    10451049msgid "German" 
    10461050msgstr "" 

  • django/branches/new-admin/django/conf/locale/es/LC_MESSAGES/django.po

    r1246 r1255  
    10691069 
    10701070#: conf/global_settings.py:40 
     1071msgid "Danish" 
     1072msgstr "" 
     1073 
     1074#: conf/global_settings.py:40 
    10711075msgid "German" 
    10721076msgstr "" 

  • django/branches/new-admin/django/conf/locale/fr/LC_MESSAGES/django.po

    r1246 r1255  
    10841084 
    10851085#: conf/global_settings.py:40 
     1086#, fuzzy 
     1087msgid "Danish" 
     1088msgstr "Espagnol" 
     1089 
     1090#: conf/global_settings.py:40 
    10861091msgid "German" 
    10871092msgstr "Allemand" 

  • django/branches/new-admin/django/conf/locale/gl/LC_MESSAGES/django.po

    r1246 r1255  
    10701070 
    10711071#: conf/global_settings.py:40 
     1072msgid "Danish" 
     1073msgstr "" 
     1074 
     1075#: conf/global_settings.py:40 
    10721076msgid "German" 
    10731077msgstr "" 

  • django/branches/new-admin/django/conf/locale/is/LC_MESSAGES/django.po

    r1246 r1255  
    10791079 
    10801080#: conf/global_settings.py:40 
     1081#, fuzzy 
     1082msgid "Danish" 
     1083msgstr "Spænska" 
     1084 
     1085#: conf/global_settings.py:40 
    10811086msgid "German" 
    10821087msgstr "Þýska" 

  • django/branches/new-admin/django/conf/locale/it/LC_MESSAGES/django.po

    r1246 r1255  
    10731073 
    10741074#: conf/global_settings.py:40 
     1075#, fuzzy 
     1076msgid "Danish" 
     1077msgstr "Spagnolo" 
     1078 
     1079#: conf/global_settings.py:40 
    10751080msgid "German" 
    10761081msgstr "Tedesco" 

  • django/branches/new-admin/django/conf/locale/no/LC_MESSAGES/django.po

    r1246 r1255  
    10791079 
    10801080#: conf/global_settings.py:40 
     1081#, fuzzy 
     1082msgid "Danish" 
     1083msgstr "Spansk" 
     1084 
     1085#: conf/global_settings.py:40 
    10811086msgid "German" 
    10821087msgstr "Tysk" 

  • django/branches/new-admin/django/conf/locale/pt_BR/LC_MESSAGES/django.po

    r1246 r1255  
    10821082 
    10831083#: conf/global_settings.py:40 
     1084#, fuzzy 
     1085msgid "Danish" 
     1086msgstr "Espanhol" 
     1087 
     1088#: conf/global_settings.py:40 
    10841089msgid "German" 
    10851090msgstr "Alemão" 

  • django/branches/new-admin/django/conf/locale/ro/LC_MESSAGES/django.po

    r1246 r1255  
    10791079 
    10801080#: conf/global_settings.py:40 
     1081#, fuzzy 
     1082msgid "Danish" 
     1083msgstr "Spaniolă" 
     1084 
     1085#: conf/global_settings.py:40 
    10811086msgid "German" 
    10821087msgstr "Germană" 

  • django/branches/new-admin/django/conf/locale/ru/LC_MESSAGES/django.po

    r1246 r1255  
    10681068 
    10691069#: conf/global_settings.py:40 
     1070msgid "Danish" 
     1071msgstr "" 
     1072 
     1073#: conf/global_settings.py:40 
    10701074msgid "German" 
    10711075msgstr "" 

  • django/branches/new-admin/django/conf/locale/sk/LC_MESSAGES/django.po

    r1246 r1255  
    10731073#: conf/global_settings.py:37 
    10741074msgid "Bengali" 
    1075 msgstr "" 
     1075msgstr "Bengálsky" 
    10761076 
    10771077#: conf/global_settings.py:38 
    …… 
    10811081#: conf/global_settings.py:39 
    10821082msgid "Welsh" 
    1083 msgstr "" 
     1083msgstr "Waleský" 
    10841084 
    10851085#: conf/global_settings.py:40 
    …… 
    11051105#: conf/global_settings.py:45 
    11061106msgid "Icelandic" 
    1107 msgstr "" 
     1107msgstr "Islandský" 
    11081108 
    11091109#: conf/global_settings.py:46 
    …… 
    11211121#: conf/global_settings.py:49 
    11221122msgid "Romanian" 
    1123 msgstr "" 
     1123msgstr "Rumúnsky" 
    11241124 
    11251125#: conf/global_settings.py:50 

  • django/branches/new-admin/django/conf/locale/sr/LC_MESSAGES/django.po

    r1246 r1255  
    10821082 
    10831083#: conf/global_settings.py:40 
     1084#, fuzzy 
     1085msgid "Danish" 
     1086msgstr "Španski" 
     1087 
     1088#: conf/global_settings.py:40 
    10841089msgid "German" 
    10851090msgstr "Nemački" 

  • django/branches/new-admin/django/conf/locale/sv/LC_MESSAGES/django.po

    r1246 r1255  
    10801080 
    10811081#: conf/global_settings.py:40 
     1082#, fuzzy 
     1083msgid "Danish" 
     1084msgstr "Spanska" 
     1085 
     1086#: conf/global_settings.py:40 
    10821087msgid "German" 
    10831088msgstr "Tyska" 

  • django/branches/new-admin/django/conf/locale/zh_CN/LC_MESSAGES/django.po

    r1246 r1255  
    10681068 
    10691069#: conf/global_settings.py:40 
     1070#, fuzzy 
     1071msgid "Danish" 
     1072msgstr "西斑牙语" 
     1073 
     1074#: conf/global_settings.py:40 
    10701075msgid "German" 
    10711076msgstr "德语" 

  • django/branches/new-admin/django/core/db/backends/postgresql.py

    r1235 r1255  
    2525                conn_string = "user=%s %s" % (DATABASE_USER, conn_string) 
    2626            if DATABASE_PASSWORD: 
    27                 conn_string += " password=%s" % DATABASE_PASSWORD 
     27                conn_string += " password='%s'" % DATABASE_PASSWORD 
    2828            if DATABASE_HOST: 
    2929                conn_string += " host=%s" % DATABASE_HOST 

  • django/branches/new-admin/django/core/formfields.py

    r1244 r1255  
    103103        self.error_dict = error_dict 
    104104        self._inline_collections = None 
     105        self.fields = [self.__getitem__(field.field_name) for field in self.manipulator.fields] 
    105106        self.edit_inline = edit_inline 
    106107     

  • django/branches/new-admin/django/parts/auth/anonymoususers.py

    r1223 r1255  
    3535        return False 
    3636 
     37    def has_module_perms(self, module): 
     38        return False 
     39 
    3740    def get_and_delete_messages(self): 
    3841        return [] 

  • django/branches/new-admin/django/templatetags/i18n.py

    r1235 r1255  
    164164def do_block_translate(parser, token): 
    165165    """ 
     166    This will translate a block of text with parameters. 
     167 
     168    Format is like this:: 
     169 
     170        {% blocktrans with foo|filter as bar and baz|filter as boo %} 
     171        This is {{ bar }} and {{ boo }}. 
     172        {% endblocktrans %} 
     173 
     174    Additionally this supports pluralization:: 
     175 
     176        {% blocktrans count var|length as count %} 
     177        There is {{ count }} object. 
     178        {% plural %} 
     179        There are {{ count }} objects. 
     180        {% endblocktrans %} 
     181 
     182    This is much like ngettext, only in template syntax. 
    166183    """ 
    167184    class BlockTranslateParser(TokenParser): 

  • django/branches/new-admin/django/views/debug.py

    r1235 r1255  
     1import re 
    12import os 
    23import sys 
    …… 
    67from django.core.template import Template, Context 
    78from django.utils.httpwrappers import HttpResponseServerError, HttpResponseNotFound 
     9 
     10HIDDEN_SETTINGS = re.compile('SECRET|PASSWORD') 
    811 
    912def technical_500_response(request, exc_type, exc_value, tb): 
    …… 
    3134        }) 
    3235        tb = tb.tb_next 
    33          
     36     
     37    # Turn the settings module into a dict, filtering out anything that  
     38    # matches HIDDEN_SETTINGS along the way. 
     39    settings_dict = {} 
     40    for k in dir(settings): 
     41        if k.isupper(): 
     42            if HIDDEN_SETTINGS.search(k): 
     43                settings_dict[k] = '********************' 
     44            else: 
     45                settings_dict[k] = getattr(settings, k) 
     46                 
    3447    t = Template(TECHNICAL_500_TEMPLATE) 
    3548    c = Context({ 
    …… 
    4053        'request' : request, 
    4154        'request_protocol' : os.environ.get("HTTPS") == "on" and "https" or "http", 
    42         'settings' : dict([(k, getattr(settings, k)) for k in dir(settings) if k.isupper()]), 
     55        'settings' : settings_dict, 
    4356         
    4457    }) 

  • django/branches/new-admin/docs/faq.txt

    r966 r1255  
    144144production settings -- and our own code met our needs delightfully. 
    145145 
     146In most cases, however, we found that existing frameworks/tools inevitably had 
     147some sort of fundamental, fatal flaw that made us squeamish. No tool fit our 
     148philosophies 100%. 
     149 
     150Like we said: We're picky. 
     151 
     152We've documented our philosophies on the `design philosophies page`_. 
     153 
     154.. _design philosophies page: http://www.djangoproject.com/documentation/design_philosophies/ 
     155 
    146156Do you have any of those nifty "screencast" things? 
    147157--------------------------------------------------- 

  • django/branches/new-admin/docs/generic_views.txt

    r854 r1255  
    5858``app_label``, ``module_name``, etc.). 
    5959 
    60 All the generic views that follow require the ``app_label`` and ``module_name`` keys. 
    61 These values are easiest to explain through example:: 
     60Most of the generic views that follow require the ``app_label`` and 
     61``module_name`` keys. These values are easiest to explain through example:: 
    6262 
    6363    >>> from django.models.blog import entries 
    …… 
    6868of the ``module_name`` option of your model). In the docs below, these keys 
    6969will not be repeated, but each generic view requires them. 
     70 
     71Using "simple" generic views 
     72============================ 
     73 
     74The ``django.views.generic.simple`` module contains simple views to handle a 
     75couple of common cases: rendering a template when no view logic is needed, 
     76and issuing a redirect.  These views are: 
     77 
     78``direct_to_template`` 
     79    Renders a given template using any extra parameters passed in the 
     80    urlpattern; requires the ``template`` argument. 
     81     
     82    For example, given the following URL patterns:: 
     83         
     84        urlpatterns = patterns('django.views.generic.simple', 
     85            (r'^foo/$',             'direct_to_template', {'template' : 'foo_index'}), 
     86            (r'^foo/(?P<id>\d+)/$', 'direct_to_template', {'template' : 'foo_detail'}), 
     87        ) 
     88         
     89    ... a request to ``/foo/`` would cause the ``foo_index`` template to be 
     90    rendered, and a request to ``/foo/15/`` would cause the ``foo_detail`` 
     91    template to be rendered with a context variable ``{{ params.id }}`` that is 
     92    set to ``15``. 
     93     
     94``redirect_to`` 
     95    Issue a redirect to a given URL. 
     96 
     97    The given url may contain dict-style string formatting which will be 
     98    interpolated against the params in the URL.  For example, to redirect from 
     99    ``/foo/<id>/`` to ``/bar/<id>/``, you could use the following urlpattern:: 
     100 
     101        urlpatterns = patterns('django.views.generic.simple', 
     102            ('^foo/(?p<id>\d+)/$', 'redirect_to', {'url' : '/bar/%(id)s/'}), 
     103        ) 
     104         
     105    If the given url is ``None``, a HttpResponseGone (410) will be issued. 
    70106 
    71107Using date-based generic views 
    …… 
    323359        object 
    324360            The object about to be deleted 
     361 

  • django/branches/new-admin/docs/settings.txt

    r1223 r1255  
    410410        ('cs', _('Czech')), 
    411411        ('cy', _('Welsh')), 
     412        ('da', _('Danish')), 
    412413        ('de', _('German')), 
    413414        ('en', _('English')),