From 7470797be7b4b23a433d3fa87e014b8f8b1f364d Mon Sep 17 00:00:00 2001 From: Damien Bouvy Date: Tue, 10 Oct 2023 22:26:59 +0200 Subject: [PATCH] [IMP] base,**: rewrite some error messages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Maintain the playful tone whilst avoiding nonsensical phrasing. I will not take comment at this time, thank you. Task-🤔🙃😬💅😐🤓 closes odoo/odoo#138302 Signed-off-by: Bouvy Damien (dbo) --- addons/account/models/account_account.py | 2 +- addons/account/models/account_move_line.py | 2 +- .../views/mailing_mailing_views.xml | 2 +- addons/mrp/models/mrp_production.py | 4 +-- .../onboarding/views/onboarding_templates.xml | 2 +- .../media_dialog/image_selector.xml | 2 +- odoo/addons/base/models/ir_rule.py | 4 +-- .../test_access_rights/tests/test_feedback.py | 26 +++++++++---------- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/addons/account/models/account_account.py b/addons/account/models/account_account.py index a8b43d54dde..a34158c43ef 100644 --- a/addons/account/models/account_account.py +++ b/addons/account/models/account_account.py @@ -757,7 +757,7 @@ class AccountAccount(models.Model): account_name = partner_prop_acc.get_by_record().display_name raise UserError( _("You can't delete the account %s, as it is used on a contact.\n\n" - "Imagine that a customer’s receivables evaporate; your CFO might not like it :)" + "Think of it as safeguarding your customer's receivables; your CFO would appreciate it :)" , account_name) ) diff --git a/addons/account/models/account_move_line.py b/addons/account/models/account_move_line.py index 76ca8b6aeb0..33df5cc5103 100644 --- a/addons/account/models/account_move_line.py +++ b/addons/account/models/account_move_line.py @@ -1563,7 +1563,7 @@ class AccountMoveLine(models.Model): def _unlink_except_posted(self): # Prevent deleting lines on posted entries if not self._context.get('force_delete') and any(m.state == 'posted' for m in self.move_id): - raise UserError(_("You can't delete a posted journal item. Don’t play Jenga with your accounting records; reset the journal entry to draft before deleting it.")) + raise UserError(_("You can't delete a posted journal item. Don’t play games with your accounting records; reset the journal entry to draft before deleting it.")) @api.ondelete(at_uninstall=False) def _prevent_automatic_line_deletion(self): diff --git a/addons/mass_mailing/views/mailing_mailing_views.xml b/addons/mass_mailing/views/mailing_mailing_views.xml index 0e812c882b3..6bcafb69ab1 100644 --- a/addons/mass_mailing/views/mailing_mailing_views.xml +++ b/addons/mass_mailing/views/mailing_mailing_views.xml @@ -61,7 +61,7 @@
diff --git a/addons/web_editor/static/src/components/media_dialog/image_selector.xml b/addons/web_editor/static/src/components/media_dialog/image_selector.xml index 590573145a6..a5e1303b481 100644 --- a/addons/web_editor/static/src/components/media_dialog/image_selector.xml +++ b/addons/web_editor/static/src/components/media_dialog/image_selector.xml @@ -30,7 +30,7 @@

No images found.

-

Psst! Want to impress your screen? Upload from the button in the top right corner!

+

Wow, it feels a bit empty in here. Upload from the button in the top right corner!

Discover a world of awesomeness in our copyright-free image haven. No legal drama, just nice images!

