Allow substitution of messages as variables in other messages.

grit/format/rc.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.
 
 '''Support for formatting an RC file for compilation.
 '''
 
 import os
 import types
 import re
 
 from grit import lazy_re
 from grit import util
 from grit.format import interface
+from grit.node import misc
+
 
 '''
 This dictionary defines the langauge charset pair lookup table, which is used
 for replacing the GRIT expand variables for language info in Product Version
 resource. The key is the language ISO country code, and the value
 is the language and character-set pair, which is a hexadecimal string
 consisting of the concatenation of the language and character-set identifiers.
 The first 4 digit of the value is the hex value of LCID, the remaining
 4 digits is the hex value of character-set id(code page)of the language.
 
@@ skipping 14 matching lines @@
     END
     BLOCK "VarFileInfo"
     BEGIN
         VALUE "Translation", [GRITVERLANGID], [GRITVERCHARSETID]
     END
 END
 
 '''
 
 _LANGUAGE_CHARSET_PAIR = {
-  'ar'           : '040104e8',
-  'fi'           : '040b04e4',
-  'ko'           : '041203b5',
-  'es'           : '040a04e4',
-  'bg'           : '040204e3',
+  # Language neutral LCID, unicode(1200) code page.
+  'neutral'     : '000004b0',
+  # LANG_USER_DEFAULT LCID, unicode(1200) code page.
+  'userdefault' : '040004b0',
+  'ar'          : '040104e8',
+  'fi'          : '040b04e4',
+  'ko'          : '041203b5',
+  'es'          : '040a04e4',
+  'bg'          : '040204e3',
   # No codepage for filipino, use unicode(1200).
-  'fil'          : '046404b0',
-  'fr'           : '040c04e4',
-  'lv'           : '042604e9',
-  'sv'           : '041d04e4',
-  'ca'           : '040304e4',
-  'de'           : '040704e4',
-  'lt'           : '042704e9',
+  'fil'         : '046404e4',
+  'fr'          : '040c04e4',
+  'lv'          : '042604e9',
+  'sv'          : '041d04e4',
+  'ca'          : '040304e4',
+  'de'          : '040704e4',
+  'lt'          : '042704e9',
   # Do not use! This is only around for backwards
-  # compatibility. Use file instead.
-  'tl'           : '0c0004b0',
-  'zh-CN'        : '080403a8',
-  'el'           : '040804e5',
-  'no'           : '041404e4',
-  'th'           : '041e036a',
-  'zh-TW'        : '040403b6',
-  'iw'           : '040d04e7',
-  'pl'           : '041504e2',
-  'tr'           : '041f04e6',
-  'hr'           : '041a04e4',
-  # No codepage for hindi, use unicode(1200).
-  'hi'           : '043904b0',
-  'pt-PT'        : '081604e4',
-  'pt-BR'        : '041604e4',
-  'uk'           : '042204e3',
-  'cs'           : '040504e2',
-  'hu'           : '040e04e2',
-  'ro'           : '041804e2',
-  # No codepage for urdu, use unicode(1200).
-  'ur'           : '042004b0',
-  'da'           : '040604e4',
-  'is'           : '040f04e4',
-  'ru'           : '041904e3',
-  'vi'           : '042a04ea',
-  'nl'           : '041304e4',
-  'id'           : '042104e4',
-  'sr'           : '081a04e2',
-  'en-GB'        : '0809040e',
-  'it'           : '041004e4',
-  'sk'           : '041b04e2',
-  'et'           : '042504e9',
-  'ja'           : '041103a4',
-  'sl'           : '042404e2',
-  'en'           : '040904b0',
-  'fake_bidi'    : '040d04e7',
+  # compatibility and will be removed - use fil instead
+  'tl'          : '0c0004b0',
+  'zh-CN'       : '080403a8',
+  'zh-TW'       : '040403b6',
+  'zh-HK'       : '0c0403b6',
+  'el'          : '040804e5',
+  'no'          : '041404e4',
+  'th'          : '041e036a',
+  'he'          : '040d04e7',
+  'iw'          : '040d04e7',
+  'pl'          : '041504e2',
+  'tr'          : '041f04e6',
+  'hr'          : '041a04e4',
+  # No codepage for Hindi, use unicode(1200).
+  'hi'          : '043904b0',
+  'pt-PT'       : '081604e4',
+  'pt-BR'       : '041604e4',
+  'uk'          : '042204e3',
+  'cs'          : '040504e2',
+  'hu'          : '040e04e2',
+  'ro'          : '041804e2',
+  # No codepage for Urdu, use unicode(1200).
+  'ur'          : '042004b0',
+  'da'          : '040604e4',
+  'is'          : '040f04e4',
+  'ru'          : '041904e3',
+  'vi'          : '042a04ea',
+  'nl'          : '041304e4',
+  'id'          : '042104e4',
+  'sr'          : '081a04e2',
+  'en-GB'       : '0809040e',
+  'it'          : '041004e4',
+  'sk'          : '041b04e2',
+  'et'          : '042504e9',
+  'ja'          : '041103a4',
+  'sl'          : '042404e2',
+  'en'          : '040904b0',
+  # LCID for Mexico; Windows does not support L.A. LCID.
+  'es-419'      : '080a04e4',
+  # No codepage for Bengali, use unicode(1200).
+  'bn'          : '044504b0',
+  'fa'          : '042904e8',
+  # No codepage for Gujarati, use unicode(1200).
+  'gu'          : '044704b0',
+  # No codepage for Kannada, use unicode(1200).
+  'kn'          : '044b04b0',
+  # Malay (Malaysia) [ms-MY]
+  'ms'          : '043e04e4',
+  # No codepage for Malayalam, use unicode(1200).
+  'ml'          : '044c04b0',
+  # No codepage for Marathi, use unicode(1200).
+  'mr'          : '044e04b0',
+  # No codepage for Oriya , use unicode(1200).
+  'or'          : '044804b0',
+  # No codepage for Tamil, use unicode(1200).
+  'ta'          : '044904b0',
+  # No codepage for Telugu, use unicode(1200).
+  'te'          : '044a04b0',
+  # No codepage for Amharic, use unicode(1200). >= Vista.
+  'am'          : '045e04b0',
+  'sw'          : '044104e4',
+  'af'          : '043604e4',
+  'eu'          : '042d04e4',
+  'fr-CA'       : '0c0c04e4',
+  'gl'          : '045604e4',
+  # No codepage for Zulu, use unicode(1200).
+  'zu'          : '043504b0',
+  'fake-bidi'   : '040d04e7',
 }
 
