Changeset 2060

Timestamp:

01/18/06 19:09:28 (3 years ago)

Author:

adrian

Message:

magic-removal: Merged to [2059]

Files:

• django/branches/magic-removal/django/bin/compile-messages.py (modified) (1 diff)
• django/branches/magic-removal/django/bin/unique-messages.py (modified) (2 diffs)
• django/branches/magic-removal/django/utils/html.py (modified) (1 diff)
• django/branches/magic-removal/django/views/debug.py (modified) (1 diff)
• django/branches/magic-removal/django/views/i18n.py (modified) (3 diffs)
• django/branches/magic-removal/docs/i18n.txt (modified) (1 diff)

django/branches/magic-removal/django/bin/compile-messages.py

@@ -17 +17 @@
-
-    for (dirpath, dirnames, filenames) in os.walk(basedir):
-ile
-ile
-ile
-ile
+
+
+
+
-                cmd = 'msgfmt -o "%s.mo" "%s.po"' % (pf, pf)
-                os.system(cmd)

django/branches/magic-removal/django/bin/unique-messages.py

@@ -3 +3 @@
-import os
-import sys
-import getopt
-
-def unique_messages():
@@ -17 +16 @@
-
-    for (dirpath, dirnames, filenames) in os.walk(basedir):
-ile
-ile
-ile
-ile
+
+
+
+
-                cmd = 'msguniq "%s.po"' % pf
-                stdout = os.popen(cmd)

django/branches/magic-removal/django/utils/html.py

@@ -13 +13 @@
-word_split_re = re.compile(r'(\s+)')
-punctuation_re = re.compile('^(?P<lead>(?:%s)*)(?P<middle>.*?)(?P<trail>(?:%s)*)$' % \
-p) for p
-p) for p
+x) for x
+x) for x
-simple_email_re = re.compile(r'^\S+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9._-]+$')
-link_target_attribute_re = re.compile(r'(<a [^>]*?)target=[^\s>]+')
-html_gunk_re = re.compile(r'(?:<br clear="all">|<i><\/i>|<b><\/b>|<em><\/em>|<strong><\/strong>|<\/?smallcaps>|<\/?uppercase>)', re.IGNORECASE)
-d) for d
+x) for x
-trailing_empty_content_re = re.compile(r'(?:<p>(?:&nbsp;|\s|<br \/>)*?</p>\s*)+\Z')
+del x # Temporary variable
-
-def escape(html):

django/branches/magic-removal/django/views/debug.py

@@ -3 +3 @@
-from django.utils.html import escape
-from django.http import HttpResponseServerError, HttpResponseNotFound
-inspect, os, re, sys
+os, re
-from itertools import count, izip
-from os.path import dirname, join as pathjoin

django/branches/magic-removal/django/views/i18n.py

@@ -1 @@
-import re
-import os
-
-import gettext as gettext_module
-
-from django import http
-from django.utils.translation import check_for_language, activate, to_locale, get_language
-from django.utils.text import javascript_quote
-from django.conf import settings
+import os
+import gettext as gettext_module
-
-def set_language(request):
@@ -146 +143 @@
-            try:
-                catalog = gettext_module.translation(domain, path, [default_locale])
-, e
+
-                catalog = None
-            if catalog is not None:
@@ -155 +152 @@
-            try:
-                catalog = gettext_module.translation(domain, path, [locale])
-, e
+
-                catalog = None
-            if catalog is not None:

django/branches/magic-removal/docs/i18n.txt

@@ -448 +448 @@
-
-      .. _LANGUAGES setting: http://www.djangoproject.com/documentation/settings/#languages
-the LocaleMiddleware
-django 
+The ``LocaleMiddleware``
+Django-
-      for your application that aren't already in the set of translations
-s source tree, you will want to at least provide
-
-
+'s source tree, you'll want to provide at least
+,
+-
-      need at least those translations for the system to work correctly.
-
-just copy over the english ``.po`` file
-and to translate at least the technical messages and
+copy the English ``.po`` file and to
+translate at least the technical messages --
-      messages, too.
-
- by them being all upper case.
-You don't translate the message ID as with other messages, you provid
-the correct local variant on the provided english value. For example
+
+; they're all upper case. You
+don't translate the message ID as with other messages, you provide th
+correct local variant on the provided English value. For example,
-      ``DATETIME_FORMAT`` (or ``DATE_FORMAT`` or ``TIME_FORMAT``), this would
- 
-``now`` tag date formattings
+
+format strings used by the ``now`` template tag
-
-Once ``LocaleMiddleware`` determines the user's preference, it makes this