summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/gui/didyouknowwindow.cpp3
-rw-r--r--src/gui/gui.cpp2
-rw-r--r--src/gui/helpwindow.cpp1
-rw-r--r--src/gui/serverdialog.cpp2
-rw-r--r--src/net/tmwa/npchandler.cpp2
-rw-r--r--src/utils/langs.cpp87
-rw-r--r--src/utils/langs.h38
-rw-r--r--src/utils/stringutils.cpp56
-rw-r--r--src/utils/stringutils.h6
11 files changed, 137 insertions, 64 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 955795a14..a52ce41da 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -451,6 +451,8 @@ SET(SRCS
utils/copynpaste.h
utils/dtor.h
utils/gettext.h
+ utils/langs.cpp
+ utils/langs.h
utils/mathutils.h
utils/paths.cpp
utils/paths.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 0e76af87c..c5fdaeac1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -456,6 +456,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
utils/copynpaste.h \
utils/dtor.h \
utils/gettext.h \
+ utils/langs.cpp \
+ utils/langs.h \
utils/mathutils.h \
utils/mkdir.cpp \
utils/mkdir.h \
diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp
index db0878360..a6b89923e 100644
--- a/src/gui/didyouknowwindow.cpp
+++ b/src/gui/didyouknowwindow.cpp
@@ -22,6 +22,7 @@
#include "gui/didyouknowwindow.h"
+#include "configuration.h"
#include "logger.h"
#include "gui/gui.h"
@@ -34,9 +35,9 @@
#include "gui/widgets/scrollarea.h"
#include "resources/resourcemanager.h"
-#include "configuration.h"
#include "utils/gettext.h"
+#include "utils/langs.h"
#include "debug.h"
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 1d8b45872..f8d68a672 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -42,6 +42,8 @@
#include "resources/imageloader.h"
#include "resources/resourcemanager.h"
+#include "utils/langs.h"
+
#include <guichan/exception.hpp>
#include <guichan/image.hpp>
diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp
index a099c7a7a..5876667da 100644
--- a/src/gui/helpwindow.cpp
+++ b/src/gui/helpwindow.cpp
@@ -36,6 +36,7 @@
#include "configuration.h"
#include "utils/gettext.h"
+#include "utils/langs.h"
#include "debug.h"
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 59bdf9660..c50c2b802 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -46,9 +46,9 @@
#include "net/net.h"
#include "utils/gettext.h"
+#include "utils/langs.h"
#include "utils/stringutils.h"
#include "utils/xml.h"
-#include "widgets/dropdown.h"
#include <guichan/font.hpp>
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index d86c64a96..837b83337 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -35,6 +35,8 @@
#include "net/ea/eaprotocol.h"
+#include "utils/langs.h"
+
#include "debug.h"
extern Net::NpcHandler *npcHandler;
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);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-13 13:37:15 +0000