summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
Diffstat (limited to 'remoting')
-rw-r--r--remoting/remoting.gyp6
-rwxr-xr-xremoting/tools/build/remoting_localize.py6
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.")