Changeset 2058
- Timestamp:
- 01/18/06 19:06:12 (3 years ago)
- Files:
-
- django/trunk/django/bin/compile-messages.py (modified) (1 diff)
- django/trunk/django/bin/unique-messages.py (modified) (2 diffs)
- django/trunk/django/utils/html.py (modified) (1 diff)
- django/trunk/django/views/debug.py (modified) (1 diff)
- django/trunk/django/views/i18n.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/trunk/django/bin/compile-messages.py
r2056 r2058 17 17 18 18 for (dirpath, dirnames, filenames) in os.walk(basedir): 19 for f ilein filenames:20 if f ile.endswith('.po'):21 sys.stderr.write('processing file %s in %s\n' % (f ile, dirpath))22 pf = os.path.splitext(os.path.join(dirpath, f ile))[0]19 for f in filenames: 20 if f.endswith('.po'): 21 sys.stderr.write('processing file %s in %s\n' % (f, dirpath)) 22 pf = os.path.splitext(os.path.join(dirpath, f))[0] 23 23 cmd = 'msgfmt -o "%s.mo" "%s.po"' % (pf, pf) 24 24 os.system(cmd) django/trunk/django/bin/unique-messages.py
r2056 r2058 3 3 import os 4 4 import sys 5 import getopt6 5 7 6 def unique_messages(): … … 17 16 18 17 for (dirpath, dirnames, filenames) in os.walk(basedir): 19 for f ilein filenames:20 if f ile.endswith('.po'):21 sys.stderr.write('processing file %s in %s\n' % (f ile, dirpath))22 pf = os.path.splitext(os.path.join(dirpath, f ile))[0]18 for f in filenames: 19 if f.endswith('.po'): 20 sys.stderr.write('processing file %s in %s\n' % (f, dirpath)) 21 pf = os.path.splitext(os.path.join(dirpath, f))[0] 23 22 cmd = 'msguniq "%s.po"' % pf 24 23 stdout = os.popen(cmd) django/trunk/django/utils/html.py
r1969 r2058 13 13 word_split_re = re.compile(r'(\s+)') 14 14 punctuation_re = re.compile('^(?P<lead>(?:%s)*)(?P<middle>.*?)(?P<trail>(?:%s)*)$' % \ 15 ('|'.join([re.escape( p) for pin LEADING_PUNCTUATION]),16 '|'.join([re.escape( p) for pin TRAILING_PUNCTUATION])))15 ('|'.join([re.escape(x) for x in LEADING_PUNCTUATION]), 16 '|'.join([re.escape(x) for x in TRAILING_PUNCTUATION]))) 17 17 simple_email_re = re.compile(r'^\S+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9._-]+$') 18 18 link_target_attribute_re = re.compile(r'(<a [^>]*?)target=[^\s>]+') 19 19 html_gunk_re = re.compile(r'(?:<br clear="all">|<i><\/i>|<b><\/b>|<em><\/em>|<strong><\/strong>|<\/?smallcaps>|<\/?uppercase>)', re.IGNORECASE) 20 hard_coded_bullets_re = re.compile(r'((?:<p>(?:%s).*?[a-zA-Z].*?</p>\s*)+)' % '|'.join([re.escape( d) for din DOTS]), re.DOTALL)20 hard_coded_bullets_re = re.compile(r'((?:<p>(?:%s).*?[a-zA-Z].*?</p>\s*)+)' % '|'.join([re.escape(x) for x in DOTS]), re.DOTALL) 21 21 trailing_empty_content_re = re.compile(r'(?:<p>(?: |\s|<br \/>)*?</p>\s*)+\Z') 22 del x # Temporary variable 22 23 23 24 def escape(html): django/trunk/django/views/debug.py
r1825 r2058 3 3 from django.utils.html import escape 4 4 from django.utils.httpwrappers import HttpResponseServerError, HttpResponseNotFound 5 import inspect, os, re, sys5 import os, re 6 6 from itertools import count, izip 7 7 from os.path import dirname, join as pathjoin django/trunk/django/views/i18n.py
r1560 r2058 1 import re2 import os3 4 import gettext as gettext_module5 6 1 from django.utils import httpwrappers 7 2 from django.utils.translation import check_for_language, activate, to_locale, get_language 8 3 from django.utils.text import javascript_quote 9 4 from django.conf import settings 5 import os 6 import gettext as gettext_module 10 7 11 8 def set_language(request): … … 146 143 try: 147 144 catalog = gettext_module.translation(domain, path, [default_locale]) 148 except IOError , e:145 except IOError: 149 146 catalog = None 150 147 if catalog is not None: … … 155 152 try: 156 153 catalog = gettext_module.translation(domain, path, [locale]) 157 except IOError , e:154 except IOError: 158 155 catalog = None 159 156 if catalog is not None:
