Fixing a bug in GRIT where messages with substitutions would

grit/node/base.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.
 
 '''Base types for nodes in a GRIT resource tree.
 '''
 
 import os
 import sys
@@ skipping 279 matching lines @@
       inside_parts = inside_parts[:-1]
 
     # If the last item is a string (not a node) and ends with whitespace,
     # we need to add the ''' delimiter.
     if (isinstance(last_item, types.StringTypes) and
         last_item.rstrip() != last_item):
       inside_parts[-1] = inside_parts[-1] + u"'''"
 
     return u''.join(inside_parts)
 
-  def RunGatherers(self, recursive=0, debug=False):
+  def RunGatherers(self, recursive=0, debug=False, substitute_messages=False):
     '''Runs all gatherers on this object, which may add to the data stored
     by the object.  If 'recursive' is true, will call RunGatherers() recursively
     on all child nodes first.  If 'debug' is True, will print out information
     as it is running each nodes' gatherers.
-
-    Gatherers for <translations> child nodes will always be run after all other
-    child nodes have been gathered.
     '''
     if recursive:
-      process_last = []
       for child in self.children:
-        if child.name == 'translations':
-          process_last.append(child)
-        else:
-          child.RunGatherers(recursive=recursive, debug=debug)
-      for child in process_last:
+        assert child.name != 'translations'  # <grit> node overrides
         child.RunGatherers(recursive=recursive, debug=debug)
 
   def SubstituteMessages(self, substituter):
     '''Applies substitutions to all messages in the tree.
 
     Called as a final step of RunGatherers.
 
     Args:
       substituter: a grit.util.Substituter object.
     '''
@@ skipping 233 matching lines @@
   def ExpandVariables(self):
     '''Whether we need to expand variables on a given node.'''
     return False
 
 
 class ContentNode(Node):
   '''Convenience baseclass for nodes that can have content.'''
   def _ContentType(self):
     return self._CONTENT_TYPE_MIXED