diff --git a/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py b/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py index c4ed3a85b7bfe0cf9c8dd354f9fcc8bfcc0d956b..3ddef43d33aa6e1e1e99eabe5e6c70a386843939 100644 --- a/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py +++ b/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py @@ -61,9 +61,19 @@ def findStaticTranslationText(page_template, func_name_list): 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 @@ def findStaticTranslationText(page_template, func_name_list): 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() # diff --git a/bt5/erp5_forge/bt/change_log b/bt5/erp5_forge/bt/change_log index 85478dde102949666e6b58ab4e72d976c2e4ce6f..5f316f403cac8d9cc983bd5414555bd6431f89b0 100644 --- a/bt5/erp5_forge/bt/change_log +++ b/bt5/erp5_forge/bt/change_log @@ -1,3 +1,6 @@ +2008-08-28 yusei +* Extract translation message from tal:dfeine expression. + 2008-08-27 yusei * Improve pot file export. diff --git a/bt5/erp5_forge/bt/revision b/bt5/erp5_forge/bt/revision index 871cae9aa662ba186a3a1da42301a2cfbbaea7e0..5f1a9f39c27866e19c2665f899cec7d843660ad4 100644 --- a/bt5/erp5_forge/bt/revision +++ b/bt5/erp5_forge/bt/revision @@ -1 +1 @@ -323 \ No newline at end of file +324 \ No newline at end of file