Django

Code

Changeset 960

Show
Ignore:
Timestamp:
10/19/05 11:32:57 (3 years ago)
Author:
hugo
Message:

i18n: merged to trunk [959]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/i18n/django/conf/project_template/settings.py

    r956 r960  
    99MANAGERS = ADMINS 
    1010 
    11 LANGUAGE_CODE = 'en-us' 
    12  
    1311DATABASE_ENGINE = 'postgresql' # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'. 
    1412DATABASE_NAME = ''             # Or path to database file if using sqlite3. 
    …… 
    1715DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3. 
    1816DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3. 
     17 
     18# Local time zone for this installation. All choices can be found here: 
     19# http://www.postgresql.org/docs/current/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE 
     20TIME_ZONE = 'America/Chicago' 
     21 
     22# Language code for this installation. All choices can be found here: 
     23# http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes 
     24# http://blogs.law.harvard.edu/tech/stories/storyReader$15 
     25LANGUAGE_CODE = 'en-us' 
    1926 
    2027SITE_ID = 1 

  • django/branches/i18n/django/contrib/admin/views/doc.py

    r932 r960  
    2020    if not doc: 
    2121        return missing_docutils_page(request) 
    22     return render_to_response('doc/index', context_instance=DjangoContext(request)) 
     22    return render_to_response('admin_doc/index', context_instance=DjangoContext(request)) 
    2323doc_index = staff_member_required(doc_index) 
    2424 
    2525def bookmarklets(request): 
    26     return render_to_response('doc/bookmarklets', { 
     26    return render_to_response('admin_doc/bookmarklets', { 
    2727        'admin_url' : "%s://%s" % (os.environ.get('HTTPS') == 'on' and 'https' or 'http', request.META['HTTP_HOST']), 
    2828    }, context_instance=DjangoContext(request)) 
    …… 
    6464    template.registered_tags, template.registered_filters = saved_tagset 
    6565 
    66     return render_to_response('doc/template_tag_index', {'tags': tags}, context_instance=DjangoContext(request)) 
     66    return render_to_response('admin_doc/template_tag_index', {'tags': tags}, context_instance=DjangoContext(request)) 
    6767template_tag_index = staff_member_required(template_tag_index) 
    6868 
    …… 
    9797    template.registered_tags, template.registered_filters = saved_tagset 
    9898 
    99     return render_to_response('doc/template_filter_index', {'filters': filters}, context_instance=DjangoContext(request)) 
     99    return render_to_response('admin_doc/template_filter_index', {'filters': filters}, context_instance=DjangoContext(request)) 
    100100template_filter_index = staff_member_required(template_filter_index) 
    101101 
    …… 
    117117                'url'    : simplify_regex(regex), 
    118118            }) 
    119     return render_to_response('doc/view_index', {'views': views}, context_instance=DjangoContext(request)) 
     119    return render_to_response('admin_doc/view_index', {'views': views}, context_instance=DjangoContext(request)) 
    120120view_index = staff_member_required(view_index) 
    121121 
    …… 
    136136    for key in metadata: 
    137137        metadata[key] = doc.parse_rst(metadata[key], 'model', 'view:' + view) 
    138     return render_to_response('doc/view_detail', { 
     138    return render_to_response('admin_doc/view_detail', { 
    139139        'name': view, 
    140140        'summary': title, 
    …… 
    157157                'class'  : opts.module_name, 
    158158            }) 
    159     return render_to_response('doc/model_index', {'models': models}, context_instance=DjangoContext(request)) 
     159    return render_to_response('admin_doc/model_index', {'models': models}, context_instance=DjangoContext(request)) 
    160160model_index = staff_member_required(model_index) 
    161161 
    …… 
    195195                'verbose'   : verbose, 
    196196            }) 
    197     return render_to_response('doc/model_detail', { 
     197    return render_to_response('admin_doc/model_detail', { 
    198198        'name': '%s.%s' % (opts.app_label, opts.module_name), 
    199199        'summary': "Fields on %s objects" % opts.verbose_name, 
    …… 
    216216                'order'     : list(settings_mod.TEMPLATE_DIRS).index(dir), 
    217217            }) 
    218     return render_to_response('doc/template_detail', { 
     218    return render_to_response('admin_doc/template_detail', { 
    219219        'name': template, 
    220220        'templates': templates, 
    …… 
    228228def missing_docutils_page(request): 
    229229    """Display an error message for people without docutils""" 
    230     return render_to_response('doc/missing_docutils') 
     230    return render_to_response('admin_doc/missing_docutils') 
    231231 
    232232def load_all_installed_template_libraries():