Changeset 1408

Timestamp:

11/24/05 18:09:46 (3 years ago)

Author:

rjwittams

Message:

Merged to trunk 1407

Files:

• django/branches/new-admin/django/conf/locale/de/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/new-admin/django/conf/locale/de/LC_MESSAGES/django.po (modified) (2 diffs)
• django/branches/new-admin/django/conf/locale/sk/LC_MESSAGES/django.po (modified) (18 diffs)
• django/branches/new-admin/django/contrib/admin/templates/registration/password_reset_form.html (modified) (1 diff)
• django/branches/new-admin/django/core/template/loader.py (modified) (1 diff)
• django/branches/new-admin/django/core/template/loaders/app_directories.py (modified) (1 diff)
• django/branches/new-admin/django/core/template/loaders/filesystem.py (modified) (1 diff)
• django/branches/new-admin/django/models/auth.py (modified) (1 diff)
• django/branches/new-admin/django/utils/translation.py (modified) (2 diffs)
• django/branches/new-admin/django/views/debug.py (modified) (9 diffs)
• django/branches/new-admin/django/views/registration/passwords.py (modified) (1 diff)
• django/branches/new-admin/django/views/static.py (modified) (1 diff)

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

@@ -784 +784 @@
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
-#: contrib/admin/templates/registration/password_reset_done.html:4
-msgid "Password reset"
@@ -1286 +1287 @@
-
-#: models/auth.py:37
-
-
+'
+'
-
-#: models/auth.py:38

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

@@ -17 +17 @@
-"Content-Transfer-Encoding: 8bit\n"
-
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "presmerovaný z"
+
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Tu by sa mala použiť absolútna cesta, bez domény. Napr.: '/events/search/'."
+
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "presmerovaný na "
+
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Tu môže byť buď absolútna cesta (ako hore) alebo plné  URL začínajúce s "
+"'http://'."
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "presmerovanie"
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "presmerovania"
+
-#: contrib/comments/models/comments.py:8
-#: contrib/comments/models/comments.py:161
-#, fuzzy
-msgid "object ID"
-msgstr "Ukáž objekt id"
@@ -29 +59 @@
-#: contrib/comments/models/comments.py:10
-#: contrib/comments/models/comments.py:162
-#, fuzzy
-msgid "comment"
-obsah
+komentár
-
-#: contrib/comments/models/comments.py:11
@@ -80 +109 @@
-
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
-#, fuzzy
-msgid "IP address"
-msgstr "IP adresa"
@@ -101 +129 @@
-
-#: contrib/comments/models/comments.py:32
-#, fuzzy
-msgid "Comments"
-msgstr "Komentáre"
@@ -107 +134 @@
-#: contrib/comments/models/comments.py:85
-#: contrib/comments/models/comments.py:204
-#, fuzzy
-msgid "Content object"
-msgstr "Obsah objectu"
@@ -127 +153 @@
-
-#: contrib/comments/models/comments.py:163
-#, fuzzy
-msgid "person's name"
-msgstr "meno osoby"
-
-#: contrib/comments/models/comments.py:166
-#, fuzzy
-msgid "ip address"
-msgstr "ip adresa"
@@ -141 +165 @@
-
-#: contrib/comments/models/comments.py:172
-#, fuzzy
-msgid "Free comment"
-msgstr "Voľný komentár"
-
-#: contrib/comments/models/comments.py:173
-#, fuzzy
-msgid "Free comments"
-msgstr "Voľné komentáre"
@@ -155 +177 @@
-
-#: contrib/comments/models/comments.py:210
-#, fuzzy
-msgid "score date"
-dátum konca platnosti
+údaje stavu
-
-#: contrib/comments/models/comments.py:213
@@ -173 +194 @@
-
-#: contrib/comments/models/comments.py:248
-#, fuzzy
-msgid "flag date"
-msgstr "návestie dátumu"
-
-#: contrib/comments/models/comments.py:251
-#, fuzzy
-msgid "User flag"
-msgstr "Návestie uživateľa"
-
-#: contrib/comments/models/comments.py:252
-#, fuzzy
-msgid "User flags"
-msgstr "Návestia užívateľa"
@@ -204 +222 @@
-
-#: contrib/comments/models/comments.py:278
-#, fuzzy
-msgid "deletion date"
-msgstr "vymazaný dátum"
@@ -226 +243 @@
-
-#: contrib/comments/views/karma.py:22
-#, fuzzy
-msgid "Invalid comment ID"
-msgstr "Neplatný komentár ID"
@@ -237 +253 @@
-msgid ""
-"This rating is required because you've entered at least one other rating."
-
+Toto hlasovanie je nevyhnutné, lebo súvisí s predchádzjúcou voľbou.
-"Táto voľba je nevyhnutná nakoľko je pokračovaním vašej predchádzajúcej."
-
@@ -295 +311 @@
-"invalid"
-msgstr "Formulár kometára má chybný výstupný parameter -- objectID bol chybný"
+"Formulár komentára ma chybný 'cieľový' parameter  -- the objekt ID bol "
+"poškodený"
-
-#: contrib/comments/views/comments.py:254
@@ -533 +551 @@
-
-#: contrib/admin/views/doc.py:266
-#, fuzzy
-msgid "Date (without time)"
-msgstr "Dátum (bez času)"
-
-#: contrib/admin/views/doc.py:267
-#, fuzzy
-msgid "Date (with time)"
-msgstr "Dátum (a čas)"
-
-#: contrib/admin/views/doc.py:268
-#, fuzzy
-msgid "E-mail address"
-msgstr "E-mailová adresa"
@@ -552 +567 @@
-
-#: contrib/admin/views/doc.py:270
-#, fuzzy
-msgid "Decimal number"
-msgstr "Desiatkové číslo"
@@ -561 +575 @@
-
-#: contrib/admin/views/doc.py:277
-#, fuzzy
-msgid "Phone number"
-msgstr "Číslo telefónu"
@@ -576 +589 @@
-msgid "Time"
-msgstr "Čas"
-
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
-msgid "URL"
-msgstr "URL"
-
-#: contrib/admin/views/doc.py:285
@@ -1307 +1316 @@
-#: models/auth.py:36
-msgid "e-mail address"
-
+-
-
-#: models/auth.py:37

