[MERGE] merge up to last branch

bzr revid: rlo@openerp.com-20111219103346-k8va78gdfudedg62

1 files changed, 7 insertions, 8 deletions

diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js
index 9bf814aa4f4..e650530a914 100644
--- a/addons/web_process/static/src/js/process.js
+++ b/addons/web_process/static/src/js/process.js
@@ -1,5 +1,6 @@
 openerp.web_process = function (openerp) {
-    var QWeb = openerp.web.qweb;
+    var QWeb = openerp.web.qweb,
+          _t = openerp.web._t;
     openerp.web.ViewManager.include({
         start: function() {
             this._super();
@@ -275,19 +276,17 @@ openerp.web_process = function (openerp) {
             var dialog = new openerp.web.Dialog(this, {
                 width: 800,
                 height: 600,
-                buttons : {
-                    Cancel : function() {
-                        $(this).dialog('destroy');
-                    },
-                    Save : function() {
+                buttons : [
+                    {text: _t("Cancel"), click: function() { $(this).dialog('destroy'); }},
+                    {text: _t("Save"), click: function() {
                         var form_view = action_manager.inner_viewmanager.views.form.controller;
 
                         form_view.do_save(function() {
                             self.initialize_process_view();
                         });
                         $(this).dialog('destroy');
-                    }
-                }
+                    }}
+                ]
             }).start().open();
 
             action_manager.appendTo(dialog.$element);