mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-15 13:39:11 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: Merged to [2056]

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2057 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-01-19 00:55:18 +00:00
parent a4ead45cb2
commit 58605bcfe3
5 changed files with 164 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
django/bin/compile-messages.py
View File

@ -4,21 +4,24 @@ import os
import sys import sys
import getopt import getopt
basedir = None def compile_messages():
basedir = None
if os.path.isdir(os.path.join('conf', 'locale')): if os.path.isdir(os.path.join('conf', 'locale')):
basedir = os.path.abspath(os.path.join('conf', 'locale')) basedir = os.path.abspath(os.path.join('conf', 'locale'))
elif os.path.isdir('locale'): elif os.path.isdir('locale'):
basedir = os.path.abspath('locale') basedir = os.path.abspath('locale')
else: else:
print "this script should be run from the django svn tree or your project or app tree" print "this script should be run from the django svn tree or your project or app tree"
sys.exit(1) sys.exit(1)
for (dirpath, dirnames, filenames) in os.walk(basedir): for (dirpath, dirnames, filenames) in os.walk(basedir):
for file in filenames: for file in filenames:
if file.endswith('.po'): if file.endswith('.po'):
sys.stderr.write('processing file %s in %s\n' % (file, dirpath)) sys.stderr.write('processing file %s in %s\n' % (file, dirpath))
pf = os.path.splitext(os.path.join(dirpath, file))[0] pf = os.path.splitext(os.path.join(dirpath, file))[0]
cmd = 'msgfmt -o "%s.mo" "%s.po"' % (pf, pf) cmd = 'msgfmt -o "%s.mo" "%s.po"' % (pf, pf)
os.system(cmd) os.system(cmd)
if __name__ == "__main__":
compile_messages()

212
django/bin/make-messages.py
View File

@ -1,139 +1,141 @@
#!/usr/bin/python #!/usr/bin/python
from django.utils.translation import templateize
import re import re
import os import os
import sys import sys
import getopt import getopt
from django.utils.translation import templateize
pythonize_re = re.compile(r'\n\s*//') pythonize_re = re.compile(r'\n\s*//')
localedir = None def make_messages():
localedir = None
if os.path.isdir(os.path.join('conf', 'locale')): if os.path.isdir(os.path.join('conf', 'locale')):
localedir = os.path.abspath(os.path.join('conf', 'locale')) localedir = os.path.abspath(os.path.join('conf', 'locale'))
elif os.path.isdir('locale'): elif os.path.isdir('locale'):
localedir = os.path.abspath('locale') localedir = os.path.abspath('locale')
else: else:
print "This script should be run from the django svn tree or your project or app tree." print "This script should be run from the django svn tree or your project or app tree."
print "If you did indeed run it from the svn checkout or your project or application," print "If you did indeed run it from the svn checkout or your project or application,"
print "maybe you are just missing the conf/locale (in the django tree) or locale (for project" print "maybe you are just missing the conf/locale (in the django tree) or locale (for project"
print "and application) directory?" print "and application) directory?"
print "make-messages.py doesn't create it automatically, you have to create it by hand if" print "make-messages.py doesn't create it automatically, you have to create it by hand if"
print "you want to enable i18n for your project or application." print "you want to enable i18n for your project or application."
sys.exit(1) sys.exit(1)
(opts, args) = getopt.getopt(sys.argv[1:], 'l:d:va') (opts, args) = getopt.getopt(sys.argv[1:], 'l:d:va')
lang = None lang = None
domain = 'django' domain = 'django'
verbose = False verbose = False
all = False all = False
for o, v in opts: for o, v in opts:
if o == '-l': if o == '-l':
lang = v lang = v
elif o == '-d': elif o == '-d':
domain = v domain = v
elif o == '-v': elif o == '-v':
verbose = True verbose = True
elif o == '-a': elif o == '-a':
all = True all = True
if domain not in ('django', 'djangojs'): if domain not in ('django', 'djangojs'):
print "currently make-messages.py only supports domains 'django' and 'djangojs'" print "currently make-messages.py only supports domains 'django' and 'djangojs'"
sys.exit(1) sys.exit(1)
if (lang is None and not all) or domain is None: if (lang is None and not all) or domain is None:
print "usage: make-messages.py -l <language>" print "usage: make-messages.py -l <language>"
print " or: make-messages.py -a" print " or: make-messages.py -a"
sys.exit(1) sys.exit(1)
languages = [] languages = []
if lang is not None: if lang is not None:
languages.append(lang) languages.append(lang)
elif all: elif all:
languages = [el for el in os.listdir(localedir) if not el.startswith('.')] languages = [el for el in os.listdir(localedir) if not el.startswith('.')]
for lang in languages: for lang in languages:
print "processing language", lang print "processing language", lang
basedir = os.path.join(localedir, lang, 'LC_MESSAGES') basedir = os.path.join(localedir, lang, 'LC_MESSAGES')
if not os.path.isdir(basedir): if not os.path.isdir(basedir):
os.makedirs(basedir) os.makedirs(basedir)
pofile = os.path.join(basedir, '%s.po' % domain) pofile = os.path.join(basedir, '%s.po' % domain)
potfile = os.path.join(basedir, '%s.pot' % domain) potfile = os.path.join(basedir, '%s.pot' % domain)
if os.path.exists(potfile): if os.path.exists(potfile):
os.unlink(potfile) os.unlink(potfile)
for (dirpath, dirnames, filenames) in os.walk("."): for (dirpath, dirnames, filenames) in os.walk("."):
for file in filenames: for file in filenames:
if domain == 'djangojs' and file.endswith('.js'): if domain == 'djangojs' and file.endswith('.js'):
if verbose: sys.stdout.write('processing file %s in %s\n' % (file, dirpath)) if verbose: sys.stdout.write('processing file %s in %s\n' % (file, dirpath))
src = open(os.path.join(dirpath, file), "rb").read()
src = pythonize_re.sub('\n#', src)
open(os.path.join(dirpath, '%s.py' % file), "wb").write(src)
thefile = '%s.py' % file
cmd = 'xgettext %s -d %s -L Perl --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy -o - "%s"' % (
os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile))
(stdin, stdout, stderr) = os.popen3(cmd, 'b')
msgs = stdout.read()
errors = stderr.read()
if errors:
print "errors happened while running xgettext on %s" % file
print errors
sys.exit(8)
old = '#: '+os.path.join(dirpath, thefile)[2:]
new = '#: '+os.path.join(dirpath, file)[2:]
msgs = msgs.replace(old, new)
if msgs:
open(potfile, 'ab').write(msgs)
os.unlink(os.path.join(dirpath, thefile))
elif domain == 'django' and (file.endswith('.py') or file.endswith('.html')):
thefile = file
if file.endswith('.html'):
src = open(os.path.join(dirpath, file), "rb").read() src = open(os.path.join(dirpath, file), "rb").read()
open(os.path.join(dirpath, '%s.py' % file), "wb").write(templateize(src)) src = pythonize_re.sub('\n#', src)
open(os.path.join(dirpath, '%s.py' % file), "wb").write(src)
thefile = '%s.py' % file thefile = '%s.py' % file
if verbose: sys.stdout.write('processing file %s in %s\n' % (file, dirpath)) cmd = 'xgettext %s -d %s -L Perl --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy -o - "%s"' % (
cmd = 'xgettext %s -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy -o - "%s"' % ( os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile))
os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile)) (stdin, stdout, stderr) = os.popen3(cmd, 'b')
(stdin, stdout, stderr) = os.popen3(cmd, 'b') msgs = stdout.read()
msgs = stdout.read() errors = stderr.read()
errors = stderr.read() if errors:
if errors: print "errors happened while running xgettext on %s" % file
print "errors happened while running xgettext on %s" % file print errors
print errors sys.exit(8)
sys.exit(8)
if thefile != file:
old = '#: '+os.path.join(dirpath, thefile)[2:] old = '#: '+os.path.join(dirpath, thefile)[2:]
new = '#: '+os.path.join(dirpath, file)[2:] new = '#: '+os.path.join(dirpath, file)[2:]
msgs = msgs.replace(old, new) msgs = msgs.replace(old, new)
if msgs: if msgs:
open(potfile, 'ab').write(msgs) open(potfile, 'ab').write(msgs)
if thefile != file:
os.unlink(os.path.join(dirpath, thefile)) os.unlink(os.path.join(dirpath, thefile))
elif domain == 'django' and (file.endswith('.py') or file.endswith('.html')):
thefile = file
if file.endswith('.html'):
src = open(os.path.join(dirpath, file), "rb").read()
open(os.path.join(dirpath, '%s.py' % file), "wb").write(templateize(src))
thefile = '%s.py' % file
if verbose: sys.stdout.write('processing file %s in %s\n' % (file, dirpath))
cmd = 'xgettext %s -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy -o - "%s"' % (
os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile))
(stdin, stdout, stderr) = os.popen3(cmd, 'b')
msgs = stdout.read()
errors = stderr.read()
if errors:
print "errors happened while running xgettext on %s" % file
print errors
sys.exit(8)
if thefile != file:
old = '#: '+os.path.join(dirpath, thefile)[2:]
new = '#: '+os.path.join(dirpath, file)[2:]
msgs = msgs.replace(old, new)
if msgs:
open(potfile, 'ab').write(msgs)
if thefile != file:
os.unlink(os.path.join(dirpath, thefile))
if os.path.exists(potfile): if os.path.exists(potfile):
(stdin, stdout, stderr) = os.popen3('msguniq "%s"' % potfile, 'b') (stdin, stdout, stderr) = os.popen3('msguniq "%s"' % potfile, 'b')
msgs = stdout.read()
errors = stderr.read()
if errors:
print "errors happened while running msguniq"
print errors
sys.exit(8)
open(potfile, 'w').write(msgs)
if os.path.exists(pofile):
(stdin, stdout, stderr) = os.popen3('msgmerge -q "%s" "%s"' % (pofile, potfile), 'b')
msgs = stdout.read() msgs = stdout.read()
errors = stderr.read() errors = stderr.read()
if errors: if errors:
print "errors happened while running msgmerge" print "errors happened while running msguniq"
print errors print errors
sys.exit(8) sys.exit(8)
open(pofile, 'wb').write(msgs) open(potfile, 'w').write(msgs)
os.unlink(potfile) if os.path.exists(pofile):
(stdin, stdout, stderr) = os.popen3('msgmerge -q "%s" "%s"' % (pofile, potfile), 'b')
msgs = stdout.read()
errors = stderr.read()
if errors:
print "errors happened while running msgmerge"
print errors
sys.exit(8)
open(pofile, 'wb').write(msgs)
os.unlink(potfile)
if __name__ == "__main__":
make_messages()