django/branches/new-admin/django/contrib/admin/templates/registration/password_reset_form.html

@@ -8 +8 @@
-{% block content %}
-
-}
+%
-
-<p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you." %}</p>

django/branches/new-admin/django/core/template/loader.py

@@ -60 +60 @@
-    for loader in template_source_loaders:
-        try:
- 
+
-            return (source, make_origin(display_name, loader, name, dirs))
-        except TemplateDoesNotExist:

django/branches/new-admin/django/core/template/loaders/app_directories.py

@@ -28 +28 @@
-app_template_dirs = tuple(app_template_dirs)
-
+def get_template_sources(template_name, template_dirs=None):
+    for template_dir in app_template_dirs:
+        yield os.path.join(template_dir, template_name) + TEMPLATE_FILE_EXTENSION
+
-def load_template_source(template_name, template_dirs=None):
-
-
+
-        try:
-            return (open(filepath).read(), filepath)

django/branches/new-admin/django/core/template/loaders/filesystem.py

@@ -5 +5 @@
-import os
-
-load_template_source
+get_template_sources
-    if not template_dirs:
-        template_dirs = TEMPLATE_DIRS
+    for template_dir in template_dirs:
+        yield os.path.join(template_dir, template_name) + TEMPLATE_FILE_EXTENSION
+
+def load_template_source(template_name, template_dirs=None):
-    tried = []
-
-
+
-        try:
-            return (open(filepath).read(), filepath)

django/branches/new-admin/django/models/auth.py

@@ -35 +35 @@
-    last_name = meta.CharField(_('last name'), maxlength=30, blank=True)
-    email = meta.EmailField(_('e-mail address'), blank=True)
-
+'
-    is_staff = meta.BooleanField(_('staff status'), help_text=_("Designates whether the user can log into this admin site."))
-    is_active = meta.BooleanField(_('active'), default=True)

django/branches/new-admin/django/utils/translation.py

@@ -365 +365 @@
-constant_re = re.compile(r"""_\(((?:".*?")|(?:'.*?'))\)""")
-def templateize(src):
-    from django.core.template import Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK
-    """
-    Turns a Django template into something that is understood by xgettext. It
@@ -371 +370 @@
-    function invocations.
-    """
+    from django.core.template import Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK
-    out = StringIO()
-    intrans = False

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

@@ -1 +1 @@
-
-from django.conf import settings
-
+, TemplateDoesNotExist
-from django.utils.html import escape
-from django.utils.httpwrappers import HttpResponseServerError, HttpResponseNotFound
@@ -11 +11 @@
-
-def linebreak_iter(template_source):
+    yield 0
-    p = template_source.find('\n')
-    while p >= 0:
-
++1
-        p = template_source.find('\n', p+1)
-    yield len(template_source) + 1
@@ -24 +25 @@
-    upto = 0
-    source_lines = []
-
-
-
+
-        if start >= upto and end <= next:
-            line = num
-            before = escape(template_source[upto:start])
-            during = escape(template_source[start:end])
- - 1
- - 1
+
+
-        upto = next
-    total = len(source_lines)
-
-0
+1
-    bottom = min(total, line + 1 + context_lines)
-
@@ -45 +44 @@
-        'during': during,
-        'after': after,
- 
- 
+
+
-        'total': total,
-        'line': line,
@@ -60 +59 @@
-    """
-    template_info = None
+    template_does_not_exist = False
+    loader_debug_info = None
+    if issubclass(exc_type, TemplateDoesNotExist):
+        from django.core.template.loader import template_source_loaders
+        template_does_not_exist = True
+        loader_debug_info = []
+        for loader in template_source_loaders:
+            try:
+                source_list_func = getattr(__import__(loader.__module__, '', '', ['get_template_sources']), 'get_template_sources')
+                # NOTE: This assumes exc_value is the name of the template that
+                # the loader attempted to load.
+                template_list = [{'name': t, 'exists': os.path.exists(t)} \
+                    for t in source_list_func(str(exc_value))]
+            except (ImportError, AttributeError):
+                template_list = []
+            loader_debug_info.append({
+                'loader': loader.__module__ + '.' + loader.__name__,
+                'templates': template_list,
+            })
-    if settings.TEMPLATE_DEBUG and hasattr(exc_value, 'source'):
-        exc_type, exc_value, tb, template_info = get_template_exception_info(exc_type, exc_value, tb)
@@ -102 +120 @@
-        'settings': settings_dict,
-        'template_info': template_info,
+        'template_does_not_exist': template_does_not_exist,
+        'loader_debug_info': loader_debug_info,
-    })
-    return HttpResponseServerError(t.render(c), mimetype='text/html')
@@ -189 +209 @@
-    #summary h2 { font-weight: normal; color: #666; }
-    #explanation { background:#eee; }
-
+
+
-    #traceback { background:#eee; }
-    #requestinfo { background:#f6f6f6; padding-left:120px; }
@@ -274 +295 @@
-  </table>
-</div>
+{% if template_does_not_exist %}
+<div id="template-not-exist">
+    <h2>Template-loader postmortem</h2>
+    {% if loader_debug_info %}
+        <p>Django tried loading these templates, in this order:</p>
+        <ul>
+        {% for loader in loader_debug_info %}
+            <li>Using loader <code>{{ loader.loader }}</code>:
+                <ul>{% for t in loader.templates %}<li><code>{{ t.name }}</code> (File {% if t.exists %}exists{% else %}does not exist{% endif %})</li>{% endfor %}</ul>
+            </li>
+        {% endfor %}
+        </ul>
+    {% else %}
+        <p>Django couldn't find any templates because your <code>TEMPLATE_LOADERS</code> setting is empty!</p>
+    {% endif %}
+</div>
+{% endif %}
-{% if template_info %}
-<div id="template">
@@ -286 +324 @@
-   {% else %}
-      <tr><th>{{ source_line.0 }}</th>
- 
+
-   {% endifequal %}
-   {% endfor %}

django/branches/new-admin/django/views/registration/passwords.py

@@ -42 +42 @@
-            'user': self.user_cache,
-        }
-c
+Context(c)
-
-class PasswordChangeForm(formfields.Manipulator):

django/branches/new-admin/django/views/static.py

@@ -35 +35 @@
-            # strip '.' amd '..' in path
-            continue
-
+.replace('\\', '/')
-    if newpath and path != newpath:
-        return HttpResponseRedirect(newpath)