+# There is no appropriate sublang for Spanish (Latin America) [es-419], so we
+# use Mexico. SUBLANG_DEFAULT would incorrectly map to Spain. Unlike other
+# Latin American countries, Mexican Spanish is supported by VERSIONINFO:
+# http://msdn.microsoft.com/en-us/library/aa381058.aspx
+
 _LANGUAGE_DIRECTIVE_PAIR = {
-  'ar'           : 'LANG_ARABIC, SUBLANG_DEFAULT',
-  'fi'           : 'LANG_FINNISH, SUBLANG_DEFAULT',
-  'ko'           : 'LANG_KOREAN, SUBLANG_KOREAN',
-  'es'           : 'LANG_SPANISH, SUBLANG_SPANISH_MODERN',
-  'bg'           : 'LANG_BULGARIAN, SUBLANG_DEFAULT',
-  'fil'          : '100, SUBLANG_DEFAULT',  # LANG_FILIPINO is not in winnt.h
-  'fr'           : 'LANG_FRENCH, SUBLANG_FRENCH',
-  'lv'           : 'LANG_LATVIAN, SUBLANG_DEFAULT',
-  'sv'           : 'LANG_SWEDISH, SUBLANG_SWEDISH',
-  'ca'           : 'LANG_CATALAN, SUBLANG_DEFAULT',
-  'de'           : 'LANG_GERMAN, SUBLANG_GERMAN',
-  'lt'           : 'LANG_LITHUANIAN, SUBLANG_LITHUANIAN',
-  'tl'           : 'LANG_NEUTRAL, SUBLANG_DEFAULT',  # Do not use! See above.
-  'zh-CN'        : 'LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED',
-  'el'           : 'LANG_GREEK, SUBLANG_DEFAULT',
-  'no'           : 'LANG_NORWEGIAN, SUBLANG_DEFAULT',
-  'th'           : 'LANG_THAI, SUBLANG_DEFAULT',
-  'zh-TW'        : 'LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL',
-  'iw'           : 'LANG_HEBREW, SUBLANG_DEFAULT',
-  'pl'           : 'LANG_POLISH, SUBLANG_DEFAULT',
-  'tr'           : 'LANG_TURKISH, SUBLANG_DEFAULT',
-  'hr'           : 'LANG_CROATIAN, SUBLANG_DEFAULT',
-  'hi'           : 'LANG_HINDI, SUBLANG_DEFAULT',
-  'pt-BR'        : 'LANG_PORTUGUESE, SUBLANG_DEFAULT',
-  'pt-PT'        : 'LANG_PORTUGUESE, SUBLANG_PORTUGUESE',
-  'uk'           : 'LANG_UKRAINIAN, SUBLANG_DEFAULT',
-  'cs'           : 'LANG_CZECH, SUBLANG_DEFAULT',
-  'hu'           : 'LANG_HUNGARIAN, SUBLANG_DEFAULT',
-  'ro'           : 'LANG_ROMANIAN, SUBLANG_DEFAULT',
-  'ur'           : 'LANG_URDU, SUBLANG_DEFAULT',
-  'da'           : 'LANG_DANISH, SUBLANG_DEFAULT',
-  'is'           : 'LANG_ICELANDIC, SUBLANG_DEFAULT',
-  'ru'           : 'LANG_RUSSIAN, SUBLANG_DEFAULT',
-  'vi'           : 'LANG_VIETNAMESE, SUBLANG_DEFAULT',
-  'nl'           : 'LANG_DUTCH, SUBLANG_DEFAULT',
-  'id'           : 'LANG_INDONESIAN, SUBLANG_DEFAULT',
-  'sr'           : 'LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC',
-  'en-GB'        : 'LANG_ENGLISH, SUBLANG_ENGLISH_UK',
-  'it'           : 'LANG_ITALIAN, SUBLANG_DEFAULT',
-  'sk'           : 'LANG_SLOVAK, SUBLANG_DEFAULT',
-  'et'           : 'LANG_ESTONIAN, SUBLANG_DEFAULT',
-  'ja'           : 'LANG_JAPANESE, SUBLANG_DEFAULT',
-  'sl'           : 'LANG_SLOVENIAN, SUBLANG_DEFAULT',
-  'en'           : 'LANG_ENGLISH, SUBLANG_ENGLISH_US',
-  'fake_bidi'    : 'LANG_HEBREW, SUBLANG_DEFAULT',
+  'neutral'     : 'LANG_NEUTRAL, SUBLANG_NEUTRAL',
+  'userdefault' : 'LANG_NEUTRAL, SUBLANG_DEFAULT',
+  'ar'          : 'LANG_ARABIC, SUBLANG_DEFAULT',
+  'fi'          : 'LANG_FINNISH, SUBLANG_DEFAULT',
+  'ko'          : 'LANG_KOREAN, SUBLANG_KOREAN',
+  'es'          : 'LANG_SPANISH, SUBLANG_SPANISH_MODERN',
+  'bg'          : 'LANG_BULGARIAN, SUBLANG_DEFAULT',
+  # LANG_FILIPINO (100) not in VC 7 winnt.h.
+  'fil'         : '100, SUBLANG_DEFAULT',
+  'fr'          : 'LANG_FRENCH, SUBLANG_FRENCH',
+  'lv'          : 'LANG_LATVIAN, SUBLANG_DEFAULT',
+  'sv'          : 'LANG_SWEDISH, SUBLANG_SWEDISH',
+  'ca'          : 'LANG_CATALAN, SUBLANG_DEFAULT',
+  'de'          : 'LANG_GERMAN, SUBLANG_GERMAN',
+  'lt'          : 'LANG_LITHUANIAN, SUBLANG_LITHUANIAN',
+  # Do not use! See above.
+  'tl'          : 'LANG_NEUTRAL, SUBLANG_DEFAULT',
+  'zh-CN'       : 'LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED',
+  'zh-TW'       : 'LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL',
+  'zh-HK'       : 'LANG_CHINESE, SUBLANG_CHINESE_HONGKONG',
+  'el'          : 'LANG_GREEK, SUBLANG_DEFAULT',
+  'no'          : 'LANG_NORWEGIAN, SUBLANG_DEFAULT',
+  'th'          : 'LANG_THAI, SUBLANG_DEFAULT',
+  'he'          : 'LANG_HEBREW, SUBLANG_DEFAULT',
+  'iw'          : 'LANG_HEBREW, SUBLANG_DEFAULT',
+  'pl'          : 'LANG_POLISH, SUBLANG_DEFAULT',
+  'tr'          : 'LANG_TURKISH, SUBLANG_DEFAULT',
+  'hr'          : 'LANG_CROATIAN, SUBLANG_DEFAULT',
+  'hi'          : 'LANG_HINDI, SUBLANG_DEFAULT',
+  'pt-PT'       : 'LANG_PORTUGUESE, SUBLANG_PORTUGUESE',
+  'pt-BR'       : 'LANG_PORTUGUESE, SUBLANG_DEFAULT',
+  'uk'          : 'LANG_UKRAINIAN, SUBLANG_DEFAULT',
+  'cs'          : 'LANG_CZECH, SUBLANG_DEFAULT',
+  'hu'          : 'LANG_HUNGARIAN, SUBLANG_DEFAULT',
+  'ro'          : 'LANG_ROMANIAN, SUBLANG_DEFAULT',
+  'ur'          : 'LANG_URDU, SUBLANG_DEFAULT',
+  'da'          : 'LANG_DANISH, SUBLANG_DEFAULT',
+  'is'          : 'LANG_ICELANDIC, SUBLANG_DEFAULT',
+  'ru'          : 'LANG_RUSSIAN, SUBLANG_DEFAULT',
+  'vi'          : 'LANG_VIETNAMESE, SUBLANG_DEFAULT',
+  'nl'          : 'LANG_DUTCH, SUBLANG_DEFAULT',
+  'id'          : 'LANG_INDONESIAN, SUBLANG_DEFAULT',
+  'sr'          : 'LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC',
+  'en-GB'       : 'LANG_ENGLISH, SUBLANG_ENGLISH_UK',
+  'it'          : 'LANG_ITALIAN, SUBLANG_DEFAULT',
+  'sk'          : 'LANG_SLOVAK, SUBLANG_DEFAULT',
+  'et'          : 'LANG_ESTONIAN, SUBLANG_DEFAULT',
+  'ja'          : 'LANG_JAPANESE, SUBLANG_DEFAULT',
+  'sl'          : 'LANG_SLOVENIAN, SUBLANG_DEFAULT',
+  'en'          : 'LANG_ENGLISH, SUBLANG_ENGLISH_US',
+  # No L.A. sublang exists.
+  'es-419'      : 'LANG_SPANISH, SUBLANG_SPANISH_MEXICAN',
+  'bn'          : 'LANG_BENGALI, SUBLANG_DEFAULT',
+  'fa'          : 'LANG_PERSIAN, SUBLANG_DEFAULT',
+  'gu'          : 'LANG_GUJARATI, SUBLANG_DEFAULT',
+  'kn'          : 'LANG_KANNADA, SUBLANG_DEFAULT',
+  'ms'          : 'LANG_MALAY, SUBLANG_DEFAULT',
+  'ml'          : 'LANG_MALAYALAM, SUBLANG_DEFAULT',
+  'mr'          : 'LANG_MARATHI, SUBLANG_DEFAULT',
+  'or'          : 'LANG_ORIYA, SUBLANG_DEFAULT',
+  'ta'          : 'LANG_TAMIL, SUBLANG_DEFAULT',
+  'te'          : 'LANG_TELUGU, SUBLANG_DEFAULT',
+  'am'          : 'LANG_AMHARIC, SUBLANG_DEFAULT',
+  'sw'          : 'LANG_SWAHILI, SUBLANG_DEFAULT',
+  'af'          : 'LANG_AFRIKAANS, SUBLANG_DEFAULT',
+  'eu'          : 'LANG_BASQUE, SUBLANG_DEFAULT',
+  'fr-CA'       : 'LANG_FRENCH, SUBLANG_FRENCH_CANADIAN',
+  'gl'          : 'LANG_GALICIAN, SUBLANG_DEFAULT',
+  'zu'          : 'LANG_ZULU, SUBLANG_DEFAULT',
+  'fake-bidi'   : 'LANG_HEBREW, SUBLANG_DEFAULT',
 }
 