diff --git a/odoo/addons/base/models/ir_rule.py b/odoo/addons/base/models/ir_rule.py index 444df4b0406..cc5446666f4 100644 --- a/odoo/addons/base/models/ir_rule.py +++ b/odoo/addons/base/models/ir_rule.py @@ -204,7 +204,7 @@ class IrRule(models.Model): "Sorry, %s doesn't have '%s' access to:", user_description, operations[operation]) failing_model = _("- %s (%s)", description, model) - resolution_info = _("If you really, really need access, go bribe your friendly administrator.") + resolution_info = _("If you really, really need access, perhaps you can win over your friendly administrator with a batch of freshly baked cookies.") if not self.user_has_groups('base.group_no_one') or not self.env.user.has_group('base.group_user'): records.invalidate_recordset() @@ -232,7 +232,7 @@ class IrRule(models.Model): failing_rules = _("Blame the following rules:\n%s", rules_description) if company_related: - failing_rules += "\n\n" + _('Note: this might be a multi-company issue.') + failing_rules += "\n\n" + _('Note: this might be a multi-company issue. Switching company may help - in Odoo, not in real life!') # clean up the cache of records prefetched with display_name above records_sudo.invalidate_recordset() diff --git a/odoo/addons/test_access_rights/tests/test_feedback.py b/odoo/addons/test_access_rights/tests/test_feedback.py index f36b67b3b80..e980ef7bcc9 100644 --- a/odoo/addons/test_access_rights/tests/test_feedback.py +++ b/odoo/addons/test_access_rights/tests/test_feedback.py @@ -203,7 +203,7 @@ class TestIRRuleFeedback(Feedback): Sorry, %s (id=%s) doesn't have 'write' access to: - %s (%s) -If you really, really need access, go bribe your friendly administrator.""" +If you really, really need access, perhaps you can win over your friendly administrator with a batch of freshly baked cookies.""" % (self.user.name, self.user.id, self.record._description, self.record._name)) # debug mode self.debug_mode() @@ -219,7 +219,7 @@ Sorry, %s (id=%s) doesn't have 'write' access to: Blame the following rules: - rule 0 -If you really, really need access, go bribe your friendly administrator.""" +If you really, really need access, perhaps you can win over your friendly administrator with a batch of freshly baked cookies.""" % (self.user.name, self.user.id, self.record._description, self.record.display_name, self.record._name, self.record.id)) ChildModel = self.env['test_access_right.inherits'] @@ -235,7 +235,7 @@ Sorry, %s (id=%s) doesn't have 'write' access to: Blame the following rules: - rule 0 -If you really, really need access, go bribe your friendly administrator.""" +If you really, really need access, perhaps you can win over your friendly administrator with a batch of freshly baked cookies.""" % (self.user.name, self.user.id, self.record._description, self.record.display_name, self.record._name, self.record.id)) def test_locals(self): @@ -255,7 +255,7 @@ Blame the following rules: - rule 0 - rule 1 -If you really, really need access, go bribe your friendly administrator.""" +If you really, really need access, perhaps you can win over your friendly administrator with a batch of freshly baked cookies.""" % (self.user.name, self.user.id, self.record._description, self.record.display_name, self.record._name, self.record.id)) def test_globals_all(self): @@ -275,7 +275,7 @@ Blame the following rules: - rule 0 - rule 1 -If you really, really need access, go bribe your friendly administrator.""" +If you really, really need access, perhaps you can win over your friendly administrator with a batch of freshly baked cookies.""" % (self.user.name, self.user.id, self.record._description, self.record.display_name, self.record._name, self.record.id)) def test_globals_any(self): @@ -297,7 +297,7 @@ Sorry, %s (id=%s) doesn't have 'write' access to: Blame the following rules: - rule 0 -If you really, really need access, go bribe your friendly administrator.""" +If you really, really need access, perhaps you can win over your friendly administrator with a batch of freshly baked cookies.""" % (self.user.name, self.user.id, self.record._description, self.record.display_name, self.record._name, self.record.id)) def test_combination(self): @@ -320,7 +320,7 @@ Blame the following rules: - rule 2 - rule 3 -If you really, really need access, go bribe your friendly administrator.""" +If you really, really need access, perhaps you can win over your friendly administrator with a batch of freshly baked cookies.""" % (self.user.name, self.user.id, self.record._description, self.record.display_name, self.record._name, self.record.id)) def test_warn_company_no_access(self): @@ -343,9 +343,9 @@ Sorry, %s (id=%s) doesn't have 'write' access to: Blame the following rules: - rule 0 -Note: this might be a multi-company issue. +Note: this might be a multi-company issue. Switching company may help - in Odoo, not in real life! -If you really, really need access, go bribe your friendly administrator.""" +If you really, really need access, perhaps you can win over your friendly administrator with a batch of freshly baked cookies.""" % (self.user.name, self.user.id, self.record._description, self.record.display_name, self.record._name, self.record.id)) def test_warn_company_no_company_field(self): @@ -377,9 +377,9 @@ Sorry, %s (id=%s) doesn't have 'read' access to: Blame the following rules: - rule 0 -Note: this might be a multi-company issue. +Note: this might be a multi-company issue. Switching company may help - in Odoo, not in real life! -If you really, really need access, go bribe your friendly administrator.""" +If you really, really need access, perhaps you can win over your friendly administrator with a batch of freshly baked cookies.""" % (self.user.name, self.user.id, child_record._description, child_record.display_name, child_record._name, child_record.id)) def test_warn_company_access(self): @@ -402,9 +402,9 @@ Sorry, %s (id=%s) doesn't have 'read' access to: Blame the following rules: - rule 0 -Note: this might be a multi-company issue. +Note: this might be a multi-company issue. Switching company may help - in Odoo, not in real life! -If you really, really need access, go bribe your friendly administrator.""" +If you really, really need access, perhaps you can win over your friendly administrator with a batch of freshly baked cookies.""" % (self.user.name, self.user.id, self.record._description, self.record.display_name, self.record._name, self.record.id, self.record.sudo().company_id.display_name)) p = self.env['test_access_right.inherits'].create({'some_id': self.record.id}) self.env.flush_all()