4 files changed, 125 insertions, 62 deletions
diff --git a/src/utils/langs.cpp b/src/utils/langs.cpp
new file mode 100644
index 000000000..2efbd781a
--- /dev/null
+++ b/src/utils/langs.cpp
@@ -0,0 +1,87 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-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/langs.h"
+
+#include "configuration.h"
+
+#include <string.h>
+#include <algorithm>
+#include <cstdarg>
+#include <cstdio>
+#include <list>
+
+#include "debug.h"
+
+std::vector<std::string> getLang()
+{
+    std::vector<std::string> langs;
+
+    std::string lang = config.getValue("lang", "").c_str();
+    if (lang.empty())
+    {
+        char *lng = getenv("LANG");
+        if (!lng)
+            return langs;
+        lang = lng;
+    }
+
+    int dot = lang.find(".");
+    if (dot != (signed)std::string::npos)
+        lang = lang.substr(0, dot);
+    langs.push_back(lang);
+    dot = lang.find("_");
+    if (dot != (signed)std::string::npos)
+        langs.push_back(lang.substr(0, dot));
+    return langs;
+}
+
+std::string getLangSimple()
+{
+    std::string lang = config.getValue("lang", "").c_str();
+    if (lang.empty())
+    {
+        char *lng = getenv("LANG");
+        if (!lng)
+            return "";
+        return lng;
+    }
+    return lang;
+}
+
+std::string getLangShort()
+{
+    std::string lang = config.getValue("lang", "").c_str();
+    if (lang.empty())
+    {
+        char *lng = getenv("LANG");
+        if (!lng)
+            return "";
+        lang = lng;
+    }
+
+    int dot = lang.find(".");
+    if (dot != (signed)std::string::npos)
+        lang = lang.substr(0, dot);
+    dot = lang.find("_");
+    if (dot != (signed)std::string::npos)
+        return lang.substr(0, dot);
+    return lang;
+}
diff --git a/src/utils/langs.h b/src/utils/langs.h
new file mode 100644
index 000000000..c3f2f1398
--- /dev/null
+++ b/src/utils/langs.h
@@ -0,0 +1,38 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2007-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-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_LANGS_H
+#define UTILS_LANGS_H
+
+#include <string>
+#include <sstream>
+#include <list>
+#include <set>
+#include <vector>
+
+std::vector<std::string> getLang();
+
+std::string getLangSimple();
+
+std::string getLangShort();
+
+#endif // UTILS_LANGS_H
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 08bcac9e6..b07a4e367 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -486,62 +486,6 @@ std::string combineDye2(std::string file, std::string dye)
     }
 }
 
-std::vector<std::string> getLang()
-{
-    std::vector<std::string> langs;
-
-    std::string lang = config.getValue("lang", "").c_str();
-    if (lang.empty())
-    {
-        char *lng = getenv("LANG");
-        if (!lng)
-            return langs;
-        lang = lng;
-    }
-
-    int dot = lang.find(".");
-    if (dot != (signed)std::string::npos)
-        lang = lang.substr(0, dot);
-    langs.push_back(lang);
-    dot = lang.find("_");
-    if (dot != (signed)std::string::npos)
-        langs.push_back(lang.substr(0, dot));
-    return langs;
-}
-
-std::string getLangSimple()
-{
-    std::string lang = config.getValue("lang", "").c_str();
-    if (lang.empty())
-    {
-        char *lng = getenv("LANG");
-        if (!lng)
-            return "";
-        return lng;
-    }
-    return lang;
-}
-
-std::string getLangShort()
-{
-    std::string lang = config.getValue("lang", "").c_str();
-    if (lang.empty())
-    {
-        char *lng = getenv("LANG");
-        if (!lng)
-            return "";
-        lang = lng;
-    }
-
-    int dot = lang.find(".");
-    if (dot != (signed)std::string::npos)
-        lang = lang.substr(0, dot);
-    dot = lang.find("_");
-    if (dot != (signed)std::string::npos)
-        return lang.substr(0, dot);
-    return lang;
-}
-
 std::string packList(std::list<std::string> &list)
 {
     std::list<std::string>::const_iterator i = list.begin();
diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h
index 0b22ef847..a685a9b17 100644
--- a/src/utils/stringutils.h
+++ b/src/utils/stringutils.h
@@ -186,12 +186,6 @@ std::string combineDye(std::string file, std::string dye);
 
 std::string combineDye2(std::string file, std::string dye);
 
-std::vector<std::string> getLang();
-
-std::string getLangSimple();
-
-std::string getLangShort();
-
 std::string packList(std::list<std::string> &list);
 
 std::list<std::string> unpackList(const std::string &str);