[MERGE] trunk

bzr revid: fme@openerp.com-20121217113842-j3a013i7xrsb5a69

5 files changed, 74 insertions, 72 deletions

diff --git a/addons/web_graph/i18n/de.po b/addons/web_graph/i18n/de.po
index 13aee967ff7..5832dddc608 100644
--- a/addons/web_graph/i18n/de.po
+++ b/addons/web_graph/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-12-10 22:55+0000\n"
+"PO-Revision-Date: 2012-12-16 11:14+0000\n"
 "Last-Translator: Maik Steinfeld <m.steinfeld@intero-technologies.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-11 05:03+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-17 04:58+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
 
 #. module: web_graph
 #. openerp-web
@@ -36,21 +36,21 @@ msgstr "Zeige Daten"
 #: code:addons/web_graph/static/src/js/graph.js:22
 #, python-format
 msgid "Graph"
-msgstr "Grafik"
+msgstr "Diagramm"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:25
 #, python-format
 msgid "Inside"
-msgstr ""
+msgstr "Innen"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:3
 #, python-format
 msgid "&iacute;"
-msgstr ""
+msgstr "&iacute;"
 
 #. module: web_graph
 #. openerp-web
@@ -64,14 +64,14 @@ msgstr "Tortendiagramm"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:28
 #, python-format
 msgid "Actions"
-msgstr ""
+msgstr "Aktionen"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:7
 #, python-format
 msgid "Graph Mode"
-msgstr ""
+msgstr "Diagramm Ansicht"
 
 #. module: web_graph
 #. openerp-web
@@ -92,7 +92,7 @@ msgstr "Als PNG herunterladen"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:26
 #, python-format
 msgid "Top"
-msgstr ""
+msgstr "Oben"
 
 #. module: web_graph
 #. openerp-web
@@ -106,14 +106,14 @@ msgstr "Versteckt"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:3
 #, python-format
 msgid "Graph Options"
-msgstr ""
+msgstr "Diagramm Optionen"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:14
 #, python-format
 msgid "Lines"
-msgstr ""
+msgstr "Zeilen"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/en_AU.po b/addons/web_graph/i18n/en_AU.po
index 6f32b5be35a..88fad190f6e 100644
--- a/addons/web_graph/i18n/en_AU.po
+++ b/addons/web_graph/i18n/en_AU.po
@@ -8,28 +8,28 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-04-09 03:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-16 06:36+0000\n"
+"Last-Translator: David Bowers <sales@skitzotek.com>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:21+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-17 04:58+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:12
 #, python-format
 msgid "Bars"
-msgstr ""
+msgstr "Bars"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:33
 #, python-format
 msgid "Show Data"
-msgstr ""
+msgstr "Show Data"
 
 #. module: web_graph
 #. openerp-web
@@ -43,95 +43,95 @@ msgstr "Graph"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:25
 #, python-format
 msgid "Inside"
-msgstr ""
+msgstr "Inside"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:3
 #, python-format
 msgid "&iacute;"
-msgstr ""
+msgstr "&iacute;"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:11
 #, python-format
 msgid "Pie"
-msgstr ""
+msgstr "Pie"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:28
 #, python-format
 msgid "Actions"
-msgstr ""
+msgstr "Actions"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:7
 #, python-format
 msgid "Graph Mode"
-msgstr ""
+msgstr "Graph Mode"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:18
 #, python-format
 msgid "Radar"
-msgstr ""
+msgstr "Radar"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:34
 #, python-format
 msgid "Download as PNG"
-msgstr ""
+msgstr "Download as *.PNG"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:26
 #, python-format
 msgid "Top"
-msgstr ""
+msgstr "Top"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:24
 #, python-format
 msgid "Hidden"
-msgstr ""
+msgstr "Hidden"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:3
 #, python-format
 msgid "Graph Options"
-msgstr ""
+msgstr "Graph Options"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:14
 #, python-format
 msgid "Lines"
-msgstr ""
+msgstr "Lines"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:20
 #, python-format
 msgid "Legend"
-msgstr ""
+msgstr "Legend"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:32
 #, python-format
 msgid "Switch Axis"
-msgstr ""
+msgstr "Switch Axis"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:15
 #, python-format
 msgid "Areas"
-msgstr ""
+msgstr "Areas"
diff --git a/addons/web_graph/i18n/ro.po b/addons/web_graph/i18n/ro.po
index 3cb502dc133..bc49a951d7e 100644
--- a/addons/web_graph/i18n/ro.po
+++ b/addons/web_graph/i18n/ro.po
@@ -8,28 +8,28 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-03-28 19:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-14 18:43+0000\n"
+"Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:21+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-15 05:17+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:12
 #, python-format
 msgid "Bars"