-def GetLangCharsetPair(language) :
-  if _LANGUAGE_CHARSET_PAIR.has_key(language) :
+def GetLangCharsetPair(language):
+  if _LANGUAGE_CHARSET_PAIR.has_key(language):
     return _LANGUAGE_CHARSET_PAIR[language]
-  else :
+  else:
     print 'Warning:GetLangCharsetPair() found undefined language %s' %(language)
     return ''
 
-def GetLangDirectivePair(language) :
-  if _LANGUAGE_DIRECTIVE_PAIR.has_key(language) :
+def GetLangDirectivePair(language):
+  if _LANGUAGE_DIRECTIVE_PAIR.has_key(language):
     return _LANGUAGE_DIRECTIVE_PAIR[language]
-  else :
+  else:
     print 'Warning:GetLangDirectivePair() found undefined language %s' % (language)
     return 'unknown language: see tools/grit/format/rc.py'
 
-def GetLangIdHex(language) :
-  if _LANGUAGE_CHARSET_PAIR.has_key(language) :
+def GetLangIdHex(language):
+  if _LANGUAGE_CHARSET_PAIR.has_key(language):
     langcharset = _LANGUAGE_CHARSET_PAIR[language]
     lang_id = '0x' + langcharset[0:4]
     return lang_id
-  else :
+  else:
     print 'Warning:GetLangIdHex() found undefined language %s' %(language)
     return ''
 
 
