diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@7262f16d-afe8-6277-6482-052fa10e57b1> | 2014-01-23 03:22:29 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@7262f16d-afe8-6277-6482-052fa10e57b1> | 2014-01-23 03:22:29 +0000 |
| commit | e297aa63727b070e6095c669fcb79cc5a996ced7 (patch) | |
| tree | 6a8ab7d0978d30820c8d80935b7fa1f7aa486fe6 | |
| parent | ee2aae98b1aba3315f768fe9667d245ad46f3c9c (diff) | |
| download | grit-e297aa63727b070e6095c669fcb79cc5a996ced7.tar.gz | |
Strip IDS_ as well as IDR_ in the chrome_messages_json generator.
This is needed for renaming string resources in Chrome Remote
Desktop webapp from IDR_ to IDS_ for consistency with other
Chrome string resources.
R=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/138903021
Patch from Lambros Lambrou <lambroslambrou@chromium.org>.
git-svn-id: http://grit-i18n.googlecode.com/svn/trunk@148 7262f16d-afe8-6277-6482-052fa10e57b1
| -rw-r--r-- | grit/format/chrome_messages_json.py | 2 | ||||
| -rw-r--r-- | grit/format/chrome_messages_json_unittest.py | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/grit/format/chrome_messages_json.py b/grit/format/chrome_messages_json.py index 7b370d7..b5af6d4 100644 --- a/grit/format/chrome_messages_json.py +++ b/grit/format/chrome_messages_json.py @@ -25,7 +25,7 @@ def Format(root, lang='en', output_dir='.'): for child in root.ActiveDescendants(): if isinstance(child, message.MessageNode): id = child.attrs['name'] - if id.startswith('IDR_'): + if id.startswith('IDR_') or id.startswith('IDS_'): id = id[4:] loc_message = encoder.encode(child.Translate(lang)) diff --git a/grit/format/chrome_messages_json_unittest.py b/grit/format/chrome_messages_json_unittest.py index 484230f..3dab23e 100644 --- a/grit/format/chrome_messages_json_unittest.py +++ b/grit/format/chrome_messages_json_unittest.py @@ -49,22 +49,22 @@ class ChromeMessagesJsonFormatUnittest(unittest.TestCase): output = buf.getvalue() test = u""" { - "IDS_SIMPLE_MESSAGE": { + "SIMPLE_MESSAGE": { "message": "Simple message." }, - "IDS_QUOTES": { + "QUOTES": { "message": "element\\u2019s \\u201c%s\\u201d attribute" }, - "IDS_PLACEHOLDERS": { + "PLACEHOLDERS": { "message": "%1$d error, %2$d warning" }, - "IDS_STARTS_WITH_SPACE": { + "STARTS_WITH_SPACE": { "message": "(%d)" }, - "IDS_DOUBLE_QUOTES": { + "DOUBLE_QUOTES": { "message": "A \\"double quoted\\" message." }, - "IDS_BACKSLASH": { + "BACKSLASH": { "message": "\\\\" } } |