summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-10 23:08:35 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-10 23:13:43 +0100
commitdb3de66d52a9e8d65c657f7438f033144e8087c7 (patch)
tree2abd33c41a6c06ebae8341d3bcfcceb15620a8fd /src/resources
parent19db8d94d88db56dc9484cc85308906add21826d (diff)
downloadmana-db3de66d52a9e8d65c657f7438f033144e8087c7.tar.gz
mana-db3de66d52a9e8d65c657f7438f033144e8087c7.tar.bz2
mana-db3de66d52a9e8d65c657f7438f033144e8087c7.tar.xz
mana-db3de66d52a9e8d65c657f7438f033144e8087c7.zip
Don't make log statements translatable
The log is mainly used to aid the developers, hence shouldn't be translated to the user's local language. Also introduces unnecessary work for all translators.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/colordb.cpp11
-rw-r--r--src/resources/emotedb.cpp9
-rw-r--r--src/resources/itemdb.cpp14
-rw-r--r--src/resources/monsterdb.cpp19
-rw-r--r--src/resources/npcdb.cpp6
5 files changed, 31 insertions, 28 deletions
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index 61ea4bc0..081958c6 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -25,7 +25,6 @@
#include "../log.h"
-#include "../utils/gettext.h"
#include "../utils/xml.h"
#define HAIR_COLOR_FILE "colors.xml"
@@ -51,7 +50,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;
@@ -61,7 +60,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;
@@ -78,7 +77,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") :
@@ -93,7 +92,7 @@ void ColorDB::load()
void ColorDB::unload()
{
- logger->log(_("Unloading color database..."));
+ logger->log("Unloading color database...");
mColors.clear();
mLoaded = false;
@@ -108,7 +107,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
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index ac41b59c..6a14eeb3 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -23,7 +23,6 @@
#include "../log.h"
-#include "../utils/gettext.h"
#include "../utils/xml.h"
namespace
@@ -47,14 +46,14 @@ void EmoteDB::load()
unknownSprite->variant = 0;
mUnknown.sprites.push_back(unknownSprite);
- logger->log(_("Initializing emote database..."));
+ logger->log("Initializing emote database...");
XML::Document doc("emotes.xml");
xmlNodePtr rootNode = doc.rootNode();
if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "emotes"))
{
- logger->log(_("Emote Database: Error while loading emotes.xml!"));
+ logger->log("Emote Database: Error while loading emotes.xml!");
return;
}
@@ -67,7 +66,7 @@ void EmoteDB::load()
int id = XML::getProperty(emoteNode, "id", -1);
if (id == -1)
{
- logger->log(_("Emote Database: Emote with missing ID in emotes.xml!"));
+ logger->log("Emote Database: Emote with missing ID in emotes.xml!");
continue;
}
@@ -126,7 +125,7 @@ const EmoteInfo& EmoteDB::get(int id)
if (i == mEmoteInfos.end())
{
- logger->log(_("EmoteDB: Warning, unknown emote ID %d requested"), id);
+ logger->log("EmoteDB: Warning, unknown emote ID %d requested", id);
return mUnknown;
}
else
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 9976f0d4..6fa010d4 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -49,7 +49,7 @@ void ItemDB::load()
if (mLoaded)
return;
- logger->log(_("Initializing item database..."));
+ logger->log("Initializing item database...");
mUnknown = new ItemInfo();
mUnknown->setName(_("Unknown item"));
@@ -74,12 +74,12 @@ void ItemDB::load()
if (id == 0)
{
- logger->log(_("ItemDB: Invalid or missing item ID in items.xml!"));
+ logger->log("ItemDB: Invalid or missing item ID in items.xml!");
continue;
}
else if (mItemInfos.find(id) != mItemInfos.end())
{
- logger->log(_("ItemDB: Redefinition of item ID %d"), id);
+ logger->log("ItemDB: Redefinition of item ID %d", id);
}
std::string type = XML::getProperty(node, "type", "other");
@@ -135,7 +135,7 @@ void ItemDB::load()
}
else
{
- logger->log(_("ItemDB: Duplicate name of item found item %d"),
+ logger->log("ItemDB: Duplicate name of item found item %d",
id);
}
}
@@ -161,7 +161,7 @@ void ItemDB::load()
void ItemDB::unload()
{
- logger->log(_("Unloading item database..."));
+ logger->log("Unloading item database...");
delete mUnknown;
mUnknown = NULL;
@@ -179,7 +179,7 @@ const ItemInfo& ItemDB::get(int id)
if (i == mItemInfos.end())
{
- logger->log(_("ItemDB: Error, unknown item ID# %d"), id);
+ logger->log("ItemDB: Error, unknown item ID# %d", id);
return *mUnknown;
}
else
@@ -235,7 +235,7 @@ void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node)
}
else
{
- logger->log(_("ItemDB: Ignoring unknown sound event '%s'"),
+ logger->log("ItemDB: Ignoring unknown sound event '%s'",
event.c_str());
}
}
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index c7824a5d..15451c95 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -43,7 +43,7 @@ void MonsterDB::load()
mUnknown.addSprite("error.xml");
mUnknown.setName(_("unnamed"));
- logger->log(_("Initializing monster database..."));
+ logger->log("Initializing monster database...");
XML::Document doc(_("monsters.xml"));
xmlNodePtr rootNode = doc.rootNode();
@@ -81,7 +81,8 @@ void MonsterDB::load()
}
else
{
- logger->log(_("MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"),
+ logger->log("MonsterDB: Unknown target cursor type \"%s\" for %s -"
+ "using medium sized one",
targetCursor.c_str(), currentInfo->getName().c_str());
currentInfo->setTargetCursorSize(Being::TC_MEDIUM);
}
@@ -91,7 +92,8 @@ void MonsterDB::load()
{
if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))
{
- currentInfo->addSprite((const char*) spriteNode->xmlChildrenNode->content);
+ currentInfo->addSprite(
+ (const char*) spriteNode->xmlChildrenNode->content);
}
if (xmlStrEqual(spriteNode->name, BAD_CAST "sound"))
@@ -118,14 +120,17 @@ void MonsterDB::load()
}
else
{
- logger->log(_("MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"),
- filename, event.c_str(), currentInfo->getName().c_str());
+ logger->log("MonsterDB: Warning, sound effect %s for "
+ "unknown event %s of monster %s",
+ filename, event.c_str(),
+ currentInfo->getName().c_str());
}
}
if (xmlStrEqual(spriteNode->name, BAD_CAST "attack"))
{
- std::string event = XML::getProperty(spriteNode, "particle-effect", "");
+ std::string event = XML::getProperty(
+ spriteNode, "particle-effect", "");
currentInfo->addAttackParticleEffect(event);
}
@@ -156,7 +161,7 @@ const MonsterInfo &MonsterDB::get(int id)
if (i == mMonsterInfos.end())
{
- logger->log(_("MonsterDB: Warning, unknown monster ID %d requested"), id);
+ logger->log("MonsterDB: Warning, unknown monster ID %d requested", id);
return mUnknown;
}
else
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 73c3939d..ee65136a 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -43,7 +43,7 @@ void NPCDB::load()
unknownSprite->variant = 0;
mUnknown.sprites.push_back(unknownSprite);
- logger->log(_("Initializing NPC database..."));
+ logger->log("Initializing NPC database...");
XML::Document doc("npcs.xml");
xmlNodePtr rootNode = doc.rootNode();
@@ -62,7 +62,7 @@ void NPCDB::load()
int id = XML::getProperty(npcNode, "id", 0);
if (id == 0)
{
- logger->log(_("NPC Database: NPC with missing ID in npcs.xml!"));
+ logger->log("NPC Database: NPC with missing ID in npcs.xml!");
continue;
}
@@ -120,7 +120,7 @@ const NPCInfo& NPCDB::get(int id)
if (i == mNPCInfos.end())
{
- logger->log(_("NPCDB: Warning, unknown NPC ID %d requested"), id);
+ logger->log("NPCDB: Warning, unknown NPC ID %d requested", id);
return mUnknown;
}
else