diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-17 12:46:22 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-17 12:46:22 +0000 |
| commit | 37f6edb3670afc1aa7cf6b11fede783328fb49b7 (patch) | |
| tree | 9426f6d5327606f272e71d9f30df7198421c5a81 /remoting | |
| parent | 0ea8a6b9d32b646855fe14ed6abf9f2242c4dc23 (diff) | |
| download | chromium_src-37f6edb3670afc1aa7cf6b11fede783328fb49b7.zip chromium_src-37f6edb3670afc1aa7cf6b11fede783328fb49b7.tar.gz chromium_src-37f6edb3670afc1aa7cf6b11fede783328fb49b7.tar.bz2 | |
Revert 245489 "make utf-8 default encoding for remoting_localize.py"
Broke compilation on windows clobber builder: mc : error : -u switch cannot be used with non-Unicode message file!
> make utf-8 default encoding for remoting_localize.py
>
> Review URL: https://codereview.chromium.org/140793007
TBR=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/141003004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/remoting.gyp | 6 | ||||
| -rwxr-xr-x | remoting/tools/build/remoting_localize.py | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index a93fabb..b8adb63 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -805,6 +805,7 @@ '--template', 'host/plugin/host_plugin-InfoPlist.strings.jinja2', '--locale_output', '<(SHARED_INTERMEDIATE_DIR)/remoting/host_plugin_resources/@{json_suffix}.lproj/InfoPlist.strings', + '--encoding', 'utf-8', '<@(remoting_locales)', ], }, @@ -826,6 +827,7 @@ '--template', 'host/remoting_me2me_host-InfoPlist.strings.jinja2', '--locale_output', '<(SHARED_INTERMEDIATE_DIR)/remoting/host_resources/@{json_suffix}.lproj/InfoPlist.strings', + '--encoding', 'utf-8', '<@(remoting_locales)', ], }, @@ -847,6 +849,7 @@ '--template', 'host/mac/me2me_preference_pane-InfoPlist.strings.jinja2', '--locale_output', '<(SHARED_INTERMEDIATE_DIR)/remoting/preference_pane_resources/@{json_suffix}.lproj/InfoPlist.strings', + '--encoding', 'utf-8', '<@(remoting_locales)', ], }, @@ -868,6 +871,7 @@ '--template', 'host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2', '--locale_output', '<(SHARED_INTERMEDIATE_DIR)/remoting/uninstaller_resources/@{json_suffix}.lproj/InfoPlist.strings', + '--encoding', 'utf-8', '<@(remoting_locales)', ], }, @@ -1638,7 +1642,6 @@ '--locale_dir', '<(webapp_locale_dir)', '--template', '<(RULE_INPUT_PATH)', '--output', '<@(_outputs)', - '--encoding', 'utf-16', '<@(remoting_locales)', ], 'message': 'Localizing the dialogs and strings' @@ -2262,6 +2265,7 @@ '--template', '<(input)', '--locale_output', '<(output)', + '--encoding', 'utf-8', 'en', ], }, diff --git a/remoting/tools/build/remoting_localize.py b/remoting/tools/build/remoting_localize.py index 5c4eeb1..6a88884 100755 --- a/remoting/tools/build/remoting_localize.py +++ b/remoting/tools/build/remoting_localize.py @@ -590,7 +590,7 @@ def ReadMessagesFromFile(file_name): return values -def WriteIfChanged(file_name, contents, encoding): +def WriteIfChanged(file_name, contents, encoding='utf-16'): """ Writes the specified contents to the specified file_name iff the contents are different than the current contents. @@ -743,8 +743,8 @@ def DoMain(argv): '-d', '--define', dest='define', action='append', type='string', help='define a variable (NAME=VALUE).') parser.add_option( - '--encoding', dest='encoding', type='string', default='utf-8', - help="set the encoding of <output>. 'utf-8' is the default.") + '--encoding', dest='encoding', type='string', default='utf-16', + help="set the encoding of <output>. 'utf-16' is the default.") parser.add_option( '--jinja2', dest='jinja2', type='string', help="specifies path to the jinja2 library.") |