From 52a970bce3783f518b18152804e61607377ed04f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@odoo.com>
Date: Thu, 29 Nov 2018 11:11:33 +0000
Subject: [PATCH] [FIX] base: make demo install warning more prominent

Users may not notice the warning and carry the risk of irreversibly
damaging their production database. Making the warning message more
frightening should help avoid this.

closes odoo/odoo#29128
---
 odoo/addons/base/data/ir_demo_data.xml | 22 ++++++++++++++---
 odoo/addons/base/i18n/base.pot         | 34 ++++++++++++++++++--------
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/odoo/addons/base/data/ir_demo_data.xml b/odoo/addons/base/data/ir_demo_data.xml
index e0e42387ab4..60f8c9cb50c 100644
--- a/odoo/addons/base/data/ir_demo_data.xml
+++ b/odoo/addons/base/data/ir_demo_data.xml
@@ -11,11 +11,25 @@
         <field name="model">ir.demo</field>
         <field name="arch" type="xml">
             <form>
-                <p>Demo data should only be used on test databases. Once they are loaded, they cannot be removed.</p>
-                <p>Are you sure you want to load demo data?</p>
+                <div class="row container">
+                    <div class="col-12 text-center">
+                      <div class="card text-white bg-danger mb-3 w-75 ml64">
+                        <div class="card-header">
+                                <span class="fa fa-2x fa-warning" t-translation="off">&amp;nbsp;</span>
+                                <span class="text-white text-uppercase">Danger Zone</span>
+                        </div>
+                        <div class="card-body bg-transparent text-center">
+                          <p>Demo data should only be used on test databases!
+                             Once they are loaded, they cannot be removed!</p>
+                          <p>Please confirm that you want to <b>irreversibly</b> make this database a demo database.</p>
+                        </div>
+                      </div>
+                    </div>
+                </div>
+
                 <footer>
-                    <button name="install_demo" string="Load demo data" type="object" class="btn-primary"/>
-                    <button special="cancel" string="Discard" class="btn-secondary"/>
+                    <button special="cancel" string="Oops, no!" class="btn-primary"/>
+                    <button name="install_demo" string="Yes, I understand the risks" type="object" class="btn-secondary"/>
                 </footer>
             </form>
         </field>
diff --git a/odoo/addons/base/i18n/base.pot b/odoo/addons/base/i18n/base.pot
index dfd4ca25656..6a25a4ccdf1 100644
--- a/odoo/addons/base/i18n/base.pot
+++ b/odoo/addons/base/i18n/base.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-08 07:02+0000\n"
-"PO-Revision-Date: 2018-10-08 07:02+0000\n"
+"POT-Creation-Date: 2018-11-29 10:24+0000\n"
+"PO-Revision-Date: 2018-11-29 10:24+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -4775,6 +4775,11 @@ msgstr ""
 msgid "<span class=\"o_form_label\">We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R).\"</span>"
 msgstr ""
 
+#. module: base
+#: model_terms:ir.ui.view,arch_db:base.demo_force_install_form
+msgid "<span class=\"text-white text-uppercase\">Danger Zone</span>"
+msgstr ""
+
 #. module: base
 #: model_terms:ir.ui.view,arch_db:base.sequence_view
 msgid "<span colspan=\"2\">Current Year with Century: %(year)s</span>\n"
@@ -6231,11 +6236,6 @@ msgstr ""
 msgid "Are you sure to execute the list of automatic merges of your contacts ?"
 msgstr ""
 
-#. module: base
-#: model_terms:ir.ui.view,arch_db:base.demo_force_install_form
-msgid "Are you sure you want to load demo data?"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.ar
 msgid "Argentina"
@@ -8832,7 +8832,8 @@ msgstr ""
 
 #. module: base
 #: model_terms:ir.ui.view,arch_db:base.demo_force_install_form
-msgid "Demo data should only be used on test databases. Once they are loaded, they cannot be removed."
+msgid "Demo data should only be used on test databases!\n"
+"                             Once they are loaded, they cannot be removed!"
 msgstr ""
 
 #. module: base
@@ -8959,7 +8960,6 @@ msgid "Disabling this option will also uninstall the following modules \n"
 msgstr ""
 
 #. module: base
-#: model_terms:ir.ui.view,arch_db:base.demo_force_install_form
 #: model_terms:ir.ui.view,arch_db:base.onboarding_container
 #: model_terms:ir.ui.view,arch_db:base.res_config_settings_view_form
 msgid "Discard"
@@ -13082,7 +13082,6 @@ msgstr ""
 
 #. module: base
 #: model:ir.actions.act_window,name:base.demo_force_install_action
-#: model_terms:ir.ui.view,arch_db:base.demo_force_install_form
 msgid "Load demo data"
 msgstr ""
 
@@ -15715,6 +15714,11 @@ msgstr ""
 msgid "Only users with the following access level are currently allowed to do that"
 msgstr ""
 
+#. module: base
+#: model_terms:ir.ui.view,arch_db:base.demo_force_install_form
+msgid "Oops, no!"
+msgstr ""
+
 #. module: base
 #: model_terms:ir.ui.view,arch_db:base.view_base_module_update
 msgid "Open Apps"
@@ -16449,6 +16453,11 @@ msgstr ""
 msgid "Please configure an email on the current user to simulate sending an email message via this outgoing server"
 msgstr ""
 
+#. module: base
+#: model_terms:ir.ui.view,arch_db:base.demo_force_install_form
+msgid "Please confirm that you want to <b>irreversibly</b> make this database a demo database."
+msgstr ""
+
 #. module: base
 #: code:addons/base/models/ir_model.py:1231
 #, python-format
@@ -21090,6 +21099,11 @@ msgstr ""
 msgid "Yemen"
 msgstr ""
 
+#. module: base
+#: model_terms:ir.ui.view,arch_db:base.demo_force_install_form
+msgid "Yes, I understand the risks"
+msgstr ""
+
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_yodlee
 msgid "Yodlee"