[Erp5-report] r23219 - in /erp5/trunk/bt5/erp5_forge: ExtensionTemplateItem/ bt/

[nobody at svn.erp5.org]

Author: yusei
Date: Thu Aug 28 12:05:43 2008
New Revision: 23219

URL: http://svn.erp5.org?rev=23219&view=rev
Log:
2008-08-28 yusei
* Extract translation message from tal:dfeine expression.

Modified:
    erp5/trunk/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py
    erp5/trunk/bt5/erp5_forge/bt/change_log
    erp5/trunk/bt5/erp5_forge/bt/revision

Modified: erp5/trunk/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py?rev=23219&r1=23218&r2=23219&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py (original)
+++ erp5/trunk/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py Thu Aug 28 12:05:43 2008
@@ -61,9 +61,19 @@
       text_dict.update(interpreter._i18n_message_id_dict)
 
   def addTextFromPythonExpression(node):
-    tal_expression = node[1]
-    if isinstance(tal_expression, (tuple, list)):
-      tal_expression = tal_expression[0]
+    if node[0]=='insertText':
+      tal_expression = node[1]
+      if isinstance(tal_expression, (tuple, list)):
+        tal_expression = tal_expression[0]
+    elif node[0] in ('setLocal', 'setGlobal'):
+      if len(node)==2:
+        tal_expression = node[1][1]
+      elif len(node)==3:
+        tal_expression = node[2]
+      else:
+        return
+    else:
+      return
     tal_expression = tal_expression[1:-1]
     match = name_match(tal_expression)
     if match:
@@ -86,6 +96,8 @@
   parser.parseString(page_template._text)
   iterate(parser.gen.program, 'insertTranslation', addText)
   iterate(parser.gen.program, 'insertText', addTextFromPythonExpression)
+  iterate(parser.gen.program, 'setLocal', addTextFromPythonExpression)
+  iterate(parser.gen.program, 'setGlobal', addTextFromPythonExpression)
   return text_dict.keys()
 
 #

Modified: erp5/trunk/bt5/erp5_forge/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/change_log?rev=23219&r1=23218&r2=23219&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_forge/bt/change_log Thu Aug 28 12:05:43 2008
@@ -1,3 +1,6 @@
+2008-08-28 yusei
+* Extract translation message from tal:dfeine expression.
+
 2008-08-27 yusei
 * Improve pot file export.
 

Modified: erp5/trunk/bt5/erp5_forge/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/revision?rev=23219&r1=23218&r2=23219&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/revision (original)
+++ erp5/trunk/bt5/erp5_forge/bt/revision Thu Aug 28 12:05:43 2008
@@ -1,1 +1,1 @@
-323
+324