Merge lp:~openerp-dev/openerp-web/7.0-opw-580435-port-vme into lp:openerp-web/7.0

[Vidhin Mehta (OpenERP)]

Graph view usablity bug.
Go to : Reporting -> Sale -> lead analysis (graph view) third column don't show any name in x-axis,
and in list view shows "undefine".

[Christophe Matthieu (OpenERP) (chm-openerp)]

Hi,
Why do you use "_t" instead of "_lt" ?
Thanks.

review: Needs Information

[Xavier (Open ERP) (xmo-deactivatedaccount)]

_lt is more costly and only necessary at the toplevel of the module: it defers the translation until the moment it is *used* instead of doing it directly, so it's for defining translatable strings before translations are loaded.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

(& it can be slightly tricker as it returns an object-which-can-be-stringified where _t returns a string directly)

=== modified file 'addons/web_graph/static/src/js/graph.js'
--- addons/web_graph/static/src/js/graph.js	2012-12-13 14:09:14 +0000
+++ addons/web_graph/static/src/js/graph.js	2013-01-25 07:17:19 +0000
@@ -5,6 +5,7 @@
 openerp.web_graph = function (instance) {
 
 var _lt = instance.web._lt;
+var _t = instance.web._t;
 
 // removed ``undefined`` values
 var filter_values = function (o) {
@@ -365,7 +366,7 @@
         }).then(function() {
             var res = {
                 'data': result,
-                'ticks': _.map(ticks, function(el, key) { return [el, key] })
+                'ticks': _.map(ticks, function(el, key) { return [el, key || _t("Undefined")] })
             };
             return res;
         });