FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Extract Python messages in nested gettext calls by sublee · Pull Request #488 · python-babel/babel · GitHub

  1. python-babel
  2. babel

Repository navigation

Extract Python messages in nested gettext calls #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akx merged 4 commits into from
Mar 31, 2017
Conversation 2 Commits 4 Checks 0 Files changed
Merged

Extract Python messages in nested gettext calls #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aec35d8
Add test case for nested gettext
sublee Mar 31, 2017
f94d61c
More complex test cases for nested gettext
sublee Mar 31, 2017
95b920d
Rename test case
sublee Mar 31, 2017
b96c84e
Fix extraction bug on nested messages
sublee Mar 31, 2017
File filter

Filter by extension

Filter by extension .py  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
5 changes: 4 additions & 1 deletion babel/messages/extract.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,8 @@ def extract_python(fileobj, keywords, comment_tags, options):
translator_comments.append((lineno, value))
break
elif funcname and call_stack == 0:
if tok == OP and value == ')':
nested = (tok == NAME and value in keywords)
if (tok == OP and value == ')') or nested:
if buf:
messages.append(''.join(buf))
del buf[:]
Expand All @@ -470,6 +471,8 @@ def extract_python(fileobj, keywords, comment_tags, options):
messages = []
translator_comments = []
in_translator_comments = False
if nested:
funcname = value
elif tok == STRING:
# Unwrap quotes in a safe manner, maintaining the string's
# encoding
Expand Down
31 changes: 31 additions & 0 deletions tests/messages/test_extract.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,37 @@ def test_extract_strip_comment_tags(self):
self.assertEqual([u'This is a multiline comment with',
u'a prefix too'], messages[1][2])

def test_nested_messages(self):
buf = BytesIO(b"""
# NOTE: First
_(u'Hello, {name}!', name=_(u'Foo Bar'))

# NOTE: Second
_(u'Hello, {name1} and {name2}!', name1=_(u'Heungsub'),
name2=_(u'Armin'))

# NOTE: Third
_(u'Hello, {0} and {1}!', _(u'Heungsub'),
_(u'Armin'))
""")
messages = list(extract.extract_python(buf, ('_',), ['NOTE:'], {}))
self.assertEqual((u'Hello, {name}!', None), messages[0][2])
self.assertEqual([u'NOTE: First'], messages[0][3])
self.assertEqual(u'Foo Bar', messages[1][2])
self.assertEqual([], messages[1][3])
self.assertEqual((u'Hello, {name1} and {name2}!', None), messages[2][2])
self.assertEqual([u'NOTE: Second'], messages[2][3])
self.assertEqual(u'Heungsub', messages[3][2])
self.assertEqual([], messages[3][3])
self.assertEqual(u'Armin', messages[4][2])
self.assertEqual([], messages[4][3])
self.assertEqual((u'Hello, {0} and {1}!', None), messages[5][2])
self.assertEqual([u'NOTE: Third'], messages[5][3])
self.assertEqual(u'Heungsub', messages[6][2])
self.assertEqual([], messages[6][3])
self.assertEqual(u'Armin', messages[7][2])
self.assertEqual([], messages[7][3])


class ExtractTestCase(unittest.TestCase):

Expand Down
Back | FazBrowse Home | New Git URL