tools/grit/grit/node/message.py - Issue 7744017: Updated *.pak file format to support both UTF8 and UTF16

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/grit/grit/node/message.py

Issue 7744017: Updated *.pak file format to support both UTF8 and UTF16 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Updated. Created 9 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: tools/grit/grit/node/message.py

diff --git a/tools/grit/grit/node/message.py b/tools/grit/grit/node/message.py

index a48a645fd4ba2ce489bf2c6794f4b6c751539c73..0d252c11b9116c5144e1ee42e515f31ca8613173 100644

--- a/tools/grit/grit/node/message.py

+++ b/tools/grit/grit/node/message.py

@@ -19,6 +19,7 @@ from grit import exception

from grit import tclib

from grit import util

+BINARY, UTF8, UTF16 = range(3)

# Finds whitespace at the start and end of a string which can be multiline.

_WHITESPACE = re.compile('(?P<start>\s*)(?P<body>.+?)(?P<end>\s*)\Z',

@@ -186,7 +187,7 @@ class MessageNode(base.ContentNode):

else:

return self.attrs['offset']

- def GetDataPackPair(self, lang):

+ def GetDataPackPair(self, lang, encoding):

'''Returns a (id, string) pair that represents the string id and the string

in utf8. This is used to generate the data pack data file.

'''

@@ -199,10 +200,15 @@ class MessageNode(base.ContentNode):

# Windows automatically translates \n to a new line, but GTK+ doesn't.

# Manually do the conversion here rather than at run time.

message = message.replace("\\n", "\n")

- # |message| is a python unicode string, so convert to a utf16 byte stream

- # because that's the format of datapacks. We skip the first 2 bytes

- # because it is the BOM.

- return id, message.encode('utf16')[2:]

+ # |message| is a python unicode string, so convert to a byte stream that

+ # has the correct encoding requested for the datapacks. We skip the first

+ # 2 bytes of text resources because it is the BOM.

+ if encoding == UTF8:

+ return id, message.encode('utf8')

+ if encoding == UTF16:

+ return id, message.encode('utf16')[2:]

+ # Default is BINARY

+ return id, message

# static method

def Construct(parent, message, name, desc='', meaning='', translateable=True):

« tools/grit/grit/format/data_pack_unittest.py ('K') | « tools/grit/grit/node/include.py ('k') | ui/base/resource/data_pack.h » ('j') | ui/base/resource/data_pack.cc » ('J')