Merge lp:~onnis-roberto/web-addons/6.1 into lp:~webaddons-core-editors/web-addons/6.1

[Roberto Onnis]

[web_export_view]: enables export of boolean values in tree view

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Roberto, thank you very much for your contribution. I see these little things to fix:

- You must enclose in different 'if' some conditions to avoid possible False:

if(data_id.find('input').get(0) != undefined) {
    if(data_id.find('input').get(0).type == 'checkbox' {
        if (data_id.find('input').get(0).checked){
            text = _t("True");
        }
        else {
            text = _t("False");
        }
    }
.
.
.
or am I not understanding correctly the code?

- Include updated translatation template file.

Regards.

review: Needs Fixing (code review)

[lp:~onnis-roberto/web-addons/6.1]

25. By Roberto Onnis on 2014-02-21

[web_export_view]: fixes unandled case in if else construct

[Roberto Onnis (onnis-roberto)]

Hi Pedro, thanks for your fast review, I've pushed the fix in js code.

How can I create a pot file of a web module? I've tried with the openerp export functionality but it returns an empty file

Thanks in advance
Roberto

> Hi, Roberto, thank you very much for your contribution. I see these little
> things to fix:
>
> - You must enclose in different 'if' some conditions to avoid possible False:
>
> if(data_id.find('input').get(0) != undefined) {
> if(data_id.find('input').get(0).type == 'checkbox' {
> if (data_id.find('input').get(0).checked){
> text = _t("True");
> }
> else {
> text = _t("False");
> }
> }
> .
> .
> .
> or am I not understanding correctly the code?
>
> - Include updated translatation template file.
>
> Regards.

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Roberto,

I have faced previously the same problem with translation on js files, and I finally ended adding lines by hand. It's a little odd, but very straightforward. I include here both sections for translating True and False (add them to the header generated by OpenERP):

#. module: web_export_view
#. openerp-web
#: code:addons/web_export_view/static/src/js/web_advanced_export.js:103
#, python-format
msgid "True"
msgstr ""

#. module: web_export_view
#. openerp-web
#: code:addons/web_export_view/static/src/js/web_advanced_export.js:106
#, python-format
msgid "False"
msgstr ""

I have seen that there is no current pot file, so these are the other entries you need for the full translation of the module:

#. module: web_export_view
#. openerp-web
#: code:addons/web_export_view/static/src/js/web_advanced_export.js:38
#, python-format
msgid "Customize"
msgstr ""

#. module: web_export_view
#. openerp-web
#: code:addons/web_export_view/static/src/js/web_advanced_export.js:40
#, python-format
msgid "Translate"
msgstr ""

#. module: web_export_view
#. openerp-web
#: code:addons/web_export_view/static/src/js/web_advanced_export.js:42
#, python-format
msgid "Technical translation"
msgstr ""

#. module: web_export_view
#. openerp-web
#: code:addons/web_export_view/static/src/js/web_advanced_export.js:46
#, python-format
msgid "Other Options"
msgstr ""

#. module: web_export_view
#. openerp-web
#: code:addons/web_export_view/static/src/js/web_advanced_export.js:49
#, python-format
msgid "Import"
msgstr ""

#. module: web_export_view
#. openerp-web
#: code:addons/web_export_view/static/src/js/web_advanced_export.js:52
#, python-format
msgid "Export"
msgstr ""

#. module: web_export_view
#. openerp-web
#: code:addons/web_export_view/static/src/js/web_advanced_export.js:56
#, python-format
msgid "Export current view"
msgstr ""

Regards.

[lp:~onnis-roberto/web-addons/6.1]

26. By Roberto Onnis on 2014-02-26

[web_export_view]: localization template added

[Roberto Onnis (onnis-roberto)]

Template File added, thanks Pedro

review: Needs Resubmitting

[Pedro Manuel Baeza (pedro.baeza)]

Thanks for the changes.

Regards.

review: Approve (code review)

[Lorenzo Battistini (elbati)]

Thanks Roberto.

Would this be applicable to v7 too?

review: Approve (code review)

[Roberto Onnis (onnis-roberto)]

review: Approve

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Can you remove the line with "I have seen that there is no current pot file, so these are the other entries you need for the full translation of the module:" in the pot file?

review: Needs Fixing

[lp:~onnis-roberto/web-addons/6.1]

27. By Roberto Onnis on 2014-02-28

[web_export_view] misprint deleted in localization pot file

[Roberto Onnis (onnis-roberto)]

line removed in pot file

R.

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

[Holger Brunn (Therp) (hbrunn)]

Given that Guewen's concern was resolved a while ago, I set this to approved.

=== added directory 'web_export_view/i18n'
=== added file 'web_export_view/i18n/web_export_view.pot'
--- web_export_view/i18n/web_export_view.pot	1970-01-01 00:00:00 +0000
+++ web_export_view/i18n/web_export_view.pot	2014-02-28 13:05:28 +0000
@@ -0,0 +1,80 @@
+# Translations template for PROJECT.
+# Copyright (C) 2014 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2014-02-21 18:59+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#. module: web_export_view
+#. openerp-web
+#: code:addons/web_export_view/static/src/js/web_advanced_export.js:103
+#, python-format
+msgid "True"
+msgstr ""
+
+#. module: web_export_view
+#. openerp-web
+#: code:addons/web_export_view/static/src/js/web_advanced_export.js:106
+#, python-format
+msgid "False"
+msgstr ""
+
+#. module: web_export_view
+#. openerp-web
+#: code:addons/web_export_view/static/src/js/web_advanced_export.js:38
+#, python-format
+msgid "Customize"
+msgstr ""
+
+#. module: web_export_view
+#. openerp-web
+#: code:addons/web_export_view/static/src/js/web_advanced_export.js:40
+#, python-format
+msgid "Translate"
+msgstr ""
+
+#. module: web_export_view
+#. openerp-web
+#: code:addons/web_export_view/static/src/js/web_advanced_export.js:42
+#, python-format
+msgid "Technical translation"
+msgstr ""
+
+#. module: web_export_view
+#. openerp-web
+#: code:addons/web_export_view/static/src/js/web_advanced_export.js:46
+#, python-format
+msgid "Other Options"
+msgstr ""
+
+#. module: web_export_view
+#. openerp-web
+#: code:addons/web_export_view/static/src/js/web_advanced_export.js:49
+#, python-format
+msgid "Import"
+msgstr ""
+
+#. module: web_export_view
+#. openerp-web
+#: code:addons/web_export_view/static/src/js/web_advanced_export.js:52
+#, python-format
+msgid "Export"
+msgstr ""
+
+#. module: web_export_view
+#. openerp-web
+#: code:addons/web_export_view/static/src/js/web_advanced_export.js:56
+#, python-format
+msgid "Export current view"
+msgstr ""

=== modified file 'web_export_view/static/js/web_advanced_export.js'
--- web_export_view/static/js/web_advanced_export.js	2013-05-24 11:28:51 +0000
+++ web_export_view/static/js/web_advanced_export.js	2014-02-28 13:05:28 +0000
@@ -89,17 +89,33 @@
             });
             rows = view.$element.find('.ui-widget-content tr');
             export_rows = [];
-            $.each(rows,function(){
+            $.each(rows,function(){         
                 $row = $(this);
-                // find only rows with data
+                // find only rows with data     
                 if($row.attr('data-id')){
                     export_row = [];
                     $.each(export_columns_keys,function(){
                         cell = $row.find('td[data-field="'+this+'"]').get(0);
-                        text = cell.text || cell.textContent || cell.innerHTML || "";
-                        export_row.push(text.trim());
+                        var data_id = $( '<div>' + cell.innerHTML + '</div>');
+                        if(data_id.find('input').get(0) != undefined) {
+                                if(data_id.find('input').get(0).type == 'checkbox'){
+                                        if(data_id.find('input').get(0).checked){
+                                                text = _t("True");
+                                        }
+                                        else {
+                                                text = _t("False");
+                                        }
+                                }
+                                else {
+                                         text = cell.text || cell.textContent || cell.innerHTML || "";
+                                }
+                        }
+                        else{  
+                                text = cell.text || cell.textContent || cell.innerHTML || "";
+                        }      
+                        export_row.push(text.trim());   
                     });
-                    export_rows.push(export_row);
+                    export_rows.push(export_row);   
                 }
             });
             $.blockUI();