Skip missing translations when generating JSON resources.

grit/clique.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.
 
 '''Collections of messages and their translations, called cliques.  Also
 collections of cliques (uber-cliques).
 '''
 
 import re
@@ skipping 347 matching lines @@
     self.shortcut_groups.append(group)
 
   def SetCustomType(self, custom_type):
     '''Makes this clique use custom_type for validating messages and
     translations, and optionally modifying translations.
     '''
     self.custom_type = custom_type
     if custom_type and not custom_type.Validate(self.GetMessage()):
       raise exception.InvalidMessage(self.GetMessage().GetRealContent())
 
-  def MessageForLanguage(self, lang, pseudo_if_no_match=True, fallback_to_english=False):
+  def MessageForLanguage(self, lang, pseudo_if_no_match=True,
+                         fallback_to_english=False, none_if_no_match=False):

[Jamie, 2015/10/27 19:25:13]

Optional: AFAICT, the final three parameters to this function are mutually
exclusive, with no documented behaviour if more than one is set to true. Perhaps
it would be better to replace them with an enum?

[Sergey Ulanov, 2016/02/06 01:03:17]

The existing two flags are specified as booleans in the input grd files.
Reverted the change in this file

     '''Returns the message/translation for the specified language, providing
     a pseudotranslation if there is no available translation and a pseudo-
     translation is requested.
 
     The translation of any message whatsoever in the special language
     'x_constant' is the message "TTTTTT".
 
     Args:
       lang: 'en'
       pseudo_if_no_match: True
       fallback_to_english: False
+      none_if_no_match: False
 
     Return:
       tclib.BaseMessage
     '''
     if not self.translateable:
       return self.GetMessage()
 
     if lang == constants.CONSTANT_LANGUAGE:
       return self.CONSTANT_TRANSLATION
 
     for msglang in self.clique.keys():
       if lang == msglang:
         return self.clique[msglang]
 
     if lang == constants.FAKE_BIDI:
       return pseudo_rtl.PseudoRTLMessage(self.GetMessage())
 
     if fallback_to_english:
       self.uber_clique._AddMissingTranslation(lang, self, is_error=False)
       return self.GetMessage()
 
     # If we're not supposed to generate pseudotranslations, we add an error
     # report to a list of errors, then fail at a higher level, so that we
     # get a list of all messages that are missing translations.

[Jamie, 2015/10/27 19:25:13]

This comment is a bit misleading now that there's another fallback option. I
suggest rephrasing it so that it isn't specific to pseudotranslations and moving
it to just above the AddMissingTranslation call.

[Sergey Ulanov, 2016/02/06 01:03:17]

Done.

-    if not pseudo_if_no_match:
-      self.uber_clique._AddMissingTranslation(lang, self, is_error=True)
+    if pseudo_if_no_match:
+      return pseudo.PseudoMessage(self.GetMessage())
 
+    if none_if_no_match:
+      return None
+
+    self.uber_clique._AddMissingTranslation(lang, self, is_error=True)
     return pseudo.PseudoMessage(self.GetMessage())
 
   def AllMessagesThatMatch(self, lang_re, include_pseudo = True):
     '''Returns a map of all messages that match 'lang', including the pseudo
     translation if requested.
 
     Args:
       lang_re: re.compile('fr|en')
       include_pseudo: True
 
@@ skipping 57 matching lines @@
     transl_msg = tclib.Translation(id=self.GetId(),
                                    text=translation.GetPresentableContent(),
                                    placeholders=original.GetPlaceholders())
 
     if self.custom_type and not self.custom_type.ValidateAndModify(language, transl_msg):
       print "WARNING: %s translation failed validation: %s" % (
         language, transl_msg.GetId())
 
     self.clique[language] = transl_msg