[Merge]

bzr revid: vir@tinyerp.com-20101005043457-bxgzubu7m9teawws

1 files changed, 33 insertions, 31 deletions

diff --git a/bin/addons/base/module/wizard/base_language_install_view.xml b/bin/addons/base/module/wizard/base_language_install_view.xml
index 794ea6bed7d..38edf4d4a82 100644
--- a/bin/addons/base/module/wizard/base_language_install_view.xml
+++ b/bin/addons/base/module/wizard/base_language_install_view.xml
@@ -8,13 +8,38 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Load Official Translation">
-                    <separator string="Load an Official Translation" colspan="4"/>
-                    <group colspan="4"><field name="lang"/></group>
-                    <label string="" colspan="4"/>
-                    <label string="Please be patient, as this operation may take a few minutes..." colspan="4"/>
-                    <separator string="" colspan="4"/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="lang_install" string="Load" type="object" icon="gtk-ok"/>
+                    <group col="8">
+                        <group colspan="3">
+                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
+                            <newline/>
+                            <label colspan="4" width="220" string="This wizard helps you add a new language to your OpenERP system. After loading a new language it becomes available as default interface language for users and partners."/>
+                            <label colspan="4" width="220"/>
+                            <label colspan="4" width="220" string="Please be patient, this operation may take a few minutes (depending on the number of modules currently installed)..."/>
+                            <field name="state" invisible="1"/>
+                        </group>
+                        <separator orientation="vertical" rowspan="15"/>
+                        <group colspan="4">
+                            <separator string="Load Official Translation" colspan="4"/>
+                            <group states="init" colspan="4">
+                                <field name="lang" colspan="4"/>
+                            </group>
+                            <group states="done" colspan="4">
+                                <label string="The selected language has been successfully installed.
+You must change the preferences of the user and open a new menu to view the changes." colspan="4"/>
+                            </group>
+                        </group>
+                        <group colspan="8" col="8" states="init">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                            <button name="lang_install" string="Load" type="object" icon="gtk-ok"/>
+                        </group>
+                        <group colspan="8" col="8" states="done">
+                            <separator string="" colspan="8"/>
+                            <label colspan="7" width="220"/>
+                            <button special="cancel" string="Close" icon="gtk-ok"/>
+                        </group>
+                    </group>
                 </form>
            </field>
         </record>
@@ -32,30 +57,7 @@
         name="Load an Official Translation"
         action="action_view_base_language_install"
         id="menu_view_base_language_install"
-        parent="menu_translation"/>
-
-        <record id="view_base_language_install_msg" model="ir.ui.view">
-            <field name="name">Official Translation Loaded</field>
-            <field name="model">base.module.import.msg</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            <form string="Official Translation Loaded">
-                <separator string="Official Translation Loaded" colspan="4"/>
-                <label string="The selected language has been successfully installed.\nYou must change the preferences of the user and open a new menu to view the changes." colspan="4"/>
-                <separator string="" colspan="4"/>
-                <button special="cancel" string="OK" icon="gtk-ok"/>
-            </form>
-            </field>
-        </record>
-
-        <record id="action_view_base_language_install_msg" model="ir.actions.act_window">
-            <field name="name">Official Translation Loaded</field>
-            <field name="res_model">base.module.import.msg</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_base_language_install"/>
-            <field name="target">new</field>
-        </record>
+        parent="menu_translation" sequence="2"/>
     </data>
 </openerp>