-msgstr ""
+msgstr "Bare"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:33
 #, python-format
 msgid "Show Data"
-msgstr ""
+msgstr "Afiseaza Datele"
 
 #. module: web_graph
 #. openerp-web
@@ -43,95 +43,95 @@ msgstr "Grafic"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:25
 #, python-format
 msgid "Inside"
-msgstr ""
+msgstr "Interior"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:3
 #, python-format
 msgid "&iacute;"
-msgstr ""
+msgstr "&iacute;"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:11
 #, python-format
 msgid "Pie"
-msgstr ""
+msgstr "Diagrama circulara"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:28
 #, python-format
 msgid "Actions"
-msgstr ""
+msgstr "Actiuni"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:7
 #, python-format
 msgid "Graph Mode"
-msgstr ""
+msgstr "Modul Grafic"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:18
 #, python-format
 msgid "Radar"
-msgstr ""
+msgstr "Radar"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:34
 #, python-format
 msgid "Download as PNG"
-msgstr ""
+msgstr "Descarca drept PNG"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:26
 #, python-format
 msgid "Top"
-msgstr ""
+msgstr "Sus"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:24
 #, python-format
 msgid "Hidden"
-msgstr ""
+msgstr "Ascuns(a)"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:3
 #, python-format
 msgid "Graph Options"
-msgstr ""
+msgstr "Optiuni Grafic"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:14
 #, python-format
 msgid "Lines"
-msgstr ""
+msgstr "Linii"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:20
 #, python-format
 msgid "Legend"
-msgstr ""
+msgstr "Legenda"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:32
 #, python-format
 msgid "Switch Axis"
-msgstr ""
+msgstr "Schimba Axa"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:15
 #, python-format
 msgid "Areas"
-msgstr ""
+msgstr "Zone"
diff --git a/addons/web_graph/i18n/sl.po b/addons/web_graph/i18n/sl.po
index c17c876e65e..7f2a304c41f 100644
--- a/addons/web_graph/i18n/sl.po
+++ b/addons/web_graph/i18n/sl.po
@@ -8,28 +8,28 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-01-30 17:56+0000\n"
-"Last-Translator: ERP Basing <erp@basing.si>\n"
+"PO-Revision-Date: 2012-12-14 12:56+0000\n"
+"Last-Translator: Dusan Laznik <laznik@mentis.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:21+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-15 05:17+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:12
 #, python-format
 msgid "Bars"
-msgstr ""
+msgstr "Vrstice"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:33
 #, python-format
 msgid "Show Data"
-msgstr ""
+msgstr "Prikaži podatke"
 
 #. module: web_graph
 #. openerp-web
@@ -43,95 +43,95 @@ msgstr "Graf"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:25
 #, python-format
 msgid "Inside"
-msgstr ""
+msgstr "Znotraj"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:3
 #, python-format
 msgid "&iacute;"
-msgstr ""
+msgstr "&iacute;"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:11
 #, python-format
 msgid "Pie"
-msgstr ""
+msgstr "Krožni izsek"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:28
 #, python-format
 msgid "Actions"
-msgstr ""
+msgstr "Dejanja"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:7
 #, python-format
 msgid "Graph Mode"
-msgstr ""
+msgstr "Način grafa"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:18
 #, python-format
 msgid "Radar"
-msgstr ""
+msgstr "Radar"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:34
 #, python-format
 msgid "Download as PNG"
-msgstr ""
+msgstr "Prenesi kot PNG"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:26
 #, python-format
 msgid "Top"
-msgstr ""
+msgstr "Zgoraj"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:24
 #, python-format
 msgid "Hidden"
-msgstr ""
+msgstr "Skrito"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:3
 #, python-format
 msgid "Graph Options"
-msgstr ""
+msgstr "Možnosti grafa"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:14
 #, python-format
 msgid "Lines"
-msgstr ""
+msgstr "Vrstice"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:20
 #, python-format
 msgid "Legend"
-msgstr ""
+msgstr "Legenda"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:32
 #, python-format
 msgid "Switch Axis"
-msgstr ""
+msgstr "Sprememba osi"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:15
 #, python-format
 msgid "Areas"
-msgstr ""
+msgstr "Območja"
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index 282822d6cba..35ad0aaaea8 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -42,7 +42,9 @@ instance.web_graph.GraphView = instance.web.View.extend({
         this.group_by = [];
 
         this.graph = null;
-        this.on('view_loaded', self, self.load_graph);
+    },
+    view_loading: function(r) {
+        return this.load_graph(r);
     },
     destroy: function () {
         if (this.graph) {