Allow substitution of messages as variables in other messages.

grit/format/policy_templates/template_formatter.py

 #!/usr/bin/env python
 # 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.
 
 
 import os
 import sys
 import types
 
@@ skipping 26 matching lines @@
         for generating the output. If writer name is 'adm', then the class
         from module 'writers.adm_writer' will be used.
     '''
     super(type(self), self).__init__()
     writer_module_name = \
         'grit.format.policy_templates.writers.' + writer_name + '_writer'
     __import__(writer_module_name)
     # The module that contains the writer class:
     self._writer_module = sys.modules[writer_module_name]
 
-  def Format(self, item, lang='en', begin_item=True, output_dir='.'):
+  def Format(self, item, lang='en', output_dir='.'):
     '''Generates a template corresponding to an <output> node in the grd file.
 
     Args:
       item: the <grit> root node of the grit tree.
       lang: the language of outputted text, e.g.: 'en'
       begin_item: True or False, depending on if this function was called at
                   the beginning or at the end of the item.
       output_dir: The output directory, currently unused here.
 
     Returns:
       The text of the template file.
     '''
-    if not begin_item:
-      return ''
-
     self._lang = lang
     self._config = writer_configuration.GetConfigurationForBuild(item.defines)
     self._policy_data = None
     self._messages = {}
     self._ParseGritNodes(item)
     return self._GetOutput()
 
   def _GetOutput(self):
     '''Generates a template file using the instance variables initialized
     in Format() using the writer specified in __init__().
@@ skipping 22 matching lines @@
     if (isinstance(item, structure.StructureNode) and
         item.attrs['type'] == 'policy_template_metafile'):
       assert self._policy_data == None
       json_text = item.gatherer.Translate(
           self._lang,
           pseudo_if_not_available=item.PseudoIsAllowed(),
           fallback_to_english=item.ShouldFallbackToEnglish())
       self._policy_data = eval(json_text)
     for child in item.children:
       self._ParseGritNodes(child)