Fixed #27034 -- Made makemessages independent of USE_I18N
Thanks Tim Graham for the review.
This commit is contained in:
Claude Paroz
parent
324c1b432a
commit
5fb22b4d4c
|
|
@ -21,6 +21,7 @@ from django.utils.encoding import DEFAULT_LOCALE_ENCODING, force_str
|
||||||
from django.utils.functional import cached_property
|
from django.utils.functional import cached_property
|
||||||
from django.utils.jslex import prepare_js_for_gettext
|
from django.utils.jslex import prepare_js_for_gettext
|
||||||
from django.utils.text import get_text_list
|
from django.utils.text import get_text_list
|
||||||
|
from django.utils.translation import templatize
|
||||||
|
|
||||||
plural_forms_re = re.compile(r'^(?P<value>"Plural-Forms.+?\\n")\s*$', re.MULTILINE | re.DOTALL)
|
plural_forms_re = re.compile(r'^(?P<value>"Plural-Forms.+?\\n")\s*$', re.MULTILINE | re.DOTALL)
|
||||||
STATUS_OK = 0
|
STATUS_OK = 0
|
||||||
|
|
@ -99,8 +100,6 @@ class BuildFile(object):
|
||||||
Preprocess (if necessary) a translatable file before passing it to
|
Preprocess (if necessary) a translatable file before passing it to
|
||||||
xgettext GNU gettext utility.
|
xgettext GNU gettext utility.
|
||||||
"""
|
"""
|
||||||
from django.utils.translation import templatize
|
|
||||||
|
|
||||||
if not self.is_templatized:
|
if not self.is_templatized:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
@ -277,12 +276,6 @@ class Command(BaseCommand):
|
||||||
extensions = options['extensions']
|
extensions = options['extensions']
|
||||||
self.symlinks = options['symlinks']
|
self.symlinks = options['symlinks']
|
||||||
|
|
||||||
# Need to ensure that the i18n framework is enabled
|
|
||||||
if settings.configured:
|
|
||||||
settings.USE_I18N = True
|
|
||||||
else:
|
|
||||||
settings.configure(USE_I18N=True)
|
|
||||||
|
|
||||||
ignore_patterns = options['ignore_patterns']
|
ignore_patterns = options['ignore_patterns']
|
||||||
if options['use_default_ignore_patterns']:
|
if options['use_default_ignore_patterns']:
|
||||||
ignore_patterns += ['CVS', '.*', '*~', '*.pyc']
|
ignore_patterns += ['CVS', '.*', '*~', '*.pyc']
|
||||||
|
|
|
||||||
|
|
@ -211,7 +211,8 @@ def get_language_from_path(path):
|
||||||
|
|
||||||
|
|
||||||
def templatize(src, origin=None):
|
def templatize(src, origin=None):
|
||||||
return _trans.templatize(src, origin)
|
from .template import templatize
|
||||||
|
return templatize(src, origin)
|
||||||
|
|
||||||
|
|
||||||
def deactivate_all():
|
def deactivate_all():
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,237 @@
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
import re
|
||||||
|
import warnings
|
||||||
|
|
||||||
|
from django.conf import settings
|
||||||
|
from django.template.base import (
|
||||||
|
TOKEN_BLOCK, TOKEN_COMMENT, TOKEN_TEXT, TOKEN_VAR, TRANSLATOR_COMMENT_MARK,
|
||||||
|
Lexer,
|
||||||
|
)
|
||||||
|
from django.utils import six
|
||||||
|
from django.utils.encoding import force_text
|
||||||
|
from django.utils.six import StringIO
|
||||||
|
|
||||||
|
from . import TranslatorCommentWarning, trim_whitespace
|
||||||
|
|
||||||
|
dot_re = re.compile(r'\S')
|
||||||
|
|
||||||
|
|
||||||
|
def blankout(src, char):
|
||||||
|
"""
|
||||||
|
Change every non-whitespace character to the given char.
|
||||||
|
Used in the templatize function.
|
||||||
|
"""
|
||||||
|
return dot_re.sub(char, src)
|
||||||
|
|
||||||
|
|
||||||
|
context_re = re.compile(r"""^\s+.*context\s+((?:"[^"]*?")|(?:'[^']*?'))\s*""")
|
||||||
|
inline_re = re.compile(
|
||||||
|
# Match the trans 'some text' part
|
||||||
|
r"""^\s*trans\s+((?:"[^"]*?")|(?:'[^']*?'))"""
|
||||||
|
# Match and ignore optional filters
|
||||||
|
r"""(?:\s*\|\s*[^\s:]+(?::(?:[^\s'":]+|(?:"[^"]*?")|(?:'[^']*?')))?)*"""
|
||||||
|
# Match the optional context part
|
||||||
|
r"""(\s+.*context\s+((?:"[^"]*?")|(?:'[^']*?')))?\s*"""
|
||||||
|
)
|
||||||
|
block_re = re.compile(r"""^\s*blocktrans(\s+.*context\s+((?:"[^"]*?")|(?:'[^']*?')))?(?:\s+|$)""")
|
||||||
|
endblock_re = re.compile(r"""^\s*endblocktrans$""")
|
||||||
|
plural_re = re.compile(r"""^\s*plural$""")
|
||||||
|
constant_re = re.compile(r"""_\(((?:".*?")|(?:'.*?'))\)""")
|
||||||
|
|
||||||
|
|
||||||
|
def templatize(src, origin=None):
|
||||||
|
"""
|
||||||
|
Turn a Django template into something that is understood by xgettext. It
|
||||||
|
does so by translating the Django translation tags into standard gettext
|
||||||
|
function invocations.
|
||||||
|
"""
|
||||||
|
src = force_text(src, settings.FILE_CHARSET)
|
||||||
|
out = StringIO('')
|
||||||
|
message_context = None
|
||||||
|
intrans = False
|
||||||
|
inplural = False
|
||||||
|
trimmed = False
|
||||||
|
singular = []
|
||||||
|
plural = []
|
||||||
|
incomment = False
|
||||||
|
comment = []
|
||||||
|
lineno_comment_map = {}
|
||||||
|
comment_lineno_cache = None
|
||||||
|
# Adding the u prefix allows gettext to recognize the Unicode string
|
||||||
|
# (#26093).
|
||||||
|
raw_prefix = 'u' if six.PY3 else ''
|
||||||
|
|
||||||
|
def join_tokens(tokens, trim=False):
|
||||||
|
message = ''.join(tokens)
|
||||||
|
if trim:
|
||||||
|
message = trim_whitespace(message)
|
||||||
|
return message
|
||||||
|
|
||||||
|
for t in Lexer(src).tokenize():
|
||||||
|
if incomment:
|
||||||
|
if t.token_type == TOKEN_BLOCK and t.contents == 'endcomment':
|
||||||
|
content = ''.join(comment)
|
||||||
|
translators_comment_start = None
|
||||||
|
for lineno, line in enumerate(content.splitlines(True)):
|
||||||
|
if line.lstrip().startswith(TRANSLATOR_COMMENT_MARK):
|
||||||
|
translators_comment_start = lineno
|
||||||
|
for lineno, line in enumerate(content.splitlines(True)):
|
||||||
|
if translators_comment_start is not None and lineno >= translators_comment_start:
|
||||||
|
out.write(' # %s' % line)
|
||||||
|
else:
|
||||||
|
out.write(' #\n')
|
||||||
|
incomment = False
|
||||||
|
comment = []
|
||||||
|
else:
|
||||||
|
comment.append(t.contents)
|
||||||
|
elif intrans:
|
||||||
|
if t.token_type == TOKEN_BLOCK:
|
||||||
|
endbmatch = endblock_re.match(t.contents)
|
||||||
|
pluralmatch = plural_re.match(t.contents)
|
||||||
|
if endbmatch:
|
||||||
|
if inplural:
|
||||||
|
if message_context:
|
||||||
|
out.write(' npgettext({p}{!r}, {p}{!r}, {p}{!r},count) '.format(
|
||||||
|
message_context,
|
||||||
|
join_tokens(singular, trimmed),
|
||||||
|
join_tokens(plural, trimmed),
|
||||||
|
p=raw_prefix,
|
||||||
|
))
|
||||||
|
else:
|
||||||
|
out.write(' ngettext({p}{!r}, {p}{!r}, count) '.format(
|
||||||
|
join_tokens(singular, trimmed),
|
||||||
|
join_tokens(plural, trimmed),
|
||||||
|
p=raw_prefix,
|
||||||
|
))
|
||||||
|
for part in singular:
|
||||||
|
out.write(blankout(part, 'S'))
|
||||||
|
for part in plural:
|
||||||
|
out.write(blankout(part, 'P'))
|
||||||
|
else:
|
||||||
|
if message_context:
|
||||||
|
out.write(' pgettext({p}{!r}, {p}{!r}) '.format(
|
||||||
|
message_context,
|
||||||
|
join_tokens(singular, trimmed),
|
||||||
|
p=raw_prefix,
|
||||||
|
))
|
||||||
|
else:
|
||||||
|
out.write(' gettext({p}{!r}) '.format(
|
||||||
|
join_tokens(singular, trimmed),
|
||||||
|
p=raw_prefix,
|
||||||
|
))
|
||||||
|
for part in singular:
|
||||||
|
out.write(blankout(part, 'S'))
|
||||||
|
message_context = None
|
||||||
|
intrans = False
|
||||||
|
inplural = False
|
||||||
|
singular = []
|
||||||
|
plural = []
|
||||||
|
elif pluralmatch:
|
||||||
|
inplural = True
|
||||||
|
else:
|
||||||
|
filemsg = ''
|
||||||
|
if origin:
|
||||||
|
filemsg = 'file %s, ' % origin
|
||||||
|
raise SyntaxError(
|
||||||
|
"Translation blocks must not include other block tags: "
|
||||||
|
"%s (%sline %d)" % (t.contents, filemsg, t.lineno)
|
||||||
|
)
|
||||||
|
elif t.token_type == TOKEN_VAR:
|
||||||
|
if inplural:
|
||||||
|
plural.append('%%(%s)s' % t.contents)
|
||||||
|
else:
|
||||||
|
singular.append('%%(%s)s' % t.contents)
|
||||||
|
elif t.token_type == TOKEN_TEXT:
|
||||||
|
contents = t.contents.replace('%', '%%')
|
||||||
|
if inplural:
|
||||||
|
plural.append(contents)
|
||||||
|
else:
|
||||||
|
singular.append(contents)
|
||||||
|
else:
|
||||||
|
# Handle comment tokens (`{# ... #}`) plus other constructs on
|
||||||
|
# the same line:
|
||||||
|
if comment_lineno_cache is not None:
|
||||||
|
cur_lineno = t.lineno + t.contents.count('\n')
|
||||||
|
if comment_lineno_cache == cur_lineno:
|
||||||
|
if t.token_type != TOKEN_COMMENT:
|
||||||
|
for c in lineno_comment_map[comment_lineno_cache]:
|
||||||
|
filemsg = ''
|
||||||
|
if origin:
|
||||||
|
filemsg = 'file %s, ' % origin
|
||||||
|
warn_msg = (
|
||||||
|
"The translator-targeted comment '%s' "
|
||||||
|
"(%sline %d) was ignored, because it wasn't "
|
||||||
|
"the last item on the line."
|
||||||
|
) % (c, filemsg, comment_lineno_cache)
|
||||||
|
warnings.warn(warn_msg, TranslatorCommentWarning)
|
||||||
|
lineno_comment_map[comment_lineno_cache] = []
|
||||||
|
else:
|
||||||
|
out.write('# %s' % ' | '.join(lineno_comment_map[comment_lineno_cache]))
|
||||||
|
comment_lineno_cache = None
|
||||||
|
|
||||||
|
if t.token_type == TOKEN_BLOCK:
|
||||||
|
imatch = inline_re.match(t.contents)
|
||||||
|
bmatch = block_re.match(t.contents)
|
||||||
|
cmatches = constant_re.findall(t.contents)
|
||||||
|
if imatch:
|
||||||
|
g = imatch.group(1)
|
||||||
|
if g[0] == '"':
|
||||||
|
g = g.strip('"')
|
||||||
|
elif g[0] == "'":
|
||||||
|
g = g.strip("'")
|
||||||
|
g = g.replace('%', '%%')
|
||||||
|
if imatch.group(2):
|
||||||
|
# A context is provided
|
||||||
|
context_match = context_re.match(imatch.group(2))
|
||||||
|
message_context = context_match.group(1)
|
||||||
|
if message_context[0] == '"':
|
||||||
|
message_context = message_context.strip('"')
|
||||||
|
elif message_context[0] == "'":
|
||||||
|
message_context = message_context.strip("'")
|
||||||
|
out.write(' pgettext({p}{!r}, {p}{!r}) '.format(
|
||||||
|
message_context, g, p=raw_prefix
|
||||||
|
))
|
||||||
|
message_context = None
|
||||||
|
else:
|
||||||
|
out.write(' gettext({p}{!r}) '.format(g, p=raw_prefix))
|
||||||
|
elif bmatch:
|
||||||
|
for fmatch in constant_re.findall(t.contents):
|
||||||
|
out.write(' _(%s) ' % fmatch)
|
||||||
|
if bmatch.group(1):
|
||||||
|
# A context is provided
|
||||||
|
context_match = context_re.match(bmatch.group(1))
|
||||||
|
message_context = context_match.group(1)
|
||||||
|
if message_context[0] == '"':
|
||||||
|
message_context = message_context.strip('"')
|
||||||
|
elif message_context[0] == "'":
|
||||||
|
message_context = message_context.strip("'")
|
||||||
|
intrans = True
|
||||||
|
inplural = False
|
||||||
|
trimmed = 'trimmed' in t.split_contents()
|
||||||
|
singular = []
|
||||||
|
plural = []
|
||||||
|
elif cmatches:
|
||||||
|
for cmatch in cmatches:
|
||||||
|
out.write(' _(%s) ' % cmatch)
|
||||||
|
elif t.contents == 'comment':
|
||||||
|
incomment = True
|
||||||
|
else:
|
||||||
|
out.write(blankout(t.contents, 'B'))
|
||||||
|
elif t.token_type == TOKEN_VAR:
|
||||||
|
parts = t.contents.split('|')
|
||||||
|
cmatch = constant_re.match(parts[0])
|
||||||
|
if cmatch:
|
||||||
|
out.write(' _(%s) ' % cmatch.group(1))
|
||||||
|
for p in parts[1:]:
|
||||||
|
if p.find(':_(') >= 0:
|
||||||
|
out.write(' %s ' % p.split(':', 1)[1])
|
||||||
|
else:
|
||||||
|
out.write(blankout(p, 'F'))
|
||||||
|
elif t.token_type == TOKEN_COMMENT:
|
||||||
|
if t.contents.lstrip().startswith(TRANSLATOR_COMMENT_MARK):
|
||||||
|
lineno_comment_map.setdefault(t.lineno, []).append(t.contents)
|
||||||
|
comment_lineno_cache = t.lineno
|
||||||
|
else:
|
||||||
|
out.write(blankout(t.contents, 'X'))
|
||||||
|
return out.getvalue()
|
||||||
|
|
@ -19,10 +19,7 @@ from django.utils import lru_cache, six
|
||||||
from django.utils._os import upath
|
from django.utils._os import upath
|
||||||
from django.utils.encoding import force_text
|
from django.utils.encoding import force_text
|
||||||
from django.utils.safestring import SafeData, mark_safe
|
from django.utils.safestring import SafeData, mark_safe
|
||||||
from django.utils.six import StringIO
|
from django.utils.translation import LANGUAGE_SESSION_KEY
|
||||||
from django.utils.translation import (
|
|
||||||
LANGUAGE_SESSION_KEY, TranslatorCommentWarning, trim_whitespace,
|
|
||||||
)
|
|
||||||
|
|
||||||
# Translations are cached in a dictionary for every language.
|
# Translations are cached in a dictionary for every language.
|
||||||
# The active translations are stored by threadid to make them thread local.
|
# The active translations are stored by threadid to make them thread local.
|
||||||
|
|
@ -545,234 +542,6 @@ def get_language_from_request(request, check_path=False):
|
||||||
except LookupError:
|
except LookupError:
|
||||||
return settings.LANGUAGE_CODE
|
return settings.LANGUAGE_CODE
|
||||||
|
|
||||||
dot_re = re.compile(r'\S')
|
|
||||||
|
|
||||||
|
|
||||||
def blankout(src, char):
|
|
||||||
"""
|
|
||||||
Changes every non-whitespace character to the given char.
|
|
||||||
Used in the templatize function.
|
|
||||||
"""
|
|
||||||
return dot_re.sub(char, src)
|
|
||||||
|
|
||||||
|
|
||||||
context_re = re.compile(r"""^\s+.*context\s+((?:"[^"]*?")|(?:'[^']*?'))\s*""")
|
|
||||||
inline_re = re.compile(
|
|
||||||
# Match the trans 'some text' part
|
|
||||||
r"""^\s*trans\s+((?:"[^"]*?")|(?:'[^']*?'))"""
|
|
||||||
# Match and ignore optional filters
|
|
||||||
r"""(?:\s*\|\s*[^\s:]+(?::(?:[^\s'":]+|(?:"[^"]*?")|(?:'[^']*?')))?)*"""
|
|
||||||
# Match the optional context part
|
|
||||||
r"""(\s+.*context\s+((?:"[^"]*?")|(?:'[^']*?')))?\s*"""
|
|
||||||
)
|
|
||||||
block_re = re.compile(r"""^\s*blocktrans(\s+.*context\s+((?:"[^"]*?")|(?:'[^']*?')))?(?:\s+|$)""")
|
|
||||||
endblock_re = re.compile(r"""^\s*endblocktrans$""")
|
|
||||||
plural_re = re.compile(r"""^\s*plural$""")
|
|
||||||
constant_re = re.compile(r"""_\(((?:".*?")|(?:'.*?'))\)""")
|
|
||||||
|
|
||||||
|
|
||||||
def templatize(src, origin=None):
|
|
||||||
"""
|
|
||||||
Turns a Django template into something that is understood by xgettext. It
|
|
||||||
does so by translating the Django translation tags into standard gettext
|
|
||||||
function invocations.
|
|
||||||
"""
|
|
||||||
from django.template.base import (
|
|
||||||
Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK, TOKEN_COMMENT,
|
|
||||||
TRANSLATOR_COMMENT_MARK,
|
|
||||||
)
|
|
||||||
src = force_text(src, settings.FILE_CHARSET)
|
|
||||||
out = StringIO('')
|
|
||||||
message_context = None
|
|
||||||
intrans = False
|
|
||||||
inplural = False
|
|
||||||
trimmed = False
|
|
||||||
singular = []
|
|
||||||
plural = []
|
|
||||||
incomment = False
|
|
||||||
comment = []
|
|
||||||
lineno_comment_map = {}
|
|
||||||
comment_lineno_cache = None
|
|
||||||
# Adding the u prefix allows gettext to recognize the Unicode string
|
|
||||||
# (#26093).
|
|
||||||
raw_prefix = 'u' if six.PY3 else ''
|
|
||||||
|
|
||||||
def join_tokens(tokens, trim=False):
|
|
||||||
message = ''.join(tokens)
|
|
||||||
if trim:
|
|
||||||
message = trim_whitespace(message)
|
|
||||||
return message
|
|
||||||
|
|
||||||
for t in Lexer(src).tokenize():
|
|
||||||
if incomment:
|
|
||||||
if t.token_type == TOKEN_BLOCK and t.contents == 'endcomment':
|
|
||||||
content = ''.join(comment)
|
|
||||||
translators_comment_start = None
|
|
||||||
for lineno, line in enumerate(content.splitlines(True)):
|
|
||||||
if line.lstrip().startswith(TRANSLATOR_COMMENT_MARK):
|
|
||||||
translators_comment_start = lineno
|
|
||||||
for lineno, line in enumerate(content.splitlines(True)):
|
|
||||||
if translators_comment_start is not None and lineno >= translators_comment_start:
|
|
||||||
out.write(' # %s' % line)
|
|
||||||
else:
|
|
||||||
out.write(' #\n')
|
|
||||||
incomment = False
|
|
||||||
comment = []
|
|
||||||
else:
|
|
||||||
comment.append(t.contents)
|
|
||||||
elif intrans:
|
|
||||||
if t.token_type == TOKEN_BLOCK:
|
|
||||||
endbmatch = endblock_re.match(t.contents)
|
|
||||||
pluralmatch = plural_re.match(t.contents)
|
|
||||||
if endbmatch:
|
|
||||||
if inplural:
|
|
||||||
if message_context:
|
|
||||||
out.write(' npgettext({p}{!r}, {p}{!r}, {p}{!r},count) '.format(
|
|
||||||
message_context,
|
|
||||||
join_tokens(singular, trimmed),
|
|
||||||
join_tokens(plural, trimmed),
|
|
||||||
p=raw_prefix,
|
|
||||||
))
|
|
||||||
else:
|
|
||||||
out.write(' ngettext({p}{!r}, {p}{!r}, count) '.format(
|
|
||||||
join_tokens(singular, trimmed),
|
|
||||||
join_tokens(plural, trimmed),
|
|
||||||
p=raw_prefix,
|
|
||||||
))
|
|
||||||
for part in singular:
|
|
||||||
out.write(blankout(part, 'S'))
|
|
||||||
for part in plural:
|
|
||||||
out.write(blankout(part, 'P'))
|
|
||||||
else:
|
|
||||||
if message_context:
|
|
||||||
out.write(' pgettext({p}{!r}, {p}{!r}) '.format(
|
|
||||||
message_context,
|
|
||||||
join_tokens(singular, trimmed),
|
|
||||||
p=raw_prefix,
|
|
||||||
))
|
|
||||||
else:
|
|
||||||
out.write(' gettext({p}{!r}) '.format(
|
|
||||||
join_tokens(singular, trimmed),
|
|
||||||
p=raw_prefix,
|
|
||||||
))
|
|
||||||
for part in singular:
|
|
||||||
out.write(blankout(part, 'S'))
|
|
||||||
message_context = None
|
|
||||||
intrans = False
|
|
||||||
inplural = False
|
|
||||||
singular = []
|
|
||||||
plural = []
|
|
||||||
elif pluralmatch:
|
|
||||||
inplural = True
|
|
||||||
else:
|
|
||||||
filemsg = ''
|
|
||||||
if origin:
|
|
||||||
filemsg = 'file %s, ' % origin
|
|
||||||
raise SyntaxError(
|
|
||||||
"Translation blocks must not include other block tags: "
|
|
||||||
"%s (%sline %d)" % (t.contents, filemsg, t.lineno)
|
|
||||||
)
|
|
||||||
elif t.token_type == TOKEN_VAR:
|
|
||||||
if inplural:
|
|
||||||
plural.append('%%(%s)s' % t.contents)
|
|
||||||
else:
|
|
||||||
singular.append('%%(%s)s' % t.contents)
|
|
||||||
elif t.token_type == TOKEN_TEXT:
|
|
||||||
contents = t.contents.replace('%', '%%')
|
|
||||||
if inplural:
|
|
||||||
plural.append(contents)
|
|
||||||
else:
|
|
||||||
singular.append(contents)
|
|
||||||
|
|
||||||
else:
|
|
||||||
# Handle comment tokens (`{# ... #}`) plus other constructs on
|
|
||||||
# the same line:
|
|
||||||
if comment_lineno_cache is not None:
|
|
||||||
cur_lineno = t.lineno + t.contents.count('\n')
|
|
||||||
if comment_lineno_cache == cur_lineno:
|
|
||||||
if t.token_type != TOKEN_COMMENT:
|
|
||||||
for c in lineno_comment_map[comment_lineno_cache]:
|
|
||||||
filemsg = ''
|
|
||||||
if origin:
|
|
||||||
filemsg = 'file %s, ' % origin
|
|
||||||
warn_msg = (
|
|
||||||
"The translator-targeted comment '%s' "
|
|
||||||
"(%sline %d) was ignored, because it wasn't "
|
|
||||||
"the last item on the line."
|
|
||||||
) % (c, filemsg, comment_lineno_cache)
|
|
||||||
warnings.warn(warn_msg, TranslatorCommentWarning)
|
|
||||||
lineno_comment_map[comment_lineno_cache] = []
|
|
||||||
else:
|
|
||||||
out.write('# %s' % ' | '.join(lineno_comment_map[comment_lineno_cache]))
|
|
||||||
comment_lineno_cache = None
|
|
||||||
|
|
||||||
if t.token_type == TOKEN_BLOCK:
|
|
||||||
imatch = inline_re.match(t.contents)
|
|
||||||
bmatch = block_re.match(t.contents)
|
|
||||||
cmatches = constant_re.findall(t.contents)
|
|
||||||
if imatch:
|
|
||||||
g = imatch.group(1)
|
|
||||||
if g[0] == '"':
|
|
||||||
g = g.strip('"')
|
|
||||||
elif g[0] == "'":
|
|
||||||
g = g.strip("'")
|
|
||||||
g = g.replace('%', '%%')
|
|
||||||
if imatch.group(2):
|
|
||||||
# A context is provided
|
|
||||||
context_match = context_re.match(imatch.group(2))
|
|
||||||
message_context = context_match.group(1)
|
|
||||||
if message_context[0] == '"':
|
|
||||||
message_context = message_context.strip('"')
|
|
||||||
elif message_context[0] == "'":
|
|
||||||
message_context = message_context.strip("'")
|
|
||||||
out.write(' pgettext({p}{!r}, {p}{!r}) '.format(
|
|
||||||
message_context, g, p=raw_prefix
|
|
||||||
))
|
|
||||||
message_context = None
|
|
||||||
else:
|
|
||||||
out.write(' gettext({p}{!r}) '.format(g, p=raw_prefix))
|
|
||||||
elif bmatch:
|
|
||||||
for fmatch in constant_re.findall(t.contents):
|
|
||||||
out.write(' _(%s) ' % fmatch)
|
|
||||||
if bmatch.group(1):
|
|
||||||
# A context is provided
|
|
||||||
context_match = context_re.match(bmatch.group(1))
|
|
||||||
message_context = context_match.group(1)
|
|
||||||
if message_context[0] == '"':
|
|
||||||
message_context = message_context.strip('"')
|
|
||||||
elif message_context[0] == "'":
|
|
||||||
message_context = message_context.strip("'")
|
|
||||||
intrans = True
|
|
||||||
inplural = False
|
|
||||||
trimmed = 'trimmed' in t.split_contents()
|
|
||||||
singular = []
|
|
||||||
plural = []
|
|
||||||
elif cmatches:
|
|
||||||
for cmatch in cmatches:
|
|
||||||
out.write(' _(%s) ' % cmatch)
|
|
||||||
elif t.contents == 'comment':
|
|
||||||
incomment = True
|
|
||||||
else:
|
|
||||||
out.write(blankout(t.contents, 'B'))
|
|
||||||
elif t.token_type == TOKEN_VAR:
|
|
||||||
parts = t.contents.split('|')
|
|
||||||
cmatch = constant_re.match(parts[0])
|
|
||||||
if cmatch:
|
|
||||||
out.write(' _(%s) ' % cmatch.group(1))
|
|
||||||
for p in parts[1:]:
|
|
||||||
if p.find(':_(') >= 0:
|
|
||||||
out.write(' %s ' % p.split(':', 1)[1])
|
|
||||||
else:
|
|
||||||
out.write(blankout(p, 'F'))
|
|
||||||
elif t.token_type == TOKEN_COMMENT:
|
|
||||||
if t.contents.lstrip().startswith(TRANSLATOR_COMMENT_MARK):
|
|
||||||
lineno_comment_map.setdefault(t.lineno,
|
|
||||||
[]).append(t.contents)
|
|
||||||
comment_lineno_cache = t.lineno
|
|
||||||
else:
|
|
||||||
out.write(blankout(t.contents, 'X'))
|
|
||||||
return out.getvalue()
|
|
||||||
|
|
||||||
|
|
||||||
def parse_accept_lang_header(lang_string):
|
def parse_accept_lang_header(lang_string):
|
||||||
"""
|
"""
|
||||||
|
|
|
||||||
|
|
@ -135,6 +135,19 @@ class ExtractorTests(POFileAssertionMixin, RunInTmpDirMixin, SimpleTestCase):
|
||||||
|
|
||||||
class BasicExtractorTests(ExtractorTests):
|
class BasicExtractorTests(ExtractorTests):
|
||||||
|
|
||||||
|
@override_settings(USE_I18N=False)
|
||||||
|
def test_use_i18n_false(self):
|
||||||
|
"""
|
||||||
|
makemessages also runs successfully when USE_I18N is False.
|
||||||
|
"""
|
||||||
|
management.call_command('makemessages', locale=[LOCALE], verbosity=0)
|
||||||
|
self.assertTrue(os.path.exists(self.PO_FILE))
|
||||||
|
with io.open(self.PO_FILE, 'r', encoding='utf-8') as fp:
|
||||||
|
po_contents = fp.read()
|
||||||
|
# Check two random strings
|
||||||
|
self.assertIn('#. Translators: One-line translator comment #1', po_contents)
|
||||||
|
self.assertIn('msgctxt "Special trans context #1"', po_contents)
|
||||||
|
|
||||||
def test_comments_extractor(self):
|
def test_comments_extractor(self):
|
||||||
management.call_command('makemessages', locale=[LOCALE], verbosity=0)
|
management.call_command('makemessages', locale=[LOCALE], verbosity=0)
|
||||||
self.assertTrue(os.path.exists(self.PO_FILE))
|
self.assertTrue(os.path.exists(self.PO_FILE))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue