[Erp5-report] r34044 nicolas - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTempla...

[nobody at svn.erp5.org]

Author: nicolas
Date: Wed Mar 24 11:58:17 2010
New Revision: 34044

URL: http://svn.erp5.org?rev=34044&view=rev
Log:
Index also translated workflow state title generated with getMessageIdWithContext

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_updateTranslationTable.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_updateTranslationTable.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_updateTranslationTable.xml?rev=34044&r1=34043&r2=34044&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_updateTranslationTable.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_updateTranslationTable.xml [utf8] Wed Mar 24 11:58:17 2010
@@ -83,11 +83,12 @@
         # translate state title as well\n
         if state.title != \'\' :\n
           state_var_title = \'%s_title\' % state_var\n
-          msg_id = getMessageIdWithContext(state.title,\'state\',wf.id)\n
+          msg_id = getMessageIdWithContext(state.title, \'state\', wf.id)\n
           translated_message = context.Localizer.erp5_ui.gettext(msg_id, default=\'\', lang=lang).encode(\'utf-8\')\n
           if translated_message == \'\':\n
+            msg_id = state.title\n
             translated_message = context.Localizer.erp5_ui.gettext(state.title.decode(\'utf-8\'), lang=lang).encode(\'utf-8\')\n
-          key = (lang, state_var_title, state_id, state.title)\n
+          key = (lang, state_var_title, state_id, msg_id)\n
           if not translated_keys.has_key(key):\n
             translated_keys[key] = None # mark as translated\n
             obj = newTempBase(context, \'temp_translation_%d\' % i,\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=34044&r1=34043&r2=34044&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Wed Mar 24 11:58:17 2010
@@ -1,1 +1,1 @@
-1519
+1528