Merge branch 'master' into stripped

6 files changed, 532 insertions, 0 deletions

diff --git a/src/utils/translation/podict.cpp b/src/utils/translation/podict.cpp
new file mode 100644
index 000000000..0be0b279f
--- /dev/null
+++ b/src/utils/translation/podict.cpp
@@ -0,0 +1,55 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "utils/translation/podict.h"
+
+#include <string.h>
+
+#include "localconsts.h"
+#include "logger.h"
+
+#include "debug.h"
+
+std::string empty;
+
+PoDict *translator = nullptr;
+
+PoDict::PoDict(std::string lang) :
+    mLang(lang)
+{
+}
+
+PoDict::~PoDict()
+{
+}
+
+const std::string PoDict::getStr(std::string &str)
+{
+    if (mPoLines.find(str) == mPoLines.end())
+        return str;
+    return mPoLines[str];
+}
+
+const char *PoDict::getChar(const char *str)
+{
+    if (mPoLines.find(str) == mPoLines.end())
+        return str;
+    return mPoLines[str].c_str();
+}
diff --git a/src/utils/translation/podict.h b/src/utils/translation/podict.h
new file mode 100644
index 000000000..0b7dd726c
--- /dev/null
+++ b/src/utils/translation/podict.h
@@ -0,0 +1,59 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UTILS_TRANSLATION_PODICT_H
+#define UTILS_TRANSLATION_PODICT_H
+
+#include <string>
+#include <map>
+
+typedef std::map <std::string, std::string> PoMap;
+
+class PoDict
+{
+    public:
+        PoDict(std::string lang);
+
+        ~PoDict();
+
+        const std::string getStr(std::string &str);
+
+        const char *getChar(const char *str);
+
+    protected:
+        friend class PoParser;
+
+        PoMap *getMap()
+        { return &mPoLines; }
+
+        void set(std::string key, std::string value)
+        { mPoLines[key] = value; }
+
+        void setLang(std::string lang)
+        { mLang = lang; }
+
+    private:
+        PoMap mPoLines;
+        std::string mLang;
+};
+
+extern PoDict *translator;
+
+#endif // UTILS_TRANSLATION_PODICT_H
diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp
new file mode 100644
index 000000000..24d2ee4d4
--- /dev/null
+++ b/src/utils/translation/poparser.cpp
@@ -0,0 +1,221 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "utils/translation/poparser.h"
+
+#include "resources/resourcemanager.h"
+
+#include "utils/stringutils.h"
+
+#include "localconsts.h"
+#include "logger.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "debug.h"
+
+PoParser::PoParser() :
+    mDict(nullptr),
+    mReadingId(false),
+    mReadingStr(false)
+{
+}
+
+void PoParser::openFile()
+{
+    ResourceManager *resman = ResourceManager::getInstance();
+    int size;
+    char *buf = static_cast<char*>(resman->loadFile(getFileName(mLang), size));
+
+    mFile.str(std::string(buf, size));
+    free(buf);
+}
+
+PoDict *PoParser::load(std::string lang)
+{
+    setLang(lang);
+    mDict = getDict();
+
+    openFile();
+
+    mMsgId = "";
+    mMsgStr = "";
+
+    // cycle by msgid+msgstr
+    while (readLine())
+    {
+        // reading msgid
+        while (readMsgId())
+        {
+            if (!readLine())
+                break;
+        }
+
+        if (!mMsgId.empty())
+        {
+            // if we got msgid then reading msgstr
+            while (readMsgStr())
+            {
+                if (!readLine())
+                    break;
+            }
+        }
+
+        if (!mMsgId.empty() && !mMsgStr.empty())
+        {
+//            logger->log("add key: " + mMsgId);
+//            logger->log("add value: " + mMsgStr);
+
+            // store key and value
+            mDict->set(mMsgId, mMsgStr);
+        }
+
+        mMsgId = "";
+        mMsgStr = "";
+    }
+
+    return mDict;
+}
+
+bool PoParser::readLine()
+{
+    char line[1001];
+    if (!mFile.getline(line, 1000))
+        return false;
+    mLine = line;
+    return true;
+}
+
+bool PoParser::readMsgId()
+{
+    // if we reading msgstr then stop here
+    if (mReadingStr)
+        return false;
+
+    const std::string msgId1 = "msgid \"";
+
+    // check if in reading process
+    if (mReadingId)
+    {
+        // if we get empty line in file then stop reading
+        if (mLine.empty())
+        {
+            mReadingId = false;
+            return false;
+        }
+        else if (checkLine())
+        {
+            // reading text from: "text"
+            mMsgId += mLine.substr(1, mLine.size() - 2);
+            mLine = "";
+            return true;
+        }
+        // stop reading in other case
+        mReadingId = false;
+        return false;
+    }
+    else
+    {
+        // check line start from msgid "
+        if (strStartWith(mLine, msgId1))
+        {
+            mReadingId = true;
+            // reading text from: msgid "text"
+            mMsgId += mLine.substr(msgId1.size(),
+                mLine.size() - 1 - msgId1.size());
+            mLine = "";
+            return true;
+        }
+        // stop reading if we dont read msgid before
+        return mMsgId.empty();
+    }
+}
+
+bool PoParser::readMsgStr()
+{
+    const std::string msgStr1 = "msgstr \"";
+
+    // check if in reading process
+    if (mReadingStr)
+    {
+        // if we get empty line in file then stop reading
+        if (mLine.empty())
+        {
+            mReadingStr = false;
+            return false;
+        }
+        if (checkLine())
+        {
+            // reading text from: "text"
+            mMsgStr += mLine.substr(1, mLine.size() - 2);
+            mLine = "";
+            return true;
+        }
+        // stop reading in other case
+        mReadingStr = false;
+    }
+    else
+    {
+        // check line start from msgstr "
+        if (strStartWith(mLine, msgStr1))
+        {
+            mReadingStr = true;
+            // reading text from: msgid "text"
+            mMsgStr += mLine.substr(msgStr1.size(),
+                mLine.size() - 1 - msgStr1.size());
+            mLine = "";
+            return true;
+        }
+    }
+
+    // stop reading in other case
+    return false;
+}
+
+bool PoParser::checkLine()
+{
+    // check is line in format: "text"
+    return mLine.size() > 2 && mLine[0] == '\"'
+        && mLine[mLine.size() - 1] == '\"';
+}
+
+PoDict *PoParser::getEmptyDict()
+{
+    return new PoDict("");
+}
+
+bool PoParser::checkLang(std::string lang) const
+{
+    // check is po file exists
+    ResourceManager *resman = ResourceManager::getInstance();
+    return resman->exists(getFileName(lang));
+}
+
+std::string PoParser::getFileName(std::string lang) const
+{
+    // get po file name from lang name
+    return strprintf("translations/%s.po", lang.c_str());
+}
+
+PoDict *PoParser::getDict()
+{
+    return new PoDict(mLang);
+}
diff --git a/src/utils/translation/poparser.h b/src/utils/translation/poparser.h
new file mode 100644
index 000000000..799cd2fe7
--- /dev/null
+++ b/src/utils/translation/poparser.h
@@ -0,0 +1,78 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UTILS_TRANSLATION_POPARSER_H
+#define UTILS_TRANSLATION_POPARSER_H
+
+#include "utils/translation/podict.h"
+
+#include <sstream>
+#include <string>
+
+class PoParser
+{
+    public:
+        PoParser();
+
+        PoDict *load(std::string fileName);
+
+        bool checkLang(std::string lang) const;
+
+        static PoDict *getEmptyDict();
+
+    private:
+        void setLang(std::string lang)
+        { mLang = lang; }
+
+        void openFile();
+
+        bool readLine();
+
+        bool readMsgId();
+
+        bool readMsgStr();
+
+        bool checkLine();
+
+        std::string getFileName(std::string lang) const;
+
+        PoDict *getDict();
+
+        // current lang
+        std::string mLang;
+
+        // po file object
+        std::istringstream mFile;
+
+        // current line from po file
+        std::string mLine;
+
+        std::string mMsgId;
+
+        std::string mMsgStr;
+
+        PoDict *mDict;
+
+        bool mReadingId;
+
+        bool mReadingStr;
+};
+
+#endif // UTILS_TRANSLATION_POPARSER_H
diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp
new file mode 100644
index 000000000..1b68cc91d
--- /dev/null
+++ b/src/utils/translation/translationmanager.cpp
@@ -0,0 +1,78 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "utils/translation/translationmanager.h"
+
+#include "utils/langs.h"
+
+#include "utils/translation/podict.h"
+#include "utils/translation/poparser.h"
+
+#include <string.h>
+
+#include "localconsts.h"
+#include "logger.h"
+
+#include "debug.h"
+
+void TranslationManager::init()
+{
+    if (translator)
+        delete translator;
+    translator = PoParser::getEmptyDict();
+}
+
+void TranslationManager::loadCurrentLang()
+{
+    if (translator)
+        delete translator;
+    translator = loadLang(getLang());
+}
+
+void TranslationManager::close()
+{
+    delete translator;
+    translator = nullptr;
+}
+
+PoDict *TranslationManager::loadLang(LangVect lang)
+{
+    std::string name = "";
+    PoParser parser;
+
+    LangIter it = lang.begin();
+    LangIter it_end = lang.end();
+
+    for (; it != it_end; ++ it)
+    {
+        if (*it == "C")
+            continue;
+
+        if (parser.checkLang(*it))
+        {
+            name = *it;
+            break;
+        }
+    }
+    if (!name.empty())
+        return parser.load(name);
+    logger->log("can't find client data translation");
+    return PoParser::getEmptyDict();
+}
diff --git a/src/utils/translation/translationmanager.h b/src/utils/translation/translationmanager.h
new file mode 100644
index 000000000..39702f4f4
--- /dev/null
+++ b/src/utils/translation/translationmanager.h
@@ -0,0 +1,41 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UTILS_TRANSLATION_MANAGER_H
+#define UTILS_TRANSLATION_MANAGER_H
+
+#include <string>
+#include <vector>
+
+class PoDict;
+
+class TranslationManager
+{
+    public:
+        static PoDict *loadLang(std::vector<std::string> lang);
+
+        static void init();
+
+        static void close();
+
+        static void loadCurrentLang();
+};
+
+#endif // UTILS_TRANSLATION_MANAGER_H