From 1f717def35c32dfa78c356239dd0a32b83554e19 Mon Sep 17 00:00:00 2001
From: Capostrophic <alexdobrohotov@yandex.ru>
Date: Sat, 25 Aug 2018 00:27:42 +0300
Subject: [PATCH] Update journal, start script and spell verifiers messages

---
 apps/opencs/model/tools/journalcheck.cpp     | 18 +++++-------------
 apps/opencs/model/tools/spellcheck.cpp       |  4 ++--
 apps/opencs/model/tools/startscriptcheck.cpp |  3 +--
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/apps/opencs/model/tools/journalcheck.cpp b/apps/opencs/model/tools/journalcheck.cpp
index 4a7ab7d660..bd77e95b63 100644
--- a/apps/opencs/model/tools/journalcheck.cpp
+++ b/apps/opencs/model/tools/journalcheck.cpp
@@ -33,6 +33,7 @@ void CSMTools::JournalCheckStage::perform(int stage, CSMDoc::Messages& messages)
     std::set<int> questIndices;
 
     CSMWorld::InfoCollection::Range range = mJournalInfos.getTopicRange(journal.mId);
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Journal, journal.mId);
 
     for (CSMWorld::InfoCollection::RecordConstIterator it = range.first; it != range.second; ++it)
     {
@@ -56,9 +57,7 @@ void CSMTools::JournalCheckStage::perform(int stage, CSMDoc::Messages& messages)
 
         if (journalInfo.mResponse.empty())
         {
-            CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_JournalInfo, journalInfo.mId);
-
-            messages.add(id, "Journal Info: missing description", "", CSMDoc::Message::Severity_Warning);
+            messages.add(id, "Missing journal entry text", "", CSMDoc::Message::Severity_Warning);
         }
 
         std::pair<std::set<int>::iterator, bool> result = questIndices.insert(journalInfo.mData.mJournalIndex);
@@ -66,25 +65,18 @@ void CSMTools::JournalCheckStage::perform(int stage, CSMDoc::Messages& messages)
         // Duplicate index
         if (result.second == false)
         {
-            CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_JournalInfo, journalInfo.mId);
-
             std::ostringstream stream;
-            stream << "Journal: duplicated quest index " << journalInfo.mData.mJournalIndex;
-
+            stream << "Duplicated quest index " << journalInfo.mData.mJournalIndex;
             messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
         }
     }
 
     if (totalInfoCount == 0)
     {
-        CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Journal, journal.mId);
-
-        messages.add(id, "Journal: no defined Journal Infos", "", CSMDoc::Message::Severity_Warning);
+        messages.add(id, "No related journal entry", "", CSMDoc::Message::Severity_Warning);
     }
     else if (statusNamedCount > 1)
     {
-        CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Journal, journal.mId);
-
-        messages.add(id, "Journal: multiple infos with quest status \"Named\"", "", CSMDoc::Message::Severity_Error);
+        messages.add(id, "Multiple entries with quest status 'Named'", "", CSMDoc::Message::Severity_Error);
     }
 }
diff --git a/apps/opencs/model/tools/spellcheck.cpp b/apps/opencs/model/tools/spellcheck.cpp
index 3e59f0d9a3..6c08aca37b 100644
--- a/apps/opencs/model/tools/spellcheck.cpp
+++ b/apps/opencs/model/tools/spellcheck.cpp
@@ -36,11 +36,11 @@ void CSMTools::SpellCheckStage::perform (int stage, CSMDoc::Messages& messages)
 
     // test for empty name and description
     if (spell.mName.empty())
-        messages.push_back (std::make_pair (id, spell.mId + " has an empty name"));
+        messages.push_back (std::make_pair (id, "Name is missing"));
 
     // test for invalid cost values
     if (spell.mData.mCost<0)
-        messages.push_back (std::make_pair (id, spell.mId + " has a negative spell costs"));
+        messages.push_back (std::make_pair (id, "Spell cost is negative"));
 
     /// \todo check data members that can't be edited in the table view
 }
diff --git a/apps/opencs/model/tools/startscriptcheck.cpp b/apps/opencs/model/tools/startscriptcheck.cpp
index b1d92380b3..5a9f63dc43 100644
--- a/apps/opencs/model/tools/startscriptcheck.cpp
+++ b/apps/opencs/model/tools/startscriptcheck.cpp
@@ -25,8 +25,7 @@ void CSMTools::StartScriptCheckStage::perform(int stage, CSMDoc::Messages& messa
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_StartScript, scriptId);
 
     if (mScripts.searchId (Misc::StringUtils::lowerCase (scriptId))==-1)
-        messages.push_back (
-            std::make_pair (id, "Start script " + scriptId + " does not exist"));
+        messages.push_back (std::make_pair (id, "Start script " + scriptId + " does not exist"));
 }
 
 int CSMTools::StartScriptCheckStage::setup()