37
django/bin/unique-messages.py
View File

@ -4,23 +4,26 @@ import os
import sys import sys
import getopt import getopt
basedir = None def unique_messages():
basedir = None
if os.path.isdir(os.path.join('conf', 'locale')): if os.path.isdir(os.path.join('conf', 'locale')):
basedir = os.path.abspath(os.path.join('conf', 'locale')) basedir = os.path.abspath(os.path.join('conf', 'locale'))
elif os.path.isdir('locale'): elif os.path.isdir('locale'):
basedir = os.path.abspath('locale') basedir = os.path.abspath('locale')
else: else:
print "this script should be run from the django svn tree or your project or app tree" print "this script should be run from the django svn tree or your project or app tree"
sys.exit(1) sys.exit(1)
for (dirpath, dirnames, filenames) in os.walk(basedir): for (dirpath, dirnames, filenames) in os.walk(basedir):
for file in filenames: for file in filenames:
if file.endswith('.po'): if file.endswith('.po'):
sys.stderr.write('processing file %s in %s\n' % (file, dirpath)) sys.stderr.write('processing file %s in %s\n' % (file, dirpath))
pf = os.path.splitext(os.path.join(dirpath, file))[0] pf = os.path.splitext(os.path.join(dirpath, file))[0]
cmd = 'msguniq "%s.po"' % pf cmd = 'msguniq "%s.po"' % pf
stdout = os.popen(cmd) stdout = os.popen(cmd)
msg = stdout.read() msg = stdout.read()
open('%s.po' % pf, 'w').write(msg) open('%s.po' % pf, 'w').write(msg)
if __name__ == "__main__":
unique_messages()

18
docs/i18n.txt
View File

@ -447,6 +447,24 @@ Notes:
en-us). en-us).
.. _LANGUAGES setting: http://www.djangoproject.com/documentation/settings/#languages .. _LANGUAGES setting: http://www.djangoproject.com/documentation/settings/#languages
* the LocaleMiddleware can only select languages for which there is a
django provided base translation. If you want to provide translations
for your application that aren't already in the set of translations
in Djangos source tree, you will want to at least provide basic
translations for that language. For example Django uses technical
message IDs to translate date formats and time formats - so you will
need at least those translations for the system to work correctly.
A good starting point is to just copy over the english ``.po`` file
and to translate at least the technical messages and maybe the validator
messages, too.
Technical message IDs are easily recognized by them being all upper case.
You don't translate the message ID as with other messages, you provide
the correct local variant on the provided english value. For example with
``DATETIME_FORMAT`` (or ``DATE_FORMAT`` or ``TIME_FORMAT``), this would
be the format string that you want to use in your language. The format
is identical to the ``now`` tag date formattings.
Once ``LocaleMiddleware`` determines the user's preference, it makes this Once ``LocaleMiddleware`` determines the user's preference, it makes this
preference available as ``request.LANGUAGE_CODE`` for each `request object`_. preference available as ``request.LANGUAGE_CODE`` for each `request object`_.

2
docs/templates_python.txt
View File

@ -285,7 +285,7 @@ optional, third positional argument, ``processors``. In this example, the
Here's what each of the default processors does: Here's what each of the default processors does:
.. _HttpRequest object: http://www.djangoproject.com/documentation/request_response/#httprequest-objects .. _HttpRequest object: http://www.djangoproject.com/documentation/request_response/#httprequest-objects
.. _TEMPLATE_CONTEXT_PROCESSORS setting: http://www.djangoproject.com/documentation/settings/#template-context_processors .. _TEMPLATE_CONTEXT_PROCESSORS setting: http://www.djangoproject.com/documentation/settings/#template-context-processors
django.core.context_processors.auth django.core.context_processors.auth
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~