[Erp5-report] r10483 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplat...

[nobody at svn.erp5.org]

Author: vincent
Date: Mon Oct  2 15:13:52 2006
New Revision: 10483

URL: http://svn.erp5.org?rev=10483&view=rev
Log:
Translate dialog buttons text.
Cache selected language (calculate once per page).
Use cached selected language to render translator mode links.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/developper_shortcut_render.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/developper_shortcut_render.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/developper_shortcut_render.xml?rev=10483&r1=10482&r2=10483&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/developper_shortcut_render.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/developper_shortcut_render.xml Mon Oct  2 15:13:52 2006
@@ -85,7 +85,7 @@
 <tal:block metal:define-macro="translate_link">\n
   <tal:block tal:condition="preferred_html_style_translator_mode">\n
     <a tal:define="image image | python: \'translate.png\'"\n
-       tal:attributes="href python: \'%s/manage_messages?regex=^%s%%24&amp;lang=%s\' % (\'/\'.join(here.Localizer.erp5_ui.getPhysicalPath()[len(here.Localizer.erp5_ui.getPortalObject().getPhysicalPath()):]), message, here.Localizer.get_selected_language());\n
+       tal:attributes="href python: \'%s/manage_messages?regex=^%s%%24&amp;lang=%s\' % (\'/\'.join(here.Localizer.erp5_ui.getPhysicalPath()[len(here.Localizer.erp5_ui.getPortalObject().getPhysicalPath()):]), message, selected_language);\n
                        title info;"><img tal:attributes="src python: \'images/%s\' % (image, );\n
                                                          alt info;"/></a>\n
   </tal:block>\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml?rev=10483&r1=10482&r2=10483&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml Mon Oct  2 15:13:52 2006
@@ -88,9 +88,14 @@
           <tal:block metal:define-slot="main" />\n
           <tal:block metal:define-slot="bottom" />\n
         </div>\n
-        <input id="dialog_cancel_button" value="Cancel" name="Base_cancel:method" type="submit" i18n:translate="" i18n:domain="ui" />\n
-        <input tal:condition="python: form.update_action!=\'\'" id="dialog_update_button" value="Update" name="Base_showUpdateDialog:method" type="submit" i18n:translate="" i18n:domain="ui" />\n
-        <input tal:attributes="value python: here.Base_getFormViewDialogActionButtonTitle(form); name python: \'%s:method\' % (form_action, )" id="dialog_submit_button" type="submit" i18n:translate="" i18n:domain="ui" />\n
+        <input tal:attributes="value python: here.Base_translateString(\'Cancel\')"\n
+               id="dialog_cancel_button" name="Base_cancel:method" type="submit" />\n
+        <input tal:condition="python: form.update_action!=\'\'"\n
+               tal:attributes="value python: here.Base_translateString(\'Update\')"\n
+               id="dialog_update_button" name="Base_showUpdateDialog:method" type="submit" />\n
+        <input tal:attributes="value python: here.Base_translateString(here.Base_getFormViewDialogActionButtonTitle(form));\n
+                               name python: \'%s:method\' % (form_action, )"\n
+               id="dialog_submit_button" type="submit" />\n
       </tal:block>\n
     </tal:block>\n
   </tal:block>\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml?rev=10483&r1=10482&r2=10483&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml Mon Oct  2 15:13:52 2006
@@ -74,6 +74,7 @@
     global form                 nocall:form | nothing;\n
     global preferred_html_style_developper_mode   here/portal_preferences/getPreferredHtmlStyleDevelopperMode;\n
     global preferred_html_style_translator_mode   here/portal_preferences/getPreferredHtmlStyleTranslatorMode;\n
+    global selected_language    here/Localizer/get_selected_language;\n
   "/>\n
 </tal:block>\n
 \n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=10483&r1=10482&r2=10483&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Mon Oct  2 15:13:52 2006
@@ -1,1 +1,1 @@
-237
+241