Merge lp:~savoirfairelinux-openerp/ocb-server/translate_warnings_1297525-trunk into lp:ocb-server
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Holger Brunn (Therp) | ||||
Proposed branch: | lp:~savoirfairelinux-openerp/ocb-server/translate_warnings_1297525-trunk | ||||
Merge into: | lp:ocb-server | ||||
Diff against target: |
69 lines (+9/-7) 3 files modified
openerp/osv/orm.py (+1/-1) openerp/service/wsgi_server.py (+6/-4) openerp/tools/translate.py (+2/-2) |
||||
To merge this branch: | bzr merge lp:~savoirfairelinux-openerp/ocb-server/translate_warnings_1297525-trunk | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Holger Brunn (Therp) | Disapprove | ||
Stefan Rijnhart (Opener) | Abstain | ||
Sandy Carter (http://www.savoirfairelinux.com) | Needs Information | ||
OpenERP Community Reviewer/Maintainer | Pending | ||
Review via email: mp+212736@code.launchpad.net |
Description of the change
When searching a frame for context, the _() looks for self.localcontext but misses self.context.
The integration of this patch allows for web warnings (such as except_orm) to be translated by _()
Unmerged revisions
- 5298. By Sandy Carter (http://www.savoirfairelinux.com)
-
[IMP] Use english translatable string in error popups
- 5297. By El Hadji Dem (http://www.savoirfairelinux.com)
-
[FIX] Fixed instance of ValidateError not being translated
- 5296. 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. - 5295. By Sandy Carter (http://www.savoirfairelinux.com)
-
Also look for context in self
Two commits have been added:
r5296 from OpenERP's support
r5297 from our team for a case I missed of error message translation