Merge lp:~savoirfairelinux-openerp/ocb-web/translate_warnings_1297525 into lp:ocb-web

[Sandy Carter (http://www.savoirfairelinux.com)]

Allows the title of warning boxes such as except_orm to be translated.

Prerequisite for displaying translated values:
https://code.launchpad.net/~savoirfairelinux-openerp/ocb-server/translate_warnings_1297525-trunk/+merge/212736

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

[lp:~savoirfairelinux-openerp/ocb-web/translate_warnings_1297525]

4173. By Sandy Carter (http://www.savoirfairelinux.com) on 2014-04-30

[IMP] Use english translatable string in error popups

[Holger Brunn (Therp) (hbrunn)]

please make a pull request for https://github.com/OCA/OCB if you still consider this fix relevant.

[Holger Brunn (Therp) (hbrunn)]

Development for 7.0 has moved to github on https://github.com/OCA/ocb - please move your merge proposal there if it is still valid.

(I close and reject this in order to have a cleaner overview for 6.1 MPs which indeed have to be done on launchpad)

review: Disapprove

Unmerged revisions

4173. By Sandy Carter (http://www.savoirfairelinux.com) on 2014-04-30

[IMP] Use english translatable string in error popups

4172. By Sandy Carter (http://www.savoirfairelinux.com) on 2014-03-25

Made Error messages translatable

=== modified file 'addons/web/session.py'
--- addons/web/session.py	2013-05-14 10:37:36 +0000
+++ addons/web/session.py	2014-04-30 15:36:22 +0000
@@ -8,6 +8,7 @@
 import xmlrpclib
 
 import openerp
+from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
@@ -84,17 +85,17 @@
         self.jsonp_requests = {}     # FIXME use a LRU
 
     def send(self, service_name, method, *args):
-        code_string = u"warning -- %s\n\n%s"
+        code_string = _(u"warning -- %s\n\n%s")
         try:
             return openerp.netsvc.dispatch_rpc(service_name, method, args)
         except openerp.osv.osv.except_osv, e:
             raise xmlrpclib.Fault(code_string % (e.name, e.value), '')
         except openerp.exceptions.Warning, e:
-            raise xmlrpclib.Fault(code_string % ("Warning", e), '')
+            raise xmlrpclib.Fault(code_string % (_("Warning"), e), '')
         except openerp.exceptions.AccessError, e:
-            raise xmlrpclib.Fault(code_string % ("AccessError", e), '')
+            raise xmlrpclib.Fault(code_string % (_("Access Error"), e), '')
         except openerp.exceptions.AccessDenied, e:
-            raise xmlrpclib.Fault('AccessDenied', openerp.tools.ustr(e))
+            raise xmlrpclib.Fault(_('Access Denied'), openerp.tools.ustr(e))
         except openerp.exceptions.DeferredException, e:
             formatted_info = "".join(traceback.format_exception(*e.traceback))
             raise xmlrpclib.Fault(openerp.tools.ustr(e), formatted_info)