From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 14 Jul 2020 18:12:16 +0000 (-0500)
Subject: Improve error messages
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=37297a8482eedbb0a3adab2748b3e76401d87e4a;p=akkoma

Improve error messages
---

diff --git a/lib/pleroma/application_requirements.ex b/lib/pleroma/application_requirements.ex
index f0f34734e..d51160b82 100644
--- a/lib/pleroma/application_requirements.ex
+++ b/lib/pleroma/application_requirements.ex
@@ -31,10 +31,10 @@ defmodule Pleroma.ApplicationRequirements do
     if Pleroma.Config.get([:instance, :account_activation_required]) &&
          not Pleroma.Config.get([Pleroma.Emails.Mailer, :enabled]) do
       Logger.error(
-        "To use confirmation an user account need to enable and setting mailer.\nIf you want to start Pleroma anyway, set\nconfig :pleroma, :instance, account_activation_required: false\nOtherwise setup and enable mailer."
+        "Account activation enabled, but no Mailer settings enabled.\nPlease set config :pleroma, :instance, account_activation_required: false\nOtherwise setup and enable Mailer."
       )
 
-      {:error, "Confirmation account: Mailer is disabled"}
+      {:error, "Account activation enabled, but Mailer is disabled. Cannot send confirmation emails."}
     else
       :ok
     end