-def GetCharsetIdDecimal(language) :
-  if _LANGUAGE_CHARSET_PAIR.has_key(language) :
+def GetCharsetIdDecimal(language):
+  if _LANGUAGE_CHARSET_PAIR.has_key(language):
     langcharset = _LANGUAGE_CHARSET_PAIR[language]
     charset_decimal = int(langcharset[4:], 16)
     return str(charset_decimal)
-  else :
+  else:
     print 'Warning:GetCharsetIdDecimal() found undefined language %s' %(language)
     return ''
 
 
 def GetUnifiedLangCode(language) :
   r = re.compile('([a-z]{1,2})_([a-z]{1,2})')
   if r.match(language) :
     underscore = language.find('_')
     return language[0:underscore] + '-' + language[underscore + 1:].upper()
   else :
     return language
 
 
+def RcSubstitutions(substituter, lang):
+  '''Add language-based substitutions for Rc files to the substitutor.'''
+  unified_lang_code = GetUnifiedLangCode(lang)
+  substituter.AddSubstitutions({
+      'GRITVERLANGCHARSETHEX': GetLangCharsetPair(unified_lang_code),
+      'GRITVERLANGID': GetLangIdHex(unified_lang_code),
+      'GRITVERCHARSETID': GetCharsetIdDecimal(unified_lang_code)})
+
+
 class TopLevel(interface.ItemFormatter):
   '''Writes out the required preamble for RC files.'''
