diff --git a/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_getCurrentInstallationStatus.xml b/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_getCurrentInstallationStatus.xml deleted file mode 100644 index 70ce14bcf95a829e73295cb59c7fb888c028a19b..0000000000000000000000000000000000000000 --- a/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_getCurrentInstallationStatus.xml +++ /dev/null @@ -1,126 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>Script_magic</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>_bind_names</string> </key> - <value> - <object> - <klass> - <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_asgns</string> </key> - <value> - <dictionary> - <item> - <key> <string>name_container</string> </key> - <value> <string>container</string> </value> - </item> - <item> - <key> <string>name_context</string> </key> - <value> <string>context</string> </value> - </item> - <item> - <key> <string>name_m_self</string> </key> - <value> <string>script</string> </value> - </item> - <item> - <key> <string>name_subpath</string> </key> - <value> <string>traverse_subpath</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_body</string> </key> - <value> <string>"""\n -Estimate current installation status """\n -activity_threshold = 46\n -\n -\n -return 100\n -</string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>errors</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>func_code</string> </key> - <value> - <object> - <klass> - <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>co_argcount</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>co_varnames</string> </key> - <value> - <tuple> - <string>activity_threshold</string> - </tuple> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>func_defaults</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>WizardTool_getCurrentInstallationStatus</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_successfulConfiguration.xml b/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_successfulConfiguration.xml deleted file mode 100644 index 81facf32d1d66ad65060dafe7c3ad38fe0988693..0000000000000000000000000000000000000000 --- a/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_successfulConfiguration.xml +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_bind_names</string> </key> - <value> - <object> - <klass> - <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_asgns</string> </key> - <value> - <dictionary> - <item> - <key> <string>name_subpath</string> </key> - <value> <string>traverse_subpath</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_text</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -<div>\n -\n - <h3 i18n:translate=""\n - i18n:domain="ui">Configuration is over. Enjoy your new ERP5 system!</h3>\n -\n - <p i18n:translate=""\n - i18n:domain="ui">\n - Please click link below. \n - You will be redirected to a form in which you can login using \n - one of yours newly created ERP5 user accounts.\n - </p>\n - <a i18n:translate=""\n - i18n:domain="ui"\n - tal:attributes="href python: \'%s/login_form\' %here.getPortalObject().absolute_url()"> \n - Start using your new ERP5 system\n - </a>\n -\n -</div>\n - - -]]></string> </value> - </item> - <item> - <key> <string>content_type</string> </key> - <value> <string>text/html</string> </value> - </item> - <item> - <key> <string>expand</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>WizardTool_successfulConfiguration</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Successful Installation Confirmation</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_view/my_header.xml b/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_view/my_header.xml index 1b108ff3e03b3e3efc4f37542394f6e97b9046b5..9996bbfbd8fffc99dc24d73f8861b24c61489256 100644 --- a/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_view/my_header.xml +++ b/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_view/my_header.xml @@ -156,7 +156,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/WizardTool_viewWelcomeMessageRenderer</string> </value> + <value> <string>python: here.portal_wizard.callRemoteProxyMethod(\'WizardTool_viewWelcomeMessageRenderer\')</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_viewRunningInstallationMessageRenderer.xml b/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_viewRunningInstallationMessageRenderer.xml index 9837daccddbbb490aa432b84df4d09ced818e9c8..7f6a1189f7ed6ce23b0b08b5c50b43c897f3d8c0 100644 --- a/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_viewRunningInstallationMessageRenderer.xml +++ b/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_viewRunningInstallationMessageRenderer.xml @@ -59,17 +59,10 @@ </div>\n </div>\n </div>\n - \n - <h3 i18n:translate=""\n - i18n:domain="ui"> \n - ERP5 installation process is running.</h3>\n - \n - <p i18n:translate=""\n - i18n:domain="ui"> \n - Please be patient and do not move from current page until you get \n - confirmation that the installation is over. \n - It will last approximately 5 to 10 minutes.\n - </p>\n +\n + <tal:block \n + tal:replace="structure python: here.portal_wizard.callRemoteProxyMethod(\'WizardTool_viewPatienceMessageRenderer\')"/>\n +\n </tal:block> ]]></string> </value> diff --git a/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_viewWelcomeMessageRenderer.xml b/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_viewWelcomeMessageRenderer.xml deleted file mode 100644 index 49986cdd374ceb1c30de8e47a10ecd378953de02..0000000000000000000000000000000000000000 --- a/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/WizardTool_viewWelcomeMessageRenderer.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_bind_names</string> </key> - <value> - <object> - <klass> - <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_asgns</string> </key> - <value> - <dictionary> - <item> - <key> <string>name_subpath</string> </key> - <value> <string>traverse_subpath</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_text</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -<h2 i18n:translate=""\n - i18n:domain="ui"> Welcome to Wizard</h2>\n - \n -<p i18n:translate=""\n - i18n:domain="ui"> This tool will help you configure your fresh ERP5</p>\n -\n -\n -\n -\n -\n - - -]]></string> </value> - </item> - <item> - <key> <string>content_type</string> </key> - <value> <string>text/html</string> </value> - </item> - <item> - <key> <string>expand</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>WizardTool_viewWelcomeMessageRenderer</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Welcome to Wizard</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_dialog.xml b/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_dialog.xml index 37d2bc9fa9b26160968baa5b838004c25c4cbfca..fe82a0d16cd79183d3b3b986c4777761b1a5f62a 100644 --- a/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_dialog.xml +++ b/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_dialog.xml @@ -89,6 +89,8 @@ <input type="Submit" \n value="Previous" \n name="previous:method"\n + i18n:attributes="value" \n + i18n:domain="ui" \n tal:attributes="value python: options.get(\'previous\')"/>\n </tal:block>\n \n @@ -97,6 +99,8 @@ <input type="Submit" \n value="Search"\n name="next:method"\n + i18n:attributes="value" \n + i18n:domain="ui"\n tal:attributes="value python: options.get(\'next\')" />\n </span>\n </tal:block>\n diff --git a/bt5/erp5_wizard/bt/change_log b/bt5/erp5_wizard/bt/change_log index 97f8f89aa53c3b17b51b7992a23efc0b8726be0f..e7c9f6495ba5d9e145da3382d1301ab0e48e6101 100644 --- a/bt5/erp5_wizard/bt/change_log +++ b/bt5/erp5_wizard/bt/change_log @@ -1,5 +1,5 @@ -2008-10-3 yusei -* Don't use Localizer in wizard side if message is generated in witch side. All dynamic messages should be translated when wizard receives. +2008-10-06 ivan +* User server side rendered messages (for i18n) 2008-10-2 yusei * Use cookie to store user's preferred language and set the language value to REQUEST so that next page after login can use correct language. diff --git a/bt5/erp5_wizard/bt/revision b/bt5/erp5_wizard/bt/revision index 8d9f781b525d012ac086a85ada4d36c91a210fd8..3fdc173dabdd1038c973c374ec30f55cfddafdfb 100644 --- a/bt5/erp5_wizard/bt/revision +++ b/bt5/erp5_wizard/bt/revision @@ -1 +1 @@ -118 \ No newline at end of file +122 \ No newline at end of file