Style cleanups throughout most of the code. Splitting function type from

the function names should no longer be around.

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index bdc6211a..f80ca6b3 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -27,6 +27,7 @@
 #include "../log.h"
 
 #include "../utils/dtor.h"
+#include "../utils/gettext.h"
 #include "../utils/xml.h"
 
 #define HAIR_COLOR_FILE "colors.xml"
@@ -52,7 +53,7 @@ void ColorDB::load()
 
     if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
     {
-        logger->log("Trying TMW's color file, %s.", TMW_COLOR_FILE);
+        logger->log(_("Trying TMW's color file, %s."), TMW_COLOR_FILE);
 
         TMWHair = true;
 
@@ -62,7 +63,7 @@ void ColorDB::load()
         root = doc->rootNode();
         if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
         {
-            logger->log("ColorDB: Failed");
+            logger->log(_("ColorDB: Failed"));
             mColors[0] = mFail;
             mLoaded = true;
 
@@ -79,7 +80,7 @@ void ColorDB::load()
 
             if (mColors.find(id) != mColors.end())
             {
-                logger->log("ColorDB: Redefinition of dye ID %d", id);
+                logger->log(_("ColorDB: Redefinition of dye ID %d"), id);
             }
 
             TMWHair ? mColors[id] = XML::getProperty(node, "value", "#FFFFFF") :
@@ -94,7 +95,7 @@ void ColorDB::load()
 
 void ColorDB::unload()
 {
-    logger->log("Unloading color database...");
+    logger->log(_("Unloading color database..."));
 
     mColors.clear();
     mLoaded = false;
@@ -109,7 +110,7 @@ std::string& ColorDB::get(int id)
 
     if (i == mColors.end())
     {
-        logger->log("ColorDB: Error, unknown dye ID# %d", id);
+        logger->log(_("ColorDB: Error, unknown dye ID# %d"), id);
         return mFail;
     }
     else