openstack
/
horizon
Code Issues Proposed changes

Babel extractor translating inner tags 

The current extractor does not support nesting of inner tags.
This creates problems when we have something like this
"<translate> hello <b>beautiful</b> world</translate>".
The message extraction gets prematurely cut off.

Futhermore, the extractor does not support trimming.
This is important because angular-gettext trims the content and use that
as the msgid. The goal is to get it working with angular-gettext, hence,
we also need to trim our messages.

Change-Id: I9265f731431521240dddd24bb87baa97cc3ed4b5
Implements: blueprint babel-translate-inner-tags
This commit is contained in:
Thai Tran 2015-08-17 15:25:06 -07:00
parent a2f0157d30
commit 3aad49dbc7
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
horizon/test/tests/babel_extract_angular.py
View File

@ -151,3 +151,22 @@ class ExtractAngularTestCase(test.TestCase):
(9, u'gettext', 'oh \\"hello\\" there', []),
],
messages)
def test_trim_translate_tag(self):
buf = StringIO(
"<html><translate> \n hello\n world! \n "
"</translate></html>")
messages = list(extract_angular(buf, [], [], {}))
self.assertEqual([(1, 'gettext', 'hello\n world!', [])], messages)
def test_nested_translate_tag(self):
buf = StringIO(
"<html><translate>hello <b>beautiful <i>world</i></b> !"
"</translate></html>"
)
messages = list(extract_angular(buf, [], [], {}))
self.assertEqual(
[(1, 'gettext', 'hello <b>beautiful <i>world</i></b> !', [])],
messages)

21
horizon/utils/babel_extract_angular.py
View File

@ -37,9 +37,6 @@ class AngularGettextHTMLParser(html_parser.HTMLParser):
{$ 'content' | translate $}
The string will be translated, minus expression handling (i.e. just
bare strings are allowed.)
Note: This will not cope with nested tags (which I don't think make any
sense)
"""
def __init__(self):
@ -50,6 +47,7 @@ class AngularGettextHTMLParser(html_parser.HTMLParser):
html_parser.HTMLParser.__init__(self)
self.in_translate = False
self.inner_tags = []
self.data = ''
self.strings = []
self.line = 0
@ -69,6 +67,9 @@ class AngularGettextHTMLParser(html_parser.HTMLParser):
self.plural_form = value
if attr == 'translate-comment':
self.comments.append(value)
elif self.in_translate:
self.data += '<%s>' % tag
self.inner_tags.append(tag)
else:
for attr in attrs:
if not attr[1]:
@ -90,14 +91,18 @@ class AngularGettextHTMLParser(html_parser.HTMLParser):
def handle_endtag(self, tag):
if self.in_translate:
if len(self.inner_tags) > 0:
tag = self.inner_tags.pop()
self.data += "</%s>" % tag
return
if self.plural_form:
messages = (
self.data,
self.data.strip(),
self.plural_form
)
func_name = u'ngettext'
else:
messages = self.data
messages = self.data.strip()
func_name = u'gettext'
self.strings.append(
(self.line, func_name, messages, self.comments)
@ -122,12 +127,6 @@ def extract_angular(fileobj, keywords, comment_tags, options):
:return: an iterator over ``(lineno, funcname, message, comments)``
tuples
:rtype: ``iterator``
This particular extractor is quite simple because it is intended to only
deal with angular templates which do not need comments, or the more
complicated forms of translations.
A later version will address pluralization.
"""
parser = AngularGettextHTMLParser()