Commit 4b415115 authored by Ivan Tyagov's avatar Ivan Tyagov

Use server side i18n messages.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24021 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 86424a56
...@@ -365,7 +365,14 @@ class WizardTool(BaseTool): ...@@ -365,7 +365,14 @@ class WizardTool(BaseTool):
witch_tool = server.portal_witch witch_tool = server.portal_witch
return witch_tool return witch_tool
def _callRemoteMethod(self, distant_method, server_url=None): def callRemoteProxyMethod(self, distant_method, server_url=None):
""" Call proxy method on server. """
# set real method_id
form = self.REQUEST.form
form['method_id'] = distant_method
return self._callRemoteMethod('proxyMethodHandler', wrap_result=0)
def _callRemoteMethod(self, distant_method, server_url=None, wrap_result=1):
""" Call remote method on server and get result. """ """ Call remote method on server and get result. """
result_call = GeneratorCall() result_call = GeneratorCall()
if server_url is None: if server_url is None:
...@@ -405,6 +412,9 @@ class WizardTool(BaseTool): ...@@ -405,6 +412,9 @@ class WizardTool(BaseTool):
"next": None, "next": None,
"previous": None}) "previous": None})
else: else:
if not wrap_result:
# simply return raw result
return html
result_call.load(html) result_call.load(html)
command = result_call["command"] command = result_call["command"]
html = result_call["data"] html = result_call["data"]
...@@ -679,7 +689,7 @@ class WizardTool(BaseTool): ...@@ -679,7 +689,7 @@ class WizardTool(BaseTool):
portal_activities = getToolByName(self.getPortalObject(), 'portal_activities') portal_activities = getToolByName(self.getPortalObject(), 'portal_activities')
is_bt5_installation_over = (portal_activities.countMessageWithTag('initialERP5Setup')==0) is_bt5_installation_over = (portal_activities.countMessageWithTag('initialERP5Setup')==0)
if 0 == len(portal_activities.getMessageList()) and is_bt5_installation_over: if 0 == len(portal_activities.getMessageList()) and is_bt5_installation_over:
html = self.WizardTool_successfulConfiguration() html = self.callRemoteProxyMethod('WizardTool_successfulConfiguration')
else: else:
if is_bt5_installation_over: if is_bt5_installation_over:
# only if bt5s are installed start tracking number of activities # only if bt5s are installed start tracking number of activities
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment