Fixing a bug in GRIT where messages with substitutions would

grit/node/misc.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.
 
 '''Miscellaneous node types.
 '''
 
 import os.path
 import re
@@ skipping 415 matching lines @@
           print '-' * 78
           raise e
 
         try:
           node.attrs['first_id'] = str(id_list.pop(0))
         except IndexError, e:
           raise Exception('Please update %s and add a first id for %s (%s).'
                           % (first_ids_filename, filename, node.name))
 
   def RunGatherers(self, recursive=0, debug=False):
-    '''Gathers information for the structure nodes, then apply substitutions.
+    '''Gathers information for the top-level nodes, then apply substitutions,
+    then gather the <translations> node (all substitutions must be done before
+    it is gathered so that they can match up correctly).
 
     The substitutions step requires that the OutputContext has been set.
     Locally, get the Substitution messages
     and add them to the substituter. Also add substitutions for language codes
     in the Rc.
 
+    Gatherers for <translations> child nodes will always be run after all other
+    child nodes have been gathered.
+
     Args:
       recursive: will call RunGatherers() recursively on all child nodes first.
       debug: will print information while running gatherers.
     '''
-    base.Node.RunGatherers(self, recursive, False)
-    assert self.output_language
-    self.SubstituteMessages(self.substituter)
+    if recursive:
+      process_last = []
+      for child in self.children:
+        if child.name == 'translations':
+          process_last.append(child)
+        else:
+          child.RunGatherers(recursive=recursive, debug=debug)
+
+      assert self.output_language
+      self.SubstituteMessages(self.substituter)
+
+      for child in process_last:
+        child.RunGatherers(recursive=recursive, debug=debug)
 
 
 class IdentifierNode(base.Node):
   '''A node for specifying identifiers that should appear in the resource
   header file, and be unique amongst all other resource identifiers, but don't
   have any other attributes or reference any resources.
   '''
 
   def MandatoryAttributes(self):
     return ['name']
@@ skipping 24 matching lines @@
     by parameters of the same name.
     '''
     node = IdentifierNode()
     node.StartParsing('identifier', parent)
     node.HandleAttribute('name', name)
     node.HandleAttribute('id', id)
     node.HandleAttribute('comment', comment)
     node.HandleAttribute('systemid', systemid)
     node.EndParsing()
     return node