diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/developper_shortcut_render.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/developper_shortcut_render.xml index 978266122e866a6e16dd9d375a7969d9bae94186..cd4d7af6cf398e01caeb02376cb26a6f41932cd0 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/developper_shortcut_render.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/developper_shortcut_render.xml @@ -85,7 +85,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <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&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&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 diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml index f54749a639e2f1249e26bbb14f6f968e24b20a6c..c10d0e19f26413ebaca69c55e76eae81fdd0a633 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml @@ -88,9 +88,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <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 diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml index 49027a14516fa25f849eabdf6f460a0169a1d6f0..9e954997e923a217e1966e8010b59432e015f6c2 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml @@ -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 diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index f71beab75f5697f6169cfd1d9147fcee958c1038..9ce0f492d80944457bbd2a7c2b839341343dce56 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -237 \ No newline at end of file +241 \ No newline at end of file