-  def Format(self, item, lang='en', begin_item=True, output_dir='.'):
+  def Format(self, item, lang='en', output_dir='.'):
     assert isinstance(lang, types.StringTypes)
-    if not begin_item:
-      return ''
-    else:
-      # Find the location of the resource header file, so that we can include
-      # it.
-      resource_header = 'resource.h'  # fall back to this
-      language_directive = ''
-      for output in item.GetRoot().GetOutputFiles():
-        if output.attrs['type'] == 'rc_header':
-          resource_header = os.path.abspath(output.GetOutputFilename())
-          resource_header = util.MakeRelativePath(output_dir, resource_header)
-        if output.attrs['lang'] != lang:
-          continue
-        if output.attrs['language_section'] == '':
-          # If no language_section is requested, no directive is added
-          # (Used when the generated rc will be included from another rc
-          # file that will have the appropriate language directive)
-          language_directive = ''
-        elif output.attrs['language_section'] == 'neutral':
-          # If a neutral language section is requested (default), add a
-          # neutral language directive
-          language_directive = 'LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL'
-        elif output.attrs['language_section'] == 'lang':
-          language_directive = 'LANGUAGE %s' % GetLangDirectivePair(lang)
-      resource_header = resource_header.replace('\\', '\\\\')
-      return '''// Copyright (c) Google Inc. %d
+    assert isinstance(item, misc.GritNode)
+    # Find the location of the resource header file, so that we can include
+    # it.
+    resource_header = 'resource.h'  # fall back to this
+    language_directive = ''
+    for output in item.GetRoot().GetOutputFiles():
+      if output.attrs['type'] == 'rc_header':
+        resource_header = os.path.abspath(output.GetOutputFilename())
+        resource_header = util.MakeRelativePath(output_dir, resource_header)
+      if output.attrs['lang'] != lang:
+        continue
+      if output.attrs['language_section'] == '':
+        # If no language_section is requested, no directive is added
+        # (Used when the generated rc will be included from another rc
+        # file that will have the appropriate language directive)
+        language_directive = ''
+      elif output.attrs['language_section'] == 'neutral':
+        # If a neutral language section is requested (default), add a
+        # neutral language directive
+        language_directive = 'LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL'
+      elif output.attrs['language_section'] == 'lang':
+        language_directive = 'LANGUAGE %s' % GetLangDirectivePair(lang)
+    resource_header = resource_header.replace('\\', '\\\\')
+    return '''// Copyright (c) Google Inc. %d
 // All rights reserved.
 // This file is automatically generated by GRIT.  Do not edit.
 
 #include "%s"
 #include <winresrc.h>
 #ifdef IDC_STATIC
 #undef IDC_STATIC
 #endif
 #define IDC_STATIC (-1)
 
 %s
 
 
 ''' % (util.GetCurrentYear(), resource_header, language_directive)
 # end Format() function
 
 
 
 class StringTable(interface.ItemFormatter):
   '''Surrounds a collection of string messages with the required begin and
   end blocks to declare a string table.'''
 
-  def Format(self, item, lang='en', begin_item=True, output_dir='.'):
+  def Format(self, item, lang='en', output_dir='.'):
     assert isinstance(lang, types.StringTypes)
-    if begin_item:
-      return 'STRINGTABLE\nBEGIN\n'
-    else:
-      return 'END\n\n'
+    return 'STRINGTABLE\nBEGIN\n'
+
+  def FormatEnd(self, item, lang='en', output_dir='.'):
+    assert isinstance(lang, types.StringTypes)
+    return 'END\n\n'
 
 
 class Message(interface.ItemFormatter):
   '''Writes out a single message to a string table.'''
 
-  def Format(self, item, lang='en', begin_item=True, output_dir='.'):
+  def Format(self, item, lang='en', output_dir='.'):
     from grit.node import message
-    if not begin_item:
-      return ''
-
     assert isinstance(lang, types.StringTypes)
     assert isinstance(item, message.MessageNode)
 
     message = item.ws_at_start + item.Translate(lang) + item.ws_at_end
     # Escape quotation marks (RC format uses doubling-up
     message = message.replace('"', '""')
     # Replace linebreaks with a \n escape
     message = util.LINEBREAKS.sub(r'\\n', message)
+    substituter = getattr(item.GetRoot(), 'substituter', None)
+    if substituter:
+      message = substituter.Substitute(message)
 
     name_attr = item.GetTextualIds()[0]
 
     return '  %-15s "%s"\n' % (name_attr, message)
 
 
 class RcSection(interface.ItemFormatter):
   '''Writes out an .rc file section.'''
 
-  def Format(self, item, lang='en', begin_item=True, output_dir='.'):
-    if not begin_item:
-      return ''
-
+  def Format(self, item, lang='en', output_dir='.'):
     assert isinstance(lang, types.StringTypes)
     from grit.node import structure
     assert isinstance(item, structure.StructureNode)
 
     if item.IsExcludedFromRc():
       return ''
     else:
       text = item.gatherer.Translate(
         lang, skeleton_gatherer=item.GetSkeletonGatherer(),
         pseudo_if_not_available=item.PseudoIsAllowed(),
         fallback_to_english=item.ShouldFallbackToEnglish()) + '\n\n'
 
       # Replace the language expand_variables in version rc info.
-      unified_lang_code = GetUnifiedLangCode(lang)
-      if text.find('[GRITVERLANGCHARSETHEX]') != -1:
-        text = text.replace('[GRITVERLANGCHARSETHEX]',
-                            GetLangCharsetPair(unified_lang_code))
-      if text.find('[GRITVERLANGID]') != -1:
-        text = text.replace('[GRITVERLANGID]', GetLangIdHex(unified_lang_code))
-      if text.find('[GRITVERCHARSETID]') != -1:
-        text = text.replace('[GRITVERCHARSETID]',
-                            GetCharsetIdDecimal(unified_lang_code))
+      if item.ExpandVariables():
+        substituter = getattr(item.GetRoot(), 'substituter', None)
+        if substituter:
+          text = substituter.Substitute(text)
 
       return text
 
 
 class RcInclude(interface.ItemFormatter):
   '''Writes out an item that is included in an .rc file (e.g. an ICON)'''
 
   def __init__(self, type, filenameWithoutPath = 0, relative_path = 0,
                flatten_html = 0):
     '''Indicates to the instance what the type of the resource include is,
     e.g. 'ICON' or 'HTML'.  Case must be correct, i.e. if the type is all-caps
     the parameter should be all-caps.
 
     Args:
       type: 'ICON'
     '''
     self.type_ = type
     self.filenameWithoutPath = filenameWithoutPath
     self.relative_path_ = relative_path
     self.flatten_html = flatten_html
 
-  def Format(self, item, lang='en', begin_item=True, output_dir='.'):
-    if not begin_item:
-      return ''
-
+  def Format(self, item, lang='en', output_dir='.'):
     assert isinstance(lang, types.StringTypes)
     from grit.node import structure
     from grit.node import include
     assert isinstance(item, (structure.StructureNode, include.IncludeNode))
     assert (isinstance(item, include.IncludeNode) or
             item.attrs['type'] in ['tr_html', 'admin_template', 'txt', 'muppet'])
 
     # By default, we use relative pathnames to included resources so that
     # sharing the resulting .rc files is possible.
     #
     # The FileForLanguage() Function has the side effect of generating the file
     # if needed (e.g. if it is an HTML file include).
     filename = os.path.abspath(item.FileForLanguage(lang, output_dir))
     if self.flatten_html:
       filename = item.Flatten(output_dir)
     elif self.filenameWithoutPath:
       filename = os.path.basename(filename)
     elif self.relative_path_:
       filename = util.MakeRelativePath(output_dir, filename)
 
     filename = filename.replace('\\', '\\\\')  # escape for the RC format
 
     if isinstance(item, structure.StructureNode) and item.IsExcludedFromRc():
       return ''
     else:
       return '%-18s %-18s "%s"\n' % (item.attrs['name'], self.type_, filename)