Merge lp:~openerp-dev/openobject-server/7.0-opw-605743-msh into lp:openobject-server/7.0
Status: | Needs review | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~openerp-dev/openobject-server/7.0-opw-605743-msh | ||||
Merge into: | lp:openobject-server/7.0 | ||||
Diff against target: |
56 lines (+8/-6) 2 files modified
openerp/service/wsgi_server.py (+6/-4) openerp/tools/translate.py (+2/-2) |
||||
To merge this branch: | bzr merge lp:~openerp-dev/openobject-server/7.0-opw-605743-msh | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Naresh(OpenERP) | Pending | ||
Martin Trigaux (OpenERP) | Pending | ||
Review via email: mp+213024@code.launchpad.net |
Description of the change
Hello,
Fixed the issue of translation, warnings, except_orm and which is raised through OpenERPSession class send method or raised xmlrpclib.Fault in xmlrpc_
There is also a fix for web-client, branch for web-client is: lp:~openerp-dev/openerp-web/7.0-opw-605743-msh
Demo: Raise any exception like except_osv or except_orm(Test it in any other language), web-client will show Title of dialog like "OpenERP Warning", Warning is not translated.
Also fixed some other translation issue while fixing this, like tools and service using GettextAlias(i.e. _) but these is not going to register in pot because this py files are outside module, it is not inside any module path so explicitly added those py's path.
Also consdiered context attribute of object if there is no localcontext found.
Thanks.
Unmerged revisions
- 5267. By Mohammed Shekha(Open ERP)
-
[FIX]Base, Tools Translation: Fixed the issue of translation, warnings, except_orm and which is raised through OpenERPSession class send method or raised xmlrpclib.Fault in xmlrpc_
handle_ exception_ legacy will also not be translatanble, also there is no way through which translation terms which are used outside any module like used in tools and service will not be registered in pot when translation is exported, we need to add those path explicitly, also considered context attribute in get_lang.