summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-10 23:08:35 +0100
committerIra Rice <irarice@gmail.com>2009-02-11 08:43:59 -0700
commit1ea7d80aff0961e6f55ee467b8cbe26d146828f8 (patch)
tree4e635e72541c3df3493a2a5871348f02b9f48bfe /src/resources
parent4a41ce55224ad7b54c6b5ea78126d8d314f5ef41 (diff)
downloadmana-1ea7d80aff0961e6f55ee467b8cbe26d146828f8.tar.gz
mana-1ea7d80aff0961e6f55ee467b8cbe26d146828f8.tar.bz2
mana-1ea7d80aff0961e6f55ee467b8cbe26d146828f8.tar.xz
mana-1ea7d80aff0961e6f55ee467b8cbe26d146828f8.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.cpp16
-rw-r--r--src/resources/monsterdb.cpp23
-rw-r--r--src/resources/npcdb.cpp6
5 files changed, 34 insertions, 31 deletions
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index 4ff8944c..b53798bb 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 5a014c95..23a7833c 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 5577b5e1..ceaf0395 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -50,7 +50,7 @@ void ItemDB::load()
if (mLoaded)
return;
- logger->log(_("Initializing item database..."));
+ logger->log("Initializing item database...");
mUnknown = new ItemInfo();
mUnknown->setName(_("Unknown item"));
@@ -63,7 +63,7 @@ void ItemDB::load()
if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "items"))
{
- logger->error(_("ItemDB: Error while loading items.xml!"));
+ logger->error("ItemDB: Error while loading items.xml!");
}
for_each_xml_child_node(node, rootNode)
@@ -75,12 +75,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");
@@ -136,7 +136,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);
}
}
@@ -162,7 +162,7 @@ void ItemDB::load()
void ItemDB::unload()
{
- logger->log(_("Unloading item database..."));
+ logger->log("Unloading item database...");
delete mUnknown;
mUnknown = NULL;
@@ -180,7 +180,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
@@ -236,7 +236,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 13f3a7ee..b1965989 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -44,14 +44,14 @@ 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();
if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "monsters"))
{
- logger->error(_("Monster Database: Error while loading monster.xml!"));
+ logger->error("Monster Database: Error while loading monster.xml!");
}
//iterate <monster>s
@@ -64,7 +64,7 @@ void MonsterDB::load()
MonsterInfo *currentInfo = new MonsterInfo();
- currentInfo->setName (XML::getProperty(monsterNode, "name", "unnamed"));
+ currentInfo->setName(XML::getProperty(monsterNode, "name", _("unnamed")));
std::string targetCursor;
targetCursor = XML::getProperty(monsterNode, "targetCursor", "medium");
@@ -82,7 +82,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);
}
@@ -92,7 +93,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"))
@@ -119,14 +121,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);
}
@@ -157,7 +162,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 177d3116..3e9decf1 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -44,7 +44,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();
@@ -63,7 +63,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;
}
@@ -121,7 +121,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