Move Chromoting strings to string_resources.grd.

remoting/remoting.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
 
@@ skipping 16 matching lines @@
     'version_short':
       '<(version_major).<(version_minor).'
       '<!(python <(version_py_path) -f <(chrome_version_path) -f <(remoting_version_path) -t "@BUILD@")',
     'version_full':
       '<(version_short).'
       '<!(python <(version_py_path) -f <(chrome_version_path) -f <(remoting_version_path) -t "@PATCH@")',
 
     'branding_path': '../remoting/branding_<(branding)',
     'copyright_info': '<!(python <(version_py_path) -f <(branding_path) -t "@COPYRIGHT@")',
 
+    'webapp_locale_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/webapp/_locales',
+
     # Use consistent strings across all platforms.
     # These values must match host/plugin/constants.h
     'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
     'host_plugin_description': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_DESCRIPTION@")',
     'host_plugin_name': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_FILE_NAME@")',
 
     'conditions': [
       ['OS=="mac"', {
         'mac_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_BUNDLE_ID@")',
         'mac_creator': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_CREATOR@")',
@@ skipping 15 matching lines @@
         'host_plugin_extension': 'arm.so',
         'host_plugin_prefix': 'lib',
       }],
       ['OS=="win"', {
         'host_plugin_extension': 'dll',
         'host_plugin_prefix': '',
       }],
 
       ['branding=="Chrome"', {
         'remoting_webapp_locale_files': [
-          'webapp/_locales.official/ar/messages.json',
-          'webapp/_locales.official/bg/messages.json',
-          'webapp/_locales.official/ca/messages.json',
-          'webapp/_locales.official/cs/messages.json',
-          'webapp/_locales.official/da/messages.json',
-          'webapp/_locales.official/de/messages.json',
-          'webapp/_locales.official/el/messages.json',
-          'webapp/_locales.official/en/messages.json',
-          'webapp/_locales.official/en_GB/messages.json',
-          'webapp/_locales.official/es/messages.json',
-          'webapp/_locales.official/es_419/messages.json',
-          'webapp/_locales.official/et/messages.json',
-          'webapp/_locales.official/fi/messages.json',
-          'webapp/_locales.official/fil/messages.json',
-          'webapp/_locales.official/fr/messages.json',
-          'webapp/_locales.official/he/messages.json',
-          'webapp/_locales.official/hi/messages.json',
-          'webapp/_locales.official/hr/messages.json',
-          'webapp/_locales.official/hu/messages.json',
-          'webapp/_locales.official/id/messages.json',
-          'webapp/_locales.official/it/messages.json',
-          'webapp/_locales.official/ja/messages.json',
-          'webapp/_locales.official/ko/messages.json',
-          'webapp/_locales.official/lt/messages.json',
-          'webapp/_locales.official/lv/messages.json',
-          'webapp/_locales.official/nb/messages.json',
-          'webapp/_locales.official/nl/messages.json',
-          'webapp/_locales.official/pl/messages.json',
-          'webapp/_locales.official/pt_BR/messages.json',
-          'webapp/_locales.official/pt_PT/messages.json',
-          'webapp/_locales.official/ro/messages.json',
-          'webapp/_locales.official/ru/messages.json',
-          'webapp/_locales.official/sk/messages.json',
-          'webapp/_locales.official/sl/messages.json',
-          'webapp/_locales.official/sr/messages.json',
-          'webapp/_locales.official/sv/messages.json',
-          'webapp/_locales.official/th/messages.json',
-          'webapp/_locales.official/tr/messages.json',
-          'webapp/_locales.official/uk/messages.json',
-          'webapp/_locales.official/vi/messages.json',
-          'webapp/_locales.official/zh_CN/messages.json',
-          'webapp/_locales.official/zh_TW/messages.json',
+          '<(webapp_locale_dir)/ar/messages.json',

[Jamie, 2012/10/15 04:06:38]

This will fail for an official build because the ".official" has been lost in
this patch. I'm not convinced that the old approach is the best way to separate
out the official vs. unofficial web-apps, but for this CL I think we need to
preserve the current behaviour.

[Sergey Ulanov, 2012/10/15 18:57:22]

Now the messages.json files are generated from grd file and they are always
stored in the location specified by webapp_locale_dir, which is the same for
both official and chromium builds.

+          '<(webapp_locale_dir)/bg/messages.json',
+          '<(webapp_locale_dir)/ca/messages.json',
+          '<(webapp_locale_dir)/cs/messages.json',
+          '<(webapp_locale_dir)/da/messages.json',
+          '<(webapp_locale_dir)/de/messages.json',
+          '<(webapp_locale_dir)/el/messages.json',
+          '<(webapp_locale_dir)/en/messages.json',
+          '<(webapp_locale_dir)/en_GB/messages.json',
+          '<(webapp_locale_dir)/es/messages.json',
+          '<(webapp_locale_dir)/es_419/messages.json',
+          '<(webapp_locale_dir)/et/messages.json',
+          '<(webapp_locale_dir)/fi/messages.json',
+          '<(webapp_locale_dir)/fil/messages.json',
+          '<(webapp_locale_dir)/fr/messages.json',
+          '<(webapp_locale_dir)/he/messages.json',
+          '<(webapp_locale_dir)/hi/messages.json',
+          '<(webapp_locale_dir)/hr/messages.json',
+          '<(webapp_locale_dir)/hu/messages.json',
+          '<(webapp_locale_dir)/id/messages.json',
+          '<(webapp_locale_dir)/it/messages.json',
+          '<(webapp_locale_dir)/ja/messages.json',
+          '<(webapp_locale_dir)/ko/messages.json',
+          '<(webapp_locale_dir)/lt/messages.json',
+          '<(webapp_locale_dir)/lv/messages.json',
+          '<(webapp_locale_dir)/nb/messages.json',
+          '<(webapp_locale_dir)/nl/messages.json',
+          '<(webapp_locale_dir)/pl/messages.json',
+          '<(webapp_locale_dir)/pt_BR/messages.json',
+          '<(webapp_locale_dir)/pt_PT/messages.json',
+          '<(webapp_locale_dir)/ro/messages.json',
+          '<(webapp_locale_dir)/ru/messages.json',
+          '<(webapp_locale_dir)/sk/messages.json',
+          '<(webapp_locale_dir)/sl/messages.json',
+          '<(webapp_locale_dir)/sr/messages.json',
+          '<(webapp_locale_dir)/sv/messages.json',
+          '<(webapp_locale_dir)/th/messages.json',
+          '<(webapp_locale_dir)/tr/messages.json',
+          '<(webapp_locale_dir)/uk/messages.json',
+          '<(webapp_locale_dir)/vi/messages.json',
+          '<(webapp_locale_dir)/zh_CN/messages.json',
+          '<(webapp_locale_dir)/zh_TW/messages.json',
         ],
       }, {  # else: branding!="Chrome"
         'remoting_webapp_locale_files': [
-          'webapp/_locales/en/messages.json',
+          '<(webapp_locale_dir)/en/messages.json',
         ],
       }],
       ['OS=="win"', {
         # Use auto-generated CLSID for the daemon controller to make sure that
         # the newly installed version of the controller will be used during
         # upgrade even if there is an old instance running already.
         'daemon_controller_clsid': '<!(python tools/uuidgen.py)',
       }],
     ],
     'remoting_webapp_files': [
@@ skipping 1010 matching lines @@
             'host/plugin/host_plugin.def',
           ],
         }],
       ],
     },  # end of target 'remoting_host_plugin'
 
     {
       'target_name': 'remoting_webapp',
       'type': 'none',
       'dependencies': [
+        'remoting_resources',

[Jamie, 2012/10/15 04:06:38]

This change seems unrelated to anything else in this CL. What is it needed for?

[Sergey Ulanov, 2012/10/15 18:57:22]

It is related. remoting_resources target now generates messages.json files that
are used by the webapp.

         'remoting_host_plugin',
       ],
       'sources': [
         'webapp/build-webapp.py',
         'webapp/verify-webapp.py',
         '<(remoting_version_path)',
         '<(chrome_version_path)',
         '<@(remoting_webapp_files)',
         '<@(remoting_webapp_locale_files)',
       ],
       # Can't use a 'copies' because we need to manipulate
       # the manifest file to get the right plugin name.
       # Also we need to move the plugin into the me2mom
       # folder, which means 2 copies, and gyp doesn't
       # seem to guarantee the ordering of 2 copies statements
       # when the actual project is generated.
       'actions': [
         {
           'action_name': 'Verify Remoting WebApp i18n',
           'inputs': [
             'host/plugin/host_script_object.cc',
-            'webapp/_locales/en/messages.json',
+            '<(webapp_locale_dir)/en/messages.json',
             'webapp/client_screen.js',
             'webapp/host_controller.js',
             'webapp/host_table_entry.js',
             'webapp/host_setup_dialog.js',
             'webapp/main.html',
             'webapp/manifest.json',
             'webapp/remoting.js',
             'webapp/verify-webapp.py',
           ],
           'outputs': [
             '<(PRODUCT_DIR)/remoting/webapp_verified.stamp',
           ],
           'action': [
             'python',
             'webapp/verify-webapp.py',
             '<(PRODUCT_DIR)/remoting/webapp_verified.stamp',
-            'webapp/_locales/en/messages.json',
+            '<(webapp_locale_dir)/en/messages.json',
             'webapp/client_screen.js',
             'webapp/host_controller.js',
             'webapp/host_table_entry.js',
             'webapp/host_setup_dialog.js',
             'webapp/main.html',
             'webapp/manifest.json',
             'webapp/remoting.js',
             'host/plugin/host_script_object.cc',
          ],
         },
@@ skipping 911 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }