From dabc7c1abeac73b8bbd8be44005ce7bd84ccfd16 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Fri, 17 Dec 2021 20:53:13 +0100
Subject: [PATCH] Apply suggestion batch that fixes bad english

Co-Authored-By: Rosemary Witchaven <32779090+in1tiate@users.noreply.github.com>
---
 core/include/area_data.h   | 12 ++++++------
 core/src/area_data.cpp     |  4 ++--
 core/src/commands/area.cpp |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/include/area_data.h b/core/include/area_data.h
index 6f320e7..78a692e 100644
--- a/core/include/area_data.h
+++ b/core/include/area_data.h
@@ -551,7 +551,7 @@ class AreaData : public QObject {
     QString areaMessage() const;
 
     /**
-     * @brief Returns if the flavour text is send by joining the area.
+     * @brief Returns if the area's message should be sent when a user joins the area.
      *
      * @return See short description.
      */
@@ -560,7 +560,7 @@ class AreaData : public QObject {
     /**
      * @brief Changes the area message in the area.
      *
-     * @param f_newFlacour_r The new flavour text.
+     * @param f_newMessage_r The new message.
      */
     void changeAreaMessage(const QString& f_newMessage_r);
 
@@ -830,7 +830,7 @@ class AreaData : public QObject {
     void toggleIgnoreBgList();
 
     /**
-     * @brief Toggles wether the area message is send on joining the area.
+     * @brief Toggles whether the area message is sent upon joining the area.
      */
     void toggleAreaMessageJoin();
 
@@ -963,8 +963,8 @@ private:
     /**
      * @brief The message of the area.
      *
-     * @details The area mnessage has multiple purposes. It can be used to provide general information for
-     * RP or guidance for players joining the area. Unlike document it can send on area join.
+     * @details The area message has multiple purposes. It can be used to provide general information for
+     * RP or guidance for players joining the area. Unlike document it can be sent on area join. Like a MOTD, but for the area.
      */
     QString m_area_message;
 
@@ -1056,7 +1056,7 @@ private:
     bool m_ignoreBgList;
 
     /**
-     * @brief Wether or not the area message is send on joining it.
+     * @brief Whether or not the area message is sent upon area join.
      */
     bool m_send_area_message;
 
diff --git a/core/src/area_data.cpp b/core/src/area_data.cpp
index dd46d4b..a15135f 100644
--- a/core/src/area_data.cpp
+++ b/core/src/area_data.cpp
@@ -26,7 +26,7 @@ AreaData::AreaData(QString p_name, int p_index) :
     m_status(IDLE),
     m_locked(FREE),
     m_document("No document."),
-    m_area_message("No flavour text."),
+    m_area_message("No area message set."),
     m_defHP(10),
     m_proHP(10),
     m_statement(0),
@@ -494,7 +494,7 @@ bool AreaData::sendAreaMessageOnJoin() const
 void AreaData::changeAreaMessage(const QString& f_newMessage_r)
 {
     if(f_newMessage_r.isEmpty())
-        m_area_message = "No flavour text.";
+        m_area_message = "No area message set.";
     else
         m_area_message = f_newMessage_r;
 }
diff --git a/core/src/commands/area.cpp b/core/src/commands/area.cpp
index 3ecb41d..2c88b8f 100644
--- a/core/src/commands/area.cpp
+++ b/core/src/commands/area.cpp
@@ -383,7 +383,7 @@ void AOClient::cmdAreaMessage(int argc, QStringList argv)
 
     if (argc >= 1) {
         l_area->changeAreaMessage(argv.join(" "));
-        sendServerMessage("Updated areas flavour text.");
+        sendServerMessage("Updated this area's message.");
     }
 }
 
@@ -395,7 +395,7 @@ void AOClient::cmdToggleAreaMessageOnJoin(int argc, QStringList argv)
     AreaData* l_area = server->m_areas[m_current_area];
     l_area->toggleAreaMessageJoin();
     QString l_state = l_area->sendAreaMessageOnJoin() ? "enabled." : "disabled.";
-    sendServerMessage("Sending flavour text on area join is now " +l_state);
+    sendServerMessage("Sending message on area join is now " +l_state);
 }
 
 void AOClient::cmdClearAreaMessage(int argc, QStringList argv)