Remove support for product attributes in Android xml files.

grit/tool/android2grd.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.
 
 """The 'grit android2grd' tool."""
 
 
 import getopt
 import os.path
@@ skipping 225 matching lines @@
     for child in resources.childNodes:
       if child.nodeType == Node.COMMENT_NODE:
         # Remove leading/trailing whitespace; collapse consecutive whitespaces.
         description = ' '.join(child.data.split())
       elif child.nodeType == Node.ELEMENT_NODE:
         if child.tagName != 'string':
           print 'Warning: ignoring unknown tag <%s>' % child.tagName
         else:
           translatable = self.IsTranslatable(child)
           raw_name = child.getAttribute('name')
-          product = child.getAttribute('product') or None
-          grd_name = self.__FormatName(raw_name, product)
+          if not _STRING_NAME.match(raw_name):
+            print 'Error: string name contains illegal characters: %s' % raw_name

[newt (away), 2015/08/13 23:10:52]

Done.

+          grd_name = 'IDS_' + raw_name.upper()
           # Transform the <string> node contents into a tclib.Message, taking
           # care to handle whitespace transformations and escaped characters,
           # and coverting <xliff:g> placeholders into <ph> placeholders.
           msg = self.CreateTclibMessage(child)
           msg_node = self.__CreateMessageNode(messages, grd_name, description,
               msg, translatable)
           messages.AddChild(msg_node)
           # Reset the description once a message has been parsed.
           description = ''
 
-  def __FormatName(self, name, product=None):
-    """Formats the message name.
-
-    Names in the strings.xml files should be lowercase with underscores. In grd
-    files message names should be mostly uppercase with a IDS prefix. We also
-    will annotate names with product information (lowercase) where appropriate.
-
-    Args:
-      name: The message name as found in the string.xml file.
-      product: An optional product annotation.
-
-    Returns:
-      String containing the grd style name that will be used in the translation
-      console.
-    """
-    if not _STRING_NAME.match(name):
-      print 'Error: string name contains illegal characters: %s' % name
-    grd_name = 'IDS_%s' % name.upper()
-    product_suffix = ('_product_%s' % product.lower()) if product else ''
-    return grd_name + product_suffix
-
   def CreateTclibMessage(self, android_string):
     """Transforms a <string/> element from strings.xml into a tclib.Message.
 
     Interprets whitespace, quotes, and escaped characters in the android_string
     according to Android's formatting and styling rules for strings.  Also
     converts <xliff:g> placeholders into <ph> placeholders, e.g.:
 
       <xliff:g id="website" example="google.com">%s</xliff:g>
         becomes
       <ph name="website"><ex>google.com</ex>%s</ph>
@@ skipping 201 matching lines @@
     A <string> element is by default translatable unless otherwise marked.
     """
     if android_string.hasAttribute('translatable'):
       value = android_string.getAttribute('translatable').lower()
       if value not in ('true', 'false'):
         print 'Warning: translatable attribute has invalid value: %s' % value
       return value == 'true'
     else